← 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: Andrew Bennetts
  • Date: 2010-01-12 03:53:21 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4964.
  • Revision ID: andrew.bennetts@canonical.com-20100112035321-hofpz5p10224ryj3
Merge lp:bzr, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_btree_index.py
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
46
    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')
 
47
        scenarios.append(('C', {'parse_btree':
 
48
                                compiled_btreeparser_feature.module}))
 
49
    return multiply_tests(node_tests, scenarios, others)
 
50
 
 
51
 
 
52
compiled_btreeparser_feature = tests.ModuleAvailableFeature(
 
53
                                'bzrlib._btree_serializer_pyx')
55
54
 
56
55
 
57
56
class BTreeTestCase(TestCaseWithTransport):
60
59
 
61
60
    def setUp(self):
62
61
        TestCaseWithTransport.setUp(self)
63
 
        self.overrideAttr(btree_index, '_RESERVED_HEADER_BYTES', 100)
 
62
        self._original_header = btree_index._RESERVED_HEADER_BYTES
 
63
        def restore():
 
64
            btree_index._RESERVED_HEADER_BYTES = self._original_header
 
65
        self.addCleanup(restore)
 
66
        btree_index._RESERVED_HEADER_BYTES = 100
64
67
 
65
68
    def make_nodes(self, count, key_elements, reference_lists):
66
69
        """Generate count*key_elements sample nodes."""
100
103
 
101
104
    def shrink_page_size(self):
102
105
        """Shrink the default page size so that less fits in a page."""
103
 
        self.overrideAttr(btree_index, '_PAGE_SIZE')
 
106
        old_page_size = btree_index._PAGE_SIZE
 
107
        def cleanup():
 
108
            btree_index._PAGE_SIZE = old_page_size
 
109
        self.addCleanup(cleanup)
104
110
        btree_index._PAGE_SIZE = 2048
105
111
 
106
112
 
217
223
        leaf1_bytes = zlib.decompress(leaf1)
218
224
        sorted_node_keys = sorted(node[0] for node in nodes)
219
225
        node = btree_index._LeafNode(leaf1_bytes, 1, 0)
220
 
        self.assertEqual(231, len(node))
221
 
        self.assertEqual(sorted_node_keys[:231], node.all_keys())
 
226
        self.assertEqual(231, len(node.keys))
 
227
        self.assertEqual(sorted_node_keys[:231], sorted(node.keys))
222
228
        leaf2_bytes = zlib.decompress(leaf2)
223
229
        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())
 
230
        self.assertEqual(400 - 231, len(node.keys))
 
231
        self.assertEqual(sorted_node_keys[231:], sorted(node.keys))
226
232
 
227
233
    def test_last_page_rounded_1_layer(self):
228
234
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
242
248
        leaf2 = content[74:]
243
249
        leaf2_bytes = zlib.decompress(leaf2)
244
250
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
245
 
        self.assertEqual(10, len(node))
 
251
        self.assertEqual(10, len(node.keys))
246
252
        sorted_node_keys = sorted(node[0] for node in nodes)
247
 
        self.assertEqual(sorted_node_keys, node.all_keys())
 
253
        self.assertEqual(sorted_node_keys, sorted(node.keys))
248
254
 
249
255
    def test_last_page_not_rounded_2_layer(self):
250
256
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
264
270
        leaf2 = content[8192:]
265
271
        leaf2_bytes = zlib.decompress(leaf2)
266
272
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
267
 
        self.assertEqual(400 - 231, len(node))
 
273
        self.assertEqual(400 - 231, len(node.keys))
268
274
        sorted_node_keys = sorted(node[0] for node in nodes)
269
 
        self.assertEqual(sorted_node_keys[231:], node.all_keys())
 
275
        self.assertEqual(sorted_node_keys[231:], sorted(node.keys))
270
276
 
271
277
    def test_three_level_tree_details(self):
272
278
        # The left most pointer in the second internal node in a row should
281
287
 
282
288
        for node in nodes:
283
289
            builder.add_node(*node)
284
 
        t = transport.get_transport('trace+' + self.get_url(''))
285
 
        size = t.put_file('index', self.time(builder.finish))
 
290
        transport = get_transport('trace+' + self.get_url(''))
 
291
        size = transport.put_file('index', self.time(builder.finish))
286
292
        del builder
287
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
293
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
288
294
        # Seed the metadata, we're using internal calls now.
289
295
        index.key_count()
290
296
        self.assertEqual(3, len(index._row_lengths),
303
309
        # in the second node it points at
304
310
        pos = index._row_offsets[2] + internal_node2.offset + 1
305
311
        leaf = index._get_leaf_nodes([pos])[pos]
306
 
        self.assertTrue(internal_node2.keys[0] in leaf)
 
312
        self.assertTrue(internal_node2.keys[0] in leaf.keys)
307
313
 
308
314
    def test_2_leaves_2_2(self):
309
315
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
410
416
        self.assertEqual(None, builder._backing_indices[2])
411
417
        self.assertEqual(16, builder._backing_indices[3].key_count())
412
418
        # 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)
 
419
        transport = self.get_transport('')
 
420
        size = transport.put_file('index', builder.finish())
 
421
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
416
422
        nodes = list(index.iter_all_entries())
417
423
        self.assertEqual(sorted(nodes), nodes)
418
424
        self.assertEqual(16, len(nodes))
608
614
        for key, value, references in nodes:
609
615
            builder.add_node(key, value, references)
610
616
        stream = builder.finish()
611
 
        trans = transport.get_transport('trace+' + self.get_url())
 
617
        trans = get_transport('trace+' + self.get_url())
612
618
        size = trans.put_file('index', stream)
613
619
        return btree_index.BTreeGraphIndex(trans, 'index', size)
614
620
 
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
621
    def test_clear_cache(self):
631
622
        nodes = self.make_nodes(160, 2, 2)
632
623
        index = self.make_index(ref_lists=2, key_elements=2, nodes=nodes)
649
640
        self.assertEqual(0, len(index._leaf_node_cache))
650
641
 
651
642
    def test_trivial_constructor(self):
652
 
        t = transport.get_transport('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('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('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('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('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)
 
693
            transport._activity)
703
694
        self.assertEqual(1173, size)
704
695
 
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
 
 
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('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('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('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('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)
 
747
            transport._activity)
776
748
        self.assertEqual(1488, size)
777
749
 
778
750
    def test_validate_two_pages(self):
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('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('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
805
    def test_iter_all_only_root_no_size(self):
835
806
        self.make_index(nodes=[(('key',), 'value', ())])
836
 
        t = transport.get_transport('trace+' + self.get_url(''))
837
 
        index = btree_index.BTreeGraphIndex(t, 'index', None)
838
 
        del t._activity[:]
 
807
        trans = get_transport('trace+' + self.get_url(''))
 
808
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
 
809
        del trans._activity[:]
839
810
        self.assertEqual([(('key',), 'value')],
840
811
                         [x[1:] for x in index.iter_all_entries()])
841
 
        self.assertEqual([('get', 'index')], t._activity)
 
812
        self.assertEqual([('get', 'index')], trans._activity)
842
813
 
843
814
    def test_iter_all_entries_reads(self):
844
815
        # iterating all entries reads the header, then does a linear
850
821
        nodes = self.make_nodes(10000, 2, 2)
851
822
        for node in nodes:
852
823
            builder.add_node(*node)
853
 
        t = transport.get_transport('trace+' + self.get_url(''))
854
 
        size = t.put_file('index', builder.finish())
 
824
        transport = get_transport('trace+' + self.get_url(''))
 
825
        size = transport.put_file('index', builder.finish())
855
826
        self.assertEqual(1303220, size, 'number of expected bytes in the'
856
827
                                        ' output changed')
857
828
        page_size = btree_index._PAGE_SIZE
858
829
        del builder
859
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
860
 
        del t._activity[:]
861
 
        self.assertEqual([], t._activity)
 
830
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
831
        del transport._activity[:]
 
832
        self.assertEqual([], transport._activity)
862
833
        found_nodes = self.time(list, index.iter_all_entries())
863
834
        bare_nodes = []
864
835
        for node in found_nodes:
885
856
        readv_request[-1] = (readv_request[-1][0], 1303220 % page_size)
886
857
        expected = [('readv', 'index', [(0, page_size)], False, None),
887
858
             ('readv',  'index', readv_request, False, None)]
888
 
        if expected != t._activity:
 
859
        if expected != transport._activity:
889
860
            self.assertEqualDiff(pprint.pformat(expected),
890
861
                                 pprint.pformat(transport._activity))
891
862
 
905
876
        nodes = self.make_nodes(160, 2, 2)
906
877
        for node in nodes:
907
878
            builder.add_node(*node)
908
 
        t = transport.get_transport('trace+' + self.get_url(''))
909
 
        size = t.put_file('index', builder.finish())
 
879
        transport = get_transport('trace+' + self.get_url(''))
 
880
        size = transport.put_file('index', builder.finish())
910
881
        del builder
911
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
912
 
        del t._activity[:]
913
 
        self.assertEqual([], t._activity)
 
882
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
883
        del transport._activity[:]
 
884
        self.assertEqual([], transport._activity)
914
885
        # search for one key
915
886
        found_nodes = list(index.iter_entries([nodes[30][0]]))
916
887
        bare_nodes = []
924
895
        # Should have read the root node, then one leaf page:
925
896
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
926
897
             ('readv',  'index', [(8192, 4096), ], False, None)],
927
 
            t._activity)
 
898
            transport._activity)
928
899
 
929
900
    def test_iter_key_prefix_1_element_key_None(self):
930
901
        index = self.make_index()
1113
1084
        min_l2_key = l2.min_key
1114
1085
        max_l1_key = l1.max_key
1115
1086
        self.assertTrue(max_l1_key < min_l2_key)
1116
 
        parents_min_l2_key = l2[min_l2_key][1][0]
 
1087
        parents_min_l2_key = l2.keys[min_l2_key][1][0]
1117
1088
        self.assertEqual((l1.max_key,), parents_min_l2_key)
1118
1089
        # Now, whatever key we select that would fall on the second page,
1119
1090
        # should give us all the parents until the page break
1132
1103
        parent_map = {}
1133
1104
        search_keys = index._find_ancestors([max_l1_key], 0, parent_map,
1134
1105
                                            missing_keys)
1135
 
        self.assertEqual(l1.all_keys(), sorted(parent_map))
 
1106
        self.assertEqual(sorted(l1.keys), sorted(parent_map))
1136
1107
        self.assertEqual(set(), missing_keys)
1137
1108
        self.assertEqual(set(), search_keys)
1138
1109
 
1154
1125
        for node in nodes:
1155
1126
            builder.add_node(*node)
1156
1127
        stream = builder.finish()
1157
 
        trans = self.get_transport()
 
1128
        trans = get_transport(self.get_url())
1158
1129
        size = trans.put_file('index', stream)
1159
1130
        index = btree_index.BTreeGraphIndex(trans, 'index', size)
1160
1131
        self.assertEqual(500, index.key_count())
1186
1157
 
1187
1158
class TestBTreeNodes(BTreeTestCase):
1188
1159
 
1189
 
    scenarios = btreeparser_scenarios()
 
1160
    def restore_parser(self):
 
1161
        btree_index._btree_serializer = self.saved_parser
1190
1162
 
1191
1163
    def setUp(self):
1192
1164
        BTreeTestCase.setUp(self)
1193
 
        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
1194
1168
 
1195
1169
    def test_LeafNode_1_0(self):
1196
1170
        node_bytes = ("type=leaf\n"
1208
1182
            ("2222222222222222222222222222222222222222",): ("value:2", ()),
1209
1183
            ("3333333333333333333333333333333333333333",): ("value:3", ()),
1210
1184
            ("4444444444444444444444444444444444444444",): ("value:4", ()),
1211
 
            }, dict(node.all_items()))
 
1185
            }, node.keys)
1212
1186
 
1213
1187
    def test_LeafNode_2_2(self):
1214
1188
        node_bytes = ("type=leaf\n"
1228
1202
            ('11', '33'): ('value:3',
1229
1203
                ((('11', 'ref22'),), (('11', 'ref22'), ('11', 'ref22')))),
1230
1204
            ('11', '44'): ('value:4', ((), (('11', 'ref00'),)))
1231
 
            }, dict(node.all_items()))
 
1205
            }, node.keys)
1232
1206
 
1233
1207
    def test_InternalNode_1(self):
1234
1208
        node_bytes = ("type=internal\n"
1269
1243
            ('11', '33'): ('value:3',
1270
1244
                ((('11', 'ref22'),), (('11', 'ref22'), ('11', 'ref22')))),
1271
1245
            ('11', '44'): ('value:4', ((), (('11', 'ref00'),)))
1272
 
            }, dict(node.all_items()))
 
1246
            }, node.keys)
1273
1247
 
1274
1248
    def assertFlattened(self, expected, key, value, refs):
1275
1249
        flat_key, flat_line = self.parse_btree._flatten_node(
1353
1327
        This doesn't actually create anything on disk, it just primes a
1354
1328
        BTreeGraphIndex with the recommended information.
1355
1329
        """
1356
 
        index = btree_index.BTreeGraphIndex(
1357
 
            transport.get_transport('memory:///'), 'test-index', size=size)
 
1330
        index = btree_index.BTreeGraphIndex(get_transport('memory:///'),
 
1331
                                            'test-index', size=size)
1358
1332
        if recommended_pages is not None:
1359
1333
            index._recommended_pages = recommended_pages
1360
1334
        return index