← 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: John Arbash Meinel
  • Date: 2011-05-11 11:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5851.
  • Revision ID: john@arbash-meinel.com-20110511113528-qepibuwxicjrbb2h
Break compatibility with python <2.6.

This includes auditing the code for places where we were doing
explicit 'sys.version' checks and removing them as appropriate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_btree_index.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008-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,
 
34
    scenarios,
36
35
    )
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))
 
36
 
 
37
 
 
38
load_tests = scenarios.load_tests_apply_scenarios
 
39
 
 
40
 
 
41
def btreeparser_scenarios():
44
42
    import bzrlib._btree_serializer_py as py_module
45
43
    scenarios = [('python', {'parse_btree': py_module})]
46
44
    if compiled_btreeparser_feature.available():
47
 
        scenarios.append(('C', {'parse_btree':
48
 
                                compiled_btreeparser_feature.module}))
49
 
    return multiply_tests(node_tests, scenarios, others)
 
45
        scenarios.append(('C', 
 
46
            {'parse_btree': compiled_btreeparser_feature.module}))
 
47
    return scenarios
50
48
 
51
49
 
52
50
compiled_btreeparser_feature = tests.ModuleAvailableFeature(
53
 
                                'bzrlib._btree_serializer_pyx')
 
51
    'bzrlib._btree_serializer_pyx')
54
52
 
55
53
 
56
54
class BTreeTestCase(TestCaseWithTransport):
216
214
        leaf1_bytes = zlib.decompress(leaf1)
217
215
        sorted_node_keys = sorted(node[0] for node in nodes)
218
216
        node = btree_index._LeafNode(leaf1_bytes, 1, 0)
219
 
        self.assertEqual(231, len(node.keys))
220
 
        self.assertEqual(sorted_node_keys[:231], sorted(node.keys))
 
217
        self.assertEqual(231, len(node))
 
218
        self.assertEqual(sorted_node_keys[:231], node.all_keys())
221
219
        leaf2_bytes = zlib.decompress(leaf2)
222
220
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
223
 
        self.assertEqual(400 - 231, len(node.keys))
224
 
        self.assertEqual(sorted_node_keys[231:], sorted(node.keys))
 
221
        self.assertEqual(400 - 231, len(node))
 
222
        self.assertEqual(sorted_node_keys[231:], node.all_keys())
225
223
 
226
224
    def test_last_page_rounded_1_layer(self):
227
225
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
241
239
        leaf2 = content[74:]
242
240
        leaf2_bytes = zlib.decompress(leaf2)
243
241
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
244
 
        self.assertEqual(10, len(node.keys))
 
242
        self.assertEqual(10, len(node))
245
243
        sorted_node_keys = sorted(node[0] for node in nodes)
246
 
        self.assertEqual(sorted_node_keys, sorted(node.keys))
 
244
        self.assertEqual(sorted_node_keys, node.all_keys())
247
245
 
248
246
    def test_last_page_not_rounded_2_layer(self):
249
247
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
263
261
        leaf2 = content[8192:]
264
262
        leaf2_bytes = zlib.decompress(leaf2)
265
263
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
266
 
        self.assertEqual(400 - 231, len(node.keys))
 
264
        self.assertEqual(400 - 231, len(node))
267
265
        sorted_node_keys = sorted(node[0] for node in nodes)
268
 
        self.assertEqual(sorted_node_keys[231:], sorted(node.keys))
 
266
        self.assertEqual(sorted_node_keys[231:], node.all_keys())
269
267
 
270
268
    def test_three_level_tree_details(self):
271
269
        # The left most pointer in the second internal node in a row should
280
278
 
281
279
        for node in nodes:
282
280
            builder.add_node(*node)
283
 
        transport = get_transport('trace+' + self.get_url(''))
284
 
        size = transport.put_file('index', self.time(builder.finish))
 
281
        t = transport.get_transport('trace+' + self.get_url(''))
 
282
        size = t.put_file('index', self.time(builder.finish))
285
283
        del builder
286
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
284
        index = btree_index.BTreeGraphIndex(t, 'index', size)
287
285
        # Seed the metadata, we're using internal calls now.
288
286
        index.key_count()
289
287
        self.assertEqual(3, len(index._row_lengths),
302
300
        # in the second node it points at
303
301
        pos = index._row_offsets[2] + internal_node2.offset + 1
304
302
        leaf = index._get_leaf_nodes([pos])[pos]
305
 
        self.assertTrue(internal_node2.keys[0] in leaf.keys)
 
303
        self.assertTrue(internal_node2.keys[0] in leaf)
306
304
 
307
305
    def test_2_leaves_2_2(self):
308
306
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
409
407
        self.assertEqual(None, builder._backing_indices[2])
410
408
        self.assertEqual(16, builder._backing_indices[3].key_count())
411
409
        # Now finish, and check we got a correctly ordered tree
412
 
        transport = self.get_transport('')
413
 
        size = transport.put_file('index', builder.finish())
414
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
410
        t = self.get_transport('')
 
411
        size = t.put_file('index', builder.finish())
 
412
        index = btree_index.BTreeGraphIndex(t, 'index', size)
415
413
        nodes = list(index.iter_all_entries())
416
414
        self.assertEqual(sorted(nodes), nodes)
417
415
        self.assertEqual(16, len(nodes))
607
605
        for key, value, references in nodes:
608
606
            builder.add_node(key, value, references)
609
607
        stream = builder.finish()
610
 
        trans = get_transport('trace+' + self.get_url())
 
608
        trans = transport.get_transport('trace+' + self.get_url())
611
609
        size = trans.put_file('index', stream)
612
610
        return btree_index.BTreeGraphIndex(trans, 'index', size)
613
611
 
648
646
        self.assertEqual(0, len(index._leaf_node_cache))
649
647
 
650
648
    def test_trivial_constructor(self):
651
 
        transport = get_transport('trace+' + self.get_url(''))
652
 
        index = btree_index.BTreeGraphIndex(transport, 'index', None)
 
649
        t = transport.get_transport('trace+' + self.get_url(''))
 
650
        index = btree_index.BTreeGraphIndex(t, 'index', None)
653
651
        # Checks the page size at load, but that isn't logged yet.
654
 
        self.assertEqual([], transport._activity)
 
652
        self.assertEqual([], t._activity)
655
653
 
656
654
    def test_with_size_constructor(self):
657
 
        transport = get_transport('trace+' + self.get_url(''))
658
 
        index = btree_index.BTreeGraphIndex(transport, 'index', 1)
 
655
        t = transport.get_transport('trace+' + self.get_url(''))
 
656
        index = btree_index.BTreeGraphIndex(t, 'index', 1)
659
657
        # Checks the page size at load, but that isn't logged yet.
660
 
        self.assertEqual([], transport._activity)
 
658
        self.assertEqual([], t._activity)
661
659
 
662
660
    def test_empty_key_count_no_size(self):
663
661
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
664
 
        transport = get_transport('trace+' + self.get_url(''))
665
 
        transport.put_file('index', builder.finish())
666
 
        index = btree_index.BTreeGraphIndex(transport, 'index', None)
667
 
        del transport._activity[:]
668
 
        self.assertEqual([], transport._activity)
 
662
        t = transport.get_transport('trace+' + self.get_url(''))
 
663
        t.put_file('index', builder.finish())
 
664
        index = btree_index.BTreeGraphIndex(t, 'index', None)
 
665
        del t._activity[:]
 
666
        self.assertEqual([], t._activity)
669
667
        self.assertEqual(0, index.key_count())
670
668
        # The entire index should have been requested (as we generally have the
671
669
        # size available, and doing many small readvs is inappropriate).
672
670
        # We can't tell how much was actually read here, but - check the code.
673
 
        self.assertEqual([('get', 'index')], transport._activity)
 
671
        self.assertEqual([('get', 'index')], t._activity)
674
672
 
675
673
    def test_empty_key_count(self):
676
674
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
677
 
        transport = get_transport('trace+' + self.get_url(''))
678
 
        size = transport.put_file('index', builder.finish())
 
675
        t = transport.get_transport('trace+' + self.get_url(''))
 
676
        size = t.put_file('index', builder.finish())
679
677
        self.assertEqual(72, size)
680
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
681
 
        del transport._activity[:]
682
 
        self.assertEqual([], transport._activity)
 
678
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
679
        del t._activity[:]
 
680
        self.assertEqual([], t._activity)
683
681
        self.assertEqual(0, index.key_count())
684
682
        # The entire index should have been read, as 4K > size
685
683
        self.assertEqual([('readv', 'index', [(0, 72)], False, None)],
686
 
            transport._activity)
 
684
                         t._activity)
687
685
 
688
686
    def test_non_empty_key_count_2_2(self):
689
687
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
690
688
        nodes = self.make_nodes(35, 2, 2)
691
689
        for node in nodes:
692
690
            builder.add_node(*node)
693
 
        transport = get_transport('trace+' + self.get_url(''))
694
 
        size = transport.put_file('index', builder.finish())
695
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
696
 
        del transport._activity[:]
697
 
        self.assertEqual([], transport._activity)
 
691
        t = transport.get_transport('trace+' + self.get_url(''))
 
692
        size = t.put_file('index', builder.finish())
 
693
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
694
        del t._activity[:]
 
695
        self.assertEqual([], t._activity)
698
696
        self.assertEqual(70, index.key_count())
699
697
        # The entire index should have been read, as it is one page long.
700
698
        self.assertEqual([('readv', 'index', [(0, size)], False, None)],
701
 
            transport._activity)
 
699
            t._activity)
702
700
        self.assertEqual(1173, size)
703
701
 
704
702
    def test_with_offset_no_size(self):
722
720
 
723
721
    def test__read_nodes_no_size_one_page_reads_once(self):
724
722
        self.make_index(nodes=[(('key',), 'value', ())])
725
 
        trans = get_transport('trace+' + self.get_url())
 
723
        trans = transport.get_transport('trace+' + self.get_url())
726
724
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
727
725
        del trans._activity[:]
728
726
        nodes = dict(index._read_nodes([0]))
729
727
        self.assertEqual([0], nodes.keys())
730
728
        node = nodes[0]
731
 
        self.assertEqual([('key',)], node.keys.keys())
 
729
        self.assertEqual([('key',)], node.all_keys())
732
730
        self.assertEqual([('get', 'index')], trans._activity)
733
731
 
734
732
    def test__read_nodes_no_size_multiple_pages(self):
736
734
        index.key_count()
737
735
        num_pages = index._row_offsets[-1]
738
736
        # Reopen with a traced transport and no size
739
 
        trans = get_transport('trace+' + self.get_url())
 
737
        trans = transport.get_transport('trace+' + self.get_url())
740
738
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
741
739
        del trans._activity[:]
742
740
        nodes = dict(index._read_nodes([0]))
747
745
        nodes = self.make_nodes(160, 2, 2)
748
746
        for node in nodes:
749
747
            builder.add_node(*node)
750
 
        transport = get_transport('trace+' + self.get_url(''))
751
 
        size = transport.put_file('index', builder.finish())
 
748
        t = transport.get_transport('trace+' + self.get_url(''))
 
749
        size = t.put_file('index', builder.finish())
752
750
        self.assertEqual(17692, size)
753
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
754
 
        del transport._activity[:]
755
 
        self.assertEqual([], transport._activity)
 
751
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
752
        del t._activity[:]
 
753
        self.assertEqual([], t._activity)
756
754
        self.assertEqual(320, index.key_count())
757
755
        # The entire index should not have been read.
758
756
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None)],
759
 
            transport._activity)
 
757
                         t._activity)
760
758
 
761
759
    def test_validate_one_page(self):
762
760
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
763
761
        nodes = self.make_nodes(45, 2, 2)
764
762
        for node in nodes:
765
763
            builder.add_node(*node)
766
 
        transport = get_transport('trace+' + self.get_url(''))
767
 
        size = transport.put_file('index', builder.finish())
768
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
769
 
        del transport._activity[:]
770
 
        self.assertEqual([], transport._activity)
 
764
        t = transport.get_transport('trace+' + self.get_url(''))
 
765
        size = t.put_file('index', builder.finish())
 
766
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
767
        del t._activity[:]
 
768
        self.assertEqual([], t._activity)
771
769
        index.validate()
772
770
        # The entire index should have been read linearly.
773
771
        self.assertEqual([('readv', 'index', [(0, size)], False, None)],
774
 
            transport._activity)
 
772
                         t._activity)
775
773
        self.assertEqual(1488, size)
776
774
 
777
775
    def test_validate_two_pages(self):
779
777
        nodes = self.make_nodes(80, 2, 2)
780
778
        for node in nodes:
781
779
            builder.add_node(*node)
782
 
        transport = get_transport('trace+' + self.get_url(''))
783
 
        size = transport.put_file('index', builder.finish())
 
780
        t = transport.get_transport('trace+' + self.get_url(''))
 
781
        size = t.put_file('index', builder.finish())
784
782
        # Root page, 2 leaf pages
785
783
        self.assertEqual(9339, size)
786
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
787
 
        del transport._activity[:]
788
 
        self.assertEqual([], transport._activity)
 
784
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
785
        del t._activity[:]
 
786
        self.assertEqual([], t._activity)
789
787
        index.validate()
790
788
        # The entire index should have been read linearly.
791
 
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
792
 
            ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
793
 
            transport._activity)
 
789
        self.assertEqual(
 
790
            [('readv', 'index', [(0, 4096)], False, None),
 
791
             ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
 
792
            t._activity)
794
793
        # XXX: TODO: write some badly-ordered nodes, and some pointers-to-wrong
795
794
        # node and make validate find them.
796
795
 
797
796
    def test_eq_ne(self):
798
797
        # two indices are equal when constructed with the same parameters:
799
 
        transport1 = get_transport('trace+' + self.get_url(''))
800
 
        transport2 = get_transport(self.get_url(''))
801
 
        self.assertTrue(
802
 
            btree_index.BTreeGraphIndex(transport1, 'index', None) ==
803
 
            btree_index.BTreeGraphIndex(transport1, 'index', None))
804
 
        self.assertTrue(
805
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20) ==
806
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
807
 
        self.assertFalse(
808
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20) ==
809
 
            btree_index.BTreeGraphIndex(transport2, 'index', 20))
810
 
        self.assertFalse(
811
 
            btree_index.BTreeGraphIndex(transport1, 'inde1', 20) ==
812
 
            btree_index.BTreeGraphIndex(transport1, 'inde2', 20))
813
 
        self.assertFalse(
814
 
            btree_index.BTreeGraphIndex(transport1, 'index', 10) ==
815
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
816
 
        self.assertFalse(
817
 
            btree_index.BTreeGraphIndex(transport1, 'index', None) !=
818
 
            btree_index.BTreeGraphIndex(transport1, 'index', None))
819
 
        self.assertFalse(
820
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20) !=
821
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
822
 
        self.assertTrue(
823
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20) !=
824
 
            btree_index.BTreeGraphIndex(transport2, 'index', 20))
825
 
        self.assertTrue(
826
 
            btree_index.BTreeGraphIndex(transport1, 'inde1', 20) !=
827
 
            btree_index.BTreeGraphIndex(transport1, 'inde2', 20))
828
 
        self.assertTrue(
829
 
            btree_index.BTreeGraphIndex(transport1, 'index', 10) !=
830
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
 
798
        t1 = transport.get_transport('trace+' + self.get_url(''))
 
799
        t2 = self.get_transport()
 
800
        self.assertTrue(
 
801
            btree_index.BTreeGraphIndex(t1, 'index', None) ==
 
802
            btree_index.BTreeGraphIndex(t1, 'index', None))
 
803
        self.assertTrue(
 
804
            btree_index.BTreeGraphIndex(t1, 'index', 20) ==
 
805
            btree_index.BTreeGraphIndex(t1, 'index', 20))
 
806
        self.assertFalse(
 
807
            btree_index.BTreeGraphIndex(t1, 'index', 20) ==
 
808
            btree_index.BTreeGraphIndex(t2, 'index', 20))
 
809
        self.assertFalse(
 
810
            btree_index.BTreeGraphIndex(t1, 'inde1', 20) ==
 
811
            btree_index.BTreeGraphIndex(t1, 'inde2', 20))
 
812
        self.assertFalse(
 
813
            btree_index.BTreeGraphIndex(t1, 'index', 10) ==
 
814
            btree_index.BTreeGraphIndex(t1, 'index', 20))
 
815
        self.assertFalse(
 
816
            btree_index.BTreeGraphIndex(t1, 'index', None) !=
 
817
            btree_index.BTreeGraphIndex(t1, 'index', None))
 
818
        self.assertFalse(
 
819
            btree_index.BTreeGraphIndex(t1, 'index', 20) !=
 
820
            btree_index.BTreeGraphIndex(t1, 'index', 20))
 
821
        self.assertTrue(
 
822
            btree_index.BTreeGraphIndex(t1, 'index', 20) !=
 
823
            btree_index.BTreeGraphIndex(t2, 'index', 20))
 
824
        self.assertTrue(
 
825
            btree_index.BTreeGraphIndex(t1, 'inde1', 20) !=
 
826
            btree_index.BTreeGraphIndex(t1, 'inde2', 20))
 
827
        self.assertTrue(
 
828
            btree_index.BTreeGraphIndex(t1, 'index', 10) !=
 
829
            btree_index.BTreeGraphIndex(t1, 'index', 20))
831
830
 
832
831
    def test_iter_all_only_root_no_size(self):
833
832
        self.make_index(nodes=[(('key',), 'value', ())])
834
 
        trans = get_transport('trace+' + self.get_url(''))
835
 
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
836
 
        del trans._activity[:]
 
833
        t = transport.get_transport('trace+' + self.get_url(''))
 
834
        index = btree_index.BTreeGraphIndex(t, 'index', None)
 
835
        del t._activity[:]
837
836
        self.assertEqual([(('key',), 'value')],
838
837
                         [x[1:] for x in index.iter_all_entries()])
839
 
        self.assertEqual([('get', 'index')], trans._activity)
 
838
        self.assertEqual([('get', 'index')], t._activity)
840
839
 
841
840
    def test_iter_all_entries_reads(self):
842
841
        # iterating all entries reads the header, then does a linear
848
847
        nodes = self.make_nodes(10000, 2, 2)
849
848
        for node in nodes:
850
849
            builder.add_node(*node)
851
 
        transport = get_transport('trace+' + self.get_url(''))
852
 
        size = transport.put_file('index', builder.finish())
 
850
        t = transport.get_transport('trace+' + self.get_url(''))
 
851
        size = t.put_file('index', builder.finish())
853
852
        self.assertEqual(1303220, size, 'number of expected bytes in the'
854
853
                                        ' output changed')
855
854
        page_size = btree_index._PAGE_SIZE
856
855
        del builder
857
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
858
 
        del transport._activity[:]
859
 
        self.assertEqual([], transport._activity)
 
856
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
857
        del t._activity[:]
 
858
        self.assertEqual([], t._activity)
860
859
        found_nodes = self.time(list, index.iter_all_entries())
861
860
        bare_nodes = []
862
861
        for node in found_nodes:
883
882
        readv_request[-1] = (readv_request[-1][0], 1303220 % page_size)
884
883
        expected = [('readv', 'index', [(0, page_size)], False, None),
885
884
             ('readv',  'index', readv_request, False, None)]
886
 
        if expected != transport._activity:
 
885
        if expected != t._activity:
887
886
            self.assertEqualDiff(pprint.pformat(expected),
888
887
                                 pprint.pformat(transport._activity))
889
888
 
903
902
        nodes = self.make_nodes(160, 2, 2)
904
903
        for node in nodes:
905
904
            builder.add_node(*node)
906
 
        transport = get_transport('trace+' + self.get_url(''))
907
 
        size = transport.put_file('index', builder.finish())
 
905
        t = transport.get_transport('trace+' + self.get_url(''))
 
906
        size = t.put_file('index', builder.finish())
908
907
        del builder
909
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
910
 
        del transport._activity[:]
911
 
        self.assertEqual([], transport._activity)
 
908
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
909
        del t._activity[:]
 
910
        self.assertEqual([], t._activity)
912
911
        # search for one key
913
912
        found_nodes = list(index.iter_entries([nodes[30][0]]))
914
913
        bare_nodes = []
922
921
        # Should have read the root node, then one leaf page:
923
922
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
924
923
             ('readv',  'index', [(8192, 4096), ], False, None)],
925
 
            transport._activity)
 
924
            t._activity)
926
925
 
927
926
    def test_iter_key_prefix_1_element_key_None(self):
928
927
        index = self.make_index()
1111
1110
        min_l2_key = l2.min_key
1112
1111
        max_l1_key = l1.max_key
1113
1112
        self.assertTrue(max_l1_key < min_l2_key)
1114
 
        parents_min_l2_key = l2.keys[min_l2_key][1][0]
 
1113
        parents_min_l2_key = l2[min_l2_key][1][0]
1115
1114
        self.assertEqual((l1.max_key,), parents_min_l2_key)
1116
1115
        # Now, whatever key we select that would fall on the second page,
1117
1116
        # should give us all the parents until the page break
1130
1129
        parent_map = {}
1131
1130
        search_keys = index._find_ancestors([max_l1_key], 0, parent_map,
1132
1131
                                            missing_keys)
1133
 
        self.assertEqual(sorted(l1.keys), sorted(parent_map))
 
1132
        self.assertEqual(l1.all_keys(), sorted(parent_map))
1134
1133
        self.assertEqual(set(), missing_keys)
1135
1134
        self.assertEqual(set(), search_keys)
1136
1135
 
1152
1151
        for node in nodes:
1153
1152
            builder.add_node(*node)
1154
1153
        stream = builder.finish()
1155
 
        trans = get_transport(self.get_url())
 
1154
        trans = self.get_transport()
1156
1155
        size = trans.put_file('index', stream)
1157
1156
        index = btree_index.BTreeGraphIndex(trans, 'index', size)
1158
1157
        self.assertEqual(500, index.key_count())
1184
1183
 
1185
1184
class TestBTreeNodes(BTreeTestCase):
1186
1185
 
 
1186
    scenarios = btreeparser_scenarios()
 
1187
 
1187
1188
    def setUp(self):
1188
1189
        BTreeTestCase.setUp(self)
1189
1190
        self.overrideAttr(btree_index, '_btree_serializer', self.parse_btree)
1204
1205
            ("2222222222222222222222222222222222222222",): ("value:2", ()),
1205
1206
            ("3333333333333333333333333333333333333333",): ("value:3", ()),
1206
1207
            ("4444444444444444444444444444444444444444",): ("value:4", ()),
1207
 
            }, node.keys)
 
1208
            }, dict(node.all_items()))
1208
1209
 
1209
1210
    def test_LeafNode_2_2(self):
1210
1211
        node_bytes = ("type=leaf\n"
1224
1225
            ('11', '33'): ('value:3',
1225
1226
                ((('11', 'ref22'),), (('11', 'ref22'), ('11', 'ref22')))),
1226
1227
            ('11', '44'): ('value:4', ((), (('11', 'ref00'),)))
1227
 
            }, node.keys)
 
1228
            }, dict(node.all_items()))
1228
1229
 
1229
1230
    def test_InternalNode_1(self):
1230
1231
        node_bytes = ("type=internal\n"
1265
1266
            ('11', '33'): ('value:3',
1266
1267
                ((('11', 'ref22'),), (('11', 'ref22'), ('11', 'ref22')))),
1267
1268
            ('11', '44'): ('value:4', ((), (('11', 'ref00'),)))
1268
 
            }, node.keys)
 
1269
            }, dict(node.all_items()))
1269
1270
 
1270
1271
    def assertFlattened(self, expected, key, value, refs):
1271
1272
        flat_key, flat_line = self.parse_btree._flatten_node(
1349
1350
        This doesn't actually create anything on disk, it just primes a
1350
1351
        BTreeGraphIndex with the recommended information.
1351
1352
        """
1352
 
        index = btree_index.BTreeGraphIndex(get_transport('memory:///'),
1353
 
                                            'test-index', size=size)
 
1353
        index = btree_index.BTreeGraphIndex(
 
1354
            transport.get_transport('memory:///'), 'test-index', size=size)
1354
1355
        if recommended_pages is not None:
1355
1356
            index._recommended_pages = recommended_pages
1356
1357
        return index