~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_btree_index.py

  • Committer: Joe Julian
  • Date: 2010-01-10 02:25:31 UTC
  • mto: (4634.119.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: joe@julianfamily.org-20100110022531-wqk61rsagz8xsiga
Added MANIFEST.in to allow bdist_rpm to have all the required include files and tools. bdist_rpm will still fail to build correctly on some distributions due to a disttools bug http://bugs.python.org/issue644744

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2008-2011 Canonical Ltd
 
1
# Copyright (C) 2008, 2009 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
27
27
    lru_cache,
28
28
    osutils,
29
29
    tests,
30
 
    transport,
31
30
    )
32
31
from bzrlib.tests import (
33
32
    TestCaseWithTransport,
34
 
    scenarios,
35
 
    )
36
 
from bzrlib.tests import (
37
 
    features,
38
 
    )
39
 
 
40
 
 
41
 
load_tests = scenarios.load_tests_apply_scenarios
42
 
 
43
 
 
44
 
def btreeparser_scenarios():
 
33
    condition_isinstance,
 
34
    multiply_tests,
 
35
    split_suite_by_condition,
 
36
    )
 
37
from bzrlib.transport import get_transport
 
38
 
 
39
 
 
40
def load_tests(standard_tests, module, loader):
 
41
    # parameterise the TestBTreeNodes tests
 
42
    node_tests, others = split_suite_by_condition(standard_tests,
 
43
        condition_isinstance(TestBTreeNodes))
45
44
    import bzrlib._btree_serializer_py as py_module
46
45
    scenarios = [('python', {'parse_btree': py_module})]
47
 
    if compiled_btreeparser_feature.available():
48
 
        scenarios.append(('C', 
49
 
            {'parse_btree': compiled_btreeparser_feature.module}))
50
 
    return scenarios
51
 
 
52
 
 
53
 
compiled_btreeparser_feature = features.ModuleAvailableFeature(
54
 
    'bzrlib._btree_serializer_pyx')
 
46
    if CompiledBtreeParserFeature.available():
 
47
        # Is there a way to do this that gets missing feature failures rather
 
48
        # than no indication to the user?
 
49
        import bzrlib._btree_serializer_pyx as c_module
 
50
        scenarios.append(('C', {'parse_btree': c_module}))
 
51
    return multiply_tests(node_tests, scenarios, others)
 
52
 
 
53
 
 
54
class _CompiledBtreeParserFeature(tests.Feature):
 
55
    def _probe(self):
 
56
        try:
 
57
            import bzrlib._btree_serializer_pyx
 
58
        except ImportError:
 
59
            return False
 
60
        return True
 
61
 
 
62
    def feature_name(self):
 
63
        return 'bzrlib._btree_serializer_pyx'
 
64
 
 
65
CompiledBtreeParserFeature = _CompiledBtreeParserFeature()
55
66
 
56
67
 
57
68
class BTreeTestCase(TestCaseWithTransport):
60
71
 
61
72
    def setUp(self):
62
73
        TestCaseWithTransport.setUp(self)
63
 
        self.overrideAttr(btree_index, '_RESERVED_HEADER_BYTES', 100)
 
74
        self._original_header = btree_index._RESERVED_HEADER_BYTES
 
75
        def restore():
 
76
            btree_index._RESERVED_HEADER_BYTES = self._original_header
 
77
        self.addCleanup(restore)
 
78
        btree_index._RESERVED_HEADER_BYTES = 100
64
79
 
65
80
    def make_nodes(self, count, key_elements, reference_lists):
66
81
        """Generate count*key_elements sample nodes."""
100
115
 
101
116
    def shrink_page_size(self):
102
117
        """Shrink the default page size so that less fits in a page."""
103
 
        self.overrideAttr(btree_index, '_PAGE_SIZE')
 
118
        old_page_size = btree_index._PAGE_SIZE
 
119
        def cleanup():
 
120
            btree_index._PAGE_SIZE = old_page_size
 
121
        self.addCleanup(cleanup)
104
122
        btree_index._PAGE_SIZE = 2048
105
123
 
106
124
 
107
125
class TestBTreeBuilder(BTreeTestCase):
108
126
 
109
 
    def test_clear_cache(self):
110
 
        builder = btree_index.BTreeBuilder(reference_lists=0, key_elements=1)
111
 
        # This is a no-op, but we need the api to be consistent with other
112
 
        # BTreeGraphIndex apis.
113
 
        builder.clear_cache()
114
 
 
115
127
    def test_empty_1_0(self):
116
128
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
117
129
        # NamedTemporaryFile dies on builder.finish().read(). weird.
143
155
        temp_file = builder.finish()
144
156
        content = temp_file.read()
145
157
        del temp_file
146
 
        self.assertEqual(131, len(content))
 
158
        self.assertEqual(158, len(content))
147
159
        self.assertEqual(
148
160
            "B+Tree Graph Index 2\nnode_ref_lists=0\nkey_elements=1\nlen=5\n"
149
161
            "row_lengths=1\n",
167
179
        temp_file = builder.finish()
168
180
        content = temp_file.read()
169
181
        del temp_file
170
 
        self.assertEqual(238, len(content))
 
182
        self.assertEqual(264, len(content))
171
183
        self.assertEqual(
172
184
            "B+Tree Graph Index 2\nnode_ref_lists=2\nkey_elements=2\nlen=10\n"
173
185
            "row_lengths=1\n",
217
229
        leaf1_bytes = zlib.decompress(leaf1)
218
230
        sorted_node_keys = sorted(node[0] for node in nodes)
219
231
        node = btree_index._LeafNode(leaf1_bytes, 1, 0)
220
 
        self.assertEqual(231, len(node))
221
 
        self.assertEqual(sorted_node_keys[:231], node.all_keys())
 
232
        self.assertEqual(231, len(node.keys))
 
233
        self.assertEqual(sorted_node_keys[:231], sorted(node.keys))
222
234
        leaf2_bytes = zlib.decompress(leaf2)
223
235
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
224
 
        self.assertEqual(400 - 231, len(node))
225
 
        self.assertEqual(sorted_node_keys[231:], node.all_keys())
 
236
        self.assertEqual(400 - 231, len(node.keys))
 
237
        self.assertEqual(sorted_node_keys[231:], sorted(node.keys))
226
238
 
227
239
    def test_last_page_rounded_1_layer(self):
228
240
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
233
245
        temp_file = builder.finish()
234
246
        content = temp_file.read()
235
247
        del temp_file
236
 
        self.assertEqual(155, len(content))
 
248
        self.assertEqual(181, len(content))
237
249
        self.assertEqual(
238
250
            "B+Tree Graph Index 2\nnode_ref_lists=0\nkey_elements=1\nlen=10\n"
239
251
            "row_lengths=1\n",
242
254
        leaf2 = content[74:]
243
255
        leaf2_bytes = zlib.decompress(leaf2)
244
256
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
245
 
        self.assertEqual(10, len(node))
 
257
        self.assertEqual(10, len(node.keys))
246
258
        sorted_node_keys = sorted(node[0] for node in nodes)
247
 
        self.assertEqual(sorted_node_keys, node.all_keys())
 
259
        self.assertEqual(sorted_node_keys, sorted(node.keys))
248
260
 
249
261
    def test_last_page_not_rounded_2_layer(self):
250
262
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
264
276
        leaf2 = content[8192:]
265
277
        leaf2_bytes = zlib.decompress(leaf2)
266
278
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
267
 
        self.assertEqual(400 - 231, len(node))
 
279
        self.assertEqual(400 - 231, len(node.keys))
268
280
        sorted_node_keys = sorted(node[0] for node in nodes)
269
 
        self.assertEqual(sorted_node_keys[231:], node.all_keys())
 
281
        self.assertEqual(sorted_node_keys[231:], sorted(node.keys))
270
282
 
271
283
    def test_three_level_tree_details(self):
272
284
        # The left most pointer in the second internal node in a row should
281
293
 
282
294
        for node in nodes:
283
295
            builder.add_node(*node)
284
 
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
285
 
        size = t.put_file('index', self.time(builder.finish))
 
296
        transport = get_transport('trace+' + self.get_url(''))
 
297
        size = transport.put_file('index', self.time(builder.finish))
286
298
        del builder
287
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
299
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
288
300
        # Seed the metadata, we're using internal calls now.
289
301
        index.key_count()
290
302
        self.assertEqual(3, len(index._row_lengths),
303
315
        # in the second node it points at
304
316
        pos = index._row_offsets[2] + internal_node2.offset + 1
305
317
        leaf = index._get_leaf_nodes([pos])[pos]
306
 
        self.assertTrue(internal_node2.keys[0] in leaf)
 
318
        self.assertTrue(internal_node2.keys[0] in leaf.keys)
307
319
 
308
320
    def test_2_leaves_2_2(self):
309
321
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
341
353
        # Test the parts of the index that take up memory are doing so
342
354
        # predictably.
343
355
        self.assertEqual(1, len(builder._nodes))
 
356
        self.assertEqual(1, len(builder._keys))
344
357
        self.assertIs(None, builder._nodes_by_key)
345
358
        builder.add_node(*nodes[1])
346
359
        self.assertEqual(0, len(builder._nodes))
 
360
        self.assertEqual(0, len(builder._keys))
347
361
        self.assertIs(None, builder._nodes_by_key)
348
362
        self.assertEqual(1, len(builder._backing_indices))
349
363
        self.assertEqual(2, builder._backing_indices[0].key_count())
350
364
        # now back to memory
351
365
        builder.add_node(*nodes[2])
352
366
        self.assertEqual(1, len(builder._nodes))
 
367
        self.assertEqual(1, len(builder._keys))
353
368
        self.assertIs(None, builder._nodes_by_key)
354
369
        # And spills to a second backing index combing all
355
370
        builder.add_node(*nodes[3])
356
371
        self.assertEqual(0, len(builder._nodes))
 
372
        self.assertEqual(0, len(builder._keys))
357
373
        self.assertIs(None, builder._nodes_by_key)
358
374
        self.assertEqual(2, len(builder._backing_indices))
359
375
        self.assertEqual(None, builder._backing_indices[0])
362
378
        builder.add_node(*nodes[4])
363
379
        builder.add_node(*nodes[5])
364
380
        self.assertEqual(0, len(builder._nodes))
 
381
        self.assertEqual(0, len(builder._keys))
365
382
        self.assertIs(None, builder._nodes_by_key)
366
383
        self.assertEqual(2, len(builder._backing_indices))
367
384
        self.assertEqual(2, builder._backing_indices[0].key_count())
410
427
        self.assertEqual(None, builder._backing_indices[2])
411
428
        self.assertEqual(16, builder._backing_indices[3].key_count())
412
429
        # Now finish, and check we got a correctly ordered tree
413
 
        t = self.get_transport('')
414
 
        size = t.put_file('index', builder.finish())
415
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
430
        transport = self.get_transport('')
 
431
        size = transport.put_file('index', builder.finish())
 
432
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
416
433
        nodes = list(index.iter_all_entries())
417
434
        self.assertEqual(sorted(nodes), nodes)
418
435
        self.assertEqual(16, len(nodes))
425
442
        # Test the parts of the index that take up memory are doing so
426
443
        # predictably.
427
444
        self.assertEqual(1, len(builder._nodes))
 
445
        self.assertEqual(1, len(builder._keys))
428
446
        self.assertIs(None, builder._nodes_by_key)
429
447
        builder.add_node(*nodes[1])
430
448
        self.assertEqual(0, len(builder._nodes))
 
449
        self.assertEqual(0, len(builder._keys))
431
450
        self.assertIs(None, builder._nodes_by_key)
432
451
        self.assertEqual(1, len(builder._backing_indices))
433
452
        self.assertEqual(2, builder._backing_indices[0].key_count())
434
453
        # now back to memory
435
454
        builder.add_node(*nodes[2])
436
455
        self.assertEqual(1, len(builder._nodes))
 
456
        self.assertEqual(1, len(builder._keys))
437
457
        self.assertIs(None, builder._nodes_by_key)
438
458
        # And spills to a second backing index but doesn't combine
439
459
        builder.add_node(*nodes[3])
440
460
        self.assertEqual(0, len(builder._nodes))
 
461
        self.assertEqual(0, len(builder._keys))
441
462
        self.assertIs(None, builder._nodes_by_key)
442
463
        self.assertEqual(2, len(builder._backing_indices))
443
464
        for backing_index in builder._backing_indices:
446
467
        builder.add_node(*nodes[4])
447
468
        builder.add_node(*nodes[5])
448
469
        self.assertEqual(0, len(builder._nodes))
 
470
        self.assertEqual(0, len(builder._keys))
449
471
        self.assertIs(None, builder._nodes_by_key)
450
472
        self.assertEqual(3, len(builder._backing_indices))
451
473
        for backing_index in builder._backing_indices:
510
532
        builder.add_node(*nodes[0])
511
533
        # Test the parts of the index that take up memory are doing so
512
534
        # predictably.
 
535
        self.assertEqual(1, len(builder._keys))
513
536
        self.assertEqual(1, len(builder._nodes))
514
537
        self.assertIs(None, builder._nodes_by_key)
515
538
        builder.add_node(*nodes[1])
 
539
        self.assertEqual(0, len(builder._keys))
516
540
        self.assertEqual(0, len(builder._nodes))
517
541
        self.assertIs(None, builder._nodes_by_key)
518
542
        self.assertEqual(1, len(builder._backing_indices))
521
545
        old = dict(builder._get_nodes_by_key()) #Build up the nodes by key dict
522
546
        builder.add_node(*nodes[2])
523
547
        self.assertEqual(1, len(builder._nodes))
 
548
        self.assertEqual(1, len(builder._keys))
524
549
        self.assertIsNot(None, builder._nodes_by_key)
525
550
        self.assertNotEqual({}, builder._nodes_by_key)
526
551
        # We should have a new entry
528
553
        # And spills to a second backing index combing all
529
554
        builder.add_node(*nodes[3])
530
555
        self.assertEqual(0, len(builder._nodes))
 
556
        self.assertEqual(0, len(builder._keys))
531
557
        self.assertIs(None, builder._nodes_by_key)
532
558
        self.assertEqual(2, len(builder._backing_indices))
533
559
        self.assertEqual(None, builder._backing_indices[0])
536
562
        builder.add_node(*nodes[4])
537
563
        builder.add_node(*nodes[5])
538
564
        self.assertEqual(0, len(builder._nodes))
 
565
        self.assertEqual(0, len(builder._keys))
539
566
        self.assertIs(None, builder._nodes_by_key)
540
567
        self.assertEqual(2, len(builder._backing_indices))
541
568
        self.assertEqual(2, builder._backing_indices[0].key_count())
608
635
        for key, value, references in nodes:
609
636
            builder.add_node(key, value, references)
610
637
        stream = builder.finish()
611
 
        trans = transport.get_transport_from_url('trace+' + self.get_url())
 
638
        trans = get_transport('trace+' + self.get_url())
612
639
        size = trans.put_file('index', stream)
613
640
        return btree_index.BTreeGraphIndex(trans, 'index', size)
614
641
 
615
 
    def make_index_with_offset(self, ref_lists=1, key_elements=1, nodes=[],
616
 
                               offset=0):
617
 
        builder = btree_index.BTreeBuilder(key_elements=key_elements,
618
 
                                           reference_lists=ref_lists)
619
 
        builder.add_nodes(nodes)
620
 
        transport = self.get_transport('')
621
 
        # NamedTemporaryFile dies on builder.finish().read(). weird.
622
 
        temp_file = builder.finish()
623
 
        content = temp_file.read()
624
 
        del temp_file
625
 
        size = len(content)
626
 
        transport.put_bytes('index', (' '*offset)+content)
627
 
        return btree_index.BTreeGraphIndex(transport, 'index', size=size,
628
 
                                           offset=offset)
629
 
 
630
 
    def test_clear_cache(self):
631
 
        nodes = self.make_nodes(160, 2, 2)
632
 
        index = self.make_index(ref_lists=2, key_elements=2, nodes=nodes)
633
 
        self.assertEqual(1, len(list(index.iter_entries([nodes[30][0]]))))
634
 
        self.assertEqual([1, 4], index._row_lengths)
635
 
        self.assertIsNot(None, index._root_node)
636
 
        internal_node_pre_clear = index._internal_node_cache.keys()
637
 
        self.assertTrue(len(index._leaf_node_cache) > 0)
638
 
        index.clear_cache()
639
 
        # We don't touch _root_node or _internal_node_cache, both should be
640
 
        # small, and can save a round trip or two
641
 
        self.assertIsNot(None, index._root_node)
642
 
        # NOTE: We don't want to affect the _internal_node_cache, as we expect
643
 
        #       it will be small, and if we ever do touch this index again, it
644
 
        #       will save round-trips.  This assertion isn't very strong,
645
 
        #       becuase without a 3-level index, we don't have any internal
646
 
        #       nodes cached.
647
 
        self.assertEqual(internal_node_pre_clear,
648
 
                         index._internal_node_cache.keys())
649
 
        self.assertEqual(0, len(index._leaf_node_cache))
650
 
 
651
642
    def test_trivial_constructor(self):
652
 
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
653
 
        index = btree_index.BTreeGraphIndex(t, 'index', None)
 
643
        transport = get_transport('trace+' + self.get_url(''))
 
644
        index = btree_index.BTreeGraphIndex(transport, 'index', None)
654
645
        # Checks the page size at load, but that isn't logged yet.
655
 
        self.assertEqual([], t._activity)
 
646
        self.assertEqual([], transport._activity)
656
647
 
657
648
    def test_with_size_constructor(self):
658
 
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
659
 
        index = btree_index.BTreeGraphIndex(t, 'index', 1)
 
649
        transport = get_transport('trace+' + self.get_url(''))
 
650
        index = btree_index.BTreeGraphIndex(transport, 'index', 1)
660
651
        # Checks the page size at load, but that isn't logged yet.
661
 
        self.assertEqual([], t._activity)
 
652
        self.assertEqual([], transport._activity)
662
653
 
663
654
    def test_empty_key_count_no_size(self):
664
655
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
665
 
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
666
 
        t.put_file('index', builder.finish())
667
 
        index = btree_index.BTreeGraphIndex(t, 'index', None)
668
 
        del t._activity[:]
669
 
        self.assertEqual([], t._activity)
 
656
        transport = get_transport('trace+' + self.get_url(''))
 
657
        transport.put_file('index', builder.finish())
 
658
        index = btree_index.BTreeGraphIndex(transport, 'index', None)
 
659
        del transport._activity[:]
 
660
        self.assertEqual([], transport._activity)
670
661
        self.assertEqual(0, index.key_count())
671
662
        # The entire index should have been requested (as we generally have the
672
663
        # size available, and doing many small readvs is inappropriate).
673
664
        # We can't tell how much was actually read here, but - check the code.
674
 
        self.assertEqual([('get', 'index')], t._activity)
 
665
        self.assertEqual([('get', 'index')], transport._activity)
675
666
 
676
667
    def test_empty_key_count(self):
677
668
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
678
 
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
679
 
        size = t.put_file('index', builder.finish())
 
669
        transport = get_transport('trace+' + self.get_url(''))
 
670
        size = transport.put_file('index', builder.finish())
680
671
        self.assertEqual(72, size)
681
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
682
 
        del t._activity[:]
683
 
        self.assertEqual([], t._activity)
 
672
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
673
        del transport._activity[:]
 
674
        self.assertEqual([], transport._activity)
684
675
        self.assertEqual(0, index.key_count())
685
676
        # The entire index should have been read, as 4K > size
686
677
        self.assertEqual([('readv', 'index', [(0, 72)], False, None)],
687
 
                         t._activity)
 
678
            transport._activity)
688
679
 
689
680
    def test_non_empty_key_count_2_2(self):
690
681
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
691
682
        nodes = self.make_nodes(35, 2, 2)
692
683
        for node in nodes:
693
684
            builder.add_node(*node)
694
 
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
695
 
        size = t.put_file('index', builder.finish())
696
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
697
 
        del t._activity[:]
698
 
        self.assertEqual([], t._activity)
 
685
        transport = get_transport('trace+' + self.get_url(''))
 
686
        size = transport.put_file('index', builder.finish())
 
687
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
688
        del transport._activity[:]
 
689
        self.assertEqual([], transport._activity)
699
690
        self.assertEqual(70, index.key_count())
700
691
        # The entire index should have been read, as it is one page long.
701
692
        self.assertEqual([('readv', 'index', [(0, size)], False, None)],
702
 
            t._activity)
703
 
        self.assertEqual(1173, size)
704
 
 
705
 
    def test_with_offset_no_size(self):
706
 
        index = self.make_index_with_offset(key_elements=1, ref_lists=1,
707
 
                                            offset=1234,
708
 
                                            nodes=self.make_nodes(200, 1, 1))
709
 
        index._size = None # throw away the size info
710
 
        self.assertEqual(200, index.key_count())
711
 
 
712
 
    def test_with_small_offset(self):
713
 
        index = self.make_index_with_offset(key_elements=1, ref_lists=1,
714
 
                                            offset=1234,
715
 
                                            nodes=self.make_nodes(200, 1, 1))
716
 
        self.assertEqual(200, index.key_count())
717
 
 
718
 
    def test_with_large_offset(self):
719
 
        index = self.make_index_with_offset(key_elements=1, ref_lists=1,
720
 
                                            offset=123456,
721
 
                                            nodes=self.make_nodes(200, 1, 1))
722
 
        self.assertEqual(200, index.key_count())
 
693
            transport._activity)
 
694
        self.assertEqual(1199, size)
723
695
 
724
696
    def test__read_nodes_no_size_one_page_reads_once(self):
725
697
        self.make_index(nodes=[(('key',), 'value', ())])
726
 
        trans = transport.get_transport_from_url('trace+' + self.get_url())
 
698
        trans = get_transport('trace+' + self.get_url())
727
699
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
728
700
        del trans._activity[:]
729
701
        nodes = dict(index._read_nodes([0]))
730
702
        self.assertEqual([0], nodes.keys())
731
703
        node = nodes[0]
732
 
        self.assertEqual([('key',)], node.all_keys())
 
704
        self.assertEqual([('key',)], node.keys.keys())
733
705
        self.assertEqual([('get', 'index')], trans._activity)
734
706
 
735
707
    def test__read_nodes_no_size_multiple_pages(self):
737
709
        index.key_count()
738
710
        num_pages = index._row_offsets[-1]
739
711
        # Reopen with a traced transport and no size
740
 
        trans = transport.get_transport_from_url('trace+' + self.get_url())
 
712
        trans = get_transport('trace+' + self.get_url())
741
713
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
742
714
        del trans._activity[:]
743
715
        nodes = dict(index._read_nodes([0]))
748
720
        nodes = self.make_nodes(160, 2, 2)
749
721
        for node in nodes:
750
722
            builder.add_node(*node)
751
 
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
752
 
        size = t.put_file('index', builder.finish())
 
723
        transport = get_transport('trace+' + self.get_url(''))
 
724
        size = transport.put_file('index', builder.finish())
753
725
        self.assertEqual(17692, size)
754
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
755
 
        del t._activity[:]
756
 
        self.assertEqual([], t._activity)
 
726
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
727
        del transport._activity[:]
 
728
        self.assertEqual([], transport._activity)
757
729
        self.assertEqual(320, index.key_count())
758
730
        # The entire index should not have been read.
759
731
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None)],
760
 
                         t._activity)
 
732
            transport._activity)
761
733
 
762
734
    def test_validate_one_page(self):
763
735
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
764
736
        nodes = self.make_nodes(45, 2, 2)
765
737
        for node in nodes:
766
738
            builder.add_node(*node)
767
 
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
768
 
        size = t.put_file('index', builder.finish())
769
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
770
 
        del t._activity[:]
771
 
        self.assertEqual([], t._activity)
 
739
        transport = get_transport('trace+' + self.get_url(''))
 
740
        size = transport.put_file('index', builder.finish())
 
741
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
742
        del transport._activity[:]
 
743
        self.assertEqual([], transport._activity)
772
744
        index.validate()
773
745
        # The entire index should have been read linearly.
774
746
        self.assertEqual([('readv', 'index', [(0, size)], False, None)],
775
 
                         t._activity)
776
 
        self.assertEqual(1488, size)
 
747
            transport._activity)
 
748
        self.assertEqual(1514, size)
777
749
 
778
750
    def test_validate_two_pages(self):
779
751
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
780
752
        nodes = self.make_nodes(80, 2, 2)
781
753
        for node in nodes:
782
754
            builder.add_node(*node)
783
 
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
784
 
        size = t.put_file('index', builder.finish())
 
755
        transport = get_transport('trace+' + self.get_url(''))
 
756
        size = transport.put_file('index', builder.finish())
785
757
        # Root page, 2 leaf pages
786
758
        self.assertEqual(9339, size)
787
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
788
 
        del t._activity[:]
789
 
        self.assertEqual([], t._activity)
 
759
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
760
        del transport._activity[:]
 
761
        self.assertEqual([], transport._activity)
790
762
        index.validate()
791
763
        # The entire index should have been read linearly.
792
 
        self.assertEqual(
793
 
            [('readv', 'index', [(0, 4096)], False, None),
794
 
             ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
795
 
            t._activity)
 
764
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
 
765
            ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
 
766
            transport._activity)
796
767
        # XXX: TODO: write some badly-ordered nodes, and some pointers-to-wrong
797
768
        # node and make validate find them.
798
769
 
799
770
    def test_eq_ne(self):
800
771
        # two indices are equal when constructed with the same parameters:
801
 
        t1 = transport.get_transport_from_url('trace+' + self.get_url(''))
802
 
        t2 = self.get_transport()
803
 
        self.assertTrue(
804
 
            btree_index.BTreeGraphIndex(t1, 'index', None) ==
805
 
            btree_index.BTreeGraphIndex(t1, 'index', None))
806
 
        self.assertTrue(
807
 
            btree_index.BTreeGraphIndex(t1, 'index', 20) ==
808
 
            btree_index.BTreeGraphIndex(t1, 'index', 20))
809
 
        self.assertFalse(
810
 
            btree_index.BTreeGraphIndex(t1, 'index', 20) ==
811
 
            btree_index.BTreeGraphIndex(t2, 'index', 20))
812
 
        self.assertFalse(
813
 
            btree_index.BTreeGraphIndex(t1, 'inde1', 20) ==
814
 
            btree_index.BTreeGraphIndex(t1, 'inde2', 20))
815
 
        self.assertFalse(
816
 
            btree_index.BTreeGraphIndex(t1, 'index', 10) ==
817
 
            btree_index.BTreeGraphIndex(t1, 'index', 20))
818
 
        self.assertFalse(
819
 
            btree_index.BTreeGraphIndex(t1, 'index', None) !=
820
 
            btree_index.BTreeGraphIndex(t1, 'index', None))
821
 
        self.assertFalse(
822
 
            btree_index.BTreeGraphIndex(t1, 'index', 20) !=
823
 
            btree_index.BTreeGraphIndex(t1, 'index', 20))
824
 
        self.assertTrue(
825
 
            btree_index.BTreeGraphIndex(t1, 'index', 20) !=
826
 
            btree_index.BTreeGraphIndex(t2, 'index', 20))
827
 
        self.assertTrue(
828
 
            btree_index.BTreeGraphIndex(t1, 'inde1', 20) !=
829
 
            btree_index.BTreeGraphIndex(t1, 'inde2', 20))
830
 
        self.assertTrue(
831
 
            btree_index.BTreeGraphIndex(t1, 'index', 10) !=
832
 
            btree_index.BTreeGraphIndex(t1, 'index', 20))
 
772
        transport1 = get_transport('trace+' + self.get_url(''))
 
773
        transport2 = get_transport(self.get_url(''))
 
774
        self.assertTrue(
 
775
            btree_index.BTreeGraphIndex(transport1, 'index', None) ==
 
776
            btree_index.BTreeGraphIndex(transport1, 'index', None))
 
777
        self.assertTrue(
 
778
            btree_index.BTreeGraphIndex(transport1, 'index', 20) ==
 
779
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
 
780
        self.assertFalse(
 
781
            btree_index.BTreeGraphIndex(transport1, 'index', 20) ==
 
782
            btree_index.BTreeGraphIndex(transport2, 'index', 20))
 
783
        self.assertFalse(
 
784
            btree_index.BTreeGraphIndex(transport1, 'inde1', 20) ==
 
785
            btree_index.BTreeGraphIndex(transport1, 'inde2', 20))
 
786
        self.assertFalse(
 
787
            btree_index.BTreeGraphIndex(transport1, 'index', 10) ==
 
788
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
 
789
        self.assertFalse(
 
790
            btree_index.BTreeGraphIndex(transport1, 'index', None) !=
 
791
            btree_index.BTreeGraphIndex(transport1, 'index', None))
 
792
        self.assertFalse(
 
793
            btree_index.BTreeGraphIndex(transport1, 'index', 20) !=
 
794
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
 
795
        self.assertTrue(
 
796
            btree_index.BTreeGraphIndex(transport1, 'index', 20) !=
 
797
            btree_index.BTreeGraphIndex(transport2, 'index', 20))
 
798
        self.assertTrue(
 
799
            btree_index.BTreeGraphIndex(transport1, 'inde1', 20) !=
 
800
            btree_index.BTreeGraphIndex(transport1, 'inde2', 20))
 
801
        self.assertTrue(
 
802
            btree_index.BTreeGraphIndex(transport1, 'index', 10) !=
 
803
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
833
804
 
834
 
    def test_key_too_big(self):
835
 
        # the size that matters here is the _compressed_ size of the key, so we can't
836
 
        # do a simple character repeat.
837
 
        bigKey = ''.join(map(repr, xrange(btree_index._PAGE_SIZE)))
838
 
        self.assertRaises(errors.BadIndexKey,
839
 
                          self.make_index,
840
 
                          nodes=[((bigKey,), 'value', ())])
841
 
        
842
805
    def test_iter_all_only_root_no_size(self):
843
806
        self.make_index(nodes=[(('key',), 'value', ())])
844
 
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
845
 
        index = btree_index.BTreeGraphIndex(t, 'index', None)
846
 
        del t._activity[:]
 
807
        trans = get_transport('trace+' + self.get_url(''))
 
808
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
 
809
        del trans._activity[:]
847
810
        self.assertEqual([(('key',), 'value')],
848
811
                         [x[1:] for x in index.iter_all_entries()])
849
 
        self.assertEqual([('get', 'index')], t._activity)
 
812
        self.assertEqual([('get', 'index')], trans._activity)
850
813
 
851
814
    def test_iter_all_entries_reads(self):
852
815
        # iterating all entries reads the header, then does a linear
858
821
        nodes = self.make_nodes(10000, 2, 2)
859
822
        for node in nodes:
860
823
            builder.add_node(*node)
861
 
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
862
 
        size = t.put_file('index', builder.finish())
 
824
        transport = get_transport('trace+' + self.get_url(''))
 
825
        size = transport.put_file('index', builder.finish())
863
826
        self.assertEqual(1303220, size, 'number of expected bytes in the'
864
827
                                        ' output changed')
865
828
        page_size = btree_index._PAGE_SIZE
866
829
        del builder
867
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
868
 
        del t._activity[:]
869
 
        self.assertEqual([], t._activity)
 
830
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
831
        del transport._activity[:]
 
832
        self.assertEqual([], transport._activity)
870
833
        found_nodes = self.time(list, index.iter_all_entries())
871
834
        bare_nodes = []
872
835
        for node in found_nodes:
893
856
        readv_request[-1] = (readv_request[-1][0], 1303220 % page_size)
894
857
        expected = [('readv', 'index', [(0, page_size)], False, None),
895
858
             ('readv',  'index', readv_request, False, None)]
896
 
        if expected != t._activity:
 
859
        if expected != transport._activity:
897
860
            self.assertEqualDiff(pprint.pformat(expected),
898
861
                                 pprint.pformat(transport._activity))
899
862
 
913
876
        nodes = self.make_nodes(160, 2, 2)
914
877
        for node in nodes:
915
878
            builder.add_node(*node)
916
 
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
917
 
        size = t.put_file('index', builder.finish())
 
879
        transport = get_transport('trace+' + self.get_url(''))
 
880
        size = transport.put_file('index', builder.finish())
918
881
        del builder
919
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
920
 
        del t._activity[:]
921
 
        self.assertEqual([], t._activity)
 
882
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
883
        del transport._activity[:]
 
884
        self.assertEqual([], transport._activity)
922
885
        # search for one key
923
886
        found_nodes = list(index.iter_entries([nodes[30][0]]))
924
887
        bare_nodes = []
932
895
        # Should have read the root node, then one leaf page:
933
896
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
934
897
             ('readv',  'index', [(8192, 4096), ], False, None)],
935
 
            t._activity)
 
898
            transport._activity)
936
899
 
937
900
    def test_iter_key_prefix_1_element_key_None(self):
938
901
        index = self.make_index()
1121
1084
        min_l2_key = l2.min_key
1122
1085
        max_l1_key = l1.max_key
1123
1086
        self.assertTrue(max_l1_key < min_l2_key)
1124
 
        parents_min_l2_key = l2[min_l2_key][1][0]
 
1087
        parents_min_l2_key = l2.keys[min_l2_key][1][0]
1125
1088
        self.assertEqual((l1.max_key,), parents_min_l2_key)
1126
1089
        # Now, whatever key we select that would fall on the second page,
1127
1090
        # should give us all the parents until the page break
1140
1103
        parent_map = {}
1141
1104
        search_keys = index._find_ancestors([max_l1_key], 0, parent_map,
1142
1105
                                            missing_keys)
1143
 
        self.assertEqual(l1.all_keys(), sorted(parent_map))
 
1106
        self.assertEqual(sorted(l1.keys), sorted(parent_map))
1144
1107
        self.assertEqual(set(), missing_keys)
1145
1108
        self.assertEqual(set(), search_keys)
1146
1109
 
1162
1125
        for node in nodes:
1163
1126
            builder.add_node(*node)
1164
1127
        stream = builder.finish()
1165
 
        trans = self.get_transport()
 
1128
        trans = get_transport(self.get_url())
1166
1129
        size = trans.put_file('index', stream)
1167
1130
        index = btree_index.BTreeGraphIndex(trans, 'index', size)
1168
1131
        self.assertEqual(500, index.key_count())
1194
1157
 
1195
1158
class TestBTreeNodes(BTreeTestCase):
1196
1159
 
1197
 
    scenarios = btreeparser_scenarios()
 
1160
    def restore_parser(self):
 
1161
        btree_index._btree_serializer = self.saved_parser
1198
1162
 
1199
1163
    def setUp(self):
1200
1164
        BTreeTestCase.setUp(self)
1201
 
        self.overrideAttr(btree_index, '_btree_serializer', self.parse_btree)
 
1165
        self.saved_parser = btree_index._btree_serializer
 
1166
        self.addCleanup(self.restore_parser)
 
1167
        btree_index._btree_serializer = self.parse_btree
1202
1168
 
1203
1169
    def test_LeafNode_1_0(self):
1204
1170
        node_bytes = ("type=leaf\n"
1216
1182
            ("2222222222222222222222222222222222222222",): ("value:2", ()),
1217
1183
            ("3333333333333333333333333333333333333333",): ("value:3", ()),
1218
1184
            ("4444444444444444444444444444444444444444",): ("value:4", ()),
1219
 
            }, dict(node.all_items()))
 
1185
            }, node.keys)
1220
1186
 
1221
1187
    def test_LeafNode_2_2(self):
1222
1188
        node_bytes = ("type=leaf\n"
1236
1202
            ('11', '33'): ('value:3',
1237
1203
                ((('11', 'ref22'),), (('11', 'ref22'), ('11', 'ref22')))),
1238
1204
            ('11', '44'): ('value:4', ((), (('11', 'ref00'),)))
1239
 
            }, dict(node.all_items()))
 
1205
            }, node.keys)
1240
1206
 
1241
1207
    def test_InternalNode_1(self):
1242
1208
        node_bytes = ("type=internal\n"
1277
1243
            ('11', '33'): ('value:3',
1278
1244
                ((('11', 'ref22'),), (('11', 'ref22'), ('11', 'ref22')))),
1279
1245
            ('11', '44'): ('value:4', ((), (('11', 'ref00'),)))
1280
 
            }, dict(node.all_items()))
 
1246
            }, node.keys)
1281
1247
 
1282
1248
    def assertFlattened(self, expected, key, value, refs):
1283
1249
        flat_key, flat_line = self.parse_btree._flatten_node(
1315
1281
    def test_exists(self):
1316
1282
        # This is just to let the user know if they don't have the feature
1317
1283
        # available
1318
 
        self.requireFeature(compiled_btreeparser_feature)
 
1284
        self.requireFeature(CompiledBtreeParserFeature)
1319
1285
 
1320
1286
 
1321
1287
class TestMultiBisectRight(tests.TestCase):
1361
1327
        This doesn't actually create anything on disk, it just primes a
1362
1328
        BTreeGraphIndex with the recommended information.
1363
1329
        """
1364
 
        index = btree_index.BTreeGraphIndex(
1365
 
            transport.get_transport_from_url('memory:///'),
1366
 
            'test-index', size=size)
 
1330
        index = btree_index.BTreeGraphIndex(get_transport('memory:///'),
 
1331
                                            'test-index', size=size)
1367
1332
        if recommended_pages is not None:
1368
1333
            index._recommended_pages = recommended_pages
1369
1334
        return index