~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_btree_index.py

(jelmer) Use the absolute_import feature everywhere in bzrlib,
 and add a source test to make sure it's used everywhere. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2008-2011 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,
30
31
    )
31
32
from bzrlib.tests import (
32
33
    TestCaseWithTransport,
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))
 
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():
44
45
    import bzrlib._btree_serializer_py as py_module
45
46
    scenarios = [('python', {'parse_btree': py_module})]
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()
 
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')
66
55
 
67
56
 
68
57
class BTreeTestCase(TestCaseWithTransport):
71
60
 
72
61
    def setUp(self):
73
62
        TestCaseWithTransport.setUp(self)
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
 
63
        self.overrideAttr(btree_index, '_RESERVED_HEADER_BYTES', 100)
79
64
 
80
65
    def make_nodes(self, count, key_elements, reference_lists):
81
66
        """Generate count*key_elements sample nodes."""
115
100
 
116
101
    def shrink_page_size(self):
117
102
        """Shrink the default page size so that less fits in a page."""
118
 
        old_page_size = btree_index._PAGE_SIZE
119
 
        def cleanup():
120
 
            btree_index._PAGE_SIZE = old_page_size
121
 
        self.addCleanup(cleanup)
 
103
        self.overrideAttr(btree_index, '_PAGE_SIZE')
122
104
        btree_index._PAGE_SIZE = 2048
123
105
 
124
106
 
235
217
        leaf1_bytes = zlib.decompress(leaf1)
236
218
        sorted_node_keys = sorted(node[0] for node in nodes)
237
219
        node = btree_index._LeafNode(leaf1_bytes, 1, 0)
238
 
        self.assertEqual(231, len(node.keys))
239
 
        self.assertEqual(sorted_node_keys[:231], sorted(node.keys))
 
220
        self.assertEqual(231, len(node))
 
221
        self.assertEqual(sorted_node_keys[:231], node.all_keys())
240
222
        leaf2_bytes = zlib.decompress(leaf2)
241
223
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
242
 
        self.assertEqual(400 - 231, len(node.keys))
243
 
        self.assertEqual(sorted_node_keys[231:], sorted(node.keys))
 
224
        self.assertEqual(400 - 231, len(node))
 
225
        self.assertEqual(sorted_node_keys[231:], node.all_keys())
244
226
 
245
227
    def test_last_page_rounded_1_layer(self):
246
228
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
260
242
        leaf2 = content[74:]
261
243
        leaf2_bytes = zlib.decompress(leaf2)
262
244
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
263
 
        self.assertEqual(10, len(node.keys))
 
245
        self.assertEqual(10, len(node))
264
246
        sorted_node_keys = sorted(node[0] for node in nodes)
265
 
        self.assertEqual(sorted_node_keys, sorted(node.keys))
 
247
        self.assertEqual(sorted_node_keys, node.all_keys())
266
248
 
267
249
    def test_last_page_not_rounded_2_layer(self):
268
250
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
282
264
        leaf2 = content[8192:]
283
265
        leaf2_bytes = zlib.decompress(leaf2)
284
266
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
285
 
        self.assertEqual(400 - 231, len(node.keys))
 
267
        self.assertEqual(400 - 231, len(node))
286
268
        sorted_node_keys = sorted(node[0] for node in nodes)
287
 
        self.assertEqual(sorted_node_keys[231:], sorted(node.keys))
 
269
        self.assertEqual(sorted_node_keys[231:], node.all_keys())
288
270
 
289
271
    def test_three_level_tree_details(self):
290
272
        # The left most pointer in the second internal node in a row should
299
281
 
300
282
        for node in nodes:
301
283
            builder.add_node(*node)
302
 
        transport = get_transport('trace+' + self.get_url(''))
303
 
        size = transport.put_file('index', self.time(builder.finish))
 
284
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
 
285
        size = t.put_file('index', self.time(builder.finish))
304
286
        del builder
305
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
287
        index = btree_index.BTreeGraphIndex(t, 'index', size)
306
288
        # Seed the metadata, we're using internal calls now.
307
289
        index.key_count()
308
290
        self.assertEqual(3, len(index._row_lengths),
321
303
        # in the second node it points at
322
304
        pos = index._row_offsets[2] + internal_node2.offset + 1
323
305
        leaf = index._get_leaf_nodes([pos])[pos]
324
 
        self.assertTrue(internal_node2.keys[0] in leaf.keys)
 
306
        self.assertTrue(internal_node2.keys[0] in leaf)
325
307
 
326
308
    def test_2_leaves_2_2(self):
327
309
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
428
410
        self.assertEqual(None, builder._backing_indices[2])
429
411
        self.assertEqual(16, builder._backing_indices[3].key_count())
430
412
        # Now finish, and check we got a correctly ordered tree
431
 
        transport = self.get_transport('')
432
 
        size = transport.put_file('index', builder.finish())
433
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
413
        t = self.get_transport('')
 
414
        size = t.put_file('index', builder.finish())
 
415
        index = btree_index.BTreeGraphIndex(t, 'index', size)
434
416
        nodes = list(index.iter_all_entries())
435
417
        self.assertEqual(sorted(nodes), nodes)
436
418
        self.assertEqual(16, len(nodes))
626
608
        for key, value, references in nodes:
627
609
            builder.add_node(key, value, references)
628
610
        stream = builder.finish()
629
 
        trans = get_transport('trace+' + self.get_url())
 
611
        trans = transport.get_transport_from_url('trace+' + self.get_url())
630
612
        size = trans.put_file('index', stream)
631
613
        return btree_index.BTreeGraphIndex(trans, 'index', size)
632
614
 
 
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
 
633
630
    def test_clear_cache(self):
634
631
        nodes = self.make_nodes(160, 2, 2)
635
632
        index = self.make_index(ref_lists=2, key_elements=2, nodes=nodes)
652
649
        self.assertEqual(0, len(index._leaf_node_cache))
653
650
 
654
651
    def test_trivial_constructor(self):
655
 
        transport = get_transport('trace+' + self.get_url(''))
656
 
        index = btree_index.BTreeGraphIndex(transport, 'index', None)
 
652
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
 
653
        index = btree_index.BTreeGraphIndex(t, 'index', None)
657
654
        # Checks the page size at load, but that isn't logged yet.
658
 
        self.assertEqual([], transport._activity)
 
655
        self.assertEqual([], t._activity)
659
656
 
660
657
    def test_with_size_constructor(self):
661
 
        transport = get_transport('trace+' + self.get_url(''))
662
 
        index = btree_index.BTreeGraphIndex(transport, 'index', 1)
 
658
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
 
659
        index = btree_index.BTreeGraphIndex(t, 'index', 1)
663
660
        # Checks the page size at load, but that isn't logged yet.
664
 
        self.assertEqual([], transport._activity)
 
661
        self.assertEqual([], t._activity)
665
662
 
666
663
    def test_empty_key_count_no_size(self):
667
664
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
668
 
        transport = get_transport('trace+' + self.get_url(''))
669
 
        transport.put_file('index', builder.finish())
670
 
        index = btree_index.BTreeGraphIndex(transport, 'index', None)
671
 
        del transport._activity[:]
672
 
        self.assertEqual([], transport._activity)
 
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)
673
670
        self.assertEqual(0, index.key_count())
674
671
        # The entire index should have been requested (as we generally have the
675
672
        # size available, and doing many small readvs is inappropriate).
676
673
        # We can't tell how much was actually read here, but - check the code.
677
 
        self.assertEqual([('get', 'index')], transport._activity)
 
674
        self.assertEqual([('get', 'index')], t._activity)
678
675
 
679
676
    def test_empty_key_count(self):
680
677
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
681
 
        transport = get_transport('trace+' + self.get_url(''))
682
 
        size = transport.put_file('index', builder.finish())
 
678
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
 
679
        size = t.put_file('index', builder.finish())
683
680
        self.assertEqual(72, size)
684
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
685
 
        del transport._activity[:]
686
 
        self.assertEqual([], transport._activity)
 
681
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
682
        del t._activity[:]
 
683
        self.assertEqual([], t._activity)
687
684
        self.assertEqual(0, index.key_count())
688
685
        # The entire index should have been read, as 4K > size
689
686
        self.assertEqual([('readv', 'index', [(0, 72)], False, None)],
690
 
            transport._activity)
 
687
                         t._activity)
691
688
 
692
689
    def test_non_empty_key_count_2_2(self):
693
690
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
694
691
        nodes = self.make_nodes(35, 2, 2)
695
692
        for node in nodes:
696
693
            builder.add_node(*node)
697
 
        transport = get_transport('trace+' + self.get_url(''))
698
 
        size = transport.put_file('index', builder.finish())
699
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
700
 
        del transport._activity[:]
701
 
        self.assertEqual([], transport._activity)
 
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)
702
699
        self.assertEqual(70, index.key_count())
703
700
        # The entire index should have been read, as it is one page long.
704
701
        self.assertEqual([('readv', 'index', [(0, size)], False, None)],
705
 
            transport._activity)
 
702
            t._activity)
706
703
        self.assertEqual(1173, size)
707
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())
 
723
 
708
724
    def test__read_nodes_no_size_one_page_reads_once(self):
709
725
        self.make_index(nodes=[(('key',), 'value', ())])
710
 
        trans = get_transport('trace+' + self.get_url())
 
726
        trans = transport.get_transport_from_url('trace+' + self.get_url())
711
727
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
712
728
        del trans._activity[:]
713
729
        nodes = dict(index._read_nodes([0]))
714
730
        self.assertEqual([0], nodes.keys())
715
731
        node = nodes[0]
716
 
        self.assertEqual([('key',)], node.keys.keys())
 
732
        self.assertEqual([('key',)], node.all_keys())
717
733
        self.assertEqual([('get', 'index')], trans._activity)
718
734
 
719
735
    def test__read_nodes_no_size_multiple_pages(self):
721
737
        index.key_count()
722
738
        num_pages = index._row_offsets[-1]
723
739
        # Reopen with a traced transport and no size
724
 
        trans = get_transport('trace+' + self.get_url())
 
740
        trans = transport.get_transport_from_url('trace+' + self.get_url())
725
741
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
726
742
        del trans._activity[:]
727
743
        nodes = dict(index._read_nodes([0]))
732
748
        nodes = self.make_nodes(160, 2, 2)
733
749
        for node in nodes:
734
750
            builder.add_node(*node)
735
 
        transport = get_transport('trace+' + self.get_url(''))
736
 
        size = transport.put_file('index', builder.finish())
 
751
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
 
752
        size = t.put_file('index', builder.finish())
737
753
        self.assertEqual(17692, size)
738
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
739
 
        del transport._activity[:]
740
 
        self.assertEqual([], transport._activity)
 
754
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
755
        del t._activity[:]
 
756
        self.assertEqual([], t._activity)
741
757
        self.assertEqual(320, index.key_count())
742
758
        # The entire index should not have been read.
743
759
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None)],
744
 
            transport._activity)
 
760
                         t._activity)
745
761
 
746
762
    def test_validate_one_page(self):
747
763
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
748
764
        nodes = self.make_nodes(45, 2, 2)
749
765
        for node in nodes:
750
766
            builder.add_node(*node)
751
 
        transport = get_transport('trace+' + self.get_url(''))
752
 
        size = transport.put_file('index', builder.finish())
753
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
754
 
        del transport._activity[:]
755
 
        self.assertEqual([], transport._activity)
 
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)
756
772
        index.validate()
757
773
        # The entire index should have been read linearly.
758
774
        self.assertEqual([('readv', 'index', [(0, size)], False, None)],
759
 
            transport._activity)
 
775
                         t._activity)
760
776
        self.assertEqual(1488, size)
761
777
 
762
778
    def test_validate_two_pages(self):
764
780
        nodes = self.make_nodes(80, 2, 2)
765
781
        for node in nodes:
766
782
            builder.add_node(*node)
767
 
        transport = get_transport('trace+' + self.get_url(''))
768
 
        size = transport.put_file('index', builder.finish())
 
783
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
 
784
        size = t.put_file('index', builder.finish())
769
785
        # Root page, 2 leaf pages
770
786
        self.assertEqual(9339, size)
771
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
772
 
        del transport._activity[:]
773
 
        self.assertEqual([], transport._activity)
 
787
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
788
        del t._activity[:]
 
789
        self.assertEqual([], t._activity)
774
790
        index.validate()
775
791
        # The entire index should have been read linearly.
776
 
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
777
 
            ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
778
 
            transport._activity)
 
792
        self.assertEqual(
 
793
            [('readv', 'index', [(0, 4096)], False, None),
 
794
             ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
 
795
            t._activity)
779
796
        # XXX: TODO: write some badly-ordered nodes, and some pointers-to-wrong
780
797
        # node and make validate find them.
781
798
 
782
799
    def test_eq_ne(self):
783
800
        # two indices are equal when constructed with the same parameters:
784
 
        transport1 = get_transport('trace+' + self.get_url(''))
785
 
        transport2 = get_transport(self.get_url(''))
786
 
        self.assertTrue(
787
 
            btree_index.BTreeGraphIndex(transport1, 'index', None) ==
788
 
            btree_index.BTreeGraphIndex(transport1, 'index', None))
789
 
        self.assertTrue(
790
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20) ==
791
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
792
 
        self.assertFalse(
793
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20) ==
794
 
            btree_index.BTreeGraphIndex(transport2, 'index', 20))
795
 
        self.assertFalse(
796
 
            btree_index.BTreeGraphIndex(transport1, 'inde1', 20) ==
797
 
            btree_index.BTreeGraphIndex(transport1, 'inde2', 20))
798
 
        self.assertFalse(
799
 
            btree_index.BTreeGraphIndex(transport1, 'index', 10) ==
800
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
801
 
        self.assertFalse(
802
 
            btree_index.BTreeGraphIndex(transport1, 'index', None) !=
803
 
            btree_index.BTreeGraphIndex(transport1, 'index', None))
804
 
        self.assertFalse(
805
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20) !=
806
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
807
 
        self.assertTrue(
808
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20) !=
809
 
            btree_index.BTreeGraphIndex(transport2, 'index', 20))
810
 
        self.assertTrue(
811
 
            btree_index.BTreeGraphIndex(transport1, 'inde1', 20) !=
812
 
            btree_index.BTreeGraphIndex(transport1, 'inde2', 20))
813
 
        self.assertTrue(
814
 
            btree_index.BTreeGraphIndex(transport1, 'index', 10) !=
815
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
 
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))
816
833
 
 
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
        
817
842
    def test_iter_all_only_root_no_size(self):
818
843
        self.make_index(nodes=[(('key',), 'value', ())])
819
 
        trans = get_transport('trace+' + self.get_url(''))
820
 
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
821
 
        del trans._activity[:]
 
844
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
 
845
        index = btree_index.BTreeGraphIndex(t, 'index', None)
 
846
        del t._activity[:]
822
847
        self.assertEqual([(('key',), 'value')],
823
848
                         [x[1:] for x in index.iter_all_entries()])
824
 
        self.assertEqual([('get', 'index')], trans._activity)
 
849
        self.assertEqual([('get', 'index')], t._activity)
825
850
 
826
851
    def test_iter_all_entries_reads(self):
827
852
        # iterating all entries reads the header, then does a linear
833
858
        nodes = self.make_nodes(10000, 2, 2)
834
859
        for node in nodes:
835
860
            builder.add_node(*node)
836
 
        transport = get_transport('trace+' + self.get_url(''))
837
 
        size = transport.put_file('index', builder.finish())
 
861
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
 
862
        size = t.put_file('index', builder.finish())
838
863
        self.assertEqual(1303220, size, 'number of expected bytes in the'
839
864
                                        ' output changed')
840
865
        page_size = btree_index._PAGE_SIZE
841
866
        del builder
842
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
843
 
        del transport._activity[:]
844
 
        self.assertEqual([], transport._activity)
 
867
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
868
        del t._activity[:]
 
869
        self.assertEqual([], t._activity)
845
870
        found_nodes = self.time(list, index.iter_all_entries())
846
871
        bare_nodes = []
847
872
        for node in found_nodes:
868
893
        readv_request[-1] = (readv_request[-1][0], 1303220 % page_size)
869
894
        expected = [('readv', 'index', [(0, page_size)], False, None),
870
895
             ('readv',  'index', readv_request, False, None)]
871
 
        if expected != transport._activity:
 
896
        if expected != t._activity:
872
897
            self.assertEqualDiff(pprint.pformat(expected),
873
898
                                 pprint.pformat(transport._activity))
874
899
 
888
913
        nodes = self.make_nodes(160, 2, 2)
889
914
        for node in nodes:
890
915
            builder.add_node(*node)
891
 
        transport = get_transport('trace+' + self.get_url(''))
892
 
        size = transport.put_file('index', builder.finish())
 
916
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
 
917
        size = t.put_file('index', builder.finish())
893
918
        del builder
894
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
895
 
        del transport._activity[:]
896
 
        self.assertEqual([], transport._activity)
 
919
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
920
        del t._activity[:]
 
921
        self.assertEqual([], t._activity)
897
922
        # search for one key
898
923
        found_nodes = list(index.iter_entries([nodes[30][0]]))
899
924
        bare_nodes = []
907
932
        # Should have read the root node, then one leaf page:
908
933
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
909
934
             ('readv',  'index', [(8192, 4096), ], False, None)],
910
 
            transport._activity)
 
935
            t._activity)
911
936
 
912
937
    def test_iter_key_prefix_1_element_key_None(self):
913
938
        index = self.make_index()
1096
1121
        min_l2_key = l2.min_key
1097
1122
        max_l1_key = l1.max_key
1098
1123
        self.assertTrue(max_l1_key < min_l2_key)
1099
 
        parents_min_l2_key = l2.keys[min_l2_key][1][0]
 
1124
        parents_min_l2_key = l2[min_l2_key][1][0]
1100
1125
        self.assertEqual((l1.max_key,), parents_min_l2_key)
1101
1126
        # Now, whatever key we select that would fall on the second page,
1102
1127
        # should give us all the parents until the page break
1115
1140
        parent_map = {}
1116
1141
        search_keys = index._find_ancestors([max_l1_key], 0, parent_map,
1117
1142
                                            missing_keys)
1118
 
        self.assertEqual(sorted(l1.keys), sorted(parent_map))
 
1143
        self.assertEqual(l1.all_keys(), sorted(parent_map))
1119
1144
        self.assertEqual(set(), missing_keys)
1120
1145
        self.assertEqual(set(), search_keys)
1121
1146
 
1137
1162
        for node in nodes:
1138
1163
            builder.add_node(*node)
1139
1164
        stream = builder.finish()
1140
 
        trans = get_transport(self.get_url())
 
1165
        trans = self.get_transport()
1141
1166
        size = trans.put_file('index', stream)
1142
1167
        index = btree_index.BTreeGraphIndex(trans, 'index', size)
1143
1168
        self.assertEqual(500, index.key_count())
1169
1194
 
1170
1195
class TestBTreeNodes(BTreeTestCase):
1171
1196
 
1172
 
    def restore_parser(self):
1173
 
        btree_index._btree_serializer = self.saved_parser
 
1197
    scenarios = btreeparser_scenarios()
1174
1198
 
1175
1199
    def setUp(self):
1176
1200
        BTreeTestCase.setUp(self)
1177
 
        self.saved_parser = btree_index._btree_serializer
1178
 
        self.addCleanup(self.restore_parser)
1179
 
        btree_index._btree_serializer = self.parse_btree
 
1201
        self.overrideAttr(btree_index, '_btree_serializer', self.parse_btree)
1180
1202
 
1181
1203
    def test_LeafNode_1_0(self):
1182
1204
        node_bytes = ("type=leaf\n"
1194
1216
            ("2222222222222222222222222222222222222222",): ("value:2", ()),
1195
1217
            ("3333333333333333333333333333333333333333",): ("value:3", ()),
1196
1218
            ("4444444444444444444444444444444444444444",): ("value:4", ()),
1197
 
            }, node.keys)
 
1219
            }, dict(node.all_items()))
1198
1220
 
1199
1221
    def test_LeafNode_2_2(self):
1200
1222
        node_bytes = ("type=leaf\n"
1214
1236
            ('11', '33'): ('value:3',
1215
1237
                ((('11', 'ref22'),), (('11', 'ref22'), ('11', 'ref22')))),
1216
1238
            ('11', '44'): ('value:4', ((), (('11', 'ref00'),)))
1217
 
            }, node.keys)
 
1239
            }, dict(node.all_items()))
1218
1240
 
1219
1241
    def test_InternalNode_1(self):
1220
1242
        node_bytes = ("type=internal\n"
1255
1277
            ('11', '33'): ('value:3',
1256
1278
                ((('11', 'ref22'),), (('11', 'ref22'), ('11', 'ref22')))),
1257
1279
            ('11', '44'): ('value:4', ((), (('11', 'ref00'),)))
1258
 
            }, node.keys)
 
1280
            }, dict(node.all_items()))
1259
1281
 
1260
1282
    def assertFlattened(self, expected, key, value, refs):
1261
1283
        flat_key, flat_line = self.parse_btree._flatten_node(
1293
1315
    def test_exists(self):
1294
1316
        # This is just to let the user know if they don't have the feature
1295
1317
        # available
1296
 
        self.requireFeature(CompiledBtreeParserFeature)
 
1318
        self.requireFeature(compiled_btreeparser_feature)
1297
1319
 
1298
1320
 
1299
1321
class TestMultiBisectRight(tests.TestCase):
1339
1361
        This doesn't actually create anything on disk, it just primes a
1340
1362
        BTreeGraphIndex with the recommended information.
1341
1363
        """
1342
 
        index = btree_index.BTreeGraphIndex(get_transport('memory:///'),
1343
 
                                            'test-index', size=size)
 
1364
        index = btree_index.BTreeGraphIndex(
 
1365
            transport.get_transport_from_url('memory:///'),
 
1366
            'test-index', size=size)
1344
1367
        if recommended_pages is not None:
1345
1368
            index._recommended_pages = recommended_pages
1346
1369
        return index