← 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: Canonical.com Patch Queue Manager
  • Date: 2010-02-10 16:25:28 UTC
  • mfrom: (5020.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100210162528-00g29u0ex6vzv914
(gerard) Update performs two merges in a more logical order but stop
        on conflicts

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