← 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: Jelmer Vernooij
  • Date: 2012-01-06 22:44:57 UTC
  • mfrom: (6436 +trunk)
  • mto: (6437.3.11 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20120106224457-re0pcy0fz31xob77
Merge bzr.dev.

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,
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
47
    if compiled_btreeparser_feature.available():
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')
 
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')
54
55
 
55
56
 
56
57
class BTreeTestCase(TestCaseWithTransport):
216
217
        leaf1_bytes = zlib.decompress(leaf1)
217
218
        sorted_node_keys = sorted(node[0] for node in nodes)
218
219
        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))
 
220
        self.assertEqual(231, len(node))
 
221
        self.assertEqual(sorted_node_keys[:231], node.all_keys())
221
222
        leaf2_bytes = zlib.decompress(leaf2)
222
223
        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))
 
224
        self.assertEqual(400 - 231, len(node))
 
225
        self.assertEqual(sorted_node_keys[231:], node.all_keys())
225
226
 
226
227
    def test_last_page_rounded_1_layer(self):
227
228
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
241
242
        leaf2 = content[74:]
242
243
        leaf2_bytes = zlib.decompress(leaf2)
243
244
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
244
 
        self.assertEqual(10, len(node.keys))
 
245
        self.assertEqual(10, len(node))
245
246
        sorted_node_keys = sorted(node[0] for node in nodes)
246
 
        self.assertEqual(sorted_node_keys, sorted(node.keys))
 
247
        self.assertEqual(sorted_node_keys, node.all_keys())
247
248
 
248
249
    def test_last_page_not_rounded_2_layer(self):
249
250
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
263
264
        leaf2 = content[8192:]
264
265
        leaf2_bytes = zlib.decompress(leaf2)
265
266
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
266
 
        self.assertEqual(400 - 231, len(node.keys))
 
267
        self.assertEqual(400 - 231, len(node))
267
268
        sorted_node_keys = sorted(node[0] for node in nodes)
268
 
        self.assertEqual(sorted_node_keys[231:], sorted(node.keys))
 
269
        self.assertEqual(sorted_node_keys[231:], node.all_keys())
269
270
 
270
271
    def test_three_level_tree_details(self):
271
272
        # The left most pointer in the second internal node in a row should
280
281
 
281
282
        for node in nodes:
282
283
            builder.add_node(*node)
283
 
        transport = get_transport('trace+' + self.get_url(''))
284
 
        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))
285
286
        del builder
286
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
287
        index = btree_index.BTreeGraphIndex(t, 'index', size)
287
288
        # Seed the metadata, we're using internal calls now.
288
289
        index.key_count()
289
290
        self.assertEqual(3, len(index._row_lengths),
302
303
        # in the second node it points at
303
304
        pos = index._row_offsets[2] + internal_node2.offset + 1
304
305
        leaf = index._get_leaf_nodes([pos])[pos]
305
 
        self.assertTrue(internal_node2.keys[0] in leaf.keys)
 
306
        self.assertTrue(internal_node2.keys[0] in leaf)
306
307
 
307
308
    def test_2_leaves_2_2(self):
308
309
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
409
410
        self.assertEqual(None, builder._backing_indices[2])
410
411
        self.assertEqual(16, builder._backing_indices[3].key_count())
411
412
        # 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)
 
413
        t = self.get_transport('')
 
414
        size = t.put_file('index', builder.finish())
 
415
        index = btree_index.BTreeGraphIndex(t, 'index', size)
415
416
        nodes = list(index.iter_all_entries())
416
417
        self.assertEqual(sorted(nodes), nodes)
417
418
        self.assertEqual(16, len(nodes))
607
608
        for key, value, references in nodes:
608
609
            builder.add_node(key, value, references)
609
610
        stream = builder.finish()
610
 
        trans = get_transport('trace+' + self.get_url())
 
611
        trans = transport.get_transport_from_url('trace+' + self.get_url())
611
612
        size = trans.put_file('index', stream)
612
613
        return btree_index.BTreeGraphIndex(trans, 'index', size)
613
614
 
648
649
        self.assertEqual(0, len(index._leaf_node_cache))
649
650
 
650
651
    def test_trivial_constructor(self):
651
 
        transport = get_transport('trace+' + self.get_url(''))
652
 
        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)
653
654
        # Checks the page size at load, but that isn't logged yet.
654
 
        self.assertEqual([], transport._activity)
 
655
        self.assertEqual([], t._activity)
655
656
 
656
657
    def test_with_size_constructor(self):
657
 
        transport = get_transport('trace+' + self.get_url(''))
658
 
        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)
659
660
        # Checks the page size at load, but that isn't logged yet.
660
 
        self.assertEqual([], transport._activity)
 
661
        self.assertEqual([], t._activity)
661
662
 
662
663
    def test_empty_key_count_no_size(self):
663
664
        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)
 
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)
669
670
        self.assertEqual(0, index.key_count())
670
671
        # The entire index should have been requested (as we generally have the
671
672
        # size available, and doing many small readvs is inappropriate).
672
673
        # We can't tell how much was actually read here, but - check the code.
673
 
        self.assertEqual([('get', 'index')], transport._activity)
 
674
        self.assertEqual([('get', 'index')], t._activity)
674
675
 
675
676
    def test_empty_key_count(self):
676
677
        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())
 
678
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
 
679
        size = t.put_file('index', builder.finish())
679
680
        self.assertEqual(72, size)
680
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
681
 
        del transport._activity[:]
682
 
        self.assertEqual([], transport._activity)
 
681
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
682
        del t._activity[:]
 
683
        self.assertEqual([], t._activity)
683
684
        self.assertEqual(0, index.key_count())
684
685
        # The entire index should have been read, as 4K > size
685
686
        self.assertEqual([('readv', 'index', [(0, 72)], False, None)],
686
 
            transport._activity)
 
687
                         t._activity)
687
688
 
688
689
    def test_non_empty_key_count_2_2(self):
689
690
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
690
691
        nodes = self.make_nodes(35, 2, 2)
691
692
        for node in nodes:
692
693
            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)
 
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)
698
699
        self.assertEqual(70, index.key_count())
699
700
        # The entire index should have been read, as it is one page long.
700
701
        self.assertEqual([('readv', 'index', [(0, size)], False, None)],
701
 
            transport._activity)
 
702
            t._activity)
702
703
        self.assertEqual(1173, size)
703
704
 
704
705
    def test_with_offset_no_size(self):
722
723
 
723
724
    def test__read_nodes_no_size_one_page_reads_once(self):
724
725
        self.make_index(nodes=[(('key',), 'value', ())])
725
 
        trans = get_transport('trace+' + self.get_url())
 
726
        trans = transport.get_transport_from_url('trace+' + self.get_url())
726
727
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
727
728
        del trans._activity[:]
728
729
        nodes = dict(index._read_nodes([0]))
729
730
        self.assertEqual([0], nodes.keys())
730
731
        node = nodes[0]
731
 
        self.assertEqual([('key',)], node.keys.keys())
 
732
        self.assertEqual([('key',)], node.all_keys())
732
733
        self.assertEqual([('get', 'index')], trans._activity)
733
734
 
734
735
    def test__read_nodes_no_size_multiple_pages(self):
736
737
        index.key_count()
737
738
        num_pages = index._row_offsets[-1]
738
739
        # Reopen with a traced transport and no size
739
 
        trans = get_transport('trace+' + self.get_url())
 
740
        trans = transport.get_transport_from_url('trace+' + self.get_url())
740
741
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
741
742
        del trans._activity[:]
742
743
        nodes = dict(index._read_nodes([0]))
747
748
        nodes = self.make_nodes(160, 2, 2)
748
749
        for node in nodes:
749
750
            builder.add_node(*node)
750
 
        transport = get_transport('trace+' + self.get_url(''))
751
 
        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())
752
753
        self.assertEqual(17692, size)
753
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
754
 
        del transport._activity[:]
755
 
        self.assertEqual([], transport._activity)
 
754
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
755
        del t._activity[:]
 
756
        self.assertEqual([], t._activity)
756
757
        self.assertEqual(320, index.key_count())
757
758
        # The entire index should not have been read.
758
759
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None)],
759
 
            transport._activity)
 
760
                         t._activity)
760
761
 
761
762
    def test_validate_one_page(self):
762
763
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
763
764
        nodes = self.make_nodes(45, 2, 2)
764
765
        for node in nodes:
765
766
            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)
 
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)
771
772
        index.validate()
772
773
        # The entire index should have been read linearly.
773
774
        self.assertEqual([('readv', 'index', [(0, size)], False, None)],
774
 
            transport._activity)
 
775
                         t._activity)
775
776
        self.assertEqual(1488, size)
776
777
 
777
778
    def test_validate_two_pages(self):
779
780
        nodes = self.make_nodes(80, 2, 2)
780
781
        for node in nodes:
781
782
            builder.add_node(*node)
782
 
        transport = get_transport('trace+' + self.get_url(''))
783
 
        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())
784
785
        # Root page, 2 leaf pages
785
786
        self.assertEqual(9339, size)
786
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
787
 
        del transport._activity[:]
788
 
        self.assertEqual([], transport._activity)
 
787
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
788
        del t._activity[:]
 
789
        self.assertEqual([], t._activity)
789
790
        index.validate()
790
791
        # 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)
 
792
        self.assertEqual(
 
793
            [('readv', 'index', [(0, 4096)], False, None),
 
794
             ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
 
795
            t._activity)
794
796
        # XXX: TODO: write some badly-ordered nodes, and some pointers-to-wrong
795
797
        # node and make validate find them.
796
798
 
797
799
    def test_eq_ne(self):
798
800
        # 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))
 
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))
831
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
        
832
842
    def test_iter_all_only_root_no_size(self):
833
843
        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[:]
 
844
        t = transport.get_transport_from_url('trace+' + self.get_url(''))
 
845
        index = btree_index.BTreeGraphIndex(t, 'index', None)
 
846
        del t._activity[:]
837
847
        self.assertEqual([(('key',), 'value')],
838
848
                         [x[1:] for x in index.iter_all_entries()])
839
 
        self.assertEqual([('get', 'index')], trans._activity)
 
849
        self.assertEqual([('get', 'index')], t._activity)
840
850
 
841
851
    def test_iter_all_entries_reads(self):
842
852
        # iterating all entries reads the header, then does a linear
848
858
        nodes = self.make_nodes(10000, 2, 2)
849
859
        for node in nodes:
850
860
            builder.add_node(*node)
851
 
        transport = get_transport('trace+' + self.get_url(''))
852
 
        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())
853
863
        self.assertEqual(1303220, size, 'number of expected bytes in the'
854
864
                                        ' output changed')
855
865
        page_size = btree_index._PAGE_SIZE
856
866
        del builder
857
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
858
 
        del transport._activity[:]
859
 
        self.assertEqual([], transport._activity)
 
867
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
868
        del t._activity[:]
 
869
        self.assertEqual([], t._activity)
860
870
        found_nodes = self.time(list, index.iter_all_entries())
861
871
        bare_nodes = []
862
872
        for node in found_nodes:
883
893
        readv_request[-1] = (readv_request[-1][0], 1303220 % page_size)
884
894
        expected = [('readv', 'index', [(0, page_size)], False, None),
885
895
             ('readv',  'index', readv_request, False, None)]
886
 
        if expected != transport._activity:
 
896
        if expected != t._activity:
887
897
            self.assertEqualDiff(pprint.pformat(expected),
888
898
                                 pprint.pformat(transport._activity))
889
899
 
903
913
        nodes = self.make_nodes(160, 2, 2)
904
914
        for node in nodes:
905
915
            builder.add_node(*node)
906
 
        transport = get_transport('trace+' + self.get_url(''))
907
 
        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())
908
918
        del builder
909
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
910
 
        del transport._activity[:]
911
 
        self.assertEqual([], transport._activity)
 
919
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
920
        del t._activity[:]
 
921
        self.assertEqual([], t._activity)
912
922
        # search for one key
913
923
        found_nodes = list(index.iter_entries([nodes[30][0]]))
914
924
        bare_nodes = []
922
932
        # Should have read the root node, then one leaf page:
923
933
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
924
934
             ('readv',  'index', [(8192, 4096), ], False, None)],
925
 
            transport._activity)
 
935
            t._activity)
926
936
 
927
937
    def test_iter_key_prefix_1_element_key_None(self):
928
938
        index = self.make_index()
1111
1121
        min_l2_key = l2.min_key
1112
1122
        max_l1_key = l1.max_key
1113
1123
        self.assertTrue(max_l1_key < min_l2_key)
1114
 
        parents_min_l2_key = l2.keys[min_l2_key][1][0]
 
1124
        parents_min_l2_key = l2[min_l2_key][1][0]
1115
1125
        self.assertEqual((l1.max_key,), parents_min_l2_key)
1116
1126
        # Now, whatever key we select that would fall on the second page,
1117
1127
        # should give us all the parents until the page break
1130
1140
        parent_map = {}
1131
1141
        search_keys = index._find_ancestors([max_l1_key], 0, parent_map,
1132
1142
                                            missing_keys)
1133
 
        self.assertEqual(sorted(l1.keys), sorted(parent_map))
 
1143
        self.assertEqual(l1.all_keys(), sorted(parent_map))
1134
1144
        self.assertEqual(set(), missing_keys)
1135
1145
        self.assertEqual(set(), search_keys)
1136
1146
 
1152
1162
        for node in nodes:
1153
1163
            builder.add_node(*node)
1154
1164
        stream = builder.finish()
1155
 
        trans = get_transport(self.get_url())
 
1165
        trans = self.get_transport()
1156
1166
        size = trans.put_file('index', stream)
1157
1167
        index = btree_index.BTreeGraphIndex(trans, 'index', size)
1158
1168
        self.assertEqual(500, index.key_count())
1184
1194
 
1185
1195
class TestBTreeNodes(BTreeTestCase):
1186
1196
 
 
1197
    scenarios = btreeparser_scenarios()
 
1198
 
1187
1199
    def setUp(self):
1188
1200
        BTreeTestCase.setUp(self)
1189
1201
        self.overrideAttr(btree_index, '_btree_serializer', self.parse_btree)
1204
1216
            ("2222222222222222222222222222222222222222",): ("value:2", ()),
1205
1217
            ("3333333333333333333333333333333333333333",): ("value:3", ()),
1206
1218
            ("4444444444444444444444444444444444444444",): ("value:4", ()),
1207
 
            }, node.keys)
 
1219
            }, dict(node.all_items()))
1208
1220
 
1209
1221
    def test_LeafNode_2_2(self):
1210
1222
        node_bytes = ("type=leaf\n"
1224
1236
            ('11', '33'): ('value:3',
1225
1237
                ((('11', 'ref22'),), (('11', 'ref22'), ('11', 'ref22')))),
1226
1238
            ('11', '44'): ('value:4', ((), (('11', 'ref00'),)))
1227
 
            }, node.keys)
 
1239
            }, dict(node.all_items()))
1228
1240
 
1229
1241
    def test_InternalNode_1(self):
1230
1242
        node_bytes = ("type=internal\n"
1265
1277
            ('11', '33'): ('value:3',
1266
1278
                ((('11', 'ref22'),), (('11', 'ref22'), ('11', 'ref22')))),
1267
1279
            ('11', '44'): ('value:4', ((), (('11', 'ref00'),)))
1268
 
            }, node.keys)
 
1280
            }, dict(node.all_items()))
1269
1281
 
1270
1282
    def assertFlattened(self, expected, key, value, refs):
1271
1283
        flat_key, flat_line = self.parse_btree._flatten_node(
1349
1361
        This doesn't actually create anything on disk, it just primes a
1350
1362
        BTreeGraphIndex with the recommended information.
1351
1363
        """
1352
 
        index = btree_index.BTreeGraphIndex(get_transport('memory:///'),
1353
 
                                            'test-index', size=size)
 
1364
        index = btree_index.BTreeGraphIndex(
 
1365
            transport.get_transport_from_url('memory:///'),
 
1366
            'test-index', size=size)
1354
1367
        if recommended_pages is not None:
1355
1368
            index._recommended_pages = recommended_pages
1356
1369
        return index