285
320
"""Tests for getting and putting knit records."""
287
322
def test_add_raw_records(self):
288
"""Add_raw_records adds records retrievable later."""
289
access = self.get_access()
290
memos = access.add_raw_records([('key', 10)], '1234567890')
291
self.assertEqual(['1234567890'], list(access.get_raw_records(memos)))
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])))
293
334
def test_add_several_raw_records(self):
294
335
"""add_raw_records with many records and read some back."""
295
336
access = self.get_access()
296
memos = access.add_raw_records([('key', 10), ('key2', 2), ('key3', 5)],
298
self.assertEqual(['1234567890', '12', '34567'],
299
list(access.get_raw_records(memos)))
300
self.assertEqual(['1234567890'],
301
list(access.get_raw_records(memos[0:1])))
302
self.assertEqual(['12'],
303
list(access.get_raw_records(memos[1:2])))
304
self.assertEqual(['34567'],
305
list(access.get_raw_records(memos[2:3])))
306
self.assertEqual(['1234567890', '34567'],
307
list(access.get_raw_records(memos[0:1] + memos[2:3])))
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])))
310
351
class TestKnitKnitAccess(TestCaseWithMemoryTransport, KnitRecordAccessTestsMixin):
422
493
raise _TestException('foobar')
423
except _TestException, e:
494
except _TestException as e:
424
495
retry_exc = errors.RetryWithNewPacks(None, reload_occurred=False,
425
496
exc_info=sys.exc_info())
497
# GZ 2010-08-10: Cycle with exc_info affects 3 tests
428
500
def test_read_from_several_packs(self):
429
501
access, writer = self._get_access()
431
memos.extend(access.add_raw_records([('key', 10)], '1234567890'))
503
memos.extend(access.add_raw_records([(b'key', 10)], [b'1234567890']))
433
505
access, writer = self._get_access('pack2', 'FOOBAR')
434
memos.extend(access.add_raw_records([('key', 5)], '12345'))
506
memos.extend(access.add_raw_records([(b'key', 5)], [b'12345']))
436
508
access, writer = self._get_access('pack3', 'BAZ')
437
memos.extend(access.add_raw_records([('key', 5)], 'alpha'))
509
memos.extend(access.add_raw_records([(b'key', 5)], [b'alpha']))
439
511
transport = self.get_transport()
440
access = _DirectPackAccess({"FOO":(transport, 'packfile'),
441
"FOOBAR":(transport, 'pack2'),
442
"BAZ":(transport, 'pack3')})
443
self.assertEqual(['1234567890', '12345', 'alpha'],
444
list(access.get_raw_records(memos)))
445
self.assertEqual(['1234567890'],
446
list(access.get_raw_records(memos[0:1])))
447
self.assertEqual(['12345'],
448
list(access.get_raw_records(memos[1:2])))
449
self.assertEqual(['alpha'],
450
list(access.get_raw_records(memos[2:3])))
451
self.assertEqual(['1234567890', 'alpha'],
452
list(access.get_raw_records(memos[0:1] + memos[2:3])))
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])))
454
526
def test_set_writer(self):
455
527
"""The writer should be settable post construction."""
456
access = _DirectPackAccess({})
528
access = pack_repo._DirectPackAccess({})
457
529
transport = self.get_transport()
458
530
packname = 'packfile'
460
533
def write_data(bytes):
461
534
transport.append_bytes(packname, bytes)
462
535
writer = pack.ContainerWriter(write_data)
464
537
access.set_writer(writer, index, (transport, packname))
465
memos = access.add_raw_records([('key', 10)], '1234567890')
538
memos = access.add_raw_records([(b'key', 10)], [b'1234567890'])
467
self.assertEqual(['1234567890'], list(access.get_raw_records(memos)))
540
self.assertEqual([b'1234567890'], list(access.get_raw_records(memos)))
469
542
def test_missing_index_raises_retry(self):
470
543
memos = self.make_pack_file()
471
544
transport = self.get_transport()
472
545
reload_called, reload_func = self.make_reload_func()
473
546
# Note that the index key has changed from 'foo' to 'bar'
474
access = _DirectPackAccess({'bar':(transport, 'packname')},
475
reload_func=reload_func)
547
access = pack_repo._DirectPackAccess({'bar': (transport, 'packname')},
548
reload_func=reload_func)
476
549
e = self.assertListRaises(errors.RetryWithNewPacks,
477
550
access.get_raw_records, memos)
478
551
# Because a key was passed in which does not match our index list, we
540
616
memos = self.make_pack_file()
541
617
transport = self.get_transport()
542
618
failing_transport = MockReadvFailingTransport(
543
[transport.get_bytes('packname')])
619
[transport.get_bytes('packname')])
544
620
reload_called, reload_func = self.make_reload_func()
545
access = _DirectPackAccess({'foo':(failing_transport, 'packname')})
621
access = pack_repo._DirectPackAccess(
622
{'foo': (failing_transport, 'packname')})
546
623
# Asking for a single record will not trigger the Mock failure
547
self.assertEqual(['1234567890'],
548
list(access.get_raw_records(memos[:1])))
549
self.assertEqual(['12345'],
550
list(access.get_raw_records(memos[1:2])))
624
self.assertEqual([b'1234567890'],
625
list(access.get_raw_records(memos[:1])))
626
self.assertEqual([b'12345'],
627
list(access.get_raw_records(memos[1:2])))
551
628
# A multiple offset readv() will fail mid-way through
552
629
e = self.assertListRaises(errors.NoSuchFile,
553
630
access.get_raw_records, memos)
555
632
def test_reload_or_raise_no_reload(self):
556
access = _DirectPackAccess({}, reload_func=None)
633
access = pack_repo._DirectPackAccess({}, reload_func=None)
557
634
retry_exc = self.make_retry_exception()
558
635
# Without a reload_func, we will just re-raise the original exception
559
636
self.assertRaises(_TestException, access.reload_or_raise, retry_exc)
561
638
def test_reload_or_raise_reload_changed(self):
562
639
reload_called, reload_func = self.make_reload_func(return_val=True)
563
access = _DirectPackAccess({}, reload_func=reload_func)
640
access = pack_repo._DirectPackAccess({}, reload_func=reload_func)
564
641
retry_exc = self.make_retry_exception()
565
642
access.reload_or_raise(retry_exc)
566
643
self.assertEqual([1], reload_called)
567
retry_exc.reload_occurred=True
644
retry_exc.reload_occurred = True
568
645
access.reload_or_raise(retry_exc)
569
646
self.assertEqual([2], reload_called)
571
648
def test_reload_or_raise_reload_no_change(self):
572
649
reload_called, reload_func = self.make_reload_func(return_val=False)
573
access = _DirectPackAccess({}, reload_func=reload_func)
650
access = pack_repo._DirectPackAccess({}, reload_func=reload_func)
574
651
retry_exc = self.make_retry_exception()
575
652
# If reload_occurred is False, then we consider it an error to have
576
653
# reload_func() return False (no changes).
577
654
self.assertRaises(_TestException, access.reload_or_raise, retry_exc)
578
655
self.assertEqual([1], reload_called)
579
retry_exc.reload_occurred=True
656
retry_exc.reload_occurred = True
580
657
# If reload_occurred is True, then we assume nothing changed because
581
658
# it had changed earlier, but didn't change again
582
659
access.reload_or_raise(retry_exc)
586
663
vf, reload_counter = self.make_vf_for_retrying()
587
664
# It is a little bit bogus to annotate the Revision VF, but it works,
588
665
# as we have ancestry stored there
590
667
reload_lines = vf.annotate(key)
591
668
self.assertEqual([1, 1, 0], reload_counter)
592
669
plain_lines = vf.annotate(key)
593
self.assertEqual([1, 1, 0], reload_counter) # No extra reloading
670
self.assertEqual([1, 1, 0], reload_counter) # No extra reloading
594
671
if reload_lines != plain_lines:
595
672
self.fail('Annotation was not identical with reloading.')
596
673
# Now delete the packs-in-use, which should trigger another reload, but
597
674
# this time we just raise an exception because we can't recover
598
for trans, name in vf._access._indices.itervalues():
675
for trans, name in vf._access._indices.values():
599
676
trans.delete(name)
600
677
self.assertRaises(errors.NoSuchFile, vf.annotate, key)
601
678
self.assertEqual([2, 1, 1], reload_counter)
603
680
def test__get_record_map_retries(self):
604
681
vf, reload_counter = self.make_vf_for_retrying()
605
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
682
keys = [(b'rev-1',), (b'rev-2',), (b'rev-3',)]
606
683
records = vf._get_record_map(keys)
607
684
self.assertEqual(keys, sorted(records.keys()))
608
685
self.assertEqual([1, 1, 0], reload_counter)
609
686
# Now delete the packs-in-use, which should trigger another reload, but
610
687
# this time we just raise an exception because we can't recover
611
for trans, name in vf._access._indices.itervalues():
688
for trans, name in vf._access._indices.values():
612
689
trans.delete(name)
613
690
self.assertRaises(errors.NoSuchFile, vf._get_record_map, keys)
614
691
self.assertEqual([2, 1, 1], reload_counter)
616
693
def test_get_record_stream_retries(self):
617
694
vf, reload_counter = self.make_vf_for_retrying()
618
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
695
keys = [(b'rev-1',), (b'rev-2',), (b'rev-3',)]
619
696
record_stream = vf.get_record_stream(keys, 'topological', False)
620
record = record_stream.next()
621
self.assertEqual(('rev-1',), record.key)
697
record = next(record_stream)
698
self.assertEqual((b'rev-1',), record.key)
622
699
self.assertEqual([0, 0, 0], reload_counter)
623
record = record_stream.next()
624
self.assertEqual(('rev-2',), record.key)
700
record = next(record_stream)
701
self.assertEqual((b'rev-2',), record.key)
625
702
self.assertEqual([1, 1, 0], reload_counter)
626
record = record_stream.next()
627
self.assertEqual(('rev-3',), record.key)
703
record = next(record_stream)
704
self.assertEqual((b'rev-3',), record.key)
628
705
self.assertEqual([1, 1, 0], reload_counter)
629
706
# Now delete all pack files, and see that we raise the right error
630
for trans, name in vf._access._indices.itervalues():
707
for trans, name in vf._access._indices.values():
631
708
trans.delete(name)
632
709
self.assertListRaises(errors.NoSuchFile,
633
vf.get_record_stream, keys, 'topological', False)
710
vf.get_record_stream, keys, 'topological', False)
635
712
def test_iter_lines_added_or_present_in_keys_retries(self):
636
713
vf, reload_counter = self.make_vf_for_retrying()
637
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
714
keys = [(b'rev-1',), (b'rev-2',), (b'rev-3',)]
638
715
# Unfortunately, iter_lines_added_or_present_in_keys iterates the
639
716
# result in random order (determined by the iteration order from a
640
717
# set()), so we don't have any solid way to trigger whether data is
665
742
self.addCleanup(repo.unlock)
666
743
repo.start_write_group()
668
vf.add_lines(('f-id', 'rev-5'), [('f-id', 'rev-4')], ['lines\n'])
669
vf.add_lines(('f-id', 'rev-1'), [], ['lines\n'])
670
vf.add_lines(('f-id', 'rev-2'), [('f-id', 'rev-1')], ['lines\n'])
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'])
671
748
repo.commit_write_group()
672
749
# We inserted them as rev-5, rev-1, rev-2, we should get them back in
674
stream = vf.get_record_stream([('f-id', 'rev-1'), ('f-id', 'rev-5'),
675
('f-id', 'rev-2')], 'unordered', False)
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)
676
753
keys = [r.key for r in stream]
677
self.assertEqual([('f-id', 'rev-5'), ('f-id', 'rev-1'),
678
('f-id', 'rev-2')], keys)
754
self.assertEqual([(b'f-id', b'rev-5'), (b'f-id', b'rev-1'),
755
(b'f-id', b'rev-2')], keys)
679
756
repo.start_write_group()
680
vf.add_lines(('f-id', 'rev-4'), [('f-id', 'rev-3')], ['lines\n'])
681
vf.add_lines(('f-id', 'rev-3'), [('f-id', 'rev-2')], ['lines\n'])
682
vf.add_lines(('f-id', 'rev-6'), [('f-id', 'rev-5')], ['lines\n'])
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'])
683
760
repo.commit_write_group()
684
761
# Request in random order, to make sure the output order isn't based on
686
request_keys = set(('f-id', 'rev-%d' % i) for i in range(1, 7))
763
request_keys = set((b'f-id', b'rev-%d' % i) for i in range(1, 7))
687
764
stream = vf.get_record_stream(request_keys, 'unordered', False)
688
765
keys = [r.key for r in stream]
689
766
# We want to get the keys back in disk order, but it doesn't matter
690
767
# which pack we read from first. So this can come back in 2 orders
691
alt1 = [('f-id', 'rev-%d' % i) for i in [4, 3, 6, 5, 1, 2]]
692
alt2 = [('f-id', 'rev-%d' % i) for i in [5, 1, 2, 4, 3, 6]]
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]]
693
770
if keys != alt1 and keys != alt2:
694
771
self.fail('Returned key order did not match either expected order.'
695
772
' expected %s or %s, not %s'
699
776
class LowLevelKnitDataTests(TestCase):
701
778
def create_gz_content(self, text):
703
gz_file = gzip.GzipFile(mode='wb', fileobj=sio)
780
with gzip.GzipFile(mode='wb', fileobj=sio) as gz_file:
706
782
return sio.getvalue()
708
784
def make_multiple_records(self):
709
785
"""Create the content for multiple records."""
710
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
786
sha1sum = osutils.sha_string(b'foo\nbar\n')
712
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
788
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
717
793
record_1 = (0, len(gz_txt), sha1sum)
718
794
total_txt.append(gz_txt)
719
sha1sum = osutils.sha('baz\n').hexdigest()
720
gz_txt = self.create_gz_content('version rev-id-2 1 %s\n'
795
sha1sum = osutils.sha_string(b'baz\n')
796
gz_txt = self.create_gz_content(b'version rev-id-2 1 %s\n'
724
800
record_2 = (record_1[1], len(gz_txt), sha1sum)
725
801
total_txt.append(gz_txt)
726
802
return total_txt, record_1, record_2
728
804
def test_valid_knit_data(self):
729
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
730
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
805
sha1sum = osutils.sha_string(b'foo\nbar\n')
806
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
735
811
transport = MockTransport([gz_txt])
736
812
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
737
813
knit = KnitVersionedFiles(None, access)
738
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
814
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(gz_txt)))]
740
816
contents = list(knit._read_records_iter(records))
741
self.assertEqual([(('rev-id-1',), ['foo\n', 'bar\n'],
742
'4e48e2c9a3d2ca8a708cb0cc545700544efb5021')], contents)
817
self.assertEqual([((b'rev-id-1',), [b'foo\n', b'bar\n'],
818
b'4e48e2c9a3d2ca8a708cb0cc545700544efb5021')], contents)
744
820
raw_contents = list(knit._read_records_iter_raw(records))
745
self.assertEqual([(('rev-id-1',), gz_txt, sha1sum)], raw_contents)
821
self.assertEqual([((b'rev-id-1',), gz_txt, sha1sum)], raw_contents)
747
823
def test_multiple_records_valid(self):
748
824
total_txt, record_1, record_2 = self.make_multiple_records()
749
transport = MockTransport([''.join(total_txt)])
825
transport = MockTransport([b''.join(total_txt)])
750
826
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
751
827
knit = KnitVersionedFiles(None, access)
752
records = [(('rev-id-1',), (('rev-id-1',), record_1[0], record_1[1])),
753
(('rev-id-2',), (('rev-id-2',), record_2[0], record_2[1]))]
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]))]
755
831
contents = list(knit._read_records_iter(records))
756
self.assertEqual([(('rev-id-1',), ['foo\n', 'bar\n'], record_1[2]),
757
(('rev-id-2',), ['baz\n'], record_2[2])],
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])],
760
836
raw_contents = list(knit._read_records_iter_raw(records))
761
self.assertEqual([(('rev-id-1',), total_txt[0], record_1[2]),
762
(('rev-id-2',), total_txt[1], record_2[2])],
837
self.assertEqual([((b'rev-id-1',), total_txt[0], record_1[2]),
838
((b'rev-id-2',), total_txt[1], record_2[2])],
765
841
def test_not_enough_lines(self):
766
sha1sum = osutils.sha('foo\n').hexdigest()
842
sha1sum = osutils.sha_string(b'foo\n')
767
843
# record says 2 lines data says 1
768
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
844
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
772
848
transport = MockTransport([gz_txt])
773
849
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
774
850
knit = KnitVersionedFiles(None, access)
775
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
776
self.assertRaises(errors.KnitCorrupt, list,
777
knit._read_records_iter(records))
851
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(gz_txt)))]
852
self.assertRaises(KnitCorrupt, list,
853
knit._read_records_iter(records))
779
855
# read_records_iter_raw won't detect that sort of mismatch/corruption
780
856
raw_contents = list(knit._read_records_iter_raw(records))
781
self.assertEqual([(('rev-id-1',), gz_txt, sha1sum)], raw_contents)
857
self.assertEqual([((b'rev-id-1',), gz_txt, sha1sum)], raw_contents)
783
859
def test_too_many_lines(self):
784
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
860
sha1sum = osutils.sha_string(b'foo\nbar\n')
785
861
# record says 1 lines data says 2
786
gz_txt = self.create_gz_content('version rev-id-1 1 %s\n'
862
gz_txt = self.create_gz_content(b'version rev-id-1 1 %s\n'
791
867
transport = MockTransport([gz_txt])
792
868
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
793
869
knit = KnitVersionedFiles(None, access)
794
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
795
self.assertRaises(errors.KnitCorrupt, list,
796
knit._read_records_iter(records))
870
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(gz_txt)))]
871
self.assertRaises(KnitCorrupt, list,
872
knit._read_records_iter(records))
798
874
# read_records_iter_raw won't detect that sort of mismatch/corruption
799
875
raw_contents = list(knit._read_records_iter_raw(records))
800
self.assertEqual([(('rev-id-1',), gz_txt, sha1sum)], raw_contents)
876
self.assertEqual([((b'rev-id-1',), gz_txt, sha1sum)], raw_contents)
802
878
def test_mismatched_version_id(self):
803
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
804
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
879
sha1sum = osutils.sha_string(b'foo\nbar\n')
880
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
809
885
transport = MockTransport([gz_txt])
810
886
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
811
887
knit = KnitVersionedFiles(None, access)
812
888
# We are asking for rev-id-2, but the data is rev-id-1
813
records = [(('rev-id-2',), (('rev-id-2',), 0, len(gz_txt)))]
814
self.assertRaises(errors.KnitCorrupt, list,
815
knit._read_records_iter(records))
889
records = [((b'rev-id-2',), ((b'rev-id-2',), 0, len(gz_txt)))]
890
self.assertRaises(KnitCorrupt, list,
891
knit._read_records_iter(records))
817
893
# read_records_iter_raw detects mismatches in the header
818
self.assertRaises(errors.KnitCorrupt, list,
819
knit._read_records_iter_raw(records))
894
self.assertRaises(KnitCorrupt, list,
895
knit._read_records_iter_raw(records))
821
897
def test_uncompressed_data(self):
822
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
823
txt = ('version rev-id-1 2 %s\n'
898
sha1sum = osutils.sha_string(b'foo\nbar\n')
899
txt = (b'version rev-id-1 2 %s\n'
828
904
transport = MockTransport([txt])
829
905
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
830
906
knit = KnitVersionedFiles(None, access)
831
records = [(('rev-id-1',), (('rev-id-1',), 0, len(txt)))]
907
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(txt)))]
833
909
# We don't have valid gzip data ==> corrupt
834
self.assertRaises(errors.KnitCorrupt, list,
835
knit._read_records_iter(records))
910
self.assertRaises(KnitCorrupt, list,
911
knit._read_records_iter(records))
837
913
# read_records_iter_raw will notice the bad data
838
self.assertRaises(errors.KnitCorrupt, list,
839
knit._read_records_iter_raw(records))
914
self.assertRaises(KnitCorrupt, list,
915
knit._read_records_iter_raw(records))
841
917
def test_corrupted_data(self):
842
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
843
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
918
sha1sum = osutils.sha_string(b'foo\nbar\n')
919
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
848
924
# Change 2 bytes in the middle to \xff
849
gz_txt = gz_txt[:10] + '\xff\xff' + gz_txt[12:]
925
gz_txt = gz_txt[:10] + b'\xff\xff' + gz_txt[12:]
850
926
transport = MockTransport([gz_txt])
851
927
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
852
928
knit = KnitVersionedFiles(None, access)
853
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
854
self.assertRaises(errors.KnitCorrupt, list,
855
knit._read_records_iter(records))
929
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(gz_txt)))]
930
self.assertRaises(KnitCorrupt, list,
931
knit._read_records_iter(records))
856
932
# read_records_iter_raw will barf on bad gz data
857
self.assertRaises(errors.KnitCorrupt, list,
858
knit._read_records_iter_raw(records))
933
self.assertRaises(KnitCorrupt, list,
934
knit._read_records_iter_raw(records))
861
937
class LowLevelKnitIndexTests(TestCase):
940
def _load_data(self):
941
from ..bzr._knit_load_data_py import _load_data_py
863
944
def get_knit_index(self, transport, name, mode):
864
945
mapper = ConstantMapper(name)
865
from bzrlib._knit_load_data_py import _load_data_py
866
self.overrideAttr(knit, '_load_data', _load_data_py)
867
allow_writes = lambda: 'w' in mode
868
return _KndxIndex(transport, mapper, lambda:None, allow_writes, lambda:True)
946
self.overrideAttr(knit, '_load_data', self._load_data)
950
return _KndxIndex(transport, mapper, lambda: None, allow_writes, lambda: True)
870
952
def test_create_file(self):
871
953
transport = MockTransport()
872
954
index = self.get_knit_index(transport, "filename", "w")
874
956
call = transport.calls.pop(0)
875
# call[1][1] is a StringIO - we can't test it by simple equality.
957
# call[1][1] is a BytesIO - we can't test it by simple equality.
876
958
self.assertEqual('put_file_non_atomic', call[0])
877
959
self.assertEqual('filename.kndx', call[1][0])
878
960
# With no history, _KndxIndex writes a new index:
879
961
self.assertEqual(_KndxIndex.HEADER,
880
call[1][1].getvalue())
962
call[1][1].getvalue())
881
963
self.assertEqual({'create_parent_dir': True}, call[2])
883
965
def test_read_utf8_version_id(self):
899
981
utf8_revision_id = unicode_revision_id.encode('utf-8')
900
982
transport = MockTransport([
901
983
_KndxIndex.HEADER,
902
"version option 0 1 .%s :" % (utf8_revision_id,)
984
b"version option 0 1 .%s :" % (utf8_revision_id,)
904
986
index = self.get_knit_index(transport, "filename", "r")
905
self.assertEqual({("version",):((utf8_revision_id,),)},
906
index.get_parent_map(index.keys()))
987
self.assertEqual({(b"version",): ((utf8_revision_id,),)},
988
index.get_parent_map(index.keys()))
908
990
def test_read_ignore_corrupted_lines(self):
909
991
transport = MockTransport([
910
992
_KndxIndex.HEADER,
912
"corrupted options 0 1 .b .c ",
913
"version options 0 1 :"
994
b"corrupted options 0 1 .b .c ",
995
b"version options 0 1 :"
915
997
index = self.get_knit_index(transport, "filename", "r")
916
998
self.assertEqual(1, len(index.keys()))
917
self.assertEqual(set([("version",)]), index.keys())
999
self.assertEqual({(b"version",)}, index.keys())
919
1001
def test_read_corrupted_header(self):
920
transport = MockTransport(['not a bzr knit index header\n'])
1002
transport = MockTransport([b'not a bzr knit index header\n'])
921
1003
index = self.get_knit_index(transport, "filename", "r")
922
1004
self.assertRaises(KnitHeaderError, index.keys)
924
1006
def test_read_duplicate_entries(self):
925
1007
transport = MockTransport([
926
1008
_KndxIndex.HEADER,
927
"parent options 0 1 :",
928
"version options1 0 1 0 :",
929
"version options2 1 2 .other :",
930
"version options3 3 4 0 .other :"
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 :"
932
1014
index = self.get_knit_index(transport, "filename", "r")
933
1015
self.assertEqual(2, len(index.keys()))
934
1016
# check that the index used is the first one written. (Specific
935
1017
# to KnitIndex style indices.
936
self.assertEqual("1", index._dictionary_compress([("version",)]))
937
self.assertEqual((("version",), 3, 4), index.get_position(("version",)))
938
self.assertEqual(["options3"], index.get_options(("version",)))
939
self.assertEqual({("version",):(("parent",), ("other",))},
940
index.get_parent_map([("version",)]))
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",)]))
942
1025
def test_read_compressed_parents(self):
943
1026
transport = MockTransport([
944
1027
_KndxIndex.HEADER,
947
"c option 0 1 1 0 :",
1029
b"b option 0 1 0 :",
1030
b"c option 0 1 1 0 :",
949
1032
index = self.get_knit_index(transport, "filename", "r")
950
self.assertEqual({("b",):(("a",),), ("c",):(("b",), ("a",))},
951
index.get_parent_map([("b",), ("c",)]))
1033
self.assertEqual({(b"b",): ((b"a",),), (b"c",): ((b"b",), (b"a",))},
1034
index.get_parent_map([(b"b",), (b"c",)]))
953
1036
def test_write_utf8_version_id(self):
954
1037
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
997
1080
self.assertEqual(set(), index.keys())
999
index.add_records([(("a",), ["option"], (("a",), 0, 1), [])])
1000
self.assertEqual(set([("a",)]), index.keys())
1002
index.add_records([(("a",), ["option"], (("a",), 0, 1), [])])
1003
self.assertEqual(set([("a",)]), index.keys())
1005
index.add_records([(("b",), ["option"], (("b",), 0, 1), [])])
1006
self.assertEqual(set([("a",), ("b",)]), 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())
1008
1091
def add_a_b(self, index, random_id=None):
1010
1093
if random_id is not None:
1011
1094
kwargs["random_id"] = random_id
1012
1095
index.add_records([
1013
(("a",), ["option"], (("a",), 0, 1), [("b",)]),
1014
(("a",), ["opt"], (("a",), 1, 2), [("c",)]),
1015
(("b",), ["option"], (("b",), 2, 3), [("a",)])
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",)])
1018
1101
def assertIndexIsAB(self, index):
1019
1102
self.assertEqual({
1103
(b'a',): ((b'c',),),
1104
(b'b',): ((b'a',),),
1023
1106
index.get_parent_map(index.keys()))
1024
self.assertEqual((("a",), 1, 2), index.get_position(("a",)))
1025
self.assertEqual((("b",), 2, 3), index.get_position(("b",)))
1026
self.assertEqual(["opt"], index.get_options(("a",)))
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",)))
1028
1111
def test_add_versions(self):
1029
1112
transport = MockTransport([
1092
1175
def test__get_total_build_size(self):
1094
('a',): (('fulltext', False), (('a',), 0, 100), None),
1095
('b',): (('line-delta', False), (('b',), 100, 21), ('a',)),
1096
('c',): (('line-delta', False), (('c',), 121, 35), ('b',)),
1097
('d',): (('line-delta', False), (('d',), 156, 12), ('b',)),
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',)),
1099
self.assertTotalBuildSize(100, [('a',)], positions)
1100
self.assertTotalBuildSize(121, [('b',)], positions)
1182
self.assertTotalBuildSize(100, [(b'a',)], positions)
1183
self.assertTotalBuildSize(121, [(b'b',)], positions)
1101
1184
# c needs both a & b
1102
self.assertTotalBuildSize(156, [('c',)], positions)
1185
self.assertTotalBuildSize(156, [(b'c',)], positions)
1103
1186
# we shouldn't count 'b' twice
1104
self.assertTotalBuildSize(156, [('b',), ('c',)], positions)
1105
self.assertTotalBuildSize(133, [('d',)], positions)
1106
self.assertTotalBuildSize(168, [('c',), ('d',)], positions)
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)
1108
1191
def test_get_position(self):
1109
1192
transport = MockTransport([
1110
1193
_KndxIndex.HEADER,
1114
1197
index = self.get_knit_index(transport, "filename", "r")
1116
self.assertEqual((("a",), 0, 1), index.get_position(("a",)))
1117
self.assertEqual((("b",), 1, 2), index.get_position(("b",)))
1199
self.assertEqual(((b"a",), 0, 1), index.get_position((b"a",)))
1200
self.assertEqual(((b"b",), 1, 2), index.get_position((b"b",)))
1119
1202
def test_get_method(self):
1120
1203
transport = MockTransport([
1121
1204
_KndxIndex.HEADER,
1122
"a fulltext,unknown 0 1 :",
1123
"b unknown,line-delta 1 2 :",
1205
b"a fulltext,unknown 0 1 :",
1206
b"b unknown,line-delta 1 2 :",
1126
1209
index = self.get_knit_index(transport, "filename", "r")
1128
self.assertEqual("fulltext", index.get_method("a"))
1129
self.assertEqual("line-delta", index.get_method("b"))
1130
self.assertRaises(errors.KnitIndexUnknownMethod, index.get_method, "c")
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")
1132
1215
def test_get_options(self):
1133
1216
transport = MockTransport([
1134
1217
_KndxIndex.HEADER,
1219
b"b opt2,opt3 1 2 :"
1138
1221
index = self.get_knit_index(transport, "filename", "r")
1140
self.assertEqual(["opt1"], index.get_options("a"))
1141
self.assertEqual(["opt2", "opt3"], index.get_options("b"))
1223
self.assertEqual([b"opt1"], index.get_options(b"a"))
1224
self.assertEqual([b"opt2", b"opt3"], index.get_options(b"b"))
1143
1226
def test_get_parent_map(self):
1144
1227
transport = MockTransport([
1145
1228
_KndxIndex.HEADER,
1147
"b option 1 2 0 .c :",
1148
"c option 1 2 1 0 .e :"
1230
b"b option 1 2 0 .c :",
1231
b"c option 1 2 1 0 .e :"
1150
1233
index = self.get_knit_index(transport, "filename", "r")
1152
1235
self.assertEqual({
1154
("b",):(("a",), ("c",)),
1155
("c",):(("b",), ("a",), ("e",)),
1237
(b"b",): ((b"a",), (b"c",)),
1238
(b"c",): ((b"b",), (b"a",), (b"e",)),
1156
1239
}, index.get_parent_map(index.keys()))
1158
1241
def test_impossible_parent(self):
1159
1242
"""Test we get KnitCorrupt if the parent couldn't possibly exist."""
1160
1243
transport = MockTransport([
1161
1244
_KndxIndex.HEADER,
1163
"b option 0 1 4 :" # We don't have a 4th record
1246
b"b option 0 1 4 :" # We don't have a 4th record
1165
1248
index = self.get_knit_index(transport, 'filename', 'r')
1167
self.assertRaises(errors.KnitCorrupt, index.keys)
1168
except TypeError, e:
1169
if (str(e) == ('exceptions must be strings, classes, or instances,'
1170
' not exceptions.IndexError')
1171
and sys.version_info[0:2] >= (2,5)):
1172
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1173
' raising new style exceptions with python'
1249
self.assertRaises(KnitCorrupt, index.keys)
1178
1251
def test_corrupted_parent(self):
1179
1252
transport = MockTransport([
1180
1253
_KndxIndex.HEADER,
1183
"c option 0 1 1v :", # Can't have a parent of '1v'
1256
b"c option 0 1 1v :", # Can't have a parent of '1v'
1185
1258
index = self.get_knit_index(transport, 'filename', 'r')
1187
self.assertRaises(errors.KnitCorrupt, index.keys)
1188
except TypeError, e:
1189
if (str(e) == ('exceptions must be strings, classes, or instances,'
1190
' not exceptions.ValueError')
1191
and sys.version_info[0:2] >= (2,5)):
1192
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1193
' raising new style exceptions with python'
1259
self.assertRaises(KnitCorrupt, index.keys)
1198
1261
def test_corrupted_parent_in_list(self):
1199
1262
transport = MockTransport([
1200
1263
_KndxIndex.HEADER,
1203
"c option 0 1 1 v :", # Can't have a parent of 'v'
1266
b"c option 0 1 1 v :", # Can't have a parent of 'v'
1205
1268
index = self.get_knit_index(transport, 'filename', 'r')
1207
self.assertRaises(errors.KnitCorrupt, index.keys)
1208
except TypeError, e:
1209
if (str(e) == ('exceptions must be strings, classes, or instances,'
1210
' not exceptions.ValueError')
1211
and sys.version_info[0:2] >= (2,5)):
1212
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1213
' raising new style exceptions with python'
1269
self.assertRaises(KnitCorrupt, index.keys)
1218
1271
def test_invalid_position(self):
1219
1272
transport = MockTransport([
1220
1273
_KndxIndex.HEADER,
1223
1276
index = self.get_knit_index(transport, 'filename', 'r')
1225
self.assertRaises(errors.KnitCorrupt, index.keys)
1226
except TypeError, e:
1227
if (str(e) == ('exceptions must be strings, classes, or instances,'
1228
' not exceptions.ValueError')
1229
and sys.version_info[0:2] >= (2,5)):
1230
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1231
' raising new style exceptions with python'
1277
self.assertRaises(KnitCorrupt, index.keys)
1236
1279
def test_invalid_size(self):
1237
1280
transport = MockTransport([
1238
1281
_KndxIndex.HEADER,
1241
1284
index = self.get_knit_index(transport, 'filename', 'r')
1243
self.assertRaises(errors.KnitCorrupt, index.keys)
1244
except TypeError, e:
1245
if (str(e) == ('exceptions must be strings, classes, or instances,'
1246
' not exceptions.ValueError')
1247
and sys.version_info[0:2] >= (2,5)):
1248
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1249
' raising new style exceptions with python'
1285
self.assertRaises(KnitCorrupt, index.keys)
1254
1287
def test_scan_unvalidated_index_not_implemented(self):
1255
1288
transport = MockTransport()
1263
1296
def test_short_line(self):
1264
1297
transport = MockTransport([
1265
1298
_KndxIndex.HEADER,
1267
"b option 10 10 0", # This line isn't terminated, ignored
1300
b"b option 10 10 0", # This line isn't terminated, ignored
1269
1302
index = self.get_knit_index(transport, "filename", "r")
1270
self.assertEqual(set([('a',)]), index.keys())
1303
self.assertEqual({(b'a',)}, index.keys())
1272
1305
def test_skip_incomplete_record(self):
1273
1306
# A line with bogus data should just be skipped
1274
1307
transport = MockTransport([
1275
1308
_KndxIndex.HEADER,
1277
"b option 10 10 0", # This line isn't terminated, ignored
1278
"c option 20 10 0 :", # Properly terminated, and starts with '\n'
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'
1280
1313
index = self.get_knit_index(transport, "filename", "r")
1281
self.assertEqual(set([('a',), ('c',)]), index.keys())
1314
self.assertEqual({(b'a',), (b'c',)}, index.keys())
1283
1316
def test_trailing_characters(self):
1284
1317
# A line with bogus data should just be skipped
1285
1318
transport = MockTransport([
1286
1319
_KndxIndex.HEADER,
1288
"b option 10 10 0 :a", # This line has extra trailing characters
1289
"c option 20 10 0 :", # Properly terminated, and starts with '\n'
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'
1291
1324
index = self.get_knit_index(transport, "filename", "r")
1292
self.assertEqual(set([('a',), ('c',)]), index.keys())
1325
self.assertEqual({(b'a',), (b'c',)}, index.keys())
1295
1328
class LowLevelKnitIndexTests_c(LowLevelKnitIndexTests):
1297
1330
_test_needs_features = [compiled_knit_feature]
1299
def get_knit_index(self, transport, name, mode):
1300
mapper = ConstantMapper(name)
1301
from bzrlib._knit_load_data_pyx import _load_data_c
1302
self.overrideAttr(knit, '_load_data', _load_data_c)
1303
allow_writes = lambda: mode == 'w'
1304
return _KndxIndex(transport, mapper, lambda:None,
1305
allow_writes, lambda:True)
1333
def _load_data(self):
1334
from ..bzr._knit_load_data_pyx import _load_data_c
1308
1338
class Test_KnitAnnotator(TestCaseWithMemoryTransport):
1367
1397
def test__expand_delta_records_blocks(self):
1368
1398
ann = self.make_annotator()
1369
rev_key = ('rev-id',)
1370
parent_key = ('parent-id',)
1371
record = ['0,1,1\n', 'new-line\n']
1399
rev_key = (b'rev-id',)
1400
parent_key = (b'parent-id',)
1401
record = [b'0,1,1\n', b'new-line\n']
1372
1402
details = ('line-delta', True)
1373
1403
ann._num_compression_children[parent_key] = 2
1374
1404
ann._expand_record(parent_key, (), None,
1375
['line1\n', 'line2\n', 'line3\n'],
1405
[b'line1\n', b'line2\n', b'line3\n'],
1376
1406
('fulltext', False))
1377
1407
ann._expand_record(rev_key, (parent_key,), parent_key, record, details)
1378
1408
self.assertEqual({(rev_key, parent_key): [(1, 1, 1), (3, 3, 0)]},
1379
1409
ann._matching_blocks)
1380
rev2_key = ('rev2-id',)
1381
record = ['0,1,1\n', 'new-line\n']
1410
rev2_key = (b'rev2-id',)
1411
record = [b'0,1,1\n', b'new-line\n']
1382
1412
details = ('line-delta', False)
1383
ann._expand_record(rev2_key, (parent_key,), parent_key, record, details)
1413
ann._expand_record(rev2_key, (parent_key,),
1414
parent_key, record, details)
1384
1415
self.assertEqual([(1, 1, 2), (3, 3, 0)],
1385
1416
ann._matching_blocks[(rev2_key, parent_key)])
1387
1418
def test__get_parent_ann_uses_matching_blocks(self):
1388
1419
ann = self.make_annotator()
1389
rev_key = ('rev-id',)
1390
parent_key = ('parent-id',)
1391
parent_ann = [(parent_key,)]*3
1420
rev_key = (b'rev-id',)
1421
parent_key = (b'parent-id',)
1422
parent_ann = [(parent_key,)] * 3
1392
1423
block_key = (rev_key, parent_key)
1393
1424
ann._annotations_cache[parent_key] = parent_ann
1394
1425
ann._matching_blocks[block_key] = [(0, 1, 1), (3, 3, 0)]
1395
1426
# We should not try to access any parent_lines content, because we know
1396
1427
# we already have the matching blocks
1397
1428
par_ann, blocks = ann._get_parent_annotations_and_matches(rev_key,
1398
['1\n', '2\n', '3\n'], parent_key)
1429
[b'1\n', b'2\n', b'3\n'], parent_key)
1399
1430
self.assertEqual(parent_ann, par_ann)
1400
1431
self.assertEqual([(0, 1, 1), (3, 3, 0)], blocks)
1401
1432
self.assertEqual({}, ann._matching_blocks)
1403
1434
def test__process_pending(self):
1404
1435
ann = self.make_annotator()
1405
rev_key = ('rev-id',)
1408
record = ['0,1,1\n', 'new-line\n']
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']
1409
1440
details = ('line-delta', False)
1410
p1_record = ['line1\n', 'line2\n']
1441
p1_record = [b'line1\n', b'line2\n']
1411
1442
ann._num_compression_children[p1_key] = 1
1412
res = ann._expand_record(rev_key, (p1_key,p2_key), p1_key,
1443
res = ann._expand_record(rev_key, (p1_key, p2_key), p1_key,
1413
1444
record, details)
1414
1445
self.assertEqual(None, res)
1415
1446
# self.assertTrue(p1_key in ann._pending_deltas)
1508
1539
"""Adding versions to the index should update the lookup dict"""
1509
1540
knit = self.make_test_knit()
1510
1541
idx = knit._index
1511
idx.add_records([(('a-1',), ['fulltext'], (('a-1',), 0, 0), [])])
1542
idx.add_records([((b'a-1',), [b'fulltext'], ((b'a-1',), 0, 0), [])])
1512
1543
self.check_file_contents('test.kndx',
1513
'# bzr knit index 8\n'
1515
'a-1 fulltext 0 0 :'
1544
b'# bzr knit index 8\n'
1546
b'a-1 fulltext 0 0 :'
1517
1548
idx.add_records([
1518
(('a-2',), ['fulltext'], (('a-2',), 0, 0), [('a-1',)]),
1519
(('a-3',), ['fulltext'], (('a-3',), 0, 0), [('a-2',)]),
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',)]),
1521
1552
self.check_file_contents('test.kndx',
1522
'# bzr knit index 8\n'
1524
'a-1 fulltext 0 0 :\n'
1525
'a-2 fulltext 0 0 0 :\n'
1526
'a-3 fulltext 0 0 1 :'
1528
self.assertEqual(set([('a-3',), ('a-1',), ('a-2',)]), idx.keys())
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())
1529
1560
self.assertEqual({
1530
('a-1',): ((('a-1',), 0, 0), None, (), ('fulltext', False)),
1531
('a-2',): ((('a-2',), 0, 0), None, (('a-1',),), ('fulltext', False)),
1532
('a-3',): ((('a-3',), 0, 0), None, (('a-2',),), ('fulltext', False)),
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)),
1533
1564
}, idx.get_build_details(idx.keys()))
1534
self.assertEqual({('a-1',):(),
1535
('a-2',):(('a-1',),),
1536
('a-3',):(('a-2',),),},
1537
idx.get_parent_map(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()))
1539
1570
def test_add_versions_fails_clean(self):
1540
1571
"""If add_versions fails in the middle, it restores a pristine state.
1614
1645
# delta compression inn the index
1615
1646
index1 = self.make_g_index('1', 2, [
1616
(('tip', ), 'N0 100', ([('parent', )], [], )),
1617
(('tail', ), '', ([], []))])
1647
((b'tip', ), b'N0 100', ([(b'parent', )], [], )),
1648
((b'tail', ), b'', ([], []))])
1618
1649
index2 = self.make_g_index('2', 2, [
1619
(('parent', ), ' 100 78', ([('tail', ), ('ghost', )], [('tail', )])),
1620
(('separate', ), '', ([], []))])
1650
((b'parent', ), b' 100 78',
1651
([(b'tail', ), (b'ghost', )], [(b'tail', )])),
1652
((b'separate', ), b'', ([], []))])
1622
1654
# just blob location and graph in the index.
1623
1655
index1 = self.make_g_index('1', 1, [
1624
(('tip', ), 'N0 100', ([('parent', )], )),
1625
(('tail', ), '', ([], ))])
1656
((b'tip', ), b'N0 100', ([(b'parent', )], )),
1657
((b'tail', ), b'', ([], ))])
1626
1658
index2 = self.make_g_index('2', 1, [
1627
(('parent', ), ' 100 78', ([('tail', ), ('ghost', )], )),
1628
(('separate', ), '', ([], ))])
1659
((b'parent', ), b' 100 78', ([(b'tail', ), (b'ghost', )], )),
1660
((b'separate', ), b'', ([], ))])
1629
1661
combined_index = CombinedGraphIndex([index1, index2])
1631
1663
self.combined_index = combined_index
1633
1665
add_callback = self.catch_add
1635
1667
add_callback = None
1636
return _KnitGraphIndex(combined_index, lambda:True, deltas=deltas,
1637
add_callback=add_callback)
1668
return _KnitGraphIndex(combined_index, lambda: True, deltas=deltas,
1669
add_callback=add_callback)
1639
1671
def test_keys(self):
1640
1672
index = self.two_graph_index()
1641
self.assertEqual(set([('tail',), ('tip',), ('parent',), ('separate',)]),
1673
self.assertEqual({(b'tail',), (b'tip',), (b'parent',), (b'separate',)},
1644
1676
def test_get_position(self):
1645
1677
index = self.two_graph_index()
1646
self.assertEqual((index._graph_index._indices[0], 0, 100), index.get_position(('tip',)))
1647
self.assertEqual((index._graph_index._indices[1], 100, 78), index.get_position(('parent',)))
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',)))
1649
1683
def test_get_method_deltas(self):
1650
1684
index = self.two_graph_index(deltas=True)
1651
self.assertEqual('fulltext', index.get_method(('tip',)))
1652
self.assertEqual('line-delta', index.get_method(('parent',)))
1685
self.assertEqual('fulltext', index.get_method((b'tip',)))
1686
self.assertEqual('line-delta', index.get_method((b'parent',)))
1654
1688
def test_get_method_no_deltas(self):
1655
1689
# check that the parent-history lookup is ignored with deltas=False.
1656
1690
index = self.two_graph_index(deltas=False)
1657
self.assertEqual('fulltext', index.get_method(('tip',)))
1658
self.assertEqual('fulltext', index.get_method(('parent',)))
1691
self.assertEqual('fulltext', index.get_method((b'tip',)))
1692
self.assertEqual('fulltext', index.get_method((b'parent',)))
1660
1694
def test_get_options_deltas(self):
1661
1695
index = self.two_graph_index(deltas=True)
1662
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1663
self.assertEqual(['line-delta'], index.get_options(('parent',)))
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',)))
1665
1700
def test_get_options_no_deltas(self):
1666
1701
# check that the parent-history lookup is ignored with deltas=False.
1667
1702
index = self.two_graph_index(deltas=False)
1668
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1669
self.assertEqual(['fulltext'], index.get_options(('parent',)))
1703
self.assertEqual([b'fulltext', b'no-eol'],
1704
index.get_options((b'tip',)))
1705
self.assertEqual([b'fulltext'], index.get_options((b'parent',)))
1671
1707
def test_get_parent_map(self):
1672
1708
index = self.two_graph_index()
1673
self.assertEqual({('parent',):(('tail',), ('ghost',))},
1674
index.get_parent_map([('parent',), ('ghost',)]))
1709
self.assertEqual({(b'parent',): ((b'tail',), (b'ghost',))},
1710
index.get_parent_map([(b'parent',), (b'ghost',)]))
1676
1712
def catch_add(self, entries):
1677
1713
self.caught_entries.append(entries)
1679
1715
def test_add_no_callback_errors(self):
1680
1716
index = self.two_graph_index()
1681
1717
self.assertRaises(errors.ReadOnlyError, index.add_records,
1682
[(('new',), 'fulltext,no-eol', (None, 50, 60), ['separate'])])
1718
[((b'new',), b'fulltext,no-eol', (None, 50, 60), [b'separate'])])
1684
1720
def test_add_version_smoke(self):
1685
1721
index = self.two_graph_index(catch_adds=True)
1686
index.add_records([(('new',), 'fulltext,no-eol', (None, 50, 60),
1688
self.assertEqual([[(('new', ), 'N50 60', ((('separate',),),))]],
1689
self.caught_entries)
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)
1691
1727
def test_add_version_delta_not_delta_index(self):
1692
1728
index = self.two_graph_index(catch_adds=True)
1693
self.assertRaises(errors.KnitCorrupt, index.add_records,
1694
[(('new',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
1729
self.assertRaises(KnitCorrupt, index.add_records,
1730
[((b'new',), b'no-eol,line-delta', (None, 0, 100), [(b'parent',)])])
1695
1731
self.assertEqual([], self.caught_entries)
1697
1733
def test_add_version_same_dup(self):
1698
1734
index = self.two_graph_index(catch_adds=True)
1699
1735
# options can be spelt two different ways
1700
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
1701
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100), [('parent',)])])
1737
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [(b'parent',)])])
1739
[((b'tip',), b'no-eol,fulltext', (None, 0, 100), [(b'parent',)])])
1702
1740
# position/length are ignored (because each pack could have fulltext or
1703
1741
# delta, and be at a different position.
1704
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100),
1706
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000),
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),
1708
1746
# but neither should have added data:
1709
1747
self.assertEqual([[], [], [], []], self.caught_entries)
1711
1749
def test_add_version_different_dup(self):
1712
1750
index = self.two_graph_index(deltas=True, catch_adds=True)
1713
1751
# change options
1714
self.assertRaises(errors.KnitCorrupt, index.add_records,
1715
[(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
1716
self.assertRaises(errors.KnitCorrupt, index.add_records,
1717
[(('tip',), 'fulltext', (None, 0, 100), [('parent',)])])
1752
self.assertRaises(KnitCorrupt, index.add_records,
1753
[((b'tip',), b'line-delta', (None, 0, 100), [(b'parent',)])])
1754
self.assertRaises(KnitCorrupt, index.add_records,
1755
[((b'tip',), b'fulltext', (None, 0, 100), [(b'parent',)])])
1719
self.assertRaises(errors.KnitCorrupt, index.add_records,
1720
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1757
self.assertRaises(KnitCorrupt, index.add_records,
1758
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [])])
1721
1759
self.assertEqual([], self.caught_entries)
1723
1761
def test_add_versions_nodeltas(self):
1724
1762
index = self.two_graph_index(catch_adds=True)
1725
1763
index.add_records([
1726
(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)]),
1727
(('new2',), 'fulltext', (None, 0, 6), [('new',)]),
1729
self.assertEqual([(('new', ), 'N50 60', ((('separate',),),)),
1730
(('new2', ), ' 0 6', ((('new',),),))],
1731
sorted(self.caught_entries[0]))
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]))
1732
1770
self.assertEqual(1, len(self.caught_entries))
1734
1772
def test_add_versions_deltas(self):
1735
1773
index = self.two_graph_index(deltas=True, catch_adds=True)
1736
1774
index.add_records([
1737
(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)]),
1738
(('new2',), 'line-delta', (None, 0, 6), [('new',)]),
1740
self.assertEqual([(('new', ), 'N50 60', ((('separate',),), ())),
1741
(('new2', ), ' 0 6', ((('new',),), (('new',),), ))],
1742
sorted(self.caught_entries[0]))
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]))
1743
1781
self.assertEqual(1, len(self.caught_entries))
1745
1783
def test_add_versions_delta_not_delta_index(self):
1746
1784
index = self.two_graph_index(catch_adds=True)
1747
self.assertRaises(errors.KnitCorrupt, index.add_records,
1748
[(('new',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
1785
self.assertRaises(KnitCorrupt, index.add_records,
1786
[((b'new',), b'no-eol,line-delta', (None, 0, 100), [(b'parent',)])])
1749
1787
self.assertEqual([], self.caught_entries)
1751
1789
def test_add_versions_random_id_accepted(self):
1755
1793
def test_add_versions_same_dup(self):
1756
1794
index = self.two_graph_index(catch_adds=True)
1757
1795
# options can be spelt two different ways
1758
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100),
1760
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100),
1796
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 0, 100),
1798
index.add_records([((b'tip',), b'no-eol,fulltext', (None, 0, 100),
1762
1800
# position/length are ignored (because each pack could have fulltext or
1763
1801
# delta, and be at a different position.
1764
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100),
1766
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000),
1802
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 50, 100),
1804
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 0, 1000),
1768
1806
# but neither should have added data.
1769
1807
self.assertEqual([[], [], [], []], self.caught_entries)
1771
1809
def test_add_versions_different_dup(self):
1772
1810
index = self.two_graph_index(deltas=True, catch_adds=True)
1773
1811
# change options
1774
self.assertRaises(errors.KnitCorrupt, index.add_records,
1775
[(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
1776
self.assertRaises(errors.KnitCorrupt, index.add_records,
1777
[(('tip',), 'fulltext', (None, 0, 100), [('parent',)])])
1812
self.assertRaises(KnitCorrupt, index.add_records,
1813
[((b'tip',), b'line-delta', (None, 0, 100), [(b'parent',)])])
1814
self.assertRaises(KnitCorrupt, index.add_records,
1815
[((b'tip',), b'fulltext', (None, 0, 100), [(b'parent',)])])
1779
self.assertRaises(errors.KnitCorrupt, index.add_records,
1780
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1817
self.assertRaises(KnitCorrupt, index.add_records,
1818
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [])])
1781
1819
# change options in the second record
1782
self.assertRaises(errors.KnitCorrupt, index.add_records,
1783
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)]),
1784
(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
1820
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',)])])
1785
1823
self.assertEqual([], self.caught_entries)
1787
1825
def make_g_index_missing_compression_parent(self):
1788
1826
graph_index = self.make_g_index('missing_comp', 2,
1789
[(('tip', ), ' 100 78',
1790
([('missing-parent', ), ('ghost', )], [('missing-parent', )]))])
1827
[((b'tip', ), b' 100 78',
1828
([(b'missing-parent', ), (b'ghost', )], [(b'missing-parent', )]))])
1791
1829
return graph_index
1793
1831
def make_g_index_missing_parent(self):
1794
1832
graph_index = self.make_g_index('missing_parent', 2,
1795
[(('parent', ), ' 100 78', ([], [])),
1796
(('tip', ), ' 100 78',
1797
([('parent', ), ('missing-parent', )], [('parent', )])),
1833
[((b'parent', ), b' 100 78', ([], [])),
1834
((b'tip', ), b' 100 78',
1835
([(b'parent', ), (b'missing-parent', )], [(b'parent', )])),
1799
1837
return graph_index
1801
1839
def make_g_index_no_external_refs(self):
1802
1840
graph_index = self.make_g_index('no_external_refs', 2,
1803
[(('rev', ), ' 100 78',
1804
([('parent', ), ('ghost', )], []))])
1841
[((b'rev', ), b' 100 78',
1842
([(b'parent', ), (b'ghost', )], []))])
1805
1843
return graph_index
1807
1845
def test_add_good_unvalidated_index(self):
1935
1973
add_callback = self.catch_add
1937
1975
add_callback = None
1938
return _KnitGraphIndex(combined_index, lambda:True, parents=False,
1939
add_callback=add_callback)
1976
return _KnitGraphIndex(combined_index, lambda: True, parents=False,
1977
add_callback=add_callback)
1941
1979
def test_keys(self):
1942
1980
index = self.two_graph_index()
1943
self.assertEqual(set([('tail',), ('tip',), ('parent',), ('separate',)]),
1981
self.assertEqual({(b'tail',), (b'tip',), (b'parent',), (b'separate',)},
1946
1984
def test_get_position(self):
1947
1985
index = self.two_graph_index()
1948
1986
self.assertEqual((index._graph_index._indices[0], 0, 100),
1949
index.get_position(('tip',)))
1987
index.get_position((b'tip',)))
1950
1988
self.assertEqual((index._graph_index._indices[1], 100, 78),
1951
index.get_position(('parent',)))
1989
index.get_position((b'parent',)))
1953
1991
def test_get_method(self):
1954
1992
index = self.two_graph_index()
1955
self.assertEqual('fulltext', index.get_method(('tip',)))
1956
self.assertEqual(['fulltext'], index.get_options(('parent',)))
1993
self.assertEqual('fulltext', index.get_method((b'tip',)))
1994
self.assertEqual([b'fulltext'], index.get_options((b'parent',)))
1958
1996
def test_get_options(self):
1959
1997
index = self.two_graph_index()
1960
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1961
self.assertEqual(['fulltext'], index.get_options(('parent',)))
1998
self.assertEqual([b'fulltext', b'no-eol'],
1999
index.get_options((b'tip',)))
2000
self.assertEqual([b'fulltext'], index.get_options((b'parent',)))
1963
2002
def test_get_parent_map(self):
1964
2003
index = self.two_graph_index()
1965
self.assertEqual({('parent',):None},
1966
index.get_parent_map([('parent',), ('ghost',)]))
2004
self.assertEqual({(b'parent',): None},
2005
index.get_parent_map([(b'parent',), (b'ghost',)]))
1968
2007
def catch_add(self, entries):
1969
2008
self.caught_entries.append(entries)
1971
2010
def test_add_no_callback_errors(self):
1972
2011
index = self.two_graph_index()
1973
2012
self.assertRaises(errors.ReadOnlyError, index.add_records,
1974
[(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)])])
2013
[((b'new',), b'fulltext,no-eol', (None, 50, 60), [(b'separate',)])])
1976
2015
def test_add_version_smoke(self):
1977
2016
index = self.two_graph_index(catch_adds=True)
1978
index.add_records([(('new',), 'fulltext,no-eol', (None, 50, 60), [])])
1979
self.assertEqual([[(('new', ), 'N50 60')]],
1980
self.caught_entries)
2018
[((b'new',), b'fulltext,no-eol', (None, 50, 60), [])])
2019
self.assertEqual([[((b'new', ), b'N50 60')]],
2020
self.caught_entries)
1982
2022
def test_add_version_delta_not_delta_index(self):
1983
2023
index = self.two_graph_index(catch_adds=True)
1984
self.assertRaises(errors.KnitCorrupt, index.add_records,
1985
[(('new',), 'no-eol,line-delta', (None, 0, 100), [])])
2024
self.assertRaises(KnitCorrupt, index.add_records,
2025
[((b'new',), b'no-eol,line-delta', (None, 0, 100), [])])
1986
2026
self.assertEqual([], self.caught_entries)
1988
2028
def test_add_version_same_dup(self):
1989
2029
index = self.two_graph_index(catch_adds=True)
1990
2030
# options can be spelt two different ways
1991
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1992
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100), [])])
2032
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [])])
2034
[((b'tip',), b'no-eol,fulltext', (None, 0, 100), [])])
1993
2035
# position/length are ignored (because each pack could have fulltext or
1994
2036
# delta, and be at a different position.
1995
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100), [])])
1996
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000), [])])
2038
[((b'tip',), b'fulltext,no-eol', (None, 50, 100), [])])
2040
[((b'tip',), b'fulltext,no-eol', (None, 0, 1000), [])])
1997
2041
# but neither should have added data.
1998
2042
self.assertEqual([[], [], [], []], self.caught_entries)
2000
2044
def test_add_version_different_dup(self):
2001
2045
index = self.two_graph_index(catch_adds=True)
2002
2046
# change options
2003
self.assertRaises(errors.KnitCorrupt, index.add_records,
2004
[(('tip',), 'no-eol,line-delta', (None, 0, 100), [])])
2005
self.assertRaises(errors.KnitCorrupt, index.add_records,
2006
[(('tip',), 'line-delta,no-eol', (None, 0, 100), [])])
2007
self.assertRaises(errors.KnitCorrupt, index.add_records,
2008
[(('tip',), 'fulltext', (None, 0, 100), [])])
2047
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), [])])
2010
self.assertRaises(errors.KnitCorrupt, index.add_records,
2011
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
2054
self.assertRaises(KnitCorrupt, index.add_records,
2055
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [(b'parent',)])])
2012
2056
self.assertEqual([], self.caught_entries)
2014
2058
def test_add_versions(self):
2015
2059
index = self.two_graph_index(catch_adds=True)
2016
2060
index.add_records([
2017
(('new',), 'fulltext,no-eol', (None, 50, 60), []),
2018
(('new2',), 'fulltext', (None, 0, 6), []),
2020
self.assertEqual([(('new', ), 'N50 60'), (('new2', ), ' 0 6')],
2021
sorted(self.caught_entries[0]))
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]))
2022
2066
self.assertEqual(1, len(self.caught_entries))
2024
2068
def test_add_versions_delta_not_delta_index(self):
2025
2069
index = self.two_graph_index(catch_adds=True)
2026
self.assertRaises(errors.KnitCorrupt, index.add_records,
2027
[(('new',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
2070
self.assertRaises(KnitCorrupt, index.add_records,
2071
[((b'new',), b'no-eol,line-delta', (None, 0, 100), [(b'parent',)])])
2028
2072
self.assertEqual([], self.caught_entries)
2030
2074
def test_add_versions_parents_not_parents_index(self):
2031
2075
index = self.two_graph_index(catch_adds=True)
2032
self.assertRaises(errors.KnitCorrupt, index.add_records,
2033
[(('new',), 'no-eol,fulltext', (None, 0, 100), [('parent',)])])
2076
self.assertRaises(KnitCorrupt, index.add_records,
2077
[((b'new',), b'no-eol,fulltext', (None, 0, 100), [(b'parent',)])])
2034
2078
self.assertEqual([], self.caught_entries)
2036
2080
def test_add_versions_random_id_accepted(self):
2040
2084
def test_add_versions_same_dup(self):
2041
2085
index = self.two_graph_index(catch_adds=True)
2042
2086
# options can be spelt two different ways
2043
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
2044
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100), [])])
2088
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [])])
2090
[((b'tip',), b'no-eol,fulltext', (None, 0, 100), [])])
2045
2091
# position/length are ignored (because each pack could have fulltext or
2046
2092
# delta, and be at a different position.
2047
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100), [])])
2048
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000), [])])
2094
[((b'tip',), b'fulltext,no-eol', (None, 50, 100), [])])
2096
[((b'tip',), b'fulltext,no-eol', (None, 0, 1000), [])])
2049
2097
# but neither should have added data.
2050
2098
self.assertEqual([[], [], [], []], self.caught_entries)
2052
2100
def test_add_versions_different_dup(self):
2053
2101
index = self.two_graph_index(catch_adds=True)
2054
2102
# change options
2055
self.assertRaises(errors.KnitCorrupt, index.add_records,
2056
[(('tip',), 'no-eol,line-delta', (None, 0, 100), [])])
2057
self.assertRaises(errors.KnitCorrupt, index.add_records,
2058
[(('tip',), 'line-delta,no-eol', (None, 0, 100), [])])
2059
self.assertRaises(errors.KnitCorrupt, index.add_records,
2060
[(('tip',), 'fulltext', (None, 0, 100), [])])
2103
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), [])])
2062
self.assertRaises(errors.KnitCorrupt, index.add_records,
2063
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
2110
self.assertRaises(KnitCorrupt, index.add_records,
2111
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [(b'parent',)])])
2064
2112
# change options in the second record
2065
self.assertRaises(errors.KnitCorrupt, index.add_records,
2066
[(('tip',), 'fulltext,no-eol', (None, 0, 100), []),
2067
(('tip',), 'no-eol,line-delta', (None, 0, 100), [])])
2113
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), [])])
2068
2116
self.assertEqual([], self.caught_entries)
2126
2174
_min_buffer_size=125)
2128
2176
def test__split_by_prefix(self):
2129
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
2130
'g': [('g', 'b'), ('g', 'a')],
2132
[('f', 'a'), ('g', 'b'),
2133
('g', 'a'), ('f', 'b')])
2135
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
2136
'g': [('g', 'b'), ('g', 'a')],
2138
[('f', 'a'), ('f', 'b'),
2139
('g', 'b'), ('g', 'a')])
2141
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
2142
'g': [('g', 'b'), ('g', 'a')],
2144
[('f', 'a'), ('f', 'b'),
2145
('g', 'b'), ('g', 'a')])
2147
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
2148
'g': [('g', 'b'), ('g', 'a')],
2149
'': [('a',), ('b',)]
2151
[('f', 'a'), ('g', 'b'),
2153
('g', 'a'), ('f', 'b')])
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')])
2156
2204
class TestStacking(KnitTests):
2172
2220
def test_add_lines(self):
2173
2221
# lines added to the test are not added to the basis
2174
2222
basis, test = self.get_basis_and_test_knit()
2176
key_basis = ('bar',)
2177
key_cross_border = ('quux',)
2178
key_delta = ('zaphod',)
2179
test.add_lines(key, (), ['foo\n'])
2224
key_basis = (b'bar',)
2225
key_cross_border = (b'quux',)
2226
key_delta = (b'zaphod',)
2227
test.add_lines(key, (), [b'foo\n'])
2180
2228
self.assertEqual({}, basis.get_parent_map([key]))
2181
2229
# lines added to the test that reference across the stack do a
2183
basis.add_lines(key_basis, (), ['foo\n'])
2231
basis.add_lines(key_basis, (), [b'foo\n'])
2184
2232
basis.calls = []
2185
test.add_lines(key_cross_border, (key_basis,), ['foo\n'])
2233
test.add_lines(key_cross_border, (key_basis,), [b'foo\n'])
2186
2234
self.assertEqual('fulltext', test._index.get_method(key_cross_border))
2187
2235
# we don't even need to look at the basis to see that this should be
2188
2236
# stored as a fulltext
2189
2237
self.assertEqual([], basis.calls)
2190
2238
# Subsequent adds do delta.
2191
2239
basis.calls = []
2192
test.add_lines(key_delta, (key_cross_border,), ['foo\n'])
2240
test.add_lines(key_delta, (key_cross_border,), [b'foo\n'])
2193
2241
self.assertEqual('line-delta', test._index.get_method(key_delta))
2194
2242
self.assertEqual([], basis.calls)
2196
2244
def test_annotate(self):
2197
2245
# annotations from the test knit are answered without asking the basis
2198
2246
basis, test = self.get_basis_and_test_knit()
2200
key_basis = ('bar',)
2201
key_missing = ('missing',)
2202
test.add_lines(key, (), ['foo\n'])
2248
key_basis = (b'bar',)
2249
test.add_lines(key, (), [b'foo\n'])
2203
2250
details = test.annotate(key)
2204
self.assertEqual([(key, 'foo\n')], details)
2251
self.assertEqual([(key, b'foo\n')], details)
2205
2252
self.assertEqual([], basis.calls)
2206
2253
# But texts that are not in the test knit are looked for in the basis
2208
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2255
basis.add_lines(key_basis, (), [b'foo\n', b'bar\n'])
2209
2256
basis.calls = []
2210
2257
details = test.annotate(key_basis)
2211
self.assertEqual([(key_basis, 'foo\n'), (key_basis, 'bar\n')], details)
2259
[(key_basis, b'foo\n'), (key_basis, b'bar\n')], details)
2212
2260
# Not optimised to date:
2213
2261
# self.assertEqual([("annotate", key_basis)], basis.calls)
2214
self.assertEqual([('get_parent_map', set([key_basis])),
2215
('get_parent_map', set([key_basis])),
2216
('get_record_stream', [key_basis], 'topological', True)],
2262
self.assertEqual([('get_parent_map', {key_basis}),
2263
('get_parent_map', {key_basis}),
2264
('get_record_stream', [key_basis], 'topological', True)],
2219
2267
def test_check(self):
2220
2268
# At the moment checking a stacked knit does implicitly check the
2402
record = source.get_record_stream([result[0]], 'unordered',
2455
record = next(source.get_record_stream([result[0]], 'unordered',
2404
2457
self.assertEqual(record.key, result[0])
2405
2458
self.assertEqual(record.sha1, result[1])
2406
2459
self.assertEqual(record.storage_kind, result[2])
2407
self.assertEqual(record.get_bytes_as(record.storage_kind), result[3])
2460
self.assertEqual(record.get_bytes_as(
2461
record.storage_kind), result[3])
2408
2462
# It's not strictly minimal, but it seems reasonable for now for it to
2409
2463
# ask which fallbacks have which parents.
2410
2464
self.assertEqual([
2411
("get_parent_map", set([key_basis, key_basis_2, key_missing])),
2465
("get_parent_map", {key_basis, key_basis_2, key_missing}),
2412
2466
("get_record_stream", [key_basis_2, key_basis], 'topological', False)],
2415
2469
def test_get_sha1s(self):
2416
2470
# sha1's in the test knit are answered without asking the basis
2417
2471
basis, test = self.get_basis_and_test_knit()
2419
key_basis = ('bar',)
2420
key_missing = ('missing',)
2421
test.add_lines(key, (), ['foo\n'])
2422
key_sha1sum = osutils.sha('foo\n').hexdigest()
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')
2423
2477
sha1s = test.get_sha1s([key])
2424
2478
self.assertEqual({key: key_sha1sum}, sha1s)
2425
2479
self.assertEqual([], basis.calls)
2426
2480
# But texts that are not in the test knit are looked for in the basis
2427
2481
# directly (rather than via text reconstruction) so that remote servers
2428
2482
# etc don't have to answer with full content.
2429
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2430
basis_sha1sum = osutils.sha('foo\nbar\n').hexdigest()
2483
basis.add_lines(key_basis, (), [b'foo\n', b'bar\n'])
2484
basis_sha1sum = osutils.sha_string(b'foo\nbar\n')
2431
2485
basis.calls = []
2432
2486
sha1s = test.get_sha1s([key, key_missing, key_basis])
2433
2487
self.assertEqual({key: key_sha1sum,
2434
key_basis: basis_sha1sum}, sha1s)
2435
self.assertEqual([("get_sha1s", set([key_basis, key_missing]))],
2488
key_basis: basis_sha1sum}, sha1s)
2489
self.assertEqual([("get_sha1s", {key_basis, key_missing})],
2438
2492
def test_insert_record_stream(self):
2439
2493
# records are inserted as normal; insert_record_stream builds on
2440
2494
# add_lines, so a smoke test should be all that's needed:
2442
key_basis = ('bar',)
2443
key_delta = ('zaphod',)
2495
key_basis = (b'bar',)
2496
key_delta = (b'zaphod',)
2444
2497
basis, test = self.get_basis_and_test_knit()
2445
2498
source = self.make_test_knit(name='source')
2446
basis.add_lines(key_basis, (), ['foo\n'])
2499
basis.add_lines(key_basis, (), [b'foo\n'])
2447
2500
basis.calls = []
2448
source.add_lines(key_basis, (), ['foo\n'])
2449
source.add_lines(key_delta, (key_basis,), ['bar\n'])
2501
source.add_lines(key_basis, (), [b'foo\n'])
2502
source.add_lines(key_delta, (key_basis,), [b'bar\n'])
2450
2503
stream = source.get_record_stream([key_delta], 'unordered', False)
2451
2504
test.insert_record_stream(stream)
2452
2505
# XXX: this does somewhat too many calls in making sure of whether it
2453
2506
# has to recreate the full text.
2454
self.assertEqual([("get_parent_map", set([key_basis])),
2455
('get_parent_map', set([key_basis])),
2456
('get_record_stream', [key_basis], 'unordered', True)],
2458
self.assertEqual({key_delta:(key_basis,)},
2459
test.get_parent_map([key_delta]))
2460
self.assertEqual('bar\n', test.get_record_stream([key_delta],
2461
'unordered', True).next().get_bytes_as('fulltext'))
2507
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'))
2463
2516
def test_iter_lines_added_or_present_in_keys(self):
2464
2517
# Lines from the basis are returned, and lines for a given key are only
2465
2518
# returned once.
2468
2521
# all sources are asked for keys:
2469
2522
basis, test = self.get_basis_and_test_knit()
2470
basis.add_lines(key1, (), ["foo"])
2523
basis.add_lines(key1, (), [b"foo"])
2471
2524
basis.calls = []
2472
2525
lines = list(test.iter_lines_added_or_present_in_keys([key1]))
2473
self.assertEqual([("foo\n", key1)], lines)
2474
self.assertEqual([("iter_lines_added_or_present_in_keys", set([key1]))],
2526
self.assertEqual([(b"foo\n", key1)], lines)
2527
self.assertEqual([("iter_lines_added_or_present_in_keys", {key1})],
2476
2529
# keys in both are not duplicated:
2477
test.add_lines(key2, (), ["bar\n"])
2478
basis.add_lines(key2, (), ["bar\n"])
2530
test.add_lines(key2, (), [b"bar\n"])
2531
basis.add_lines(key2, (), [b"bar\n"])
2479
2532
basis.calls = []
2480
2533
lines = list(test.iter_lines_added_or_present_in_keys([key2]))
2481
self.assertEqual([("bar\n", key2)], lines)
2534
self.assertEqual([(b"bar\n", key2)], lines)
2482
2535
self.assertEqual([], basis.calls)
2484
2537
def test_keys(self):
2487
2540
# all sources are asked for keys:
2488
2541
basis, test = self.get_basis_and_test_knit()
2489
2542
keys = test.keys()
2501
2554
basis.calls = []
2502
2555
keys = test.keys()
2503
2556
self.assertEqual(2, len(keys))
2504
self.assertEqual(set([key1, key2]), set(keys))
2557
self.assertEqual({key1, key2}, set(keys))
2505
2558
self.assertEqual([("keys",)], basis.calls)
2507
2560
def test_add_mpdiffs(self):
2508
2561
# records are inserted as normal; add_mpdiff builds on
2509
2562
# add_lines, so a smoke test should be all that's needed:
2511
key_basis = ('bar',)
2512
key_delta = ('zaphod',)
2563
key_basis = (b'bar',)
2564
key_delta = (b'zaphod',)
2513
2565
basis, test = self.get_basis_and_test_knit()
2514
2566
source = self.make_test_knit(name='source')
2515
basis.add_lines(key_basis, (), ['foo\n'])
2567
basis.add_lines(key_basis, (), [b'foo\n'])
2516
2568
basis.calls = []
2517
source.add_lines(key_basis, (), ['foo\n'])
2518
source.add_lines(key_delta, (key_basis,), ['bar\n'])
2569
source.add_lines(key_basis, (), [b'foo\n'])
2570
source.add_lines(key_delta, (key_basis,), [b'bar\n'])
2519
2571
diffs = source.make_mpdiffs([key_delta])
2520
2572
test.add_mpdiffs([(key_delta, (key_basis,),
2521
source.get_sha1s([key_delta])[key_delta], diffs[0])])
2522
self.assertEqual([("get_parent_map", set([key_basis])),
2523
('get_record_stream', [key_basis], 'unordered', True),],
2525
self.assertEqual({key_delta:(key_basis,)},
2526
test.get_parent_map([key_delta]))
2527
self.assertEqual('bar\n', test.get_record_stream([key_delta],
2528
'unordered', True).next().get_bytes_as('fulltext'))
2573
source.get_sha1s([key_delta])[key_delta], diffs[0])])
2574
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'))
2530
2582
def test_make_mpdiffs(self):
2531
2583
# Generating an mpdiff across a stacking boundary should detect parent
2532
2584
# texts regions.
2535
key_right = ('zaphod',)
2586
key_left = (b'bar',)
2587
key_right = (b'zaphod',)
2536
2588
basis, test = self.get_basis_and_test_knit()
2537
basis.add_lines(key_left, (), ['bar\n'])
2538
basis.add_lines(key_right, (), ['zaphod\n'])
2589
basis.add_lines(key_left, (), [b'bar\n'])
2590
basis.add_lines(key_right, (), [b'zaphod\n'])
2539
2591
basis.calls = []
2540
2592
test.add_lines(key, (key_left, key_right),
2541
['bar\n', 'foo\n', 'zaphod\n'])
2593
[b'bar\n', b'foo\n', b'zaphod\n'])
2542
2594
diffs = test.make_mpdiffs([key])
2543
2595
self.assertEqual([
2544
2596
multiparent.MultiParent([multiparent.ParentText(0, 0, 0, 1),
2545
multiparent.NewText(['foo\n']),
2546
multiparent.ParentText(1, 0, 2, 1)])],
2597
multiparent.NewText([b'foo\n']),
2598
multiparent.ParentText(1, 0, 2, 1)])],
2548
2600
self.assertEqual(3, len(basis.calls))
2549
2601
self.assertEqual([
2550
("get_parent_map", set([key_left, key_right])),
2551
("get_parent_map", set([key_left, key_right])),
2602
("get_parent_map", {key_left, key_right}),
2603
("get_parent_map", {key_left, key_right}),
2553
2605
basis.calls[:-1])
2554
2606
last_call = basis.calls[-1]
2555
2607
self.assertEqual('get_record_stream', last_call[0])
2556
self.assertEqual(set([key_left, key_right]), set(last_call[1]))
2608
self.assertEqual({key_left, key_right}, set(last_call[1]))
2557
2609
self.assertEqual('topological', last_call[2])
2558
2610
self.assertEqual(True, last_call[3])
2564
2616
def test_include_delta_closure_generates_a_knit_delta_closure(self):
2565
2617
vf = self.make_test_knit(name='test')
2566
2618
# put in three texts, giving ft, delta, delta
2567
vf.add_lines(('base',), (), ['base\n', 'content\n'])
2568
vf.add_lines(('d1',), (('base',),), ['d1\n'])
2569
vf.add_lines(('d2',), (('d1',),), ['d2\n'])
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'])
2570
2622
# But heuristics could interfere, so check what happened:
2571
2623
self.assertEqual(['knit-ft-gz', 'knit-delta-gz', 'knit-delta-gz'],
2572
[record.storage_kind for record in
2573
vf.get_record_stream([('base',), ('d1',), ('d2',)],
2574
'topological', False)])
2624
[record.storage_kind for record in
2625
vf.get_record_stream([(b'base',), (b'd1',), (b'd2',)],
2626
'topological', False)])
2575
2627
# generate a stream of just the deltas include_delta_closure=True,
2576
2628
# serialise to the network, and check that we get a delta closure on the wire.
2577
stream = vf.get_record_stream([('d1',), ('d2',)], 'topological', True)
2629
stream = vf.get_record_stream(
2630
[(b'd1',), (b'd2',)], 'topological', True)
2578
2631
netb = [record.get_bytes_as(record.storage_kind) for record in stream]
2579
2632
# The first bytes should be a memo from _ContentMapGenerator, and the
2580
2633
# second bytes should be empty (because its a API proxy not something
2581
2634
# for wire serialisation.
2582
self.assertEqual('', netb[1])
2635
self.assertEqual(b'', netb[1])
2583
2636
bytes = netb[0]
2584
2637
kind, line_end = network_bytes_to_kind_and_offset(bytes)
2585
2638
self.assertEqual('knit-delta-closure', kind)
2591
2644
def test_get_record_stream_gives_records(self):
2592
2645
vf = self.make_test_knit(name='test')
2593
2646
# put in three texts, giving ft, delta, delta
2594
vf.add_lines(('base',), (), ['base\n', 'content\n'])
2595
vf.add_lines(('d1',), (('base',),), ['d1\n'])
2596
vf.add_lines(('d2',), (('d1',),), ['d2\n'])
2597
keys = [('d1',), ('d2',)]
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',)]
2598
2651
generator = _VFContentMapGenerator(vf, keys,
2599
global_map=vf.get_parent_map(keys))
2652
global_map=vf.get_parent_map(keys))
2600
2653
for record in generator.get_record_stream():
2601
if record.key == ('d1',):
2602
self.assertEqual('d1\n', record.get_bytes_as('fulltext'))
2654
if record.key == (b'd1',):
2655
self.assertEqual(b'd1\n', record.get_bytes_as('fulltext'))
2604
self.assertEqual('d2\n', record.get_bytes_as('fulltext'))
2657
self.assertEqual(b'd2\n', record.get_bytes_as('fulltext'))
2606
2659
def test_get_record_stream_kinds_are_raw(self):
2607
2660
vf = self.make_test_knit(name='test')
2608
2661
# put in three texts, giving ft, delta, delta
2609
vf.add_lines(('base',), (), ['base\n', 'content\n'])
2610
vf.add_lines(('d1',), (('base',),), ['d1\n'])
2611
vf.add_lines(('d2',), (('d1',),), ['d2\n'])
2612
keys = [('base',), ('d1',), ('d2',)]
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',)]
2613
2666
generator = _VFContentMapGenerator(vf, keys,
2614
global_map=vf.get_parent_map(keys))
2615
kinds = {('base',): 'knit-delta-closure',
2616
('d1',): 'knit-delta-closure-ref',
2617
('d2',): 'knit-delta-closure-ref',
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',
2619
2672
for record in generator.get_record_stream():
2620
2673
self.assertEqual(kinds[record.key], record.storage_kind)