← 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: 2010-02-04 16:06:36 UTC
  • mfrom: (5007 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5023.
  • Revision ID: john@arbash-meinel.com-20100204160636-xqeuwz8bwt8bbts4
Merge bzr.dev 5007, resolve conflict, update NEWS

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):
217
216
        leaf1_bytes = zlib.decompress(leaf1)
218
217
        sorted_node_keys = sorted(node[0] for node in nodes)
219
218
        node = btree_index._LeafNode(leaf1_bytes, 1, 0)
220
 
        self.assertEqual(231, len(node))
221
 
        self.assertEqual(sorted_node_keys[:231], node.all_keys())
 
219
        self.assertEqual(231, len(node.keys))
 
220
        self.assertEqual(sorted_node_keys[:231], sorted(node.keys))
222
221
        leaf2_bytes = zlib.decompress(leaf2)
223
222
        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())
 
223
        self.assertEqual(400 - 231, len(node.keys))
 
224
        self.assertEqual(sorted_node_keys[231:], sorted(node.keys))
226
225
 
227
226
    def test_last_page_rounded_1_layer(self):
228
227
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
242
241
        leaf2 = content[74:]
243
242
        leaf2_bytes = zlib.decompress(leaf2)
244
243
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
245
 
        self.assertEqual(10, len(node))
 
244
        self.assertEqual(10, len(node.keys))
246
245
        sorted_node_keys = sorted(node[0] for node in nodes)
247
 
        self.assertEqual(sorted_node_keys, node.all_keys())
 
246
        self.assertEqual(sorted_node_keys, sorted(node.keys))
248
247
 
249
248
    def test_last_page_not_rounded_2_layer(self):
250
249
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
264
263
        leaf2 = content[8192:]
265
264
        leaf2_bytes = zlib.decompress(leaf2)
266
265
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
267
 
        self.assertEqual(400 - 231, len(node))
 
266
        self.assertEqual(400 - 231, len(node.keys))
268
267
        sorted_node_keys = sorted(node[0] for node in nodes)
269
 
        self.assertEqual(sorted_node_keys[231:], node.all_keys())
 
268
        self.assertEqual(sorted_node_keys[231:], sorted(node.keys))
270
269
 
271
270
    def test_three_level_tree_details(self):
272
271
        # The left most pointer in the second internal node in a row should
281
280
 
282
281
        for node in nodes:
283
282
            builder.add_node(*node)
284
 
        t = transport.get_transport('trace+' + self.get_url(''))
285
 
        size = t.put_file('index', self.time(builder.finish))
 
283
        transport = get_transport('trace+' + self.get_url(''))
 
284
        size = transport.put_file('index', self.time(builder.finish))
286
285
        del builder
287
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
286
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
288
287
        # Seed the metadata, we're using internal calls now.
289
288
        index.key_count()
290
289
        self.assertEqual(3, len(index._row_lengths),
303
302
        # in the second node it points at
304
303
        pos = index._row_offsets[2] + internal_node2.offset + 1
305
304
        leaf = index._get_leaf_nodes([pos])[pos]
306
 
        self.assertTrue(internal_node2.keys[0] in leaf)
 
305
        self.assertTrue(internal_node2.keys[0] in leaf.keys)
307
306
 
308
307
    def test_2_leaves_2_2(self):
309
308
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
410
409
        self.assertEqual(None, builder._backing_indices[2])
411
410
        self.assertEqual(16, builder._backing_indices[3].key_count())
412
411
        # 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)
 
412
        transport = self.get_transport('')
 
413
        size = transport.put_file('index', builder.finish())
 
414
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
416
415
        nodes = list(index.iter_all_entries())
417
416
        self.assertEqual(sorted(nodes), nodes)
418
417
        self.assertEqual(16, len(nodes))
608
607
        for key, value, references in nodes:
609
608
            builder.add_node(key, value, references)
610
609
        stream = builder.finish()
611
 
        trans = transport.get_transport('trace+' + self.get_url())
 
610
        trans = get_transport('trace+' + self.get_url())
612
611
        size = trans.put_file('index', stream)
613
612
        return btree_index.BTreeGraphIndex(trans, 'index', size)
614
613
 
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
614
    def test_clear_cache(self):
631
615
        nodes = self.make_nodes(160, 2, 2)
632
616
        index = self.make_index(ref_lists=2, key_elements=2, nodes=nodes)
649
633
        self.assertEqual(0, len(index._leaf_node_cache))
650
634
 
651
635
    def test_trivial_constructor(self):
652
 
        t = transport.get_transport('trace+' + self.get_url(''))
653
 
        index = btree_index.BTreeGraphIndex(t, 'index', None)
 
636
        transport = get_transport('trace+' + self.get_url(''))
 
637
        index = btree_index.BTreeGraphIndex(transport, 'index', None)
654
638
        # Checks the page size at load, but that isn't logged yet.
655
 
        self.assertEqual([], t._activity)
 
639
        self.assertEqual([], transport._activity)
656
640
 
657
641
    def test_with_size_constructor(self):
658
 
        t = transport.get_transport('trace+' + self.get_url(''))
659
 
        index = btree_index.BTreeGraphIndex(t, 'index', 1)
 
642
        transport = get_transport('trace+' + self.get_url(''))
 
643
        index = btree_index.BTreeGraphIndex(transport, 'index', 1)
660
644
        # Checks the page size at load, but that isn't logged yet.
661
 
        self.assertEqual([], t._activity)
 
645
        self.assertEqual([], transport._activity)
662
646
 
663
647
    def test_empty_key_count_no_size(self):
664
648
        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)
 
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)
670
654
        self.assertEqual(0, index.key_count())
671
655
        # The entire index should have been requested (as we generally have the
672
656
        # size available, and doing many small readvs is inappropriate).
673
657
        # We can't tell how much was actually read here, but - check the code.
674
 
        self.assertEqual([('get', 'index')], t._activity)
 
658
        self.assertEqual([('get', 'index')], transport._activity)
675
659
 
676
660
    def test_empty_key_count(self):
677
661
        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())
 
662
        transport = get_transport('trace+' + self.get_url(''))
 
663
        size = transport.put_file('index', builder.finish())
680
664
        self.assertEqual(72, size)
681
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
682
 
        del t._activity[:]
683
 
        self.assertEqual([], t._activity)
 
665
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
666
        del transport._activity[:]
 
667
        self.assertEqual([], transport._activity)
684
668
        self.assertEqual(0, index.key_count())
685
669
        # The entire index should have been read, as 4K > size
686
670
        self.assertEqual([('readv', 'index', [(0, 72)], False, None)],
687
 
                         t._activity)
 
671
            transport._activity)
688
672
 
689
673
    def test_non_empty_key_count_2_2(self):
690
674
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
691
675
        nodes = self.make_nodes(35, 2, 2)
692
676
        for node in nodes:
693
677
            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)
 
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)
699
683
        self.assertEqual(70, index.key_count())
700
684
        # The entire index should have been read, as it is one page long.
701
685
        self.assertEqual([('readv', 'index', [(0, size)], False, None)],
702
 
            t._activity)
 
686
            transport._activity)
703
687
        self.assertEqual(1173, size)
704
688
 
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
689
    def test__read_nodes_no_size_one_page_reads_once(self):
725
690
        self.make_index(nodes=[(('key',), 'value', ())])
726
 
        trans = transport.get_transport('trace+' + self.get_url())
 
691
        trans = get_transport('trace+' + self.get_url())
727
692
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
728
693
        del trans._activity[:]
729
694
        nodes = dict(index._read_nodes([0]))
730
695
        self.assertEqual([0], nodes.keys())
731
696
        node = nodes[0]
732
 
        self.assertEqual([('key',)], node.all_keys())
 
697
        self.assertEqual([('key',)], node.keys.keys())
733
698
        self.assertEqual([('get', 'index')], trans._activity)
734
699
 
735
700
    def test__read_nodes_no_size_multiple_pages(self):
737
702
        index.key_count()
738
703
        num_pages = index._row_offsets[-1]
739
704
        # Reopen with a traced transport and no size
740
 
        trans = transport.get_transport('trace+' + self.get_url())
 
705
        trans = get_transport('trace+' + self.get_url())
741
706
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
742
707
        del trans._activity[:]
743
708
        nodes = dict(index._read_nodes([0]))
748
713
        nodes = self.make_nodes(160, 2, 2)
749
714
        for node in nodes:
750
715
            builder.add_node(*node)
751
 
        t = transport.get_transport('trace+' + self.get_url(''))
752
 
        size = t.put_file('index', builder.finish())
 
716
        transport = get_transport('trace+' + self.get_url(''))
 
717
        size = transport.put_file('index', builder.finish())
753
718
        self.assertEqual(17692, size)
754
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
755
 
        del t._activity[:]
756
 
        self.assertEqual([], t._activity)
 
719
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
720
        del transport._activity[:]
 
721
        self.assertEqual([], transport._activity)
757
722
        self.assertEqual(320, index.key_count())
758
723
        # The entire index should not have been read.
759
724
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None)],
760
 
                         t._activity)
 
725
            transport._activity)
761
726
 
762
727
    def test_validate_one_page(self):
763
728
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
764
729
        nodes = self.make_nodes(45, 2, 2)
765
730
        for node in nodes:
766
731
            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)
 
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)
772
737
        index.validate()
773
738
        # The entire index should have been read linearly.
774
739
        self.assertEqual([('readv', 'index', [(0, size)], False, None)],
775
 
                         t._activity)
 
740
            transport._activity)
776
741
        self.assertEqual(1488, size)
777
742
 
778
743
    def test_validate_two_pages(self):
780
745
        nodes = self.make_nodes(80, 2, 2)
781
746
        for node in nodes:
782
747
            builder.add_node(*node)
783
 
        t = transport.get_transport('trace+' + self.get_url(''))
784
 
        size = t.put_file('index', builder.finish())
 
748
        transport = get_transport('trace+' + self.get_url(''))
 
749
        size = transport.put_file('index', builder.finish())
785
750
        # Root page, 2 leaf pages
786
751
        self.assertEqual(9339, size)
787
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
788
 
        del t._activity[:]
789
 
        self.assertEqual([], t._activity)
 
752
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
753
        del transport._activity[:]
 
754
        self.assertEqual([], transport._activity)
790
755
        index.validate()
791
756
        # 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)
 
757
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
 
758
            ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
 
759
            transport._activity)
796
760
        # XXX: TODO: write some badly-ordered nodes, and some pointers-to-wrong
797
761
        # node and make validate find them.
798
762
 
799
763
    def test_eq_ne(self):
800
764
        # 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))
 
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))
833
797
 
834
798
    def test_iter_all_only_root_no_size(self):
835
799
        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[:]
 
800
        trans = get_transport('trace+' + self.get_url(''))
 
801
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
 
802
        del trans._activity[:]
839
803
        self.assertEqual([(('key',), 'value')],
840
804
                         [x[1:] for x in index.iter_all_entries()])
841
 
        self.assertEqual([('get', 'index')], t._activity)
 
805
        self.assertEqual([('get', 'index')], trans._activity)
842
806
 
843
807
    def test_iter_all_entries_reads(self):
844
808
        # iterating all entries reads the header, then does a linear
850
814
        nodes = self.make_nodes(10000, 2, 2)
851
815
        for node in nodes:
852
816
            builder.add_node(*node)
853
 
        t = transport.get_transport('trace+' + self.get_url(''))
854
 
        size = t.put_file('index', builder.finish())
 
817
        transport = get_transport('trace+' + self.get_url(''))
 
818
        size = transport.put_file('index', builder.finish())
855
819
        self.assertEqual(1303220, size, 'number of expected bytes in the'
856
820
                                        ' output changed')
857
821
        page_size = btree_index._PAGE_SIZE
858
822
        del builder
859
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
860
 
        del t._activity[:]
861
 
        self.assertEqual([], t._activity)
 
823
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
824
        del transport._activity[:]
 
825
        self.assertEqual([], transport._activity)
862
826
        found_nodes = self.time(list, index.iter_all_entries())
863
827
        bare_nodes = []
864
828
        for node in found_nodes:
885
849
        readv_request[-1] = (readv_request[-1][0], 1303220 % page_size)
886
850
        expected = [('readv', 'index', [(0, page_size)], False, None),
887
851
             ('readv',  'index', readv_request, False, None)]
888
 
        if expected != t._activity:
 
852
        if expected != transport._activity:
889
853
            self.assertEqualDiff(pprint.pformat(expected),
890
854
                                 pprint.pformat(transport._activity))
891
855
 
905
869
        nodes = self.make_nodes(160, 2, 2)
906
870
        for node in nodes:
907
871
            builder.add_node(*node)
908
 
        t = transport.get_transport('trace+' + self.get_url(''))
909
 
        size = t.put_file('index', builder.finish())
 
872
        transport = get_transport('trace+' + self.get_url(''))
 
873
        size = transport.put_file('index', builder.finish())
910
874
        del builder
911
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
912
 
        del t._activity[:]
913
 
        self.assertEqual([], t._activity)
 
875
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
876
        del transport._activity[:]
 
877
        self.assertEqual([], transport._activity)
914
878
        # search for one key
915
879
        found_nodes = list(index.iter_entries([nodes[30][0]]))
916
880
        bare_nodes = []
924
888
        # Should have read the root node, then one leaf page:
925
889
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
926
890
             ('readv',  'index', [(8192, 4096), ], False, None)],
927
 
            t._activity)
 
891
            transport._activity)
928
892
 
929
893
    def test_iter_key_prefix_1_element_key_None(self):
930
894
        index = self.make_index()
1113
1077
        min_l2_key = l2.min_key
1114
1078
        max_l1_key = l1.max_key
1115
1079
        self.assertTrue(max_l1_key < min_l2_key)
1116
 
        parents_min_l2_key = l2[min_l2_key][1][0]
 
1080
        parents_min_l2_key = l2.keys[min_l2_key][1][0]
1117
1081
        self.assertEqual((l1.max_key,), parents_min_l2_key)
1118
1082
        # Now, whatever key we select that would fall on the second page,
1119
1083
        # should give us all the parents until the page break
1132
1096
        parent_map = {}
1133
1097
        search_keys = index._find_ancestors([max_l1_key], 0, parent_map,
1134
1098
                                            missing_keys)
1135
 
        self.assertEqual(l1.all_keys(), sorted(parent_map))
 
1099
        self.assertEqual(sorted(l1.keys), sorted(parent_map))
1136
1100
        self.assertEqual(set(), missing_keys)
1137
1101
        self.assertEqual(set(), search_keys)
1138
1102
 
1154
1118
        for node in nodes:
1155
1119
            builder.add_node(*node)
1156
1120
        stream = builder.finish()
1157
 
        trans = self.get_transport()
 
1121
        trans = get_transport(self.get_url())
1158
1122
        size = trans.put_file('index', stream)
1159
1123
        index = btree_index.BTreeGraphIndex(trans, 'index', size)
1160
1124
        self.assertEqual(500, index.key_count())
1186
1150
 
1187
1151
class TestBTreeNodes(BTreeTestCase):
1188
1152
 
1189
 
    scenarios = btreeparser_scenarios()
1190
 
 
1191
1153
    def setUp(self):
1192
1154
        BTreeTestCase.setUp(self)
1193
1155
        self.overrideAttr(btree_index, '_btree_serializer', self.parse_btree)
1208
1170
            ("2222222222222222222222222222222222222222",): ("value:2", ()),
1209
1171
            ("3333333333333333333333333333333333333333",): ("value:3", ()),
1210
1172
            ("4444444444444444444444444444444444444444",): ("value:4", ()),
1211
 
            }, dict(node.all_items()))
 
1173
            }, node.keys)
1212
1174
 
1213
1175
    def test_LeafNode_2_2(self):
1214
1176
        node_bytes = ("type=leaf\n"
1228
1190
            ('11', '33'): ('value:3',
1229
1191
                ((('11', 'ref22'),), (('11', 'ref22'), ('11', 'ref22')))),
1230
1192
            ('11', '44'): ('value:4', ((), (('11', 'ref00'),)))
1231
 
            }, dict(node.all_items()))
 
1193
            }, node.keys)
1232
1194
 
1233
1195
    def test_InternalNode_1(self):
1234
1196
        node_bytes = ("type=internal\n"
1269
1231
            ('11', '33'): ('value:3',
1270
1232
                ((('11', 'ref22'),), (('11', 'ref22'), ('11', 'ref22')))),
1271
1233
            ('11', '44'): ('value:4', ((), (('11', 'ref00'),)))
1272
 
            }, dict(node.all_items()))
 
1234
            }, node.keys)
1273
1235
 
1274
1236
    def assertFlattened(self, expected, key, value, refs):
1275
1237
        flat_key, flat_line = self.parse_btree._flatten_node(
1353
1315
        This doesn't actually create anything on disk, it just primes a
1354
1316
        BTreeGraphIndex with the recommended information.
1355
1317
        """
1356
 
        index = btree_index.BTreeGraphIndex(
1357
 
            transport.get_transport('memory:///'), 'test-index', size=size)
 
1318
        index = btree_index.BTreeGraphIndex(get_transport('memory:///'),
 
1319
                                            'test-index', size=size)
1358
1320
        if recommended_pages is not None:
1359
1321
            index._recommended_pages = recommended_pages
1360
1322
        return index