← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_btree_index.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-03-17 07:05:37 UTC
  • mfrom: (4152.1.2 branch.stacked.streams)
  • Revision ID: pqm@pqm.ubuntu.com-20090317070537-zaud24vjs2szna87
(robertc) Add client-side streaming from stacked branches (over
        bzr:// protocols) when the sort order is compatible with doing
        that. (Robert Collins, Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_btree_index.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
#
17
17
 
18
18
"""Tests for btree indices."""
23
23
from bzrlib import (
24
24
    btree_index,
25
25
    errors,
26
 
    fifo_cache,
27
 
    lru_cache,
28
 
    osutils,
29
26
    tests,
30
 
    transport,
31
27
    )
32
28
from bzrlib.tests import (
33
29
    TestCaseWithTransport,
35
31
    multiply_tests,
36
32
    split_suite_by_condition,
37
33
    )
 
34
from bzrlib.transport import get_transport
38
35
 
39
36
 
40
37
def load_tests(standard_tests, module, loader):
43
40
        condition_isinstance(TestBTreeNodes))
44
41
    import bzrlib._btree_serializer_py as py_module
45
42
    scenarios = [('python', {'parse_btree': py_module})]
46
 
    if compiled_btreeparser_feature.available():
47
 
        scenarios.append(('C', {'parse_btree':
48
 
                                compiled_btreeparser_feature.module}))
 
43
    if CompiledBtreeParserFeature.available():
 
44
        # Is there a way to do this that gets missing feature failures rather
 
45
        # than no indication to the user?
 
46
        import bzrlib._btree_serializer_c as c_module
 
47
        scenarios.append(('C', {'parse_btree': c_module}))
49
48
    return multiply_tests(node_tests, scenarios, others)
50
49
 
51
50
 
52
 
compiled_btreeparser_feature = tests.ModuleAvailableFeature(
53
 
                                'bzrlib._btree_serializer_pyx')
 
51
class _CompiledBtreeParserFeature(tests.Feature):
 
52
    def _probe(self):
 
53
        try:
 
54
            import bzrlib._btree_serializer_c
 
55
        except ImportError:
 
56
            return False
 
57
        return True
 
58
 
 
59
    def feature_name(self):
 
60
        return 'bzrlib._btree_serializer_c'
 
61
 
 
62
CompiledBtreeParserFeature = _CompiledBtreeParserFeature()
54
63
 
55
64
 
56
65
class BTreeTestCase(TestCaseWithTransport):
59
68
 
60
69
    def setUp(self):
61
70
        TestCaseWithTransport.setUp(self)
62
 
        self.overrideAttr(btree_index, '_RESERVED_HEADER_BYTES', 100)
 
71
        self._original_header = btree_index._RESERVED_HEADER_BYTES
 
72
        def restore():
 
73
            btree_index._RESERVED_HEADER_BYTES = self._original_header
 
74
        self.addCleanup(restore)
 
75
        btree_index._RESERVED_HEADER_BYTES = 100
63
76
 
64
77
    def make_nodes(self, count, key_elements, reference_lists):
65
78
        """Generate count*key_elements sample nodes."""
99
112
 
100
113
    def shrink_page_size(self):
101
114
        """Shrink the default page size so that less fits in a page."""
102
 
        self.overrideAttr(btree_index, '_PAGE_SIZE')
 
115
        old_page_size = btree_index._PAGE_SIZE
 
116
        def cleanup():
 
117
            btree_index._PAGE_SIZE = old_page_size
 
118
        self.addCleanup(cleanup)
103
119
        btree_index._PAGE_SIZE = 2048
104
120
 
105
121
 
106
122
class TestBTreeBuilder(BTreeTestCase):
107
123
 
108
 
    def test_clear_cache(self):
109
 
        builder = btree_index.BTreeBuilder(reference_lists=0, key_elements=1)
110
 
        # This is a no-op, but we need the api to be consistent with other
111
 
        # BTreeGraphIndex apis.
112
 
        builder.clear_cache()
113
 
 
114
124
    def test_empty_1_0(self):
115
125
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
116
126
        # NamedTemporaryFile dies on builder.finish().read(). weird.
142
152
        temp_file = builder.finish()
143
153
        content = temp_file.read()
144
154
        del temp_file
145
 
        self.assertEqual(131, len(content))
 
155
        self.assertEqual(158, len(content))
146
156
        self.assertEqual(
147
157
            "B+Tree Graph Index 2\nnode_ref_lists=0\nkey_elements=1\nlen=5\n"
148
158
            "row_lengths=1\n",
166
176
        temp_file = builder.finish()
167
177
        content = temp_file.read()
168
178
        del temp_file
169
 
        self.assertEqual(238, len(content))
 
179
        self.assertEqual(264, len(content))
170
180
        self.assertEqual(
171
181
            "B+Tree Graph Index 2\nnode_ref_lists=2\nkey_elements=2\nlen=10\n"
172
182
            "row_lengths=1\n",
216
226
        leaf1_bytes = zlib.decompress(leaf1)
217
227
        sorted_node_keys = sorted(node[0] for node in nodes)
218
228
        node = btree_index._LeafNode(leaf1_bytes, 1, 0)
219
 
        self.assertEqual(231, len(node))
220
 
        self.assertEqual(sorted_node_keys[:231], node.all_keys())
 
229
        self.assertEqual(231, len(node.keys))
 
230
        self.assertEqual(sorted_node_keys[:231], sorted(node.keys))
221
231
        leaf2_bytes = zlib.decompress(leaf2)
222
232
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
223
 
        self.assertEqual(400 - 231, len(node))
224
 
        self.assertEqual(sorted_node_keys[231:], node.all_keys())
 
233
        self.assertEqual(400 - 231, len(node.keys))
 
234
        self.assertEqual(sorted_node_keys[231:], sorted(node.keys))
225
235
 
226
236
    def test_last_page_rounded_1_layer(self):
227
237
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
232
242
        temp_file = builder.finish()
233
243
        content = temp_file.read()
234
244
        del temp_file
235
 
        self.assertEqual(155, len(content))
 
245
        self.assertEqual(181, len(content))
236
246
        self.assertEqual(
237
247
            "B+Tree Graph Index 2\nnode_ref_lists=0\nkey_elements=1\nlen=10\n"
238
248
            "row_lengths=1\n",
241
251
        leaf2 = content[74:]
242
252
        leaf2_bytes = zlib.decompress(leaf2)
243
253
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
244
 
        self.assertEqual(10, len(node))
 
254
        self.assertEqual(10, len(node.keys))
245
255
        sorted_node_keys = sorted(node[0] for node in nodes)
246
 
        self.assertEqual(sorted_node_keys, node.all_keys())
 
256
        self.assertEqual(sorted_node_keys, sorted(node.keys))
247
257
 
248
258
    def test_last_page_not_rounded_2_layer(self):
249
259
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
263
273
        leaf2 = content[8192:]
264
274
        leaf2_bytes = zlib.decompress(leaf2)
265
275
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
266
 
        self.assertEqual(400 - 231, len(node))
 
276
        self.assertEqual(400 - 231, len(node.keys))
267
277
        sorted_node_keys = sorted(node[0] for node in nodes)
268
 
        self.assertEqual(sorted_node_keys[231:], node.all_keys())
 
278
        self.assertEqual(sorted_node_keys[231:], sorted(node.keys))
269
279
 
270
280
    def test_three_level_tree_details(self):
271
281
        # The left most pointer in the second internal node in a row should
280
290
 
281
291
        for node in nodes:
282
292
            builder.add_node(*node)
283
 
        t = transport.get_transport('trace+' + self.get_url(''))
284
 
        size = t.put_file('index', self.time(builder.finish))
 
293
        transport = get_transport('trace+' + self.get_url(''))
 
294
        size = transport.put_file('index', self.time(builder.finish))
285
295
        del builder
286
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
296
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
287
297
        # Seed the metadata, we're using internal calls now.
288
298
        index.key_count()
289
299
        self.assertEqual(3, len(index._row_lengths),
302
312
        # in the second node it points at
303
313
        pos = index._row_offsets[2] + internal_node2.offset + 1
304
314
        leaf = index._get_leaf_nodes([pos])[pos]
305
 
        self.assertTrue(internal_node2.keys[0] in leaf)
 
315
        self.assertTrue(internal_node2.keys[0] in leaf.keys)
306
316
 
307
317
    def test_2_leaves_2_2(self):
308
318
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
340
350
        # Test the parts of the index that take up memory are doing so
341
351
        # predictably.
342
352
        self.assertEqual(1, len(builder._nodes))
 
353
        self.assertEqual(1, len(builder._keys))
343
354
        self.assertIs(None, builder._nodes_by_key)
344
355
        builder.add_node(*nodes[1])
345
356
        self.assertEqual(0, len(builder._nodes))
 
357
        self.assertEqual(0, len(builder._keys))
346
358
        self.assertIs(None, builder._nodes_by_key)
347
359
        self.assertEqual(1, len(builder._backing_indices))
348
360
        self.assertEqual(2, builder._backing_indices[0].key_count())
349
361
        # now back to memory
350
362
        builder.add_node(*nodes[2])
351
363
        self.assertEqual(1, len(builder._nodes))
 
364
        self.assertEqual(1, len(builder._keys))
352
365
        self.assertIs(None, builder._nodes_by_key)
353
366
        # And spills to a second backing index combing all
354
367
        builder.add_node(*nodes[3])
355
368
        self.assertEqual(0, len(builder._nodes))
 
369
        self.assertEqual(0, len(builder._keys))
356
370
        self.assertIs(None, builder._nodes_by_key)
357
371
        self.assertEqual(2, len(builder._backing_indices))
358
372
        self.assertEqual(None, builder._backing_indices[0])
361
375
        builder.add_node(*nodes[4])
362
376
        builder.add_node(*nodes[5])
363
377
        self.assertEqual(0, len(builder._nodes))
 
378
        self.assertEqual(0, len(builder._keys))
364
379
        self.assertIs(None, builder._nodes_by_key)
365
380
        self.assertEqual(2, len(builder._backing_indices))
366
381
        self.assertEqual(2, builder._backing_indices[0].key_count())
409
424
        self.assertEqual(None, builder._backing_indices[2])
410
425
        self.assertEqual(16, builder._backing_indices[3].key_count())
411
426
        # Now finish, and check we got a correctly ordered tree
412
 
        t = self.get_transport('')
413
 
        size = t.put_file('index', builder.finish())
414
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
415
 
        nodes = list(index.iter_all_entries())
416
 
        self.assertEqual(sorted(nodes), nodes)
417
 
        self.assertEqual(16, len(nodes))
418
 
 
419
 
    def test_spill_index_stress_1_1_no_combine(self):
420
 
        builder = btree_index.BTreeBuilder(key_elements=1, spill_at=2)
421
 
        builder.set_optimize(for_size=False, combine_backing_indices=False)
422
 
        nodes = [node[0:2] for node in self.make_nodes(16, 1, 0)]
423
 
        builder.add_node(*nodes[0])
424
 
        # Test the parts of the index that take up memory are doing so
425
 
        # predictably.
426
 
        self.assertEqual(1, len(builder._nodes))
427
 
        self.assertIs(None, builder._nodes_by_key)
428
 
        builder.add_node(*nodes[1])
429
 
        self.assertEqual(0, len(builder._nodes))
430
 
        self.assertIs(None, builder._nodes_by_key)
431
 
        self.assertEqual(1, len(builder._backing_indices))
432
 
        self.assertEqual(2, builder._backing_indices[0].key_count())
433
 
        # now back to memory
434
 
        builder.add_node(*nodes[2])
435
 
        self.assertEqual(1, len(builder._nodes))
436
 
        self.assertIs(None, builder._nodes_by_key)
437
 
        # And spills to a second backing index but doesn't combine
438
 
        builder.add_node(*nodes[3])
439
 
        self.assertEqual(0, len(builder._nodes))
440
 
        self.assertIs(None, builder._nodes_by_key)
441
 
        self.assertEqual(2, len(builder._backing_indices))
442
 
        for backing_index in builder._backing_indices:
443
 
            self.assertEqual(2, backing_index.key_count())
444
 
        # The next spills to the 3rd slot
445
 
        builder.add_node(*nodes[4])
446
 
        builder.add_node(*nodes[5])
447
 
        self.assertEqual(0, len(builder._nodes))
448
 
        self.assertIs(None, builder._nodes_by_key)
449
 
        self.assertEqual(3, len(builder._backing_indices))
450
 
        for backing_index in builder._backing_indices:
451
 
            self.assertEqual(2, backing_index.key_count())
452
 
        # Now spill a few more, and check that we don't combine
453
 
        builder.add_node(*nodes[6])
454
 
        builder.add_node(*nodes[7])
455
 
        builder.add_node(*nodes[8])
456
 
        builder.add_node(*nodes[9])
457
 
        builder.add_node(*nodes[10])
458
 
        builder.add_node(*nodes[11])
459
 
        builder.add_node(*nodes[12])
460
 
        self.assertEqual(6, len(builder._backing_indices))
461
 
        for backing_index in builder._backing_indices:
462
 
            self.assertEqual(2, backing_index.key_count())
463
 
        # Test that memory and disk are both used for query methods; and that
464
 
        # None is skipped over happily.
465
 
        self.assertEqual([(builder,) + node for node in sorted(nodes[:13])],
466
 
            list(builder.iter_all_entries()))
467
 
        # Two nodes - one memory one disk
468
 
        self.assertEqual(set([(builder,) + node for node in nodes[11:13]]),
469
 
            set(builder.iter_entries([nodes[12][0], nodes[11][0]])))
470
 
        self.assertEqual(13, builder.key_count())
471
 
        self.assertEqual(set([(builder,) + node for node in nodes[11:13]]),
472
 
            set(builder.iter_entries_prefix([nodes[12][0], nodes[11][0]])))
473
 
        builder.add_node(*nodes[13])
474
 
        builder.add_node(*nodes[14])
475
 
        builder.add_node(*nodes[15])
476
 
        self.assertEqual(8, len(builder._backing_indices))
477
 
        for backing_index in builder._backing_indices:
478
 
            self.assertEqual(2, backing_index.key_count())
479
 
        # Now finish, and check we got a correctly ordered tree
480
427
        transport = self.get_transport('')
481
428
        size = transport.put_file('index', builder.finish())
482
429
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
490
437
        self.assertTrue(builder._optimize_for_size)
491
438
        builder.set_optimize(for_size=False)
492
439
        self.assertFalse(builder._optimize_for_size)
493
 
        # test that we can set combine_backing_indices without effecting
494
 
        # _optimize_for_size
495
 
        obj = object()
496
 
        builder._optimize_for_size = obj
497
 
        builder.set_optimize(combine_backing_indices=False)
498
 
        self.assertFalse(builder._combine_backing_indices)
499
 
        self.assertIs(obj, builder._optimize_for_size)
500
 
        builder.set_optimize(combine_backing_indices=True)
501
 
        self.assertTrue(builder._combine_backing_indices)
502
 
        self.assertIs(obj, builder._optimize_for_size)
503
440
 
504
441
    def test_spill_index_stress_2_2(self):
505
442
        # test that references and longer keys don't confuse things.
509
446
        builder.add_node(*nodes[0])
510
447
        # Test the parts of the index that take up memory are doing so
511
448
        # predictably.
 
449
        self.assertEqual(1, len(builder._keys))
512
450
        self.assertEqual(1, len(builder._nodes))
513
451
        self.assertIs(None, builder._nodes_by_key)
514
452
        builder.add_node(*nodes[1])
 
453
        self.assertEqual(0, len(builder._keys))
515
454
        self.assertEqual(0, len(builder._nodes))
516
455
        self.assertIs(None, builder._nodes_by_key)
517
456
        self.assertEqual(1, len(builder._backing_indices))
520
459
        old = dict(builder._get_nodes_by_key()) #Build up the nodes by key dict
521
460
        builder.add_node(*nodes[2])
522
461
        self.assertEqual(1, len(builder._nodes))
 
462
        self.assertEqual(1, len(builder._keys))
523
463
        self.assertIsNot(None, builder._nodes_by_key)
524
464
        self.assertNotEqual({}, builder._nodes_by_key)
525
465
        # We should have a new entry
527
467
        # And spills to a second backing index combing all
528
468
        builder.add_node(*nodes[3])
529
469
        self.assertEqual(0, len(builder._nodes))
 
470
        self.assertEqual(0, len(builder._keys))
530
471
        self.assertIs(None, builder._nodes_by_key)
531
472
        self.assertEqual(2, len(builder._backing_indices))
532
473
        self.assertEqual(None, builder._backing_indices[0])
535
476
        builder.add_node(*nodes[4])
536
477
        builder.add_node(*nodes[5])
537
478
        self.assertEqual(0, len(builder._nodes))
 
479
        self.assertEqual(0, len(builder._keys))
538
480
        self.assertIs(None, builder._nodes_by_key)
539
481
        self.assertEqual(2, len(builder._backing_indices))
540
482
        self.assertEqual(2, builder._backing_indices[0].key_count())
607
549
        for key, value, references in nodes:
608
550
            builder.add_node(key, value, references)
609
551
        stream = builder.finish()
610
 
        trans = transport.get_transport('trace+' + self.get_url())
 
552
        trans = get_transport('trace+' + self.get_url())
611
553
        size = trans.put_file('index', stream)
612
554
        return btree_index.BTreeGraphIndex(trans, 'index', size)
613
555
 
614
 
    def make_index_with_offset(self, ref_lists=1, key_elements=1, nodes=[],
615
 
                               offset=0):
616
 
        builder = btree_index.BTreeBuilder(key_elements=key_elements,
617
 
                                           reference_lists=ref_lists)
618
 
        builder.add_nodes(nodes)
619
 
        transport = self.get_transport('')
620
 
        # NamedTemporaryFile dies on builder.finish().read(). weird.
621
 
        temp_file = builder.finish()
622
 
        content = temp_file.read()
623
 
        del temp_file
624
 
        size = len(content)
625
 
        transport.put_bytes('index', (' '*offset)+content)
626
 
        return btree_index.BTreeGraphIndex(transport, 'index', size=size,
627
 
                                           offset=offset)
628
 
 
629
 
    def test_clear_cache(self):
630
 
        nodes = self.make_nodes(160, 2, 2)
631
 
        index = self.make_index(ref_lists=2, key_elements=2, nodes=nodes)
632
 
        self.assertEqual(1, len(list(index.iter_entries([nodes[30][0]]))))
633
 
        self.assertEqual([1, 4], index._row_lengths)
634
 
        self.assertIsNot(None, index._root_node)
635
 
        internal_node_pre_clear = index._internal_node_cache.keys()
636
 
        self.assertTrue(len(index._leaf_node_cache) > 0)
637
 
        index.clear_cache()
638
 
        # We don't touch _root_node or _internal_node_cache, both should be
639
 
        # small, and can save a round trip or two
640
 
        self.assertIsNot(None, index._root_node)
641
 
        # NOTE: We don't want to affect the _internal_node_cache, as we expect
642
 
        #       it will be small, and if we ever do touch this index again, it
643
 
        #       will save round-trips.  This assertion isn't very strong,
644
 
        #       becuase without a 3-level index, we don't have any internal
645
 
        #       nodes cached.
646
 
        self.assertEqual(internal_node_pre_clear,
647
 
                         index._internal_node_cache.keys())
648
 
        self.assertEqual(0, len(index._leaf_node_cache))
649
 
 
650
556
    def test_trivial_constructor(self):
651
 
        t = transport.get_transport('trace+' + self.get_url(''))
652
 
        index = btree_index.BTreeGraphIndex(t, 'index', None)
 
557
        transport = get_transport('trace+' + self.get_url(''))
 
558
        index = btree_index.BTreeGraphIndex(transport, 'index', None)
653
559
        # Checks the page size at load, but that isn't logged yet.
654
 
        self.assertEqual([], t._activity)
 
560
        self.assertEqual([], transport._activity)
655
561
 
656
562
    def test_with_size_constructor(self):
657
 
        t = transport.get_transport('trace+' + self.get_url(''))
658
 
        index = btree_index.BTreeGraphIndex(t, 'index', 1)
 
563
        transport = get_transport('trace+' + self.get_url(''))
 
564
        index = btree_index.BTreeGraphIndex(transport, 'index', 1)
659
565
        # Checks the page size at load, but that isn't logged yet.
660
 
        self.assertEqual([], t._activity)
 
566
        self.assertEqual([], transport._activity)
661
567
 
662
568
    def test_empty_key_count_no_size(self):
663
569
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
664
 
        t = transport.get_transport('trace+' + self.get_url(''))
665
 
        t.put_file('index', builder.finish())
666
 
        index = btree_index.BTreeGraphIndex(t, 'index', None)
667
 
        del t._activity[:]
668
 
        self.assertEqual([], t._activity)
 
570
        transport = get_transport('trace+' + self.get_url(''))
 
571
        transport.put_file('index', builder.finish())
 
572
        index = btree_index.BTreeGraphIndex(transport, 'index', None)
 
573
        del transport._activity[:]
 
574
        self.assertEqual([], transport._activity)
669
575
        self.assertEqual(0, index.key_count())
670
576
        # The entire index should have been requested (as we generally have the
671
577
        # size available, and doing many small readvs is inappropriate).
672
578
        # We can't tell how much was actually read here, but - check the code.
673
 
        self.assertEqual([('get', 'index')], t._activity)
 
579
        self.assertEqual([('get', 'index')], transport._activity)
674
580
 
675
581
    def test_empty_key_count(self):
676
582
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
677
 
        t = transport.get_transport('trace+' + self.get_url(''))
678
 
        size = t.put_file('index', builder.finish())
 
583
        transport = get_transport('trace+' + self.get_url(''))
 
584
        size = transport.put_file('index', builder.finish())
679
585
        self.assertEqual(72, size)
680
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
681
 
        del t._activity[:]
682
 
        self.assertEqual([], t._activity)
 
586
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
587
        del transport._activity[:]
 
588
        self.assertEqual([], transport._activity)
683
589
        self.assertEqual(0, index.key_count())
684
590
        # The entire index should have been read, as 4K > size
685
591
        self.assertEqual([('readv', 'index', [(0, 72)], False, None)],
686
 
                         t._activity)
 
592
            transport._activity)
687
593
 
688
594
    def test_non_empty_key_count_2_2(self):
689
595
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
690
596
        nodes = self.make_nodes(35, 2, 2)
691
597
        for node in nodes:
692
598
            builder.add_node(*node)
693
 
        t = transport.get_transport('trace+' + self.get_url(''))
694
 
        size = t.put_file('index', builder.finish())
695
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
696
 
        del t._activity[:]
697
 
        self.assertEqual([], t._activity)
 
599
        transport = get_transport('trace+' + self.get_url(''))
 
600
        size = transport.put_file('index', builder.finish())
 
601
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
602
        del transport._activity[:]
 
603
        self.assertEqual([], transport._activity)
698
604
        self.assertEqual(70, index.key_count())
699
605
        # The entire index should have been read, as it is one page long.
700
606
        self.assertEqual([('readv', 'index', [(0, size)], False, None)],
701
 
            t._activity)
702
 
        self.assertEqual(1173, size)
703
 
 
704
 
    def test_with_offset_no_size(self):
705
 
        index = self.make_index_with_offset(key_elements=1, ref_lists=1,
706
 
                                            offset=1234,
707
 
                                            nodes=self.make_nodes(200, 1, 1))
708
 
        index._size = None # throw away the size info
709
 
        self.assertEqual(200, index.key_count())
710
 
 
711
 
    def test_with_small_offset(self):
712
 
        index = self.make_index_with_offset(key_elements=1, ref_lists=1,
713
 
                                            offset=1234,
714
 
                                            nodes=self.make_nodes(200, 1, 1))
715
 
        self.assertEqual(200, index.key_count())
716
 
 
717
 
    def test_with_large_offset(self):
718
 
        index = self.make_index_with_offset(key_elements=1, ref_lists=1,
719
 
                                            offset=123456,
720
 
                                            nodes=self.make_nodes(200, 1, 1))
721
 
        self.assertEqual(200, index.key_count())
 
607
            transport._activity)
 
608
        self.assertEqual(1199, size)
722
609
 
723
610
    def test__read_nodes_no_size_one_page_reads_once(self):
724
611
        self.make_index(nodes=[(('key',), 'value', ())])
725
 
        trans = transport.get_transport('trace+' + self.get_url())
 
612
        trans = get_transport('trace+' + self.get_url())
726
613
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
727
614
        del trans._activity[:]
728
615
        nodes = dict(index._read_nodes([0]))
729
616
        self.assertEqual([0], nodes.keys())
730
617
        node = nodes[0]
731
 
        self.assertEqual([('key',)], node.all_keys())
 
618
        self.assertEqual([('key',)], node.keys.keys())
732
619
        self.assertEqual([('get', 'index')], trans._activity)
733
620
 
734
621
    def test__read_nodes_no_size_multiple_pages(self):
736
623
        index.key_count()
737
624
        num_pages = index._row_offsets[-1]
738
625
        # Reopen with a traced transport and no size
739
 
        trans = transport.get_transport('trace+' + self.get_url())
 
626
        trans = get_transport('trace+' + self.get_url())
740
627
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
741
628
        del trans._activity[:]
742
629
        nodes = dict(index._read_nodes([0]))
747
634
        nodes = self.make_nodes(160, 2, 2)
748
635
        for node in nodes:
749
636
            builder.add_node(*node)
750
 
        t = transport.get_transport('trace+' + self.get_url(''))
751
 
        size = t.put_file('index', builder.finish())
 
637
        transport = get_transport('trace+' + self.get_url(''))
 
638
        size = transport.put_file('index', builder.finish())
752
639
        self.assertEqual(17692, size)
753
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
754
 
        del t._activity[:]
755
 
        self.assertEqual([], t._activity)
 
640
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
641
        del transport._activity[:]
 
642
        self.assertEqual([], transport._activity)
756
643
        self.assertEqual(320, index.key_count())
757
644
        # The entire index should not have been read.
758
645
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None)],
759
 
                         t._activity)
 
646
            transport._activity)
760
647
 
761
648
    def test_validate_one_page(self):
762
649
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
763
650
        nodes = self.make_nodes(45, 2, 2)
764
651
        for node in nodes:
765
652
            builder.add_node(*node)
766
 
        t = transport.get_transport('trace+' + self.get_url(''))
767
 
        size = t.put_file('index', builder.finish())
768
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
769
 
        del t._activity[:]
770
 
        self.assertEqual([], t._activity)
 
653
        transport = get_transport('trace+' + self.get_url(''))
 
654
        size = transport.put_file('index', builder.finish())
 
655
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
656
        del transport._activity[:]
 
657
        self.assertEqual([], transport._activity)
771
658
        index.validate()
772
659
        # The entire index should have been read linearly.
773
660
        self.assertEqual([('readv', 'index', [(0, size)], False, None)],
774
 
                         t._activity)
775
 
        self.assertEqual(1488, size)
 
661
            transport._activity)
 
662
        self.assertEqual(1514, size)
776
663
 
777
664
    def test_validate_two_pages(self):
778
665
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
779
666
        nodes = self.make_nodes(80, 2, 2)
780
667
        for node in nodes:
781
668
            builder.add_node(*node)
782
 
        t = transport.get_transport('trace+' + self.get_url(''))
783
 
        size = t.put_file('index', builder.finish())
 
669
        transport = get_transport('trace+' + self.get_url(''))
 
670
        size = transport.put_file('index', builder.finish())
784
671
        # Root page, 2 leaf pages
785
672
        self.assertEqual(9339, size)
786
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
787
 
        del t._activity[:]
788
 
        self.assertEqual([], t._activity)
 
673
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
674
        del transport._activity[:]
 
675
        self.assertEqual([], transport._activity)
789
676
        index.validate()
790
677
        # The entire index should have been read linearly.
791
 
        self.assertEqual(
792
 
            [('readv', 'index', [(0, 4096)], False, None),
793
 
             ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
794
 
            t._activity)
 
678
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
 
679
            ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
 
680
            transport._activity)
795
681
        # XXX: TODO: write some badly-ordered nodes, and some pointers-to-wrong
796
682
        # node and make validate find them.
797
683
 
798
684
    def test_eq_ne(self):
799
685
        # two indices are equal when constructed with the same parameters:
800
 
        t1 = transport.get_transport('trace+' + self.get_url(''))
801
 
        t2 = transport.get_transport(self.get_url(''))
802
 
        self.assertTrue(
803
 
            btree_index.BTreeGraphIndex(t1, 'index', None) ==
804
 
            btree_index.BTreeGraphIndex(t1, 'index', None))
805
 
        self.assertTrue(
806
 
            btree_index.BTreeGraphIndex(t1, 'index', 20) ==
807
 
            btree_index.BTreeGraphIndex(t1, 'index', 20))
808
 
        self.assertFalse(
809
 
            btree_index.BTreeGraphIndex(t1, 'index', 20) ==
810
 
            btree_index.BTreeGraphIndex(t2, 'index', 20))
811
 
        self.assertFalse(
812
 
            btree_index.BTreeGraphIndex(t1, 'inde1', 20) ==
813
 
            btree_index.BTreeGraphIndex(t1, 'inde2', 20))
814
 
        self.assertFalse(
815
 
            btree_index.BTreeGraphIndex(t1, 'index', 10) ==
816
 
            btree_index.BTreeGraphIndex(t1, 'index', 20))
817
 
        self.assertFalse(
818
 
            btree_index.BTreeGraphIndex(t1, 'index', None) !=
819
 
            btree_index.BTreeGraphIndex(t1, 'index', None))
820
 
        self.assertFalse(
821
 
            btree_index.BTreeGraphIndex(t1, 'index', 20) !=
822
 
            btree_index.BTreeGraphIndex(t1, 'index', 20))
823
 
        self.assertTrue(
824
 
            btree_index.BTreeGraphIndex(t1, 'index', 20) !=
825
 
            btree_index.BTreeGraphIndex(t2, 'index', 20))
826
 
        self.assertTrue(
827
 
            btree_index.BTreeGraphIndex(t1, 'inde1', 20) !=
828
 
            btree_index.BTreeGraphIndex(t1, 'inde2', 20))
829
 
        self.assertTrue(
830
 
            btree_index.BTreeGraphIndex(t1, 'index', 10) !=
831
 
            btree_index.BTreeGraphIndex(t1, 'index', 20))
 
686
        transport1 = get_transport('trace+' + self.get_url(''))
 
687
        transport2 = get_transport(self.get_url(''))
 
688
        self.assertTrue(
 
689
            btree_index.BTreeGraphIndex(transport1, 'index', None) ==
 
690
            btree_index.BTreeGraphIndex(transport1, 'index', None))
 
691
        self.assertTrue(
 
692
            btree_index.BTreeGraphIndex(transport1, 'index', 20) ==
 
693
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
 
694
        self.assertFalse(
 
695
            btree_index.BTreeGraphIndex(transport1, 'index', 20) ==
 
696
            btree_index.BTreeGraphIndex(transport2, 'index', 20))
 
697
        self.assertFalse(
 
698
            btree_index.BTreeGraphIndex(transport1, 'inde1', 20) ==
 
699
            btree_index.BTreeGraphIndex(transport1, 'inde2', 20))
 
700
        self.assertFalse(
 
701
            btree_index.BTreeGraphIndex(transport1, 'index', 10) ==
 
702
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
 
703
        self.assertFalse(
 
704
            btree_index.BTreeGraphIndex(transport1, 'index', None) !=
 
705
            btree_index.BTreeGraphIndex(transport1, 'index', None))
 
706
        self.assertFalse(
 
707
            btree_index.BTreeGraphIndex(transport1, 'index', 20) !=
 
708
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
 
709
        self.assertTrue(
 
710
            btree_index.BTreeGraphIndex(transport1, 'index', 20) !=
 
711
            btree_index.BTreeGraphIndex(transport2, 'index', 20))
 
712
        self.assertTrue(
 
713
            btree_index.BTreeGraphIndex(transport1, 'inde1', 20) !=
 
714
            btree_index.BTreeGraphIndex(transport1, 'inde2', 20))
 
715
        self.assertTrue(
 
716
            btree_index.BTreeGraphIndex(transport1, 'index', 10) !=
 
717
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
832
718
 
833
719
    def test_iter_all_only_root_no_size(self):
834
720
        self.make_index(nodes=[(('key',), 'value', ())])
835
 
        t = transport.get_transport('trace+' + self.get_url(''))
836
 
        index = btree_index.BTreeGraphIndex(t, 'index', None)
837
 
        del t._activity[:]
 
721
        trans = get_transport('trace+' + self.get_url(''))
 
722
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
 
723
        del trans._activity[:]
838
724
        self.assertEqual([(('key',), 'value')],
839
725
                         [x[1:] for x in index.iter_all_entries()])
840
 
        self.assertEqual([('get', 'index')], t._activity)
 
726
        self.assertEqual([('get', 'index')], trans._activity)
841
727
 
842
728
    def test_iter_all_entries_reads(self):
843
729
        # iterating all entries reads the header, then does a linear
849
735
        nodes = self.make_nodes(10000, 2, 2)
850
736
        for node in nodes:
851
737
            builder.add_node(*node)
852
 
        t = transport.get_transport('trace+' + self.get_url(''))
853
 
        size = t.put_file('index', builder.finish())
 
738
        transport = get_transport('trace+' + self.get_url(''))
 
739
        size = transport.put_file('index', builder.finish())
854
740
        self.assertEqual(1303220, size, 'number of expected bytes in the'
855
741
                                        ' output changed')
856
742
        page_size = btree_index._PAGE_SIZE
857
743
        del builder
858
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
859
 
        del t._activity[:]
860
 
        self.assertEqual([], t._activity)
 
744
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
745
        del transport._activity[:]
 
746
        self.assertEqual([], transport._activity)
861
747
        found_nodes = self.time(list, index.iter_all_entries())
862
748
        bare_nodes = []
863
749
        for node in found_nodes:
884
770
        readv_request[-1] = (readv_request[-1][0], 1303220 % page_size)
885
771
        expected = [('readv', 'index', [(0, page_size)], False, None),
886
772
             ('readv',  'index', readv_request, False, None)]
887
 
        if expected != t._activity:
 
773
        if expected != transport._activity:
888
774
            self.assertEqualDiff(pprint.pformat(expected),
889
775
                                 pprint.pformat(transport._activity))
890
776
 
904
790
        nodes = self.make_nodes(160, 2, 2)
905
791
        for node in nodes:
906
792
            builder.add_node(*node)
907
 
        t = transport.get_transport('trace+' + self.get_url(''))
908
 
        size = t.put_file('index', builder.finish())
 
793
        transport = get_transport('trace+' + self.get_url(''))
 
794
        size = transport.put_file('index', builder.finish())
909
795
        del builder
910
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
911
 
        del t._activity[:]
912
 
        self.assertEqual([], t._activity)
 
796
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
797
        del transport._activity[:]
 
798
        self.assertEqual([], transport._activity)
913
799
        # search for one key
914
800
        found_nodes = list(index.iter_entries([nodes[30][0]]))
915
801
        bare_nodes = []
923
809
        # Should have read the root node, then one leaf page:
924
810
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
925
811
             ('readv',  'index', [(8192, 4096), ], False, None)],
926
 
            t._activity)
 
812
            transport._activity)
927
813
 
928
814
    def test_iter_key_prefix_1_element_key_None(self):
929
815
        index = self.make_index()
1011
897
            ])
1012
898
        self.assertEqual(set([]), index.external_references(0))
1013
899
 
1014
 
    def test__find_ancestors_one_page(self):
1015
 
        key1 = ('key-1',)
1016
 
        key2 = ('key-2',)
1017
 
        index = self.make_index(ref_lists=1, key_elements=1, nodes=[
1018
 
            (key1, 'value', ([key2],)),
1019
 
            (key2, 'value', ([],)),
1020
 
            ])
1021
 
        parent_map = {}
1022
 
        missing_keys = set()
1023
 
        search_keys = index._find_ancestors([key1], 0, parent_map, missing_keys)
1024
 
        self.assertEqual({key1: (key2,), key2: ()}, parent_map)
1025
 
        self.assertEqual(set(), missing_keys)
1026
 
        self.assertEqual(set(), search_keys)
1027
 
 
1028
 
    def test__find_ancestors_one_page_w_missing(self):
1029
 
        key1 = ('key-1',)
1030
 
        key2 = ('key-2',)
1031
 
        key3 = ('key-3',)
1032
 
        index = self.make_index(ref_lists=1, key_elements=1, nodes=[
1033
 
            (key1, 'value', ([key2],)),
1034
 
            (key2, 'value', ([],)),
1035
 
            ])
1036
 
        parent_map = {}
1037
 
        missing_keys = set()
1038
 
        search_keys = index._find_ancestors([key2, key3], 0, parent_map,
1039
 
                                            missing_keys)
1040
 
        self.assertEqual({key2: ()}, parent_map)
1041
 
        # we know that key3 is missing because we read the page that it would
1042
 
        # otherwise be on
1043
 
        self.assertEqual(set([key3]), missing_keys)
1044
 
        self.assertEqual(set(), search_keys)
1045
 
 
1046
 
    def test__find_ancestors_one_parent_missing(self):
1047
 
        key1 = ('key-1',)
1048
 
        key2 = ('key-2',)
1049
 
        key3 = ('key-3',)
1050
 
        index = self.make_index(ref_lists=1, key_elements=1, nodes=[
1051
 
            (key1, 'value', ([key2],)),
1052
 
            (key2, 'value', ([key3],)),
1053
 
            ])
1054
 
        parent_map = {}
1055
 
        missing_keys = set()
1056
 
        search_keys = index._find_ancestors([key1], 0, parent_map,
1057
 
                                            missing_keys)
1058
 
        self.assertEqual({key1: (key2,), key2: (key3,)}, parent_map)
1059
 
        self.assertEqual(set(), missing_keys)
1060
 
        # all we know is that key3 wasn't present on the page we were reading
1061
 
        # but if you look, the last key is key2 which comes before key3, so we
1062
 
        # don't know whether key3 would land on this page or not.
1063
 
        self.assertEqual(set([key3]), search_keys)
1064
 
        search_keys = index._find_ancestors(search_keys, 0, parent_map,
1065
 
                                            missing_keys)
1066
 
        # passing it back in, we are sure it is 'missing'
1067
 
        self.assertEqual({key1: (key2,), key2: (key3,)}, parent_map)
1068
 
        self.assertEqual(set([key3]), missing_keys)
1069
 
        self.assertEqual(set([]), search_keys)
1070
 
 
1071
 
    def test__find_ancestors_dont_search_known(self):
1072
 
        key1 = ('key-1',)
1073
 
        key2 = ('key-2',)
1074
 
        key3 = ('key-3',)
1075
 
        index = self.make_index(ref_lists=1, key_elements=1, nodes=[
1076
 
            (key1, 'value', ([key2],)),
1077
 
            (key2, 'value', ([key3],)),
1078
 
            (key3, 'value', ([],)),
1079
 
            ])
1080
 
        # We already know about key2, so we won't try to search for key3
1081
 
        parent_map = {key2: (key3,)}
1082
 
        missing_keys = set()
1083
 
        search_keys = index._find_ancestors([key1], 0, parent_map,
1084
 
                                            missing_keys)
1085
 
        self.assertEqual({key1: (key2,), key2: (key3,)}, parent_map)
1086
 
        self.assertEqual(set(), missing_keys)
1087
 
        self.assertEqual(set(), search_keys)
1088
 
 
1089
 
    def test__find_ancestors_multiple_pages(self):
1090
 
        # We need to use enough keys that we actually cause a split
1091
 
        start_time = 1249671539
1092
 
        email = "joebob@example.com"
1093
 
        nodes = []
1094
 
        ref_lists = ((),)
1095
 
        rev_keys = []
1096
 
        for i in xrange(400):
1097
 
            rev_id = '%s-%s-%s' % (email,
1098
 
                                   osutils.compact_date(start_time + i),
1099
 
                                   osutils.rand_chars(16))
1100
 
            rev_key = (rev_id,)
1101
 
            nodes.append((rev_key, 'value', ref_lists))
1102
 
            # We have a ref 'list' of length 1, with a list of parents, with 1
1103
 
            # parent which is a key
1104
 
            ref_lists = ((rev_key,),)
1105
 
            rev_keys.append(rev_key)
1106
 
        index = self.make_index(ref_lists=1, key_elements=1, nodes=nodes)
1107
 
        self.assertEqual(400, index.key_count())
1108
 
        self.assertEqual(3, len(index._row_offsets))
1109
 
        nodes = dict(index._read_nodes([1, 2]))
1110
 
        l1 = nodes[1]
1111
 
        l2 = nodes[2]
1112
 
        min_l2_key = l2.min_key
1113
 
        max_l1_key = l1.max_key
1114
 
        self.assertTrue(max_l1_key < min_l2_key)
1115
 
        parents_min_l2_key = l2[min_l2_key][1][0]
1116
 
        self.assertEqual((l1.max_key,), parents_min_l2_key)
1117
 
        # Now, whatever key we select that would fall on the second page,
1118
 
        # should give us all the parents until the page break
1119
 
        key_idx = rev_keys.index(min_l2_key)
1120
 
        next_key = rev_keys[key_idx+1]
1121
 
        # So now when we get the parent map, we should get the key we are
1122
 
        # looking for, min_l2_key, and then a reference to go look for the
1123
 
        # parent of that key
1124
 
        parent_map = {}
1125
 
        missing_keys = set()
1126
 
        search_keys = index._find_ancestors([next_key], 0, parent_map,
1127
 
                                            missing_keys)
1128
 
        self.assertEqual([min_l2_key, next_key], sorted(parent_map))
1129
 
        self.assertEqual(set(), missing_keys)
1130
 
        self.assertEqual(set([max_l1_key]), search_keys)
1131
 
        parent_map = {}
1132
 
        search_keys = index._find_ancestors([max_l1_key], 0, parent_map,
1133
 
                                            missing_keys)
1134
 
        self.assertEqual(l1.all_keys(), sorted(parent_map))
1135
 
        self.assertEqual(set(), missing_keys)
1136
 
        self.assertEqual(set(), search_keys)
1137
 
 
1138
 
    def test__find_ancestors_empty_index(self):
1139
 
        index = self.make_index(ref_lists=1, key_elements=1, nodes=[])
1140
 
        parent_map = {}
1141
 
        missing_keys = set()
1142
 
        search_keys = index._find_ancestors([('one',), ('two',)], 0, parent_map,
1143
 
                                            missing_keys)
1144
 
        self.assertEqual(set(), search_keys)
1145
 
        self.assertEqual({}, parent_map)
1146
 
        self.assertEqual(set([('one',), ('two',)]), missing_keys)
1147
 
 
1148
 
    def test_supports_unlimited_cache(self):
1149
 
        builder = btree_index.BTreeBuilder(reference_lists=0, key_elements=1)
1150
 
        # We need enough nodes to cause a page split (so we have both an
1151
 
        # internal node and a couple leaf nodes. 500 seems to be enough.)
1152
 
        nodes = self.make_nodes(500, 1, 0)
1153
 
        for node in nodes:
1154
 
            builder.add_node(*node)
1155
 
        stream = builder.finish()
1156
 
        trans = transport.get_transport(self.get_url())
1157
 
        size = trans.put_file('index', stream)
1158
 
        index = btree_index.BTreeGraphIndex(trans, 'index', size)
1159
 
        self.assertEqual(500, index.key_count())
1160
 
        # We have an internal node
1161
 
        self.assertEqual(2, len(index._row_lengths))
1162
 
        # We have at least 2 leaf nodes
1163
 
        self.assertTrue(index._row_lengths[-1] >= 2)
1164
 
        self.assertIsInstance(index._leaf_node_cache, lru_cache.LRUCache)
1165
 
        self.assertEqual(btree_index._NODE_CACHE_SIZE,
1166
 
                         index._leaf_node_cache._max_cache)
1167
 
        self.assertIsInstance(index._internal_node_cache, fifo_cache.FIFOCache)
1168
 
        self.assertEqual(100, index._internal_node_cache._max_cache)
1169
 
        # No change if unlimited_cache=False is passed
1170
 
        index = btree_index.BTreeGraphIndex(trans, 'index', size,
1171
 
                                            unlimited_cache=False)
1172
 
        self.assertIsInstance(index._leaf_node_cache, lru_cache.LRUCache)
1173
 
        self.assertEqual(btree_index._NODE_CACHE_SIZE,
1174
 
                         index._leaf_node_cache._max_cache)
1175
 
        self.assertIsInstance(index._internal_node_cache, fifo_cache.FIFOCache)
1176
 
        self.assertEqual(100, index._internal_node_cache._max_cache)
1177
 
        index = btree_index.BTreeGraphIndex(trans, 'index', size,
1178
 
                                            unlimited_cache=True)
1179
 
        self.assertIsInstance(index._leaf_node_cache, dict)
1180
 
        self.assertIs(type(index._internal_node_cache), dict)
1181
 
        # Exercise the lookup code
1182
 
        entries = set(index.iter_entries([n[0] for n in nodes]))
1183
 
        self.assertEqual(500, len(entries))
1184
 
 
1185
900
 
1186
901
class TestBTreeNodes(BTreeTestCase):
1187
902
 
 
903
    def restore_parser(self):
 
904
        btree_index._btree_serializer = self.saved_parser
 
905
 
1188
906
    def setUp(self):
1189
907
        BTreeTestCase.setUp(self)
1190
 
        self.overrideAttr(btree_index, '_btree_serializer', self.parse_btree)
 
908
        self.saved_parser = btree_index._btree_serializer
 
909
        self.addCleanup(self.restore_parser)
 
910
        btree_index._btree_serializer = self.parse_btree
1191
911
 
1192
912
    def test_LeafNode_1_0(self):
1193
913
        node_bytes = ("type=leaf\n"
1205
925
            ("2222222222222222222222222222222222222222",): ("value:2", ()),
1206
926
            ("3333333333333333333333333333333333333333",): ("value:3", ()),
1207
927
            ("4444444444444444444444444444444444444444",): ("value:4", ()),
1208
 
            }, dict(node.all_items()))
 
928
            }, node.keys)
1209
929
 
1210
930
    def test_LeafNode_2_2(self):
1211
931
        node_bytes = ("type=leaf\n"
1225
945
            ('11', '33'): ('value:3',
1226
946
                ((('11', 'ref22'),), (('11', 'ref22'), ('11', 'ref22')))),
1227
947
            ('11', '44'): ('value:4', ((), (('11', 'ref00'),)))
1228
 
            }, dict(node.all_items()))
 
948
            }, node.keys)
1229
949
 
1230
950
    def test_InternalNode_1(self):
1231
951
        node_bytes = ("type=internal\n"
1266
986
            ('11', '33'): ('value:3',
1267
987
                ((('11', 'ref22'),), (('11', 'ref22'), ('11', 'ref22')))),
1268
988
            ('11', '44'): ('value:4', ((), (('11', 'ref00'),)))
1269
 
            }, dict(node.all_items()))
 
989
            }, node.keys)
1270
990
 
1271
991
    def assertFlattened(self, expected, key, value, refs):
1272
992
        flat_key, flat_line = self.parse_btree._flatten_node(
1304
1024
    def test_exists(self):
1305
1025
        # This is just to let the user know if they don't have the feature
1306
1026
        # available
1307
 
        self.requireFeature(compiled_btreeparser_feature)
 
1027
        self.requireFeature(CompiledBtreeParserFeature)
1308
1028
 
1309
1029
 
1310
1030
class TestMultiBisectRight(tests.TestCase):
1350
1070
        This doesn't actually create anything on disk, it just primes a
1351
1071
        BTreeGraphIndex with the recommended information.
1352
1072
        """
1353
 
        index = btree_index.BTreeGraphIndex(
1354
 
            transport.get_transport('memory:///'), 'test-index', size=size)
 
1073
        index = btree_index.BTreeGraphIndex(get_transport('memory:///'),
 
1074
                                            'test-index', size=size)
1355
1075
        if recommended_pages is not None:
1356
1076
            index._recommended_pages = recommended_pages
1357
1077
        return index