320
315
"""Tests for getting and putting knit records."""
322
317
def test_add_raw_records(self):
323
"""add_raw_records adds records retrievable later."""
324
access = self.get_access()
325
memos = access.add_raw_records([(b'key', 10)], [b'1234567890'])
326
self.assertEqual([b'1234567890'], list(access.get_raw_records(memos)))
328
def test_add_raw_record(self):
329
"""add_raw_record adds records retrievable later."""
330
access = self.get_access()
331
memos = access.add_raw_record(b'key', 10, [b'1234567890'])
332
self.assertEqual([b'1234567890'], list(access.get_raw_records([memos])))
318
"""Add_raw_records adds records retrievable later."""
319
access = self.get_access()
320
memos = access.add_raw_records([('key', 10)], '1234567890')
321
self.assertEqual(['1234567890'], list(access.get_raw_records(memos)))
334
323
def test_add_several_raw_records(self):
335
324
"""add_raw_records with many records and read some back."""
336
325
access = self.get_access()
337
memos = access.add_raw_records([(b'key', 10), (b'key2', 2), (b'key3', 5)],
338
[b'12345678901234567'])
339
self.assertEqual([b'1234567890', b'12', b'34567'],
340
list(access.get_raw_records(memos)))
341
self.assertEqual([b'1234567890'],
342
list(access.get_raw_records(memos[0:1])))
343
self.assertEqual([b'12'],
344
list(access.get_raw_records(memos[1:2])))
345
self.assertEqual([b'34567'],
346
list(access.get_raw_records(memos[2:3])))
347
self.assertEqual([b'1234567890', b'34567'],
348
list(access.get_raw_records(memos[0:1] + memos[2:3])))
326
memos = access.add_raw_records([('key', 10), ('key2', 2), ('key3', 5)],
328
self.assertEqual(['1234567890', '12', '34567'],
329
list(access.get_raw_records(memos)))
330
self.assertEqual(['1234567890'],
331
list(access.get_raw_records(memos[0:1])))
332
self.assertEqual(['12'],
333
list(access.get_raw_records(memos[1:2])))
334
self.assertEqual(['34567'],
335
list(access.get_raw_records(memos[2:3])))
336
self.assertEqual(['1234567890', '34567'],
337
list(access.get_raw_records(memos[0:1] + memos[2:3])))
351
340
class TestKnitKnitAccess(TestCaseWithMemoryTransport, KnitRecordAccessTestsMixin):
500
486
def test_read_from_several_packs(self):
501
487
access, writer = self._get_access()
503
memos.extend(access.add_raw_records([(b'key', 10)], [b'1234567890']))
489
memos.extend(access.add_raw_records([('key', 10)], '1234567890'))
505
491
access, writer = self._get_access('pack2', 'FOOBAR')
506
memos.extend(access.add_raw_records([(b'key', 5)], [b'12345']))
492
memos.extend(access.add_raw_records([('key', 5)], '12345'))
508
494
access, writer = self._get_access('pack3', 'BAZ')
509
memos.extend(access.add_raw_records([(b'key', 5)], [b'alpha']))
495
memos.extend(access.add_raw_records([('key', 5)], 'alpha'))
511
497
transport = self.get_transport()
512
access = pack_repo._DirectPackAccess({"FOO": (transport, 'packfile'),
513
"FOOBAR": (transport, 'pack2'),
514
"BAZ": (transport, 'pack3')})
515
self.assertEqual([b'1234567890', b'12345', b'alpha'],
516
list(access.get_raw_records(memos)))
517
self.assertEqual([b'1234567890'],
518
list(access.get_raw_records(memos[0:1])))
519
self.assertEqual([b'12345'],
520
list(access.get_raw_records(memos[1:2])))
521
self.assertEqual([b'alpha'],
522
list(access.get_raw_records(memos[2:3])))
523
self.assertEqual([b'1234567890', b'alpha'],
524
list(access.get_raw_records(memos[0:1] + memos[2:3])))
498
access = pack_repo._DirectPackAccess({"FOO":(transport, 'packfile'),
499
"FOOBAR":(transport, 'pack2'),
500
"BAZ":(transport, 'pack3')})
501
self.assertEqual(['1234567890', '12345', 'alpha'],
502
list(access.get_raw_records(memos)))
503
self.assertEqual(['1234567890'],
504
list(access.get_raw_records(memos[0:1])))
505
self.assertEqual(['12345'],
506
list(access.get_raw_records(memos[1:2])))
507
self.assertEqual(['alpha'],
508
list(access.get_raw_records(memos[2:3])))
509
self.assertEqual(['1234567890', 'alpha'],
510
list(access.get_raw_records(memos[0:1] + memos[2:3])))
526
512
def test_set_writer(self):
527
513
"""The writer should be settable post construction."""
693
678
def test_get_record_stream_retries(self):
694
679
vf, reload_counter = self.make_vf_for_retrying()
695
keys = [(b'rev-1',), (b'rev-2',), (b'rev-3',)]
680
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
696
681
record_stream = vf.get_record_stream(keys, 'topological', False)
697
682
record = next(record_stream)
698
self.assertEqual((b'rev-1',), record.key)
683
self.assertEqual(('rev-1',), record.key)
699
684
self.assertEqual([0, 0, 0], reload_counter)
700
685
record = next(record_stream)
701
self.assertEqual((b'rev-2',), record.key)
686
self.assertEqual(('rev-2',), record.key)
702
687
self.assertEqual([1, 1, 0], reload_counter)
703
688
record = next(record_stream)
704
self.assertEqual((b'rev-3',), record.key)
689
self.assertEqual(('rev-3',), record.key)
705
690
self.assertEqual([1, 1, 0], reload_counter)
706
691
# Now delete all pack files, and see that we raise the right error
707
692
for trans, name in vf._access._indices.values():
708
693
trans.delete(name)
709
694
self.assertListRaises(errors.NoSuchFile,
710
vf.get_record_stream, keys, 'topological', False)
695
vf.get_record_stream, keys, 'topological', False)
712
697
def test_iter_lines_added_or_present_in_keys_retries(self):
713
698
vf, reload_counter = self.make_vf_for_retrying()
714
keys = [(b'rev-1',), (b'rev-2',), (b'rev-3',)]
699
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
715
700
# Unfortunately, iter_lines_added_or_present_in_keys iterates the
716
701
# result in random order (determined by the iteration order from a
717
702
# set()), so we don't have any solid way to trigger whether data is
742
727
self.addCleanup(repo.unlock)
743
728
repo.start_write_group()
745
vf.add_lines((b'f-id', b'rev-5'), [(b'f-id', b'rev-4')], [b'lines\n'])
746
vf.add_lines((b'f-id', b'rev-1'), [], [b'lines\n'])
747
vf.add_lines((b'f-id', b'rev-2'), [(b'f-id', b'rev-1')], [b'lines\n'])
730
vf.add_lines(('f-id', 'rev-5'), [('f-id', 'rev-4')], ['lines\n'])
731
vf.add_lines(('f-id', 'rev-1'), [], ['lines\n'])
732
vf.add_lines(('f-id', 'rev-2'), [('f-id', 'rev-1')], ['lines\n'])
748
733
repo.commit_write_group()
749
734
# We inserted them as rev-5, rev-1, rev-2, we should get them back in
751
stream = vf.get_record_stream([(b'f-id', b'rev-1'), (b'f-id', b'rev-5'),
752
(b'f-id', b'rev-2')], 'unordered', False)
736
stream = vf.get_record_stream([('f-id', 'rev-1'), ('f-id', 'rev-5'),
737
('f-id', 'rev-2')], 'unordered', False)
753
738
keys = [r.key for r in stream]
754
self.assertEqual([(b'f-id', b'rev-5'), (b'f-id', b'rev-1'),
755
(b'f-id', b'rev-2')], keys)
739
self.assertEqual([('f-id', 'rev-5'), ('f-id', 'rev-1'),
740
('f-id', 'rev-2')], keys)
756
741
repo.start_write_group()
757
vf.add_lines((b'f-id', b'rev-4'), [(b'f-id', b'rev-3')], [b'lines\n'])
758
vf.add_lines((b'f-id', b'rev-3'), [(b'f-id', b'rev-2')], [b'lines\n'])
759
vf.add_lines((b'f-id', b'rev-6'), [(b'f-id', b'rev-5')], [b'lines\n'])
742
vf.add_lines(('f-id', 'rev-4'), [('f-id', 'rev-3')], ['lines\n'])
743
vf.add_lines(('f-id', 'rev-3'), [('f-id', 'rev-2')], ['lines\n'])
744
vf.add_lines(('f-id', 'rev-6'), [('f-id', 'rev-5')], ['lines\n'])
760
745
repo.commit_write_group()
761
746
# Request in random order, to make sure the output order isn't based on
763
request_keys = set((b'f-id', b'rev-%d' % i) for i in range(1, 7))
748
request_keys = set(('f-id', 'rev-%d' % i) for i in range(1, 7))
764
749
stream = vf.get_record_stream(request_keys, 'unordered', False)
765
750
keys = [r.key for r in stream]
766
751
# We want to get the keys back in disk order, but it doesn't matter
767
752
# which pack we read from first. So this can come back in 2 orders
768
alt1 = [(b'f-id', b'rev-%d' % i) for i in [4, 3, 6, 5, 1, 2]]
769
alt2 = [(b'f-id', b'rev-%d' % i) for i in [5, 1, 2, 4, 3, 6]]
753
alt1 = [('f-id', 'rev-%d' % i) for i in [4, 3, 6, 5, 1, 2]]
754
alt2 = [('f-id', 'rev-%d' % i) for i in [5, 1, 2, 4, 3, 6]]
770
755
if keys != alt1 and keys != alt2:
771
756
self.fail('Returned key order did not match either expected order.'
772
757
' expected %s or %s, not %s'
778
763
def create_gz_content(self, text):
780
with gzip.GzipFile(mode='wb', fileobj=sio) as gz_file:
765
gz_file = gzip.GzipFile(mode='wb', fileobj=sio)
782
768
return sio.getvalue()
784
770
def make_multiple_records(self):
785
771
"""Create the content for multiple records."""
786
sha1sum = osutils.sha_string(b'foo\nbar\n')
772
sha1sum = osutils.sha_string('foo\nbar\n')
788
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
774
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
793
779
record_1 = (0, len(gz_txt), sha1sum)
794
780
total_txt.append(gz_txt)
795
sha1sum = osutils.sha_string(b'baz\n')
796
gz_txt = self.create_gz_content(b'version rev-id-2 1 %s\n'
781
sha1sum = osutils.sha_string('baz\n')
782
gz_txt = self.create_gz_content('version rev-id-2 1 %s\n'
800
786
record_2 = (record_1[1], len(gz_txt), sha1sum)
801
787
total_txt.append(gz_txt)
802
788
return total_txt, record_1, record_2
804
790
def test_valid_knit_data(self):
805
sha1sum = osutils.sha_string(b'foo\nbar\n')
806
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
791
sha1sum = osutils.sha_string('foo\nbar\n')
792
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
811
797
transport = MockTransport([gz_txt])
812
798
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
813
799
knit = KnitVersionedFiles(None, access)
814
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(gz_txt)))]
800
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
816
802
contents = list(knit._read_records_iter(records))
817
self.assertEqual([((b'rev-id-1',), [b'foo\n', b'bar\n'],
818
b'4e48e2c9a3d2ca8a708cb0cc545700544efb5021')], contents)
803
self.assertEqual([(('rev-id-1',), ['foo\n', 'bar\n'],
804
'4e48e2c9a3d2ca8a708cb0cc545700544efb5021')], contents)
820
806
raw_contents = list(knit._read_records_iter_raw(records))
821
self.assertEqual([((b'rev-id-1',), gz_txt, sha1sum)], raw_contents)
807
self.assertEqual([(('rev-id-1',), gz_txt, sha1sum)], raw_contents)
823
809
def test_multiple_records_valid(self):
824
810
total_txt, record_1, record_2 = self.make_multiple_records()
825
transport = MockTransport([b''.join(total_txt)])
811
transport = MockTransport([''.join(total_txt)])
826
812
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
827
813
knit = KnitVersionedFiles(None, access)
828
records = [((b'rev-id-1',), ((b'rev-id-1',), record_1[0], record_1[1])),
829
((b'rev-id-2',), ((b'rev-id-2',), record_2[0], record_2[1]))]
814
records = [(('rev-id-1',), (('rev-id-1',), record_1[0], record_1[1])),
815
(('rev-id-2',), (('rev-id-2',), record_2[0], record_2[1]))]
831
817
contents = list(knit._read_records_iter(records))
832
self.assertEqual([((b'rev-id-1',), [b'foo\n', b'bar\n'], record_1[2]),
833
((b'rev-id-2',), [b'baz\n'], record_2[2])],
818
self.assertEqual([(('rev-id-1',), ['foo\n', 'bar\n'], record_1[2]),
819
(('rev-id-2',), ['baz\n'], record_2[2])],
836
822
raw_contents = list(knit._read_records_iter_raw(records))
837
self.assertEqual([((b'rev-id-1',), total_txt[0], record_1[2]),
838
((b'rev-id-2',), total_txt[1], record_2[2])],
823
self.assertEqual([(('rev-id-1',), total_txt[0], record_1[2]),
824
(('rev-id-2',), total_txt[1], record_2[2])],
841
827
def test_not_enough_lines(self):
842
sha1sum = osutils.sha_string(b'foo\n')
828
sha1sum = osutils.sha_string('foo\n')
843
829
# record says 2 lines data says 1
844
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
830
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
848
834
transport = MockTransport([gz_txt])
849
835
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
850
836
knit = KnitVersionedFiles(None, access)
851
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(gz_txt)))]
837
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
852
838
self.assertRaises(KnitCorrupt, list,
853
knit._read_records_iter(records))
839
knit._read_records_iter(records))
855
841
# read_records_iter_raw won't detect that sort of mismatch/corruption
856
842
raw_contents = list(knit._read_records_iter_raw(records))
857
self.assertEqual([((b'rev-id-1',), gz_txt, sha1sum)], raw_contents)
843
self.assertEqual([(('rev-id-1',), gz_txt, sha1sum)], raw_contents)
859
845
def test_too_many_lines(self):
860
sha1sum = osutils.sha_string(b'foo\nbar\n')
846
sha1sum = osutils.sha_string('foo\nbar\n')
861
847
# record says 1 lines data says 2
862
gz_txt = self.create_gz_content(b'version rev-id-1 1 %s\n'
848
gz_txt = self.create_gz_content('version rev-id-1 1 %s\n'
867
853
transport = MockTransport([gz_txt])
868
854
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
869
855
knit = KnitVersionedFiles(None, access)
870
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(gz_txt)))]
856
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
871
857
self.assertRaises(KnitCorrupt, list,
872
knit._read_records_iter(records))
858
knit._read_records_iter(records))
874
860
# read_records_iter_raw won't detect that sort of mismatch/corruption
875
861
raw_contents = list(knit._read_records_iter_raw(records))
876
self.assertEqual([((b'rev-id-1',), gz_txt, sha1sum)], raw_contents)
862
self.assertEqual([(('rev-id-1',), gz_txt, sha1sum)], raw_contents)
878
864
def test_mismatched_version_id(self):
879
sha1sum = osutils.sha_string(b'foo\nbar\n')
880
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
865
sha1sum = osutils.sha_string('foo\nbar\n')
866
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
885
871
transport = MockTransport([gz_txt])
886
872
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
887
873
knit = KnitVersionedFiles(None, access)
888
874
# We are asking for rev-id-2, but the data is rev-id-1
889
records = [((b'rev-id-2',), ((b'rev-id-2',), 0, len(gz_txt)))]
875
records = [(('rev-id-2',), (('rev-id-2',), 0, len(gz_txt)))]
890
876
self.assertRaises(KnitCorrupt, list,
891
knit._read_records_iter(records))
877
knit._read_records_iter(records))
893
879
# read_records_iter_raw detects mismatches in the header
894
880
self.assertRaises(KnitCorrupt, list,
895
knit._read_records_iter_raw(records))
881
knit._read_records_iter_raw(records))
897
883
def test_uncompressed_data(self):
898
sha1sum = osutils.sha_string(b'foo\nbar\n')
899
txt = (b'version rev-id-1 2 %s\n'
884
sha1sum = osutils.sha_string('foo\nbar\n')
885
txt = ('version rev-id-1 2 %s\n'
904
890
transport = MockTransport([txt])
905
891
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
906
892
knit = KnitVersionedFiles(None, access)
907
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(txt)))]
893
records = [(('rev-id-1',), (('rev-id-1',), 0, len(txt)))]
909
895
# We don't have valid gzip data ==> corrupt
910
896
self.assertRaises(KnitCorrupt, list,
911
knit._read_records_iter(records))
897
knit._read_records_iter(records))
913
899
# read_records_iter_raw will notice the bad data
914
900
self.assertRaises(KnitCorrupt, list,
915
knit._read_records_iter_raw(records))
901
knit._read_records_iter_raw(records))
917
903
def test_corrupted_data(self):
918
sha1sum = osutils.sha_string(b'foo\nbar\n')
919
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
904
sha1sum = osutils.sha_string('foo\nbar\n')
905
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
924
910
# Change 2 bytes in the middle to \xff
925
gz_txt = gz_txt[:10] + b'\xff\xff' + gz_txt[12:]
911
gz_txt = gz_txt[:10] + '\xff\xff' + gz_txt[12:]
926
912
transport = MockTransport([gz_txt])
927
913
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
928
914
knit = KnitVersionedFiles(None, access)
929
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(gz_txt)))]
915
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
930
916
self.assertRaises(KnitCorrupt, list,
931
knit._read_records_iter(records))
917
knit._read_records_iter(records))
932
918
# read_records_iter_raw will barf on bad gz data
933
919
self.assertRaises(KnitCorrupt, list,
934
knit._read_records_iter_raw(records))
920
knit._read_records_iter_raw(records))
937
923
class LowLevelKnitIndexTests(TestCase):
940
def _load_data(self):
925
def get_knit_index(self, transport, name, mode):
926
mapper = ConstantMapper(name)
941
927
from ..bzr._knit_load_data_py import _load_data_py
944
def get_knit_index(self, transport, name, mode):
945
mapper = ConstantMapper(name)
946
self.overrideAttr(knit, '_load_data', self._load_data)
950
return _KndxIndex(transport, mapper, lambda: None, allow_writes, lambda: True)
928
self.overrideAttr(knit, '_load_data', _load_data_py)
929
allow_writes = lambda: 'w' in mode
930
return _KndxIndex(transport, mapper, lambda:None, allow_writes, lambda:True)
952
932
def test_create_file(self):
953
933
transport = MockTransport()
981
961
utf8_revision_id = unicode_revision_id.encode('utf-8')
982
962
transport = MockTransport([
983
963
_KndxIndex.HEADER,
984
b"version option 0 1 .%s :" % (utf8_revision_id,)
964
"version option 0 1 .%s :" % (utf8_revision_id,)
986
966
index = self.get_knit_index(transport, "filename", "r")
987
self.assertEqual({(b"version",): ((utf8_revision_id,),)},
988
index.get_parent_map(index.keys()))
967
self.assertEqual({("version",):((utf8_revision_id,),)},
968
index.get_parent_map(index.keys()))
990
970
def test_read_ignore_corrupted_lines(self):
991
971
transport = MockTransport([
992
972
_KndxIndex.HEADER,
994
b"corrupted options 0 1 .b .c ",
995
b"version options 0 1 :"
974
"corrupted options 0 1 .b .c ",
975
"version options 0 1 :"
997
977
index = self.get_knit_index(transport, "filename", "r")
998
978
self.assertEqual(1, len(index.keys()))
999
self.assertEqual({(b"version",)}, index.keys())
979
self.assertEqual({("version",)}, index.keys())
1001
981
def test_read_corrupted_header(self):
1002
transport = MockTransport([b'not a bzr knit index header\n'])
982
transport = MockTransport(['not a bzr knit index header\n'])
1003
983
index = self.get_knit_index(transport, "filename", "r")
1004
984
self.assertRaises(KnitHeaderError, index.keys)
1006
986
def test_read_duplicate_entries(self):
1007
987
transport = MockTransport([
1008
988
_KndxIndex.HEADER,
1009
b"parent options 0 1 :",
1010
b"version options1 0 1 0 :",
1011
b"version options2 1 2 .other :",
1012
b"version options3 3 4 0 .other :"
989
"parent options 0 1 :",
990
"version options1 0 1 0 :",
991
"version options2 1 2 .other :",
992
"version options3 3 4 0 .other :"
1014
994
index = self.get_knit_index(transport, "filename", "r")
1015
995
self.assertEqual(2, len(index.keys()))
1016
996
# check that the index used is the first one written. (Specific
1017
997
# to KnitIndex style indices.
1018
self.assertEqual(b"1", index._dictionary_compress([(b"version",)]))
1019
self.assertEqual(((b"version",), 3, 4),
1020
index.get_position((b"version",)))
1021
self.assertEqual([b"options3"], index.get_options((b"version",)))
1022
self.assertEqual({(b"version",): ((b"parent",), (b"other",))},
1023
index.get_parent_map([(b"version",)]))
998
self.assertEqual("1", index._dictionary_compress([("version",)]))
999
self.assertEqual((("version",), 3, 4), index.get_position(("version",)))
1000
self.assertEqual(["options3"], index.get_options(("version",)))
1001
self.assertEqual({("version",):(("parent",), ("other",))},
1002
index.get_parent_map([("version",)]))
1025
1004
def test_read_compressed_parents(self):
1026
1005
transport = MockTransport([
1027
1006
_KndxIndex.HEADER,
1029
b"b option 0 1 0 :",
1030
b"c option 0 1 1 0 :",
1009
"c option 0 1 1 0 :",
1032
1011
index = self.get_knit_index(transport, "filename", "r")
1033
self.assertEqual({(b"b",): ((b"a",),), (b"c",): ((b"b",), (b"a",))},
1034
index.get_parent_map([(b"b",), (b"c",)]))
1012
self.assertEqual({("b",):(("a",),), ("c",):(("b",), ("a",))},
1013
index.get_parent_map([("b",), ("c",)]))
1036
1015
def test_write_utf8_version_id(self):
1037
1016
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
1080
1059
self.assertEqual(set(), index.keys())
1082
index.add_records([((b"a",), [b"option"], ((b"a",), 0, 1), [])])
1083
self.assertEqual({(b"a",)}, index.keys())
1085
index.add_records([((b"a",), [b"option"], ((b"a",), 0, 1), [])])
1086
self.assertEqual({(b"a",)}, index.keys())
1088
index.add_records([((b"b",), [b"option"], ((b"b",), 0, 1), [])])
1089
self.assertEqual({(b"a",), (b"b",)}, index.keys())
1061
index.add_records([(("a",), ["option"], (("a",), 0, 1), [])])
1062
self.assertEqual({("a",)}, index.keys())
1064
index.add_records([(("a",), ["option"], (("a",), 0, 1), [])])
1065
self.assertEqual({("a",)}, index.keys())
1067
index.add_records([(("b",), ["option"], (("b",), 0, 1), [])])
1068
self.assertEqual({("a",), ("b",)}, index.keys())
1091
1070
def add_a_b(self, index, random_id=None):
1093
1072
if random_id is not None:
1094
1073
kwargs["random_id"] = random_id
1095
1074
index.add_records([
1096
((b"a",), [b"option"], ((b"a",), 0, 1), [(b"b",)]),
1097
((b"a",), [b"opt"], ((b"a",), 1, 2), [(b"c",)]),
1098
((b"b",), [b"option"], ((b"b",), 2, 3), [(b"a",)])
1075
(("a",), ["option"], (("a",), 0, 1), [("b",)]),
1076
(("a",), ["opt"], (("a",), 1, 2), [("c",)]),
1077
(("b",), ["option"], (("b",), 2, 3), [("a",)])
1101
1080
def assertIndexIsAB(self, index):
1102
1081
self.assertEqual({
1103
(b'a',): ((b'c',),),
1104
(b'b',): ((b'a',),),
1106
1085
index.get_parent_map(index.keys()))
1107
self.assertEqual(((b"a",), 1, 2), index.get_position((b"a",)))
1108
self.assertEqual(((b"b",), 2, 3), index.get_position((b"b",)))
1109
self.assertEqual([b"opt"], index.get_options((b"a",)))
1086
self.assertEqual((("a",), 1, 2), index.get_position(("a",)))
1087
self.assertEqual((("b",), 2, 3), index.get_position(("b",)))
1088
self.assertEqual(["opt"], index.get_options(("a",)))
1111
1090
def test_add_versions(self):
1112
1091
transport = MockTransport([
1175
1154
def test__get_total_build_size(self):
1177
(b'a',): (('fulltext', False), ((b'a',), 0, 100), None),
1178
(b'b',): (('line-delta', False), ((b'b',), 100, 21), (b'a',)),
1179
(b'c',): (('line-delta', False), ((b'c',), 121, 35), (b'b',)),
1180
(b'd',): (('line-delta', False), ((b'd',), 156, 12), (b'b',)),
1156
('a',): (('fulltext', False), (('a',), 0, 100), None),
1157
('b',): (('line-delta', False), (('b',), 100, 21), ('a',)),
1158
('c',): (('line-delta', False), (('c',), 121, 35), ('b',)),
1159
('d',): (('line-delta', False), (('d',), 156, 12), ('b',)),
1182
self.assertTotalBuildSize(100, [(b'a',)], positions)
1183
self.assertTotalBuildSize(121, [(b'b',)], positions)
1161
self.assertTotalBuildSize(100, [('a',)], positions)
1162
self.assertTotalBuildSize(121, [('b',)], positions)
1184
1163
# c needs both a & b
1185
self.assertTotalBuildSize(156, [(b'c',)], positions)
1164
self.assertTotalBuildSize(156, [('c',)], positions)
1186
1165
# we shouldn't count 'b' twice
1187
self.assertTotalBuildSize(156, [(b'b',), (b'c',)], positions)
1188
self.assertTotalBuildSize(133, [(b'd',)], positions)
1189
self.assertTotalBuildSize(168, [(b'c',), (b'd',)], positions)
1166
self.assertTotalBuildSize(156, [('b',), ('c',)], positions)
1167
self.assertTotalBuildSize(133, [('d',)], positions)
1168
self.assertTotalBuildSize(168, [('c',), ('d',)], positions)
1191
1170
def test_get_position(self):
1192
1171
transport = MockTransport([
1193
1172
_KndxIndex.HEADER,
1197
1176
index = self.get_knit_index(transport, "filename", "r")
1199
self.assertEqual(((b"a",), 0, 1), index.get_position((b"a",)))
1200
self.assertEqual(((b"b",), 1, 2), index.get_position((b"b",)))
1178
self.assertEqual((("a",), 0, 1), index.get_position(("a",)))
1179
self.assertEqual((("b",), 1, 2), index.get_position(("b",)))
1202
1181
def test_get_method(self):
1203
1182
transport = MockTransport([
1204
1183
_KndxIndex.HEADER,
1205
b"a fulltext,unknown 0 1 :",
1206
b"b unknown,line-delta 1 2 :",
1184
"a fulltext,unknown 0 1 :",
1185
"b unknown,line-delta 1 2 :",
1209
1188
index = self.get_knit_index(transport, "filename", "r")
1211
self.assertEqual("fulltext", index.get_method(b"a"))
1212
self.assertEqual("line-delta", index.get_method(b"b"))
1213
self.assertRaises(knit.KnitIndexUnknownMethod, index.get_method, b"c")
1190
self.assertEqual("fulltext", index.get_method("a"))
1191
self.assertEqual("line-delta", index.get_method("b"))
1192
self.assertRaises(knit.KnitIndexUnknownMethod, index.get_method, "c")
1215
1194
def test_get_options(self):
1216
1195
transport = MockTransport([
1217
1196
_KndxIndex.HEADER,
1219
b"b opt2,opt3 1 2 :"
1221
1200
index = self.get_knit_index(transport, "filename", "r")
1223
self.assertEqual([b"opt1"], index.get_options(b"a"))
1224
self.assertEqual([b"opt2", b"opt3"], index.get_options(b"b"))
1202
self.assertEqual(["opt1"], index.get_options("a"))
1203
self.assertEqual(["opt2", "opt3"], index.get_options("b"))
1226
1205
def test_get_parent_map(self):
1227
1206
transport = MockTransport([
1228
1207
_KndxIndex.HEADER,
1230
b"b option 1 2 0 .c :",
1231
b"c option 1 2 1 0 .e :"
1209
"b option 1 2 0 .c :",
1210
"c option 1 2 1 0 .e :"
1233
1212
index = self.get_knit_index(transport, "filename", "r")
1235
1214
self.assertEqual({
1237
(b"b",): ((b"a",), (b"c",)),
1238
(b"c",): ((b"b",), (b"a",), (b"e",)),
1216
("b",): (("a",), ("c",)),
1217
("c",): (("b",), ("a",), ("e",)),
1239
1218
}, index.get_parent_map(index.keys()))
1241
1220
def test_impossible_parent(self):
1242
1221
"""Test we get KnitCorrupt if the parent couldn't possibly exist."""
1243
1222
transport = MockTransport([
1244
1223
_KndxIndex.HEADER,
1246
b"b option 0 1 4 :" # We don't have a 4th record
1225
"b option 0 1 4 :" # We don't have a 4th record
1248
1227
index = self.get_knit_index(transport, 'filename', 'r')
1249
1228
self.assertRaises(KnitCorrupt, index.keys)
1296
1275
def test_short_line(self):
1297
1276
transport = MockTransport([
1298
1277
_KndxIndex.HEADER,
1300
b"b option 10 10 0", # This line isn't terminated, ignored
1279
"b option 10 10 0", # This line isn't terminated, ignored
1302
1281
index = self.get_knit_index(transport, "filename", "r")
1303
self.assertEqual({(b'a',)}, index.keys())
1282
self.assertEqual({('a',)}, index.keys())
1305
1284
def test_skip_incomplete_record(self):
1306
1285
# A line with bogus data should just be skipped
1307
1286
transport = MockTransport([
1308
1287
_KndxIndex.HEADER,
1310
b"b option 10 10 0", # This line isn't terminated, ignored
1311
b"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1289
"b option 10 10 0", # This line isn't terminated, ignored
1290
"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1313
1292
index = self.get_knit_index(transport, "filename", "r")
1314
self.assertEqual({(b'a',), (b'c',)}, index.keys())
1293
self.assertEqual({('a',), ('c',)}, index.keys())
1316
1295
def test_trailing_characters(self):
1317
1296
# A line with bogus data should just be skipped
1318
1297
transport = MockTransport([
1319
1298
_KndxIndex.HEADER,
1321
b"b option 10 10 0 :a", # This line has extra trailing characters
1322
b"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1300
"b option 10 10 0 :a", # This line has extra trailing characters
1301
"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1324
1303
index = self.get_knit_index(transport, "filename", "r")
1325
self.assertEqual({(b'a',), (b'c',)}, index.keys())
1304
self.assertEqual({('a',), ('c',)}, index.keys())
1328
1307
class LowLevelKnitIndexTests_c(LowLevelKnitIndexTests):
1330
1309
_test_needs_features = [compiled_knit_feature]
1333
def _load_data(self):
1311
def get_knit_index(self, transport, name, mode):
1312
mapper = ConstantMapper(name)
1334
1313
from ..bzr._knit_load_data_pyx import _load_data_c
1314
self.overrideAttr(knit, '_load_data', _load_data_c)
1315
allow_writes = lambda: mode == 'w'
1316
return _KndxIndex(transport, mapper, lambda:None,
1317
allow_writes, lambda:True)
1338
1320
class Test_KnitAnnotator(TestCaseWithMemoryTransport):
1397
1379
def test__expand_delta_records_blocks(self):
1398
1380
ann = self.make_annotator()
1399
rev_key = (b'rev-id',)
1400
parent_key = (b'parent-id',)
1401
record = [b'0,1,1\n', b'new-line\n']
1381
rev_key = ('rev-id',)
1382
parent_key = ('parent-id',)
1383
record = ['0,1,1\n', 'new-line\n']
1402
1384
details = ('line-delta', True)
1403
1385
ann._num_compression_children[parent_key] = 2
1404
1386
ann._expand_record(parent_key, (), None,
1405
[b'line1\n', b'line2\n', b'line3\n'],
1387
['line1\n', 'line2\n', 'line3\n'],
1406
1388
('fulltext', False))
1407
1389
ann._expand_record(rev_key, (parent_key,), parent_key, record, details)
1408
1390
self.assertEqual({(rev_key, parent_key): [(1, 1, 1), (3, 3, 0)]},
1409
1391
ann._matching_blocks)
1410
rev2_key = (b'rev2-id',)
1411
record = [b'0,1,1\n', b'new-line\n']
1392
rev2_key = ('rev2-id',)
1393
record = ['0,1,1\n', 'new-line\n']
1412
1394
details = ('line-delta', False)
1413
ann._expand_record(rev2_key, (parent_key,),
1414
parent_key, record, details)
1395
ann._expand_record(rev2_key, (parent_key,), parent_key, record, details)
1415
1396
self.assertEqual([(1, 1, 2), (3, 3, 0)],
1416
1397
ann._matching_blocks[(rev2_key, parent_key)])
1418
1399
def test__get_parent_ann_uses_matching_blocks(self):
1419
1400
ann = self.make_annotator()
1420
rev_key = (b'rev-id',)
1421
parent_key = (b'parent-id',)
1422
parent_ann = [(parent_key,)] * 3
1401
rev_key = ('rev-id',)
1402
parent_key = ('parent-id',)
1403
parent_ann = [(parent_key,)]*3
1423
1404
block_key = (rev_key, parent_key)
1424
1405
ann._annotations_cache[parent_key] = parent_ann
1425
1406
ann._matching_blocks[block_key] = [(0, 1, 1), (3, 3, 0)]
1426
1407
# We should not try to access any parent_lines content, because we know
1427
1408
# we already have the matching blocks
1428
1409
par_ann, blocks = ann._get_parent_annotations_and_matches(rev_key,
1429
[b'1\n', b'2\n', b'3\n'], parent_key)
1410
['1\n', '2\n', '3\n'], parent_key)
1430
1411
self.assertEqual(parent_ann, par_ann)
1431
1412
self.assertEqual([(0, 1, 1), (3, 3, 0)], blocks)
1432
1413
self.assertEqual({}, ann._matching_blocks)
1434
1415
def test__process_pending(self):
1435
1416
ann = self.make_annotator()
1436
rev_key = (b'rev-id',)
1437
p1_key = (b'p1-id',)
1438
p2_key = (b'p2-id',)
1439
record = [b'0,1,1\n', b'new-line\n']
1417
rev_key = ('rev-id',)
1420
record = ['0,1,1\n', 'new-line\n']
1440
1421
details = ('line-delta', False)
1441
p1_record = [b'line1\n', b'line2\n']
1422
p1_record = ['line1\n', 'line2\n']
1442
1423
ann._num_compression_children[p1_key] = 1
1443
1424
res = ann._expand_record(rev_key, (p1_key, p2_key), p1_key,
1444
1425
record, details)
1539
1520
"""Adding versions to the index should update the lookup dict"""
1540
1521
knit = self.make_test_knit()
1541
1522
idx = knit._index
1542
idx.add_records([((b'a-1',), [b'fulltext'], ((b'a-1',), 0, 0), [])])
1523
idx.add_records([(('a-1',), ['fulltext'], (('a-1',), 0, 0), [])])
1543
1524
self.check_file_contents('test.kndx',
1544
b'# bzr knit index 8\n'
1546
b'a-1 fulltext 0 0 :'
1525
'# bzr knit index 8\n'
1527
'a-1 fulltext 0 0 :'
1548
1529
idx.add_records([
1549
((b'a-2',), [b'fulltext'], ((b'a-2',), 0, 0), [(b'a-1',)]),
1550
((b'a-3',), [b'fulltext'], ((b'a-3',), 0, 0), [(b'a-2',)]),
1530
(('a-2',), ['fulltext'], (('a-2',), 0, 0), [('a-1',)]),
1531
(('a-3',), ['fulltext'], (('a-3',), 0, 0), [('a-2',)]),
1552
1533
self.check_file_contents('test.kndx',
1553
b'# bzr knit index 8\n'
1555
b'a-1 fulltext 0 0 :\n'
1556
b'a-2 fulltext 0 0 0 :\n'
1557
b'a-3 fulltext 0 0 1 :'
1559
self.assertEqual({(b'a-3',), (b'a-1',), (b'a-2',)}, idx.keys())
1534
'# bzr knit index 8\n'
1536
'a-1 fulltext 0 0 :\n'
1537
'a-2 fulltext 0 0 0 :\n'
1538
'a-3 fulltext 0 0 1 :'
1540
self.assertEqual({('a-3',), ('a-1',), ('a-2',)}, idx.keys())
1560
1541
self.assertEqual({
1561
(b'a-1',): (((b'a-1',), 0, 0), None, (), ('fulltext', False)),
1562
(b'a-2',): (((b'a-2',), 0, 0), None, ((b'a-1',),), ('fulltext', False)),
1563
(b'a-3',): (((b'a-3',), 0, 0), None, ((b'a-2',),), ('fulltext', False)),
1542
('a-1',): ((('a-1',), 0, 0), None, (), ('fulltext', False)),
1543
('a-2',): ((('a-2',), 0, 0), None, (('a-1',),), ('fulltext', False)),
1544
('a-3',): ((('a-3',), 0, 0), None, (('a-2',),), ('fulltext', False)),
1564
1545
}, idx.get_build_details(idx.keys()))
1565
self.assertEqual({(b'a-1',): (),
1566
(b'a-2',): ((b'a-1',),),
1567
(b'a-3',): ((b'a-2',),), },
1568
idx.get_parent_map(idx.keys()))
1546
self.assertEqual({('a-1',): (),
1547
('a-2',): (('a-1',),),
1548
('a-3',): (('a-2',),),},
1549
idx.get_parent_map(idx.keys()))
1570
1551
def test_add_versions_fails_clean(self):
1571
1552
"""If add_versions fails in the middle, it restores a pristine state.
1582
1563
knit = self.make_test_knit()
1583
1564
idx = knit._index
1584
idx.add_records([((b'a-1',), [b'fulltext'], ((b'a-1',), 0, 0), [])])
1565
idx.add_records([(('a-1',), ['fulltext'], (('a-1',), 0, 0), [])])
1586
1567
class StopEarly(Exception):
1589
1570
def generate_failure():
1590
1571
"""Add some entries and then raise an exception"""
1591
yield ((b'a-2',), [b'fulltext'], (None, 0, 0), (b'a-1',))
1592
yield ((b'a-3',), [b'fulltext'], (None, 0, 0), (b'a-2',))
1572
yield (('a-2',), ['fulltext'], (None, 0, 0), ('a-1',))
1573
yield (('a-3',), ['fulltext'], (None, 0, 0), ('a-2',))
1593
1574
raise StopEarly()
1595
1576
# Assert the pre-condition
1596
1577
def assertA1Only():
1597
self.assertEqual({(b'a-1',)}, set(idx.keys()))
1578
self.assertEqual({('a-1',)}, set(idx.keys()))
1598
1579
self.assertEqual(
1599
{(b'a-1',): (((b'a-1',), 0, 0), None, (), ('fulltext', False))},
1600
idx.get_build_details([(b'a-1',)]))
1601
self.assertEqual({(b'a-1',): ()}, idx.get_parent_map(idx.keys()))
1580
{('a-1',): ((('a-1',), 0, 0), None, (), ('fulltext', False))},
1581
idx.get_build_details([('a-1',)]))
1582
self.assertEqual({('a-1',):()}, idx.get_parent_map(idx.keys()))
1604
1585
self.assertRaises(StopEarly, idx.add_records, generate_failure())
1645
1626
# delta compression inn the index
1646
1627
index1 = self.make_g_index('1', 2, [
1647
((b'tip', ), b'N0 100', ([(b'parent', )], [], )),
1648
((b'tail', ), b'', ([], []))])
1628
(('tip', ), 'N0 100', ([('parent', )], [], )),
1629
(('tail', ), '', ([], []))])
1649
1630
index2 = self.make_g_index('2', 2, [
1650
((b'parent', ), b' 100 78',
1651
([(b'tail', ), (b'ghost', )], [(b'tail', )])),
1652
((b'separate', ), b'', ([], []))])
1631
(('parent', ), ' 100 78', ([('tail', ), ('ghost', )], [('tail', )])),
1632
(('separate', ), '', ([], []))])
1654
1634
# just blob location and graph in the index.
1655
1635
index1 = self.make_g_index('1', 1, [
1656
((b'tip', ), b'N0 100', ([(b'parent', )], )),
1657
((b'tail', ), b'', ([], ))])
1636
(('tip', ), 'N0 100', ([('parent', )], )),
1637
(('tail', ), '', ([], ))])
1658
1638
index2 = self.make_g_index('2', 1, [
1659
((b'parent', ), b' 100 78', ([(b'tail', ), (b'ghost', )], )),
1660
((b'separate', ), b'', ([], ))])
1639
(('parent', ), ' 100 78', ([('tail', ), ('ghost', )], )),
1640
(('separate', ), '', ([], ))])
1661
1641
combined_index = CombinedGraphIndex([index1, index2])
1663
1643
self.combined_index = combined_index
1665
1645
add_callback = self.catch_add
1667
1647
add_callback = None
1668
return _KnitGraphIndex(combined_index, lambda: True, deltas=deltas,
1669
add_callback=add_callback)
1648
return _KnitGraphIndex(combined_index, lambda:True, deltas=deltas,
1649
add_callback=add_callback)
1671
1651
def test_keys(self):
1672
1652
index = self.two_graph_index()
1673
self.assertEqual({(b'tail',), (b'tip',), (b'parent',), (b'separate',)},
1653
self.assertEqual({('tail',), ('tip',), ('parent',), ('separate',)},
1676
1656
def test_get_position(self):
1677
1657
index = self.two_graph_index()
1679
(index._graph_index._indices[0], 0, 100), index.get_position((b'tip',)))
1681
(index._graph_index._indices[1], 100, 78), index.get_position((b'parent',)))
1658
self.assertEqual((index._graph_index._indices[0], 0, 100), index.get_position(('tip',)))
1659
self.assertEqual((index._graph_index._indices[1], 100, 78), index.get_position(('parent',)))
1683
1661
def test_get_method_deltas(self):
1684
1662
index = self.two_graph_index(deltas=True)
1685
self.assertEqual('fulltext', index.get_method((b'tip',)))
1686
self.assertEqual('line-delta', index.get_method((b'parent',)))
1663
self.assertEqual('fulltext', index.get_method(('tip',)))
1664
self.assertEqual('line-delta', index.get_method(('parent',)))
1688
1666
def test_get_method_no_deltas(self):
1689
1667
# check that the parent-history lookup is ignored with deltas=False.
1690
1668
index = self.two_graph_index(deltas=False)
1691
self.assertEqual('fulltext', index.get_method((b'tip',)))
1692
self.assertEqual('fulltext', index.get_method((b'parent',)))
1669
self.assertEqual('fulltext', index.get_method(('tip',)))
1670
self.assertEqual('fulltext', index.get_method(('parent',)))
1694
1672
def test_get_options_deltas(self):
1695
1673
index = self.two_graph_index(deltas=True)
1696
self.assertEqual([b'fulltext', b'no-eol'],
1697
index.get_options((b'tip',)))
1698
self.assertEqual([b'line-delta'], index.get_options((b'parent',)))
1674
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1675
self.assertEqual(['line-delta'], index.get_options(('parent',)))
1700
1677
def test_get_options_no_deltas(self):
1701
1678
# check that the parent-history lookup is ignored with deltas=False.
1702
1679
index = self.two_graph_index(deltas=False)
1703
self.assertEqual([b'fulltext', b'no-eol'],
1704
index.get_options((b'tip',)))
1705
self.assertEqual([b'fulltext'], index.get_options((b'parent',)))
1680
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1681
self.assertEqual(['fulltext'], index.get_options(('parent',)))
1707
1683
def test_get_parent_map(self):
1708
1684
index = self.two_graph_index()
1709
self.assertEqual({(b'parent',): ((b'tail',), (b'ghost',))},
1710
index.get_parent_map([(b'parent',), (b'ghost',)]))
1685
self.assertEqual({('parent',):(('tail',), ('ghost',))},
1686
index.get_parent_map([('parent',), ('ghost',)]))
1712
1688
def catch_add(self, entries):
1713
1689
self.caught_entries.append(entries)
1715
1691
def test_add_no_callback_errors(self):
1716
1692
index = self.two_graph_index()
1717
1693
self.assertRaises(errors.ReadOnlyError, index.add_records,
1718
[((b'new',), b'fulltext,no-eol', (None, 50, 60), [b'separate'])])
1694
[(('new',), 'fulltext,no-eol', (None, 50, 60), ['separate'])])
1720
1696
def test_add_version_smoke(self):
1721
1697
index = self.two_graph_index(catch_adds=True)
1722
index.add_records([((b'new',), b'fulltext,no-eol', (None, 50, 60),
1724
self.assertEqual([[((b'new', ), b'N50 60', (((b'separate',),),))]],
1725
self.caught_entries)
1698
index.add_records([(('new',), 'fulltext,no-eol', (None, 50, 60),
1700
self.assertEqual([[(('new', ), 'N50 60', ((('separate',),),))]],
1701
self.caught_entries)
1727
1703
def test_add_version_delta_not_delta_index(self):
1728
1704
index = self.two_graph_index(catch_adds=True)
1729
1705
self.assertRaises(KnitCorrupt, index.add_records,
1730
[((b'new',), b'no-eol,line-delta', (None, 0, 100), [(b'parent',)])])
1706
[(('new',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
1731
1707
self.assertEqual([], self.caught_entries)
1733
1709
def test_add_version_same_dup(self):
1734
1710
index = self.two_graph_index(catch_adds=True)
1735
1711
# options can be spelt two different ways
1737
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [(b'parent',)])])
1739
[((b'tip',), b'no-eol,fulltext', (None, 0, 100), [(b'parent',)])])
1712
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
1713
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100), [('parent',)])])
1740
1714
# position/length are ignored (because each pack could have fulltext or
1741
1715
# delta, and be at a different position.
1742
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 50, 100),
1744
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 0, 1000),
1716
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100),
1718
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000),
1746
1720
# but neither should have added data:
1747
1721
self.assertEqual([[], [], [], []], self.caught_entries)
1750
1724
index = self.two_graph_index(deltas=True, catch_adds=True)
1751
1725
# change options
1752
1726
self.assertRaises(KnitCorrupt, index.add_records,
1753
[((b'tip',), b'line-delta', (None, 0, 100), [(b'parent',)])])
1727
[(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
1754
1728
self.assertRaises(KnitCorrupt, index.add_records,
1755
[((b'tip',), b'fulltext', (None, 0, 100), [(b'parent',)])])
1729
[(('tip',), 'fulltext', (None, 0, 100), [('parent',)])])
1757
1731
self.assertRaises(KnitCorrupt, index.add_records,
1758
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [])])
1732
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1759
1733
self.assertEqual([], self.caught_entries)
1761
1735
def test_add_versions_nodeltas(self):
1762
1736
index = self.two_graph_index(catch_adds=True)
1763
1737
index.add_records([
1764
((b'new',), b'fulltext,no-eol', (None, 50, 60), [(b'separate',)]),
1765
((b'new2',), b'fulltext', (None, 0, 6), [(b'new',)]),
1767
self.assertEqual([((b'new', ), b'N50 60', (((b'separate',),),)),
1768
((b'new2', ), b' 0 6', (((b'new',),),))],
1769
sorted(self.caught_entries[0]))
1738
(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)]),
1739
(('new2',), 'fulltext', (None, 0, 6), [('new',)]),
1741
self.assertEqual([(('new', ), 'N50 60', ((('separate',),),)),
1742
(('new2', ), ' 0 6', ((('new',),),))],
1743
sorted(self.caught_entries[0]))
1770
1744
self.assertEqual(1, len(self.caught_entries))
1772
1746
def test_add_versions_deltas(self):
1773
1747
index = self.two_graph_index(deltas=True, catch_adds=True)
1774
1748
index.add_records([
1775
((b'new',), b'fulltext,no-eol', (None, 50, 60), [(b'separate',)]),
1776
((b'new2',), b'line-delta', (None, 0, 6), [(b'new',)]),
1778
self.assertEqual([((b'new', ), b'N50 60', (((b'separate',),), ())),
1779
((b'new2', ), b' 0 6', (((b'new',),), ((b'new',),), ))],
1780
sorted(self.caught_entries[0]))
1749
(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)]),
1750
(('new2',), 'line-delta', (None, 0, 6), [('new',)]),
1752
self.assertEqual([(('new', ), 'N50 60', ((('separate',),), ())),
1753
(('new2', ), ' 0 6', ((('new',),), (('new',),), ))],
1754
sorted(self.caught_entries[0]))
1781
1755
self.assertEqual(1, len(self.caught_entries))
1783
1757
def test_add_versions_delta_not_delta_index(self):
1784
1758
index = self.two_graph_index(catch_adds=True)
1785
1759
self.assertRaises(KnitCorrupt, index.add_records,
1786
[((b'new',), b'no-eol,line-delta', (None, 0, 100), [(b'parent',)])])
1760
[(('new',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
1787
1761
self.assertEqual([], self.caught_entries)
1789
1763
def test_add_versions_random_id_accepted(self):
1810
1784
index = self.two_graph_index(deltas=True, catch_adds=True)
1811
1785
# change options
1812
1786
self.assertRaises(KnitCorrupt, index.add_records,
1813
[((b'tip',), b'line-delta', (None, 0, 100), [(b'parent',)])])
1787
[(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
1814
1788
self.assertRaises(KnitCorrupt, index.add_records,
1815
[((b'tip',), b'fulltext', (None, 0, 100), [(b'parent',)])])
1789
[(('tip',), 'fulltext', (None, 0, 100), [('parent',)])])
1817
1791
self.assertRaises(KnitCorrupt, index.add_records,
1818
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [])])
1792
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1819
1793
# change options in the second record
1820
1794
self.assertRaises(KnitCorrupt, index.add_records,
1821
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [(b'parent',)]),
1822
((b'tip',), b'line-delta', (None, 0, 100), [(b'parent',)])])
1795
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)]),
1796
(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
1823
1797
self.assertEqual([], self.caught_entries)
1825
1799
def make_g_index_missing_compression_parent(self):
1826
1800
graph_index = self.make_g_index('missing_comp', 2,
1827
[((b'tip', ), b' 100 78',
1828
([(b'missing-parent', ), (b'ghost', )], [(b'missing-parent', )]))])
1801
[(('tip', ), ' 100 78',
1802
([('missing-parent', ), ('ghost', )], [('missing-parent', )]))])
1829
1803
return graph_index
1831
1805
def make_g_index_missing_parent(self):
1832
1806
graph_index = self.make_g_index('missing_parent', 2,
1833
[((b'parent', ), b' 100 78', ([], [])),
1834
((b'tip', ), b' 100 78',
1835
([(b'parent', ), (b'missing-parent', )], [(b'parent', )])),
1807
[(('parent', ), ' 100 78', ([], [])),
1808
(('tip', ), ' 100 78',
1809
([('parent', ), ('missing-parent', )], [('parent', )])),
1837
1811
return graph_index
1839
1813
def make_g_index_no_external_refs(self):
1840
1814
graph_index = self.make_g_index('no_external_refs', 2,
1841
[((b'rev', ), b' 100 78',
1842
([(b'parent', ), (b'ghost', )], []))])
1815
[(('rev', ), ' 100 78',
1816
([('parent', ), ('ghost', )], []))])
1843
1817
return graph_index
1845
1819
def test_add_good_unvalidated_index(self):
1858
1832
# examined, otherwise 'ghost' would also be reported as a missing
1860
1834
self.assertEqual(
1861
frozenset([(b'missing-parent',)]),
1835
frozenset([('missing-parent',)]),
1862
1836
index.get_missing_compression_parents())
1864
1838
def test_add_missing_noncompression_parent_unvalidated_index(self):
1865
1839
unvalidated = self.make_g_index_missing_parent()
1866
1840
combined = CombinedGraphIndex([unvalidated])
1867
1841
index = _KnitGraphIndex(combined, lambda: True, deltas=True,
1868
track_external_parent_refs=True)
1842
track_external_parent_refs=True)
1869
1843
index.scan_unvalidated_index(unvalidated)
1870
1844
self.assertEqual(
1871
frozenset([(b'missing-parent',)]), index.get_missing_parents())
1845
frozenset([('missing-parent',)]), index.get_missing_parents())
1873
1847
def test_track_external_parent_refs(self):
1874
1848
g_index = self.make_g_index('empty', 2, [])
1875
1849
combined = CombinedGraphIndex([g_index])
1876
1850
index = _KnitGraphIndex(combined, lambda: True, deltas=True,
1877
add_callback=self.catch_add, track_external_parent_refs=True)
1851
add_callback=self.catch_add, track_external_parent_refs=True)
1878
1852
self.caught_entries = []
1879
1853
index.add_records([
1880
((b'new-key',), b'fulltext,no-eol', (None, 50, 60),
1881
[(b'parent-1',), (b'parent-2',)])])
1854
(('new-key',), 'fulltext,no-eol', (None, 50, 60),
1855
[('parent-1',), ('parent-2',)])])
1882
1856
self.assertEqual(
1883
frozenset([(b'parent-1',), (b'parent-2',)]),
1857
frozenset([('parent-1',), ('parent-2',)]),
1884
1858
index.get_missing_parents())
1886
1860
def test_add_unvalidated_index_with_present_external_references(self):
1908
1882
index.scan_unvalidated_index(g_index_1)
1909
1883
index.scan_unvalidated_index(g_index_2)
1910
1884
self.assertEqual(
1911
frozenset([(b'one-missing-parent',), (b'two-missing-parent',)]),
1885
frozenset([('one-missing-parent',), ('two-missing-parent',)]),
1912
1886
index.get_missing_compression_parents())
1914
1888
def test_add_mulitiple_unvalidated_indices_with_mutual_dependencies(self):
1915
1889
graph_index_a = self.make_g_index('one', 2,
1916
[((b'parent-one', ), b' 100 78', ([(b'non-compression-parent',)], [])),
1917
((b'child-of-two', ), b' 100 78',
1918
([(b'parent-two',)], [(b'parent-two',)]))])
1890
[(('parent-one', ), ' 100 78', ([('non-compression-parent',)], [])),
1891
(('child-of-two', ), ' 100 78',
1892
([('parent-two',)], [('parent-two',)]))])
1919
1893
graph_index_b = self.make_g_index('two', 2,
1920
[((b'parent-two', ), b' 100 78', ([(b'non-compression-parent',)], [])),
1921
((b'child-of-one', ), b' 100 78',
1922
([(b'parent-one',)], [(b'parent-one',)]))])
1894
[(('parent-two', ), ' 100 78', ([('non-compression-parent',)], [])),
1895
(('child-of-one', ), ' 100 78',
1896
([('parent-one',)], [('parent-one',)]))])
1923
1897
combined = CombinedGraphIndex([graph_index_a, graph_index_b])
1924
1898
index = _KnitGraphIndex(combined, lambda: True, deltas=True)
1925
1899
index.scan_unvalidated_index(graph_index_a)
1973
1947
add_callback = self.catch_add
1975
1949
add_callback = None
1976
return _KnitGraphIndex(combined_index, lambda: True, parents=False,
1977
add_callback=add_callback)
1950
return _KnitGraphIndex(combined_index, lambda:True, parents=False,
1951
add_callback=add_callback)
1979
1953
def test_keys(self):
1980
1954
index = self.two_graph_index()
1981
self.assertEqual({(b'tail',), (b'tip',), (b'parent',), (b'separate',)},
1955
self.assertEqual({('tail',), ('tip',), ('parent',), ('separate',)},
1984
1958
def test_get_position(self):
1985
1959
index = self.two_graph_index()
1986
1960
self.assertEqual((index._graph_index._indices[0], 0, 100),
1987
index.get_position((b'tip',)))
1961
index.get_position(('tip',)))
1988
1962
self.assertEqual((index._graph_index._indices[1], 100, 78),
1989
index.get_position((b'parent',)))
1963
index.get_position(('parent',)))
1991
1965
def test_get_method(self):
1992
1966
index = self.two_graph_index()
1993
self.assertEqual('fulltext', index.get_method((b'tip',)))
1994
self.assertEqual([b'fulltext'], index.get_options((b'parent',)))
1967
self.assertEqual('fulltext', index.get_method(('tip',)))
1968
self.assertEqual(['fulltext'], index.get_options(('parent',)))
1996
1970
def test_get_options(self):
1997
1971
index = self.two_graph_index()
1998
self.assertEqual([b'fulltext', b'no-eol'],
1999
index.get_options((b'tip',)))
2000
self.assertEqual([b'fulltext'], index.get_options((b'parent',)))
1972
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1973
self.assertEqual(['fulltext'], index.get_options(('parent',)))
2002
1975
def test_get_parent_map(self):
2003
1976
index = self.two_graph_index()
2004
self.assertEqual({(b'parent',): None},
2005
index.get_parent_map([(b'parent',), (b'ghost',)]))
1977
self.assertEqual({('parent',):None},
1978
index.get_parent_map([('parent',), ('ghost',)]))
2007
1980
def catch_add(self, entries):
2008
1981
self.caught_entries.append(entries)
2010
1983
def test_add_no_callback_errors(self):
2011
1984
index = self.two_graph_index()
2012
1985
self.assertRaises(errors.ReadOnlyError, index.add_records,
2013
[((b'new',), b'fulltext,no-eol', (None, 50, 60), [(b'separate',)])])
1986
[(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)])])
2015
1988
def test_add_version_smoke(self):
2016
1989
index = self.two_graph_index(catch_adds=True)
2018
[((b'new',), b'fulltext,no-eol', (None, 50, 60), [])])
2019
self.assertEqual([[((b'new', ), b'N50 60')]],
2020
self.caught_entries)
1990
index.add_records([(('new',), 'fulltext,no-eol', (None, 50, 60), [])])
1991
self.assertEqual([[(('new', ), 'N50 60')]],
1992
self.caught_entries)
2022
1994
def test_add_version_delta_not_delta_index(self):
2023
1995
index = self.two_graph_index(catch_adds=True)
2024
1996
self.assertRaises(KnitCorrupt, index.add_records,
2025
[((b'new',), b'no-eol,line-delta', (None, 0, 100), [])])
1997
[(('new',), 'no-eol,line-delta', (None, 0, 100), [])])
2026
1998
self.assertEqual([], self.caught_entries)
2028
2000
def test_add_version_same_dup(self):
2029
2001
index = self.two_graph_index(catch_adds=True)
2030
2002
# options can be spelt two different ways
2032
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [])])
2034
[((b'tip',), b'no-eol,fulltext', (None, 0, 100), [])])
2003
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
2004
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100), [])])
2035
2005
# position/length are ignored (because each pack could have fulltext or
2036
2006
# delta, and be at a different position.
2038
[((b'tip',), b'fulltext,no-eol', (None, 50, 100), [])])
2040
[((b'tip',), b'fulltext,no-eol', (None, 0, 1000), [])])
2007
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100), [])])
2008
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000), [])])
2041
2009
# but neither should have added data.
2042
2010
self.assertEqual([[], [], [], []], self.caught_entries)
2045
2013
index = self.two_graph_index(catch_adds=True)
2046
2014
# change options
2047
2015
self.assertRaises(KnitCorrupt, index.add_records,
2048
[((b'tip',), b'no-eol,line-delta', (None, 0, 100), [])])
2049
self.assertRaises(KnitCorrupt, index.add_records,
2050
[((b'tip',), b'line-delta,no-eol', (None, 0, 100), [])])
2051
self.assertRaises(KnitCorrupt, index.add_records,
2052
[((b'tip',), b'fulltext', (None, 0, 100), [])])
2016
[(('tip',), 'no-eol,line-delta', (None, 0, 100), [])])
2017
self.assertRaises(KnitCorrupt, index.add_records,
2018
[(('tip',), 'line-delta,no-eol', (None, 0, 100), [])])
2019
self.assertRaises(KnitCorrupt, index.add_records,
2020
[(('tip',), 'fulltext', (None, 0, 100), [])])
2054
2022
self.assertRaises(KnitCorrupt, index.add_records,
2055
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [(b'parent',)])])
2023
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
2056
2024
self.assertEqual([], self.caught_entries)
2058
2026
def test_add_versions(self):
2059
2027
index = self.two_graph_index(catch_adds=True)
2060
2028
index.add_records([
2061
((b'new',), b'fulltext,no-eol', (None, 50, 60), []),
2062
((b'new2',), b'fulltext', (None, 0, 6), []),
2064
self.assertEqual([((b'new', ), b'N50 60'), ((b'new2', ), b' 0 6')],
2065
sorted(self.caught_entries[0]))
2029
(('new',), 'fulltext,no-eol', (None, 50, 60), []),
2030
(('new2',), 'fulltext', (None, 0, 6), []),
2032
self.assertEqual([(('new', ), 'N50 60'), (('new2', ), ' 0 6')],
2033
sorted(self.caught_entries[0]))
2066
2034
self.assertEqual(1, len(self.caught_entries))
2068
2036
def test_add_versions_delta_not_delta_index(self):
2069
2037
index = self.two_graph_index(catch_adds=True)
2070
2038
self.assertRaises(KnitCorrupt, index.add_records,
2071
[((b'new',), b'no-eol,line-delta', (None, 0, 100), [(b'parent',)])])
2039
[(('new',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
2072
2040
self.assertEqual([], self.caught_entries)
2074
2042
def test_add_versions_parents_not_parents_index(self):
2075
2043
index = self.two_graph_index(catch_adds=True)
2076
2044
self.assertRaises(KnitCorrupt, index.add_records,
2077
[((b'new',), b'no-eol,fulltext', (None, 0, 100), [(b'parent',)])])
2045
[(('new',), 'no-eol,fulltext', (None, 0, 100), [('parent',)])])
2078
2046
self.assertEqual([], self.caught_entries)
2080
2048
def test_add_versions_random_id_accepted(self):
2101
2065
index = self.two_graph_index(catch_adds=True)
2102
2066
# change options
2103
2067
self.assertRaises(KnitCorrupt, index.add_records,
2104
[((b'tip',), b'no-eol,line-delta', (None, 0, 100), [])])
2105
self.assertRaises(KnitCorrupt, index.add_records,
2106
[((b'tip',), b'line-delta,no-eol', (None, 0, 100), [])])
2107
self.assertRaises(KnitCorrupt, index.add_records,
2108
[((b'tip',), b'fulltext', (None, 0, 100), [])])
2068
[(('tip',), 'no-eol,line-delta', (None, 0, 100), [])])
2069
self.assertRaises(KnitCorrupt, index.add_records,
2070
[(('tip',), 'line-delta,no-eol', (None, 0, 100), [])])
2071
self.assertRaises(KnitCorrupt, index.add_records,
2072
[(('tip',), 'fulltext', (None, 0, 100), [])])
2110
2074
self.assertRaises(KnitCorrupt, index.add_records,
2111
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [(b'parent',)])])
2075
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
2112
2076
# change options in the second record
2113
2077
self.assertRaises(KnitCorrupt, index.add_records,
2114
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), []),
2115
((b'tip',), b'no-eol,line-delta', (None, 0, 100), [])])
2078
[(('tip',), 'fulltext,no-eol', (None, 0, 100), []),
2079
(('tip',), 'no-eol,line-delta', (None, 0, 100), [])])
2116
2080
self.assertEqual([], self.caught_entries)
2174
2138
_min_buffer_size=125)
2176
2140
def test__split_by_prefix(self):
2177
self.assertSplitByPrefix({b'f': [(b'f', b'a'), (b'f', b'b')],
2178
b'g': [(b'g', b'b'), (b'g', b'a')],
2180
[(b'f', b'a'), (b'g', b'b'),
2181
(b'g', b'a'), (b'f', b'b')])
2183
self.assertSplitByPrefix({b'f': [(b'f', b'a'), (b'f', b'b')],
2184
b'g': [(b'g', b'b'), (b'g', b'a')],
2186
[(b'f', b'a'), (b'f', b'b'),
2187
(b'g', b'b'), (b'g', b'a')])
2189
self.assertSplitByPrefix({b'f': [(b'f', b'a'), (b'f', b'b')],
2190
b'g': [(b'g', b'b'), (b'g', b'a')],
2192
[(b'f', b'a'), (b'f', b'b'),
2193
(b'g', b'b'), (b'g', b'a')])
2195
self.assertSplitByPrefix({b'f': [(b'f', b'a'), (b'f', b'b')],
2196
b'g': [(b'g', b'b'), (b'g', b'a')],
2197
b'': [(b'a',), (b'b',)]
2198
}, [b'f', b'g', b''],
2199
[(b'f', b'a'), (b'g', b'b'),
2201
(b'g', b'a'), (b'f', b'b')])
2141
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
2142
'g': [('g', 'b'), ('g', 'a')],
2144
[('f', 'a'), ('g', 'b'),
2145
('g', 'a'), ('f', 'b')])
2147
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
2148
'g': [('g', 'b'), ('g', 'a')],
2150
[('f', 'a'), ('f', 'b'),
2151
('g', 'b'), ('g', 'a')])
2153
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
2154
'g': [('g', 'b'), ('g', 'a')],
2156
[('f', 'a'), ('f', 'b'),
2157
('g', 'b'), ('g', 'a')])
2159
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
2160
'g': [('g', 'b'), ('g', 'a')],
2161
'': [('a',), ('b',)]
2163
[('f', 'a'), ('g', 'b'),
2165
('g', 'a'), ('f', 'b')])
2204
2168
class TestStacking(KnitTests):
2220
2184
def test_add_lines(self):
2221
2185
# lines added to the test are not added to the basis
2222
2186
basis, test = self.get_basis_and_test_knit()
2224
key_basis = (b'bar',)
2225
key_cross_border = (b'quux',)
2226
key_delta = (b'zaphod',)
2227
test.add_lines(key, (), [b'foo\n'])
2188
key_basis = ('bar',)
2189
key_cross_border = ('quux',)
2190
key_delta = ('zaphod',)
2191
test.add_lines(key, (), ['foo\n'])
2228
2192
self.assertEqual({}, basis.get_parent_map([key]))
2229
2193
# lines added to the test that reference across the stack do a
2231
basis.add_lines(key_basis, (), [b'foo\n'])
2195
basis.add_lines(key_basis, (), ['foo\n'])
2232
2196
basis.calls = []
2233
test.add_lines(key_cross_border, (key_basis,), [b'foo\n'])
2197
test.add_lines(key_cross_border, (key_basis,), ['foo\n'])
2234
2198
self.assertEqual('fulltext', test._index.get_method(key_cross_border))
2235
2199
# we don't even need to look at the basis to see that this should be
2236
2200
# stored as a fulltext
2237
2201
self.assertEqual([], basis.calls)
2238
2202
# Subsequent adds do delta.
2239
2203
basis.calls = []
2240
test.add_lines(key_delta, (key_cross_border,), [b'foo\n'])
2204
test.add_lines(key_delta, (key_cross_border,), ['foo\n'])
2241
2205
self.assertEqual('line-delta', test._index.get_method(key_delta))
2242
2206
self.assertEqual([], basis.calls)
2244
2208
def test_annotate(self):
2245
2209
# annotations from the test knit are answered without asking the basis
2246
2210
basis, test = self.get_basis_and_test_knit()
2248
key_basis = (b'bar',)
2249
test.add_lines(key, (), [b'foo\n'])
2212
key_basis = ('bar',)
2213
key_missing = ('missing',)
2214
test.add_lines(key, (), ['foo\n'])
2250
2215
details = test.annotate(key)
2251
self.assertEqual([(key, b'foo\n')], details)
2216
self.assertEqual([(key, 'foo\n')], details)
2252
2217
self.assertEqual([], basis.calls)
2253
2218
# But texts that are not in the test knit are looked for in the basis
2255
basis.add_lines(key_basis, (), [b'foo\n', b'bar\n'])
2220
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2256
2221
basis.calls = []
2257
2222
details = test.annotate(key_basis)
2259
[(key_basis, b'foo\n'), (key_basis, b'bar\n')], details)
2223
self.assertEqual([(key_basis, 'foo\n'), (key_basis, 'bar\n')], details)
2260
2224
# Not optimised to date:
2261
2225
# self.assertEqual([("annotate", key_basis)], basis.calls)
2262
2226
self.assertEqual([('get_parent_map', {key_basis}),
2263
('get_parent_map', {key_basis}),
2264
('get_record_stream', [key_basis], 'topological', True)],
2227
('get_parent_map', {key_basis}),
2228
('get_record_stream', [key_basis], 'topological', True)],
2267
2231
def test_check(self):
2268
2232
# At the moment checking a stacked knit does implicitly check the
2371
2335
self.assertEqual(record.get_bytes_as('fulltext'), result[3])
2372
2336
# It's not strictly minimal, but it seems reasonable for now for it to
2373
2337
# ask which fallbacks have which parents.
2374
self.assertEqual(2, len(calls))
2376
2339
("get_parent_map", {key_basis, key_basis_2, key_missing}),
2378
# topological is requested from the fallback, because that is what
2379
# was requested at the top level.
2382
("get_record_stream", [key_basis_2,
2383
key_basis], 'topological', True),
2384
("get_record_stream", [key_basis, key_basis_2], 'topological', True)])
2340
# topological is requested from the fallback, because that is what
2341
# was requested at the top level.
2342
("get_record_stream", [key_basis_2, key_basis], 'topological', True)],
2386
2345
def test_get_record_stream_unordered_deltas(self):
2387
2346
# records from the test knit are answered without asking the basis:
2388
2347
basis, test = self.get_basis_and_test_knit()
2390
key_basis = (b'bar',)
2391
key_missing = (b'missing',)
2392
test.add_lines(key, (), [b'foo\n'])
2349
key_basis = ('bar',)
2350
key_missing = ('missing',)
2351
test.add_lines(key, (), ['foo\n'])
2393
2352
records = list(test.get_record_stream([key], 'unordered', False))
2394
2353
self.assertEqual(1, len(records))
2395
2354
self.assertEqual([], basis.calls)
2396
2355
# Missing (from test knit) objects are retrieved from the basis:
2397
basis.add_lines(key_basis, (), [b'foo\n', b'bar\n'])
2356
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2398
2357
basis.calls = []
2399
2358
records = list(test.get_record_stream([key_basis, key_missing],
2400
'unordered', False))
2359
'unordered', False))
2401
2360
self.assertEqual(2, len(records))
2402
2361
calls = list(basis.calls)
2403
2362
for record in records:
2469
2427
def test_get_sha1s(self):
2470
2428
# sha1's in the test knit are answered without asking the basis
2471
2429
basis, test = self.get_basis_and_test_knit()
2473
key_basis = (b'bar',)
2474
key_missing = (b'missing',)
2475
test.add_lines(key, (), [b'foo\n'])
2476
key_sha1sum = osutils.sha_string(b'foo\n')
2431
key_basis = ('bar',)
2432
key_missing = ('missing',)
2433
test.add_lines(key, (), ['foo\n'])
2434
key_sha1sum = osutils.sha_string('foo\n')
2477
2435
sha1s = test.get_sha1s([key])
2478
2436
self.assertEqual({key: key_sha1sum}, sha1s)
2479
2437
self.assertEqual([], basis.calls)
2480
2438
# But texts that are not in the test knit are looked for in the basis
2481
2439
# directly (rather than via text reconstruction) so that remote servers
2482
2440
# etc don't have to answer with full content.
2483
basis.add_lines(key_basis, (), [b'foo\n', b'bar\n'])
2484
basis_sha1sum = osutils.sha_string(b'foo\nbar\n')
2441
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2442
basis_sha1sum = osutils.sha_string('foo\nbar\n')
2485
2443
basis.calls = []
2486
2444
sha1s = test.get_sha1s([key, key_missing, key_basis])
2487
2445
self.assertEqual({key: key_sha1sum,
2488
key_basis: basis_sha1sum}, sha1s)
2446
key_basis: basis_sha1sum}, sha1s)
2489
2447
self.assertEqual([("get_sha1s", {key_basis, key_missing})],
2492
2450
def test_insert_record_stream(self):
2493
2451
# records are inserted as normal; insert_record_stream builds on
2494
2452
# add_lines, so a smoke test should be all that's needed:
2495
key_basis = (b'bar',)
2496
key_delta = (b'zaphod',)
2454
key_basis = ('bar',)
2455
key_delta = ('zaphod',)
2497
2456
basis, test = self.get_basis_and_test_knit()
2498
2457
source = self.make_test_knit(name='source')
2499
basis.add_lines(key_basis, (), [b'foo\n'])
2458
basis.add_lines(key_basis, (), ['foo\n'])
2500
2459
basis.calls = []
2501
source.add_lines(key_basis, (), [b'foo\n'])
2502
source.add_lines(key_delta, (key_basis,), [b'bar\n'])
2460
source.add_lines(key_basis, (), ['foo\n'])
2461
source.add_lines(key_delta, (key_basis,), ['bar\n'])
2503
2462
stream = source.get_record_stream([key_delta], 'unordered', False)
2504
2463
test.insert_record_stream(stream)
2505
2464
# XXX: this does somewhat too many calls in making sure of whether it
2506
2465
# has to recreate the full text.
2507
2466
self.assertEqual([("get_parent_map", {key_basis}),
2508
('get_parent_map', {key_basis}),
2509
('get_record_stream', [key_basis], 'unordered', True)],
2511
self.assertEqual({key_delta: (key_basis,)},
2512
test.get_parent_map([key_delta]))
2513
self.assertEqual(b'bar\n', next(test.get_record_stream([key_delta],
2514
'unordered', True)).get_bytes_as('fulltext'))
2467
('get_parent_map', {key_basis}),
2468
('get_record_stream', [key_basis], 'unordered', True)],
2470
self.assertEqual({key_delta:(key_basis,)},
2471
test.get_parent_map([key_delta]))
2472
self.assertEqual('bar\n', test.get_record_stream([key_delta],
2473
'unordered', True).next().get_bytes_as('fulltext'))
2516
2475
def test_iter_lines_added_or_present_in_keys(self):
2517
2476
# Lines from the basis are returned, and lines for a given key are only
2518
2477
# returned once.
2521
2480
# all sources are asked for keys:
2522
2481
basis, test = self.get_basis_and_test_knit()
2523
basis.add_lines(key1, (), [b"foo"])
2482
basis.add_lines(key1, (), ["foo"])
2524
2483
basis.calls = []
2525
2484
lines = list(test.iter_lines_added_or_present_in_keys([key1]))
2526
self.assertEqual([(b"foo\n", key1)], lines)
2485
self.assertEqual([("foo\n", key1)], lines)
2527
2486
self.assertEqual([("iter_lines_added_or_present_in_keys", {key1})],
2529
2488
# keys in both are not duplicated:
2530
test.add_lines(key2, (), [b"bar\n"])
2531
basis.add_lines(key2, (), [b"bar\n"])
2489
test.add_lines(key2, (), ["bar\n"])
2490
basis.add_lines(key2, (), ["bar\n"])
2532
2491
basis.calls = []
2533
2492
lines = list(test.iter_lines_added_or_present_in_keys([key2]))
2534
self.assertEqual([(b"bar\n", key2)], lines)
2493
self.assertEqual([("bar\n", key2)], lines)
2535
2494
self.assertEqual([], basis.calls)
2537
2496
def test_keys(self):
2540
2499
# all sources are asked for keys:
2541
2500
basis, test = self.get_basis_and_test_knit()
2542
2501
keys = test.keys()
2560
2519
def test_add_mpdiffs(self):
2561
2520
# records are inserted as normal; add_mpdiff builds on
2562
2521
# add_lines, so a smoke test should be all that's needed:
2563
key_basis = (b'bar',)
2564
key_delta = (b'zaphod',)
2523
key_basis = ('bar',)
2524
key_delta = ('zaphod',)
2565
2525
basis, test = self.get_basis_and_test_knit()
2566
2526
source = self.make_test_knit(name='source')
2567
basis.add_lines(key_basis, (), [b'foo\n'])
2527
basis.add_lines(key_basis, (), ['foo\n'])
2568
2528
basis.calls = []
2569
source.add_lines(key_basis, (), [b'foo\n'])
2570
source.add_lines(key_delta, (key_basis,), [b'bar\n'])
2529
source.add_lines(key_basis, (), ['foo\n'])
2530
source.add_lines(key_delta, (key_basis,), ['bar\n'])
2571
2531
diffs = source.make_mpdiffs([key_delta])
2572
2532
test.add_mpdiffs([(key_delta, (key_basis,),
2573
source.get_sha1s([key_delta])[key_delta], diffs[0])])
2533
source.get_sha1s([key_delta])[key_delta], diffs[0])])
2574
2534
self.assertEqual([("get_parent_map", {key_basis}),
2575
('get_record_stream', [key_basis], 'unordered', True), ],
2577
self.assertEqual({key_delta: (key_basis,)},
2578
test.get_parent_map([key_delta]))
2579
self.assertEqual(b'bar\n', next(test.get_record_stream([key_delta],
2580
'unordered', True)).get_bytes_as('fulltext'))
2535
('get_record_stream', [key_basis], 'unordered', True),],
2537
self.assertEqual({key_delta:(key_basis,)},
2538
test.get_parent_map([key_delta]))
2539
self.assertEqual('bar\n', test.get_record_stream([key_delta],
2540
'unordered', True).next().get_bytes_as('fulltext'))
2582
2542
def test_make_mpdiffs(self):
2583
2543
# Generating an mpdiff across a stacking boundary should detect parent
2584
2544
# texts regions.
2586
key_left = (b'bar',)
2587
key_right = (b'zaphod',)
2547
key_right = ('zaphod',)
2588
2548
basis, test = self.get_basis_and_test_knit()
2589
basis.add_lines(key_left, (), [b'bar\n'])
2590
basis.add_lines(key_right, (), [b'zaphod\n'])
2549
basis.add_lines(key_left, (), ['bar\n'])
2550
basis.add_lines(key_right, (), ['zaphod\n'])
2591
2551
basis.calls = []
2592
2552
test.add_lines(key, (key_left, key_right),
2593
[b'bar\n', b'foo\n', b'zaphod\n'])
2553
['bar\n', 'foo\n', 'zaphod\n'])
2594
2554
diffs = test.make_mpdiffs([key])
2595
2555
self.assertEqual([
2596
2556
multiparent.MultiParent([multiparent.ParentText(0, 0, 0, 1),
2597
multiparent.NewText([b'foo\n']),
2598
multiparent.ParentText(1, 0, 2, 1)])],
2557
multiparent.NewText(['foo\n']),
2558
multiparent.ParentText(1, 0, 2, 1)])],
2600
2560
self.assertEqual(3, len(basis.calls))
2601
2561
self.assertEqual([
2602
2562
("get_parent_map", {key_left, key_right}),
2616
2576
def test_include_delta_closure_generates_a_knit_delta_closure(self):
2617
2577
vf = self.make_test_knit(name='test')
2618
2578
# put in three texts, giving ft, delta, delta
2619
vf.add_lines((b'base',), (), [b'base\n', b'content\n'])
2620
vf.add_lines((b'd1',), ((b'base',),), [b'd1\n'])
2621
vf.add_lines((b'd2',), ((b'd1',),), [b'd2\n'])
2579
vf.add_lines(('base',), (), ['base\n', 'content\n'])
2580
vf.add_lines(('d1',), (('base',),), ['d1\n'])
2581
vf.add_lines(('d2',), (('d1',),), ['d2\n'])
2622
2582
# But heuristics could interfere, so check what happened:
2623
2583
self.assertEqual(['knit-ft-gz', 'knit-delta-gz', 'knit-delta-gz'],
2624
[record.storage_kind for record in
2625
vf.get_record_stream([(b'base',), (b'd1',), (b'd2',)],
2626
'topological', False)])
2584
[record.storage_kind for record in
2585
vf.get_record_stream([('base',), ('d1',), ('d2',)],
2586
'topological', False)])
2627
2587
# generate a stream of just the deltas include_delta_closure=True,
2628
2588
# serialise to the network, and check that we get a delta closure on the wire.
2629
stream = vf.get_record_stream(
2630
[(b'd1',), (b'd2',)], 'topological', True)
2589
stream = vf.get_record_stream([('d1',), ('d2',)], 'topological', True)
2631
2590
netb = [record.get_bytes_as(record.storage_kind) for record in stream]
2632
2591
# The first bytes should be a memo from _ContentMapGenerator, and the
2633
2592
# second bytes should be empty (because its a API proxy not something
2634
2593
# for wire serialisation.
2635
self.assertEqual(b'', netb[1])
2594
self.assertEqual('', netb[1])
2636
2595
bytes = netb[0]
2637
2596
kind, line_end = network_bytes_to_kind_and_offset(bytes)
2638
2597
self.assertEqual('knit-delta-closure', kind)
2644
2603
def test_get_record_stream_gives_records(self):
2645
2604
vf = self.make_test_knit(name='test')
2646
2605
# put in three texts, giving ft, delta, delta
2647
vf.add_lines((b'base',), (), [b'base\n', b'content\n'])
2648
vf.add_lines((b'd1',), ((b'base',),), [b'd1\n'])
2649
vf.add_lines((b'd2',), ((b'd1',),), [b'd2\n'])
2650
keys = [(b'd1',), (b'd2',)]
2606
vf.add_lines(('base',), (), ['base\n', 'content\n'])
2607
vf.add_lines(('d1',), (('base',),), ['d1\n'])
2608
vf.add_lines(('d2',), (('d1',),), ['d2\n'])
2609
keys = [('d1',), ('d2',)]
2651
2610
generator = _VFContentMapGenerator(vf, keys,
2652
global_map=vf.get_parent_map(keys))
2611
global_map=vf.get_parent_map(keys))
2653
2612
for record in generator.get_record_stream():
2654
if record.key == (b'd1',):
2655
self.assertEqual(b'd1\n', record.get_bytes_as('fulltext'))
2613
if record.key == ('d1',):
2614
self.assertEqual('d1\n', record.get_bytes_as('fulltext'))
2657
self.assertEqual(b'd2\n', record.get_bytes_as('fulltext'))
2616
self.assertEqual('d2\n', record.get_bytes_as('fulltext'))
2659
2618
def test_get_record_stream_kinds_are_raw(self):
2660
2619
vf = self.make_test_knit(name='test')
2661
2620
# put in three texts, giving ft, delta, delta
2662
vf.add_lines((b'base',), (), [b'base\n', b'content\n'])
2663
vf.add_lines((b'd1',), ((b'base',),), [b'd1\n'])
2664
vf.add_lines((b'd2',), ((b'd1',),), [b'd2\n'])
2665
keys = [(b'base',), (b'd1',), (b'd2',)]
2621
vf.add_lines(('base',), (), ['base\n', 'content\n'])
2622
vf.add_lines(('d1',), (('base',),), ['d1\n'])
2623
vf.add_lines(('d2',), (('d1',),), ['d2\n'])
2624
keys = [('base',), ('d1',), ('d2',)]
2666
2625
generator = _VFContentMapGenerator(vf, keys,
2667
global_map=vf.get_parent_map(keys))
2668
kinds = {(b'base',): 'knit-delta-closure',
2669
(b'd1',): 'knit-delta-closure-ref',
2670
(b'd2',): 'knit-delta-closure-ref',
2626
global_map=vf.get_parent_map(keys))
2627
kinds = {('base',): 'knit-delta-closure',
2628
('d1',): 'knit-delta-closure-ref',
2629
('d2',): 'knit-delta-closure-ref',
2672
2631
for record in generator.get_record_stream():
2673
2632
self.assertEqual(kinds[record.key], record.storage_kind)
added
removed
breezy/tests/test_knit.py
