← 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: 2011-12-05 14:12:23 UTC
  • mto: This revision was merged to the branch mainline in revision 6348.
  • Revision ID: jelmer@samba.org-20111205141223-8qxae4h37satlzgq
Move more functionality to vf_search.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_btree_index.py
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
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
 
 
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
 
614
630
    def test_clear_cache(self):
615
631
        nodes = self.make_nodes(160, 2, 2)
616
632
        index = self.make_index(ref_lists=2, key_elements=2, nodes=nodes)
633
649
        self.assertEqual(0, len(index._leaf_node_cache))
634
650
 
635
651
    def test_trivial_constructor(self):
636
 
        transport = get_transport('trace+' + self.get_url(''))
637
 
        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)
638
654
        # Checks the page size at load, but that isn't logged yet.
639
 
        self.assertEqual([], transport._activity)
 
655
        self.assertEqual([], t._activity)
640
656
 
641
657
    def test_with_size_constructor(self):
642
 
        transport = get_transport('trace+' + self.get_url(''))
643
 
        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)
644
660
        # Checks the page size at load, but that isn't logged yet.
645
 
        self.assertEqual([], transport._activity)
 
661
        self.assertEqual([], t._activity)
646
662
 
647
663
    def test_empty_key_count_no_size(self):
648
664
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
649
 
        transport = get_transport('trace+' + self.get_url(''))
650
 
        transport.put_file('index', builder.finish())
651
 
        index = btree_index.BTreeGraphIndex(transport, 'index', None)
652
 
        del transport._activity[:]
653
 
        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)
654
670
        self.assertEqual(0, index.key_count())
655
671
        # The entire index should have been requested (as we generally have the
656
672
        # size available, and doing many small readvs is inappropriate).
657
673
        # We can't tell how much was actually read here, but - check the code.
658
 
        self.assertEqual([('get', 'index')], transport._activity)
 
674
        self.assertEqual([('get', 'index')], t._activity)
659
675
 
660
676
    def test_empty_key_count(self):
661
677
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
662
 
        transport = get_transport('trace+' + self.get_url(''))
663
 
        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())
664
680
        self.assertEqual(72, size)
665
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
666
 
        del transport._activity[:]
667
 
        self.assertEqual([], transport._activity)
 
681
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
682
        del t._activity[:]
 
683
        self.assertEqual([], t._activity)
668
684
        self.assertEqual(0, index.key_count())
669
685
        # The entire index should have been read, as 4K > size
670
686
        self.assertEqual([('readv', 'index', [(0, 72)], False, None)],
671
 
            transport._activity)
 
687
                         t._activity)
672
688
 
673
689
    def test_non_empty_key_count_2_2(self):
674
690
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
675
691
        nodes = self.make_nodes(35, 2, 2)
676
692
        for node in nodes:
677
693
            builder.add_node(*node)
678
 
        transport = get_transport('trace+' + self.get_url(''))
679
 
        size = transport.put_file('index', builder.finish())
680
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
681
 
        del transport._activity[:]
682
 
        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)
683
699
        self.assertEqual(70, index.key_count())
684
700
        # The entire index should have been read, as it is one page long.
685
701
        self.assertEqual([('readv', 'index', [(0, size)], False, None)],
686
 
            transport._activity)
 
702
            t._activity)
687
703
        self.assertEqual(1173, size)
688
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
 
689
724
    def test__read_nodes_no_size_one_page_reads_once(self):
690
725
        self.make_index(nodes=[(('key',), 'value', ())])
691
 
        trans = get_transport('trace+' + self.get_url())
 
726
        trans = transport.get_transport_from_url('trace+' + self.get_url())
692
727
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
693
728
        del trans._activity[:]
694
729
        nodes = dict(index._read_nodes([0]))
695
730
        self.assertEqual([0], nodes.keys())
696
731
        node = nodes[0]
697
 
        self.assertEqual([('key',)], node.keys.keys())
 
732
        self.assertEqual([('key',)], node.all_keys())
698
733
        self.assertEqual([('get', 'index')], trans._activity)
699
734
 
700
735
    def test__read_nodes_no_size_multiple_pages(self):
702
737
        index.key_count()
703
738
        num_pages = index._row_offsets[-1]
704
739
        # Reopen with a traced transport and no size
705
 
        trans = get_transport('trace+' + self.get_url())
 
740
        trans = transport.get_transport_from_url('trace+' + self.get_url())
706
741
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
707
742
        del trans._activity[:]
708
743
        nodes = dict(index._read_nodes([0]))
713
748
        nodes = self.make_nodes(160, 2, 2)
714
749
        for node in nodes:
715
750
            builder.add_node(*node)
716
 
        transport = get_transport('trace+' + self.get_url(''))
717
 
        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())
718
753
        self.assertEqual(17692, size)
719
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
720
 
        del transport._activity[:]
721
 
        self.assertEqual([], transport._activity)
 
754
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
755
        del t._activity[:]
 
756
        self.assertEqual([], t._activity)
722
757
        self.assertEqual(320, index.key_count())
723
758
        # The entire index should not have been read.
724
759
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None)],
725
 
            transport._activity)
 
760
                         t._activity)
726
761
 
727
762
    def test_validate_one_page(self):
728
763
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
729
764
        nodes = self.make_nodes(45, 2, 2)
730
765
        for node in nodes:
731
766
            builder.add_node(*node)
732
 
        transport = get_transport('trace+' + self.get_url(''))
733
 
        size = transport.put_file('index', builder.finish())
734
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
735
 
        del transport._activity[:]
736
 
        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)
737
772
        index.validate()
738
773
        # The entire index should have been read linearly.
739
774
        self.assertEqual([('readv', 'index', [(0, size)], False, None)],
740
 
            transport._activity)
 
775
                         t._activity)
741
776
        self.assertEqual(1488, size)
742
777
 
743
778
    def test_validate_two_pages(self):
745
780
        nodes = self.make_nodes(80, 2, 2)
746
781
        for node in nodes:
747
782
            builder.add_node(*node)
748
 
        transport = get_transport('trace+' + self.get_url(''))
749
 
        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())
750
785
        # Root page, 2 leaf pages
751
786
        self.assertEqual(9339, size)
752
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
753
 
        del transport._activity[:]
754
 
        self.assertEqual([], transport._activity)
 
787
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
788
        del t._activity[:]
 
789
        self.assertEqual([], t._activity)
755
790
        index.validate()
756
791
        # The entire index should have been read linearly.
757
 
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
758
 
            ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
759
 
            transport._activity)
 
792
        self.assertEqual(
 
793
            [('readv', 'index', [(0, 4096)], False, None),
 
794
             ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
 
795
            t._activity)
760
796
        # XXX: TODO: write some badly-ordered nodes, and some pointers-to-wrong
761
797
        # node and make validate find them.
762
798
 
763
799
    def test_eq_ne(self):
764
800
        # two indices are equal when constructed with the same parameters:
765
 
        transport1 = get_transport('trace+' + self.get_url(''))
766
 
        transport2 = get_transport(self.get_url(''))
767
 
        self.assertTrue(
768
 
            btree_index.BTreeGraphIndex(transport1, 'index', None) ==
769
 
            btree_index.BTreeGraphIndex(transport1, 'index', None))
770
 
        self.assertTrue(
771
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20) ==
772
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
773
 
        self.assertFalse(
774
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20) ==
775
 
            btree_index.BTreeGraphIndex(transport2, 'index', 20))
776
 
        self.assertFalse(
777
 
            btree_index.BTreeGraphIndex(transport1, 'inde1', 20) ==
778
 
            btree_index.BTreeGraphIndex(transport1, 'inde2', 20))
779
 
        self.assertFalse(
780
 
            btree_index.BTreeGraphIndex(transport1, 'index', 10) ==
781
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
782
 
        self.assertFalse(
783
 
            btree_index.BTreeGraphIndex(transport1, 'index', None) !=
784
 
            btree_index.BTreeGraphIndex(transport1, 'index', None))
785
 
        self.assertFalse(
786
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20) !=
787
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20))
788
 
        self.assertTrue(
789
 
            btree_index.BTreeGraphIndex(transport1, 'index', 20) !=
790
 
            btree_index.BTreeGraphIndex(transport2, 'index', 20))
791
 
        self.assertTrue(
792
 
            btree_index.BTreeGraphIndex(transport1, 'inde1', 20) !=
793
 
            btree_index.BTreeGraphIndex(transport1, 'inde2', 20))
794
 
        self.assertTrue(
795
 
            btree_index.BTreeGraphIndex(transport1, 'index', 10) !=
796
 
            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))
797
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
        
798
842
    def test_iter_all_only_root_no_size(self):
799
843
        self.make_index(nodes=[(('key',), 'value', ())])
800
 
        trans = get_transport('trace+' + self.get_url(''))
801
 
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
802
 
        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[:]
803
847
        self.assertEqual([(('key',), 'value')],
804
848
                         [x[1:] for x in index.iter_all_entries()])
805
 
        self.assertEqual([('get', 'index')], trans._activity)
 
849
        self.assertEqual([('get', 'index')], t._activity)
806
850
 
807
851
    def test_iter_all_entries_reads(self):
808
852
        # iterating all entries reads the header, then does a linear
814
858
        nodes = self.make_nodes(10000, 2, 2)
815
859
        for node in nodes:
816
860
            builder.add_node(*node)
817
 
        transport = get_transport('trace+' + self.get_url(''))
818
 
        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())
819
863
        self.assertEqual(1303220, size, 'number of expected bytes in the'
820
864
                                        ' output changed')
821
865
        page_size = btree_index._PAGE_SIZE
822
866
        del builder
823
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
824
 
        del transport._activity[:]
825
 
        self.assertEqual([], transport._activity)
 
867
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
868
        del t._activity[:]
 
869
        self.assertEqual([], t._activity)
826
870
        found_nodes = self.time(list, index.iter_all_entries())
827
871
        bare_nodes = []
828
872
        for node in found_nodes:
849
893
        readv_request[-1] = (readv_request[-1][0], 1303220 % page_size)
850
894
        expected = [('readv', 'index', [(0, page_size)], False, None),
851
895
             ('readv',  'index', readv_request, False, None)]
852
 
        if expected != transport._activity:
 
896
        if expected != t._activity:
853
897
            self.assertEqualDiff(pprint.pformat(expected),
854
898
                                 pprint.pformat(transport._activity))
855
899
 
869
913
        nodes = self.make_nodes(160, 2, 2)
870
914
        for node in nodes:
871
915
            builder.add_node(*node)
872
 
        transport = get_transport('trace+' + self.get_url(''))
873
 
        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())
874
918
        del builder
875
 
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
876
 
        del transport._activity[:]
877
 
        self.assertEqual([], transport._activity)
 
919
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
920
        del t._activity[:]
 
921
        self.assertEqual([], t._activity)
878
922
        # search for one key
879
923
        found_nodes = list(index.iter_entries([nodes[30][0]]))
880
924
        bare_nodes = []
888
932
        # Should have read the root node, then one leaf page:
889
933
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
890
934
             ('readv',  'index', [(8192, 4096), ], False, None)],
891
 
            transport._activity)
 
935
            t._activity)
892
936
 
893
937
    def test_iter_key_prefix_1_element_key_None(self):
894
938
        index = self.make_index()
1077
1121
        min_l2_key = l2.min_key
1078
1122
        max_l1_key = l1.max_key
1079
1123
        self.assertTrue(max_l1_key < min_l2_key)
1080
 
        parents_min_l2_key = l2.keys[min_l2_key][1][0]
 
1124
        parents_min_l2_key = l2[min_l2_key][1][0]
1081
1125
        self.assertEqual((l1.max_key,), parents_min_l2_key)
1082
1126
        # Now, whatever key we select that would fall on the second page,
1083
1127
        # should give us all the parents until the page break
1096
1140
        parent_map = {}
1097
1141
        search_keys = index._find_ancestors([max_l1_key], 0, parent_map,
1098
1142
                                            missing_keys)
1099
 
        self.assertEqual(sorted(l1.keys), sorted(parent_map))
 
1143
        self.assertEqual(l1.all_keys(), sorted(parent_map))
1100
1144
        self.assertEqual(set(), missing_keys)
1101
1145
        self.assertEqual(set(), search_keys)
1102
1146
 
1118
1162
        for node in nodes:
1119
1163
            builder.add_node(*node)
1120
1164
        stream = builder.finish()
1121
 
        trans = get_transport(self.get_url())
 
1165
        trans = self.get_transport()
1122
1166
        size = trans.put_file('index', stream)
1123
1167
        index = btree_index.BTreeGraphIndex(trans, 'index', size)
1124
1168
        self.assertEqual(500, index.key_count())
1150
1194
 
1151
1195
class TestBTreeNodes(BTreeTestCase):
1152
1196
 
 
1197
    scenarios = btreeparser_scenarios()
 
1198
 
1153
1199
    def setUp(self):
1154
1200
        BTreeTestCase.setUp(self)
1155
1201
        self.overrideAttr(btree_index, '_btree_serializer', self.parse_btree)
1170
1216
            ("2222222222222222222222222222222222222222",): ("value:2", ()),
1171
1217
            ("3333333333333333333333333333333333333333",): ("value:3", ()),
1172
1218
            ("4444444444444444444444444444444444444444",): ("value:4", ()),
1173
 
            }, node.keys)
 
1219
            }, dict(node.all_items()))
1174
1220
 
1175
1221
    def test_LeafNode_2_2(self):
1176
1222
        node_bytes = ("type=leaf\n"
1190
1236
            ('11', '33'): ('value:3',
1191
1237
                ((('11', 'ref22'),), (('11', 'ref22'), ('11', 'ref22')))),
1192
1238
            ('11', '44'): ('value:4', ((), (('11', 'ref00'),)))
1193
 
            }, node.keys)
 
1239
            }, dict(node.all_items()))
1194
1240
 
1195
1241
    def test_InternalNode_1(self):
1196
1242
        node_bytes = ("type=internal\n"
1231
1277
            ('11', '33'): ('value:3',
1232
1278
                ((('11', 'ref22'),), (('11', 'ref22'), ('11', 'ref22')))),
1233
1279
            ('11', '44'): ('value:4', ((), (('11', 'ref00'),)))
1234
 
            }, node.keys)
 
1280
            }, dict(node.all_items()))
1235
1281
 
1236
1282
    def assertFlattened(self, expected, key, value, refs):
1237
1283
        flat_key, flat_line = self.parse_btree._flatten_node(
1315
1361
        This doesn't actually create anything on disk, it just primes a
1316
1362
        BTreeGraphIndex with the recommended information.
1317
1363
        """
1318
 
        index = btree_index.BTreeGraphIndex(get_transport('memory:///'),
1319
 
                                            'test-index', size=size)
 
1364
        index = btree_index.BTreeGraphIndex(
 
1365
            transport.get_transport_from_url('memory:///'),
 
1366
            'test-index', size=size)
1320
1367
        if recommended_pages is not None:
1321
1368
            index._recommended_pages = recommended_pages
1322
1369
        return index