← 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-17 13:49:11 UTC
  • mfrom: (4988.11.1 imports)
  • Revision ID: pqm@pqm.ubuntu.com-20100217134911-s77se00ni7xc1hz8
(Jelmer) Remove some unused imports.

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,
 
33
    condition_isinstance,
 
34
    multiply_tests,
 
35
    split_suite_by_condition,
35
36
    )
36
 
 
37
 
 
38
 
load_tests = scenarios.load_tests_apply_scenarios
39
 
 
40
 
 
41
 
def btreeparser_scenarios():
 
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))
42
44
    import bzrlib._btree_serializer_py as py_module
43
45
    scenarios = [('python', {'parse_btree': py_module})]
44
46
    if compiled_btreeparser_feature.available():
45
 
        scenarios.append(('C', 
46
 
            {'parse_btree': compiled_btreeparser_feature.module}))
47
 
    return scenarios
 
47
        scenarios.append(('C', {'parse_btree':
 
48
                                compiled_btreeparser_feature.module}))
 
49
    return multiply_tests(node_tests, scenarios, others)
48
50
 
49
51
 
50
52
compiled_btreeparser_feature = tests.ModuleAvailableFeature(
51
 
    'bzrlib._btree_serializer_pyx')
 
53
                                'bzrlib._btree_serializer_pyx')
52
54
 
53
55
 
54
56
class BTreeTestCase(TestCaseWithTransport):
214
216
        leaf1_bytes = zlib.decompress(leaf1)
215
217
        sorted_node_keys = sorted(node[0] for node in nodes)
216
218
        node = btree_index._LeafNode(leaf1_bytes, 1, 0)
217
 
        self.assertEqual(231, len(node))
218
 
        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))
219
221
        leaf2_bytes = zlib.decompress(leaf2)
220
222
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
221
 
        self.assertEqual(400 - 231, len(node))
222
 
        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))
223
225
 
224
226
    def test_last_page_rounded_1_layer(self):
225
227
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
239
241
        leaf2 = content[74:]
240
242
        leaf2_bytes = zlib.decompress(leaf2)
241
243
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
242
 
        self.assertEqual(10, len(node))
 
244
        self.assertEqual(10, len(node.keys))
243
245
        sorted_node_keys = sorted(node[0] for node in nodes)
244
 
        self.assertEqual(sorted_node_keys, node.all_keys())
 
246
        self.assertEqual(sorted_node_keys, sorted(node.keys))
245
247
 
246
248
    def test_last_page_not_rounded_2_layer(self):
247
249
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
261
263
        leaf2 = content[8192:]
262
264
        leaf2_bytes = zlib.decompress(leaf2)
263
265
        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
264
 
        self.assertEqual(400 - 231, len(node))
 
266
        self.assertEqual(400 - 231, len(node.keys))
265
267
        sorted_node_keys = sorted(node[0] for node in nodes)
266
 
        self.assertEqual(sorted_node_keys[231:], node.all_keys())
 
268
        self.assertEqual(sorted_node_keys[231:], sorted(node.keys))
267
269
 
268
270
    def test_three_level_tree_details(self):
269
271
        # The left most pointer in the second internal node in a row should
278
280
 
279
281
        for node in nodes:
280
282
            builder.add_node(*node)
281
 
        t = transport.get_transport('trace+' + self.get_url(''))
282
 
        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))
283
285
        del builder
284
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
 
286
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
285
287
        # Seed the metadata, we're using internal calls now.
286
288
        index.key_count()
287
289
        self.assertEqual(3, len(index._row_lengths),
300
302
        # in the second node it points at
301
303
        pos = index._row_offsets[2] + internal_node2.offset + 1
302
304
        leaf = index._get_leaf_nodes([pos])[pos]
303
 
        self.assertTrue(internal_node2.keys[0] in leaf)
 
305
        self.assertTrue(internal_node2.keys[0] in leaf.keys)
304
306
 
305
307
    def test_2_leaves_2_2(self):
306
308
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
407
409
        self.assertEqual(None, builder._backing_indices[2])
408
410
        self.assertEqual(16, builder._backing_indices[3].key_count())
409
411
        # Now finish, and check we got a correctly ordered tree
410
 
        t = self.get_transport('')
411
 
        size = t.put_file('index', builder.finish())
412
 
        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)
413
415
        nodes = list(index.iter_all_entries())
414
416
        self.assertEqual(sorted(nodes), nodes)
415
417
        self.assertEqual(16, len(nodes))
605
607
        for key, value, references in nodes:
606
608
            builder.add_node(key, value, references)
607
609
        stream = builder.finish()
608
 
        trans = transport.get_transport('trace+' + self.get_url())
 
610
        trans = get_transport('trace+' + self.get_url())
609
611
        size = trans.put_file('index', stream)
610
612
        return btree_index.BTreeGraphIndex(trans, 'index', size)
611
613
 
612
 
    def make_index_with_offset(self, ref_lists=1, key_elements=1, nodes=[],
613
 
                               offset=0):
614
 
        builder = btree_index.BTreeBuilder(key_elements=key_elements,
615
 
                                           reference_lists=ref_lists)
616
 
        builder.add_nodes(nodes)
617
 
        transport = self.get_transport('')
618
 
        # NamedTemporaryFile dies on builder.finish().read(). weird.
619
 
        temp_file = builder.finish()
620
 
        content = temp_file.read()
621
 
        del temp_file
622
 
        size = len(content)
623
 
        transport.put_bytes('index', (' '*offset)+content)
624
 
        return btree_index.BTreeGraphIndex(transport, 'index', size=size,
625
 
                                           offset=offset)
626
 
 
627
614
    def test_clear_cache(self):
628
615
        nodes = self.make_nodes(160, 2, 2)
629
616
        index = self.make_index(ref_lists=2, key_elements=2, nodes=nodes)
646
633
        self.assertEqual(0, len(index._leaf_node_cache))
647
634
 
648
635
    def test_trivial_constructor(self):
649
 
        t = transport.get_transport('trace+' + self.get_url(''))
650
 
        index = btree_index.BTreeGraphIndex(t, 'index', None)
 
636
        transport = get_transport('trace+' + self.get_url(''))
 
637
        index = btree_index.BTreeGraphIndex(transport, 'index', None)
651
638
        # Checks the page size at load, but that isn't logged yet.
652
 
        self.assertEqual([], t._activity)
 
639
        self.assertEqual([], transport._activity)
653
640
 
654
641
    def test_with_size_constructor(self):
655
 
        t = transport.get_transport('trace+' + self.get_url(''))
656
 
        index = btree_index.BTreeGraphIndex(t, 'index', 1)
 
642
        transport = get_transport('trace+' + self.get_url(''))
 
643
        index = btree_index.BTreeGraphIndex(transport, 'index', 1)
657
644
        # Checks the page size at load, but that isn't logged yet.
658
 
        self.assertEqual([], t._activity)
 
645
        self.assertEqual([], transport._activity)
659
646
 
660
647
    def test_empty_key_count_no_size(self):
661
648
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
662
 
        t = transport.get_transport('trace+' + self.get_url(''))
663
 
        t.put_file('index', builder.finish())
664
 
        index = btree_index.BTreeGraphIndex(t, 'index', None)
665
 
        del t._activity[:]
666
 
        self.assertEqual([], t._activity)
 
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)
667
654
        self.assertEqual(0, index.key_count())
668
655
        # The entire index should have been requested (as we generally have the
669
656
        # size available, and doing many small readvs is inappropriate).
670
657
        # We can't tell how much was actually read here, but - check the code.
671
 
        self.assertEqual([('get', 'index')], t._activity)
 
658
        self.assertEqual([('get', 'index')], transport._activity)
672
659
 
673
660
    def test_empty_key_count(self):
674
661
        builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
675
 
        t = transport.get_transport('trace+' + self.get_url(''))
676
 
        size = t.put_file('index', builder.finish())
 
662
        transport = get_transport('trace+' + self.get_url(''))
 
663
        size = transport.put_file('index', builder.finish())
677
664
        self.assertEqual(72, size)
678
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
679
 
        del t._activity[:]
680
 
        self.assertEqual([], t._activity)
 
665
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
666
        del transport._activity[:]
 
667
        self.assertEqual([], transport._activity)
681
668
        self.assertEqual(0, index.key_count())
682
669
        # The entire index should have been read, as 4K > size
683
670
        self.assertEqual([('readv', 'index', [(0, 72)], False, None)],
684
 
                         t._activity)
 
671
            transport._activity)
685
672
 
686
673
    def test_non_empty_key_count_2_2(self):
687
674
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
688
675
        nodes = self.make_nodes(35, 2, 2)
689
676
        for node in nodes:
690
677
            builder.add_node(*node)
691
 
        t = transport.get_transport('trace+' + self.get_url(''))
692
 
        size = t.put_file('index', builder.finish())
693
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
694
 
        del t._activity[:]
695
 
        self.assertEqual([], t._activity)
 
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)
696
683
        self.assertEqual(70, index.key_count())
697
684
        # The entire index should have been read, as it is one page long.
698
685
        self.assertEqual([('readv', 'index', [(0, size)], False, None)],
699
 
            t._activity)
 
686
            transport._activity)
700
687
        self.assertEqual(1173, size)
701
688
 
702
 
    def test_with_offset_no_size(self):
703
 
        index = self.make_index_with_offset(key_elements=1, ref_lists=1,
704
 
                                            offset=1234,
705
 
                                            nodes=self.make_nodes(200, 1, 1))
706
 
        index._size = None # throw away the size info
707
 
        self.assertEqual(200, index.key_count())
708
 
 
709
 
    def test_with_small_offset(self):
710
 
        index = self.make_index_with_offset(key_elements=1, ref_lists=1,
711
 
                                            offset=1234,
712
 
                                            nodes=self.make_nodes(200, 1, 1))
713
 
        self.assertEqual(200, index.key_count())
714
 
 
715
 
    def test_with_large_offset(self):
716
 
        index = self.make_index_with_offset(key_elements=1, ref_lists=1,
717
 
                                            offset=123456,
718
 
                                            nodes=self.make_nodes(200, 1, 1))
719
 
        self.assertEqual(200, index.key_count())
720
 
 
721
689
    def test__read_nodes_no_size_one_page_reads_once(self):
722
690
        self.make_index(nodes=[(('key',), 'value', ())])
723
 
        trans = transport.get_transport('trace+' + self.get_url())
 
691
        trans = get_transport('trace+' + self.get_url())
724
692
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
725
693
        del trans._activity[:]
726
694
        nodes = dict(index._read_nodes([0]))
727
695
        self.assertEqual([0], nodes.keys())
728
696
        node = nodes[0]
729
 
        self.assertEqual([('key',)], node.all_keys())
 
697
        self.assertEqual([('key',)], node.keys.keys())
730
698
        self.assertEqual([('get', 'index')], trans._activity)
731
699
 
732
700
    def test__read_nodes_no_size_multiple_pages(self):
734
702
        index.key_count()
735
703
        num_pages = index._row_offsets[-1]
736
704
        # Reopen with a traced transport and no size
737
 
        trans = transport.get_transport('trace+' + self.get_url())
 
705
        trans = get_transport('trace+' + self.get_url())
738
706
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
739
707
        del trans._activity[:]
740
708
        nodes = dict(index._read_nodes([0]))
745
713
        nodes = self.make_nodes(160, 2, 2)
746
714
        for node in nodes:
747
715
            builder.add_node(*node)
748
 
        t = transport.get_transport('trace+' + self.get_url(''))
749
 
        size = t.put_file('index', builder.finish())
 
716
        transport = get_transport('trace+' + self.get_url(''))
 
717
        size = transport.put_file('index', builder.finish())
750
718
        self.assertEqual(17692, size)
751
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
752
 
        del t._activity[:]
753
 
        self.assertEqual([], t._activity)
 
719
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
720
        del transport._activity[:]
 
721
        self.assertEqual([], transport._activity)
754
722
        self.assertEqual(320, index.key_count())
755
723
        # The entire index should not have been read.
756
724
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None)],
757
 
                         t._activity)
 
725
            transport._activity)
758
726
 
759
727
    def test_validate_one_page(self):
760
728
        builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
761
729
        nodes = self.make_nodes(45, 2, 2)
762
730
        for node in nodes:
763
731
            builder.add_node(*node)
764
 
        t = transport.get_transport('trace+' + self.get_url(''))
765
 
        size = t.put_file('index', builder.finish())
766
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
767
 
        del t._activity[:]
768
 
        self.assertEqual([], t._activity)
 
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)
769
737
        index.validate()
770
738
        # The entire index should have been read linearly.
771
739
        self.assertEqual([('readv', 'index', [(0, size)], False, None)],
772
 
                         t._activity)
 
740
            transport._activity)
773
741
        self.assertEqual(1488, size)
774
742
 
775
743
    def test_validate_two_pages(self):
777
745
        nodes = self.make_nodes(80, 2, 2)
778
746
        for node in nodes:
779
747
            builder.add_node(*node)
780
 
        t = transport.get_transport('trace+' + self.get_url(''))
781
 
        size = t.put_file('index', builder.finish())
 
748
        transport = get_transport('trace+' + self.get_url(''))
 
749
        size = transport.put_file('index', builder.finish())
782
750
        # Root page, 2 leaf pages
783
751
        self.assertEqual(9339, size)
784
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
785
 
        del t._activity[:]
786
 
        self.assertEqual([], t._activity)
 
752
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
753
        del transport._activity[:]
 
754
        self.assertEqual([], transport._activity)
787
755
        index.validate()
788
756
        # The entire index should have been read linearly.
789
 
        self.assertEqual(
790
 
            [('readv', 'index', [(0, 4096)], False, None),
791
 
             ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
792
 
            t._activity)
 
757
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
 
758
            ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
 
759
            transport._activity)
793
760
        # XXX: TODO: write some badly-ordered nodes, and some pointers-to-wrong
794
761
        # node and make validate find them.
795
762
 
796
763
    def test_eq_ne(self):
797
764
        # two indices are equal when constructed with the same parameters:
798
 
        t1 = transport.get_transport('trace+' + self.get_url(''))
799
 
        t2 = self.get_transport()
800
 
        self.assertTrue(
801
 
            btree_index.BTreeGraphIndex(t1, 'index', None) ==
802
 
            btree_index.BTreeGraphIndex(t1, 'index', None))
803
 
        self.assertTrue(
804
 
            btree_index.BTreeGraphIndex(t1, 'index', 20) ==
805
 
            btree_index.BTreeGraphIndex(t1, 'index', 20))
806
 
        self.assertFalse(
807
 
            btree_index.BTreeGraphIndex(t1, 'index', 20) ==
808
 
            btree_index.BTreeGraphIndex(t2, 'index', 20))
809
 
        self.assertFalse(
810
 
            btree_index.BTreeGraphIndex(t1, 'inde1', 20) ==
811
 
            btree_index.BTreeGraphIndex(t1, 'inde2', 20))
812
 
        self.assertFalse(
813
 
            btree_index.BTreeGraphIndex(t1, 'index', 10) ==
814
 
            btree_index.BTreeGraphIndex(t1, 'index', 20))
815
 
        self.assertFalse(
816
 
            btree_index.BTreeGraphIndex(t1, 'index', None) !=
817
 
            btree_index.BTreeGraphIndex(t1, 'index', None))
818
 
        self.assertFalse(
819
 
            btree_index.BTreeGraphIndex(t1, 'index', 20) !=
820
 
            btree_index.BTreeGraphIndex(t1, 'index', 20))
821
 
        self.assertTrue(
822
 
            btree_index.BTreeGraphIndex(t1, 'index', 20) !=
823
 
            btree_index.BTreeGraphIndex(t2, 'index', 20))
824
 
        self.assertTrue(
825
 
            btree_index.BTreeGraphIndex(t1, 'inde1', 20) !=
826
 
            btree_index.BTreeGraphIndex(t1, 'inde2', 20))
827
 
        self.assertTrue(
828
 
            btree_index.BTreeGraphIndex(t1, 'index', 10) !=
829
 
            btree_index.BTreeGraphIndex(t1, 'index', 20))
 
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))
830
797
 
831
798
    def test_iter_all_only_root_no_size(self):
832
799
        self.make_index(nodes=[(('key',), 'value', ())])
833
 
        t = transport.get_transport('trace+' + self.get_url(''))
834
 
        index = btree_index.BTreeGraphIndex(t, 'index', None)
835
 
        del t._activity[:]
 
800
        trans = get_transport('trace+' + self.get_url(''))
 
801
        index = btree_index.BTreeGraphIndex(trans, 'index', None)
 
802
        del trans._activity[:]
836
803
        self.assertEqual([(('key',), 'value')],
837
804
                         [x[1:] for x in index.iter_all_entries()])
838
 
        self.assertEqual([('get', 'index')], t._activity)
 
805
        self.assertEqual([('get', 'index')], trans._activity)
839
806
 
840
807
    def test_iter_all_entries_reads(self):
841
808
        # iterating all entries reads the header, then does a linear
847
814
        nodes = self.make_nodes(10000, 2, 2)
848
815
        for node in nodes:
849
816
            builder.add_node(*node)
850
 
        t = transport.get_transport('trace+' + self.get_url(''))
851
 
        size = t.put_file('index', builder.finish())
 
817
        transport = get_transport('trace+' + self.get_url(''))
 
818
        size = transport.put_file('index', builder.finish())
852
819
        self.assertEqual(1303220, size, 'number of expected bytes in the'
853
820
                                        ' output changed')
854
821
        page_size = btree_index._PAGE_SIZE
855
822
        del builder
856
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
857
 
        del t._activity[:]
858
 
        self.assertEqual([], t._activity)
 
823
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
824
        del transport._activity[:]
 
825
        self.assertEqual([], transport._activity)
859
826
        found_nodes = self.time(list, index.iter_all_entries())
860
827
        bare_nodes = []
861
828
        for node in found_nodes:
882
849
        readv_request[-1] = (readv_request[-1][0], 1303220 % page_size)
883
850
        expected = [('readv', 'index', [(0, page_size)], False, None),
884
851
             ('readv',  'index', readv_request, False, None)]
885
 
        if expected != t._activity:
 
852
        if expected != transport._activity:
886
853
            self.assertEqualDiff(pprint.pformat(expected),
887
854
                                 pprint.pformat(transport._activity))
888
855
 
902
869
        nodes = self.make_nodes(160, 2, 2)
903
870
        for node in nodes:
904
871
            builder.add_node(*node)
905
 
        t = transport.get_transport('trace+' + self.get_url(''))
906
 
        size = t.put_file('index', builder.finish())
 
872
        transport = get_transport('trace+' + self.get_url(''))
 
873
        size = transport.put_file('index', builder.finish())
907
874
        del builder
908
 
        index = btree_index.BTreeGraphIndex(t, 'index', size)
909
 
        del t._activity[:]
910
 
        self.assertEqual([], t._activity)
 
875
        index = btree_index.BTreeGraphIndex(transport, 'index', size)
 
876
        del transport._activity[:]
 
877
        self.assertEqual([], transport._activity)
911
878
        # search for one key
912
879
        found_nodes = list(index.iter_entries([nodes[30][0]]))
913
880
        bare_nodes = []
921
888
        # Should have read the root node, then one leaf page:
922
889
        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
923
890
             ('readv',  'index', [(8192, 4096), ], False, None)],
924
 
            t._activity)
 
891
            transport._activity)
925
892
 
926
893
    def test_iter_key_prefix_1_element_key_None(self):
927
894
        index = self.make_index()
1110
1077
        min_l2_key = l2.min_key
1111
1078
        max_l1_key = l1.max_key
1112
1079
        self.assertTrue(max_l1_key < min_l2_key)
1113
 
        parents_min_l2_key = l2[min_l2_key][1][0]
 
1080
        parents_min_l2_key = l2.keys[min_l2_key][1][0]
1114
1081
        self.assertEqual((l1.max_key,), parents_min_l2_key)
1115
1082
        # Now, whatever key we select that would fall on the second page,
1116
1083
        # should give us all the parents until the page break
1129
1096
        parent_map = {}
1130
1097
        search_keys = index._find_ancestors([max_l1_key], 0, parent_map,
1131
1098
                                            missing_keys)
1132
 
        self.assertEqual(l1.all_keys(), sorted(parent_map))
 
1099
        self.assertEqual(sorted(l1.keys), sorted(parent_map))
1133
1100
        self.assertEqual(set(), missing_keys)
1134
1101
        self.assertEqual(set(), search_keys)
1135
1102
 
1151
1118
        for node in nodes:
1152
1119
            builder.add_node(*node)
1153
1120
        stream = builder.finish()
1154
 
        trans = self.get_transport()
 
1121
        trans = get_transport(self.get_url())
1155
1122
        size = trans.put_file('index', stream)
1156
1123
        index = btree_index.BTreeGraphIndex(trans, 'index', size)
1157
1124
        self.assertEqual(500, index.key_count())
1183
1150
 
1184
1151
class TestBTreeNodes(BTreeTestCase):
1185
1152
 
1186
 
    scenarios = btreeparser_scenarios()
1187
 
 
1188
1153
    def setUp(self):
1189
1154
        BTreeTestCase.setUp(self)
1190
1155
        self.overrideAttr(btree_index, '_btree_serializer', self.parse_btree)
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