124
273
return queue_call
276
class MockReadvFailingTransport(MockTransport):
277
"""Fail in the middle of a readv() result.
279
This Transport will successfully yield the first two requested hunks, but
280
raise NoSuchFile for the rest.
283
def readv(self, relpath, offsets):
285
for result in MockTransport.readv(self, relpath, offsets):
287
# we use 2 because the first offset is the pack header, the second
288
# is the first actual content requset
290
raise errors.NoSuchFile(relpath)
294
class KnitRecordAccessTestsMixin(object):
295
"""Tests for getting and putting knit records."""
297
def test_add_raw_records(self):
298
"""Add_raw_records adds records retrievable later."""
299
access = self.get_access()
300
memos = access.add_raw_records([('key', 10)], '1234567890')
301
self.assertEqual(['1234567890'], list(access.get_raw_records(memos)))
303
def test_add_several_raw_records(self):
304
"""add_raw_records with many records and read some back."""
305
access = self.get_access()
306
memos = access.add_raw_records([('key', 10), ('key2', 2), ('key3', 5)],
308
self.assertEqual(['1234567890', '12', '34567'],
309
list(access.get_raw_records(memos)))
310
self.assertEqual(['1234567890'],
311
list(access.get_raw_records(memos[0:1])))
312
self.assertEqual(['12'],
313
list(access.get_raw_records(memos[1:2])))
314
self.assertEqual(['34567'],
315
list(access.get_raw_records(memos[2:3])))
316
self.assertEqual(['1234567890', '34567'],
317
list(access.get_raw_records(memos[0:1] + memos[2:3])))
320
class TestKnitKnitAccess(TestCaseWithMemoryTransport, KnitRecordAccessTestsMixin):
321
"""Tests for the .kndx implementation."""
323
def get_access(self):
324
"""Get a .knit style access instance."""
325
mapper = ConstantMapper("foo")
326
access = _KnitKeyAccess(self.get_transport(), mapper)
330
class _TestException(Exception):
331
"""Just an exception for local tests to use."""
334
class TestPackKnitAccess(TestCaseWithMemoryTransport, KnitRecordAccessTestsMixin):
335
"""Tests for the pack based access."""
337
def get_access(self):
338
return self._get_access()[0]
340
def _get_access(self, packname='packfile', index='FOO'):
341
transport = self.get_transport()
342
def write_data(bytes):
343
transport.append_bytes(packname, bytes)
344
writer = pack.ContainerWriter(write_data)
346
access = _DirectPackAccess({})
347
access.set_writer(writer, index, (transport, packname))
348
return access, writer
350
def make_pack_file(self):
351
"""Create a pack file with 2 records."""
352
access, writer = self._get_access(packname='packname', index='foo')
354
memos.extend(access.add_raw_records([('key1', 10)], '1234567890'))
355
memos.extend(access.add_raw_records([('key2', 5)], '12345'))
359
def make_vf_for_retrying(self):
360
"""Create 3 packs and a reload function.
362
Originally, 2 pack files will have the data, but one will be missing.
363
And then the third will be used in place of the first two if reload()
366
:return: (versioned_file, reload_counter)
367
versioned_file a KnitVersionedFiles using the packs for access
369
tree = self.make_branch_and_memory_tree('tree')
371
self.addCleanup(tree.branch.repository.unlock)
372
tree.add([''], ['root-id'])
373
tree.commit('one', rev_id='rev-1')
374
tree.commit('two', rev_id='rev-2')
375
tree.commit('three', rev_id='rev-3')
376
# Pack these three revisions into another pack file, but don't remove
378
repo = tree.branch.repository
379
collection = repo._pack_collection
380
collection.ensure_loaded()
381
orig_packs = collection.packs
382
packer = pack_repo.Packer(collection, orig_packs, '.testpack')
383
new_pack = packer.pack()
384
# forget about the new pack
387
vf = tree.branch.repository.revisions
389
# Set up a reload() function that switches to using the new pack file
390
new_index = new_pack.revision_index
391
access_tuple = new_pack.access_tuple()
392
reload_counter = [0, 0, 0]
394
reload_counter[0] += 1
395
if reload_counter[1] > 0:
396
# We already reloaded, nothing more to do
397
reload_counter[2] += 1
399
reload_counter[1] += 1
400
vf._index._graph_index._indices[:] = [new_index]
401
vf._access._indices.clear()
402
vf._access._indices[new_index] = access_tuple
404
# Delete one of the pack files so the data will need to be reloaded. We
405
# will delete the file with 'rev-2' in it
406
trans, name = orig_packs[1].access_tuple()
408
# We don't have the index trigger reloading because we want to test
409
# that we reload when the .pack disappears
410
vf._access._reload_func = reload
411
return vf, reload_counter
413
def make_reload_func(self, return_val=True):
416
reload_called[0] += 1
418
return reload_called, reload
420
def make_retry_exception(self):
421
# We raise a real exception so that sys.exc_info() is properly
424
raise _TestException('foobar')
425
except _TestException, e:
426
retry_exc = errors.RetryWithNewPacks(None, reload_occurred=False,
427
exc_info=sys.exc_info())
430
def test_read_from_several_packs(self):
431
access, writer = self._get_access()
433
memos.extend(access.add_raw_records([('key', 10)], '1234567890'))
435
access, writer = self._get_access('pack2', 'FOOBAR')
436
memos.extend(access.add_raw_records([('key', 5)], '12345'))
438
access, writer = self._get_access('pack3', 'BAZ')
439
memos.extend(access.add_raw_records([('key', 5)], 'alpha'))
441
transport = self.get_transport()
442
access = _DirectPackAccess({"FOO":(transport, 'packfile'),
443
"FOOBAR":(transport, 'pack2'),
444
"BAZ":(transport, 'pack3')})
445
self.assertEqual(['1234567890', '12345', 'alpha'],
446
list(access.get_raw_records(memos)))
447
self.assertEqual(['1234567890'],
448
list(access.get_raw_records(memos[0:1])))
449
self.assertEqual(['12345'],
450
list(access.get_raw_records(memos[1:2])))
451
self.assertEqual(['alpha'],
452
list(access.get_raw_records(memos[2:3])))
453
self.assertEqual(['1234567890', 'alpha'],
454
list(access.get_raw_records(memos[0:1] + memos[2:3])))
456
def test_set_writer(self):
457
"""The writer should be settable post construction."""
458
access = _DirectPackAccess({})
459
transport = self.get_transport()
460
packname = 'packfile'
462
def write_data(bytes):
463
transport.append_bytes(packname, bytes)
464
writer = pack.ContainerWriter(write_data)
466
access.set_writer(writer, index, (transport, packname))
467
memos = access.add_raw_records([('key', 10)], '1234567890')
469
self.assertEqual(['1234567890'], list(access.get_raw_records(memos)))
471
def test_missing_index_raises_retry(self):
472
memos = self.make_pack_file()
473
transport = self.get_transport()
474
reload_called, reload_func = self.make_reload_func()
475
# Note that the index key has changed from 'foo' to 'bar'
476
access = _DirectPackAccess({'bar':(transport, 'packname')},
477
reload_func=reload_func)
478
e = self.assertListRaises(errors.RetryWithNewPacks,
479
access.get_raw_records, memos)
480
# Because a key was passed in which does not match our index list, we
481
# assume that the listing was already reloaded
482
self.assertTrue(e.reload_occurred)
483
self.assertIsInstance(e.exc_info, tuple)
484
self.assertIs(e.exc_info[0], KeyError)
485
self.assertIsInstance(e.exc_info[1], KeyError)
487
def test_missing_index_raises_key_error_with_no_reload(self):
488
memos = self.make_pack_file()
489
transport = self.get_transport()
490
# Note that the index key has changed from 'foo' to 'bar'
491
access = _DirectPackAccess({'bar':(transport, 'packname')})
492
e = self.assertListRaises(KeyError, access.get_raw_records, memos)
494
def test_missing_file_raises_retry(self):
495
memos = self.make_pack_file()
496
transport = self.get_transport()
497
reload_called, reload_func = self.make_reload_func()
498
# Note that the 'filename' has been changed to 'different-packname'
499
access = _DirectPackAccess({'foo':(transport, 'different-packname')},
500
reload_func=reload_func)
501
e = self.assertListRaises(errors.RetryWithNewPacks,
502
access.get_raw_records, memos)
503
# The file has gone missing, so we assume we need to reload
504
self.assertFalse(e.reload_occurred)
505
self.assertIsInstance(e.exc_info, tuple)
506
self.assertIs(e.exc_info[0], errors.NoSuchFile)
507
self.assertIsInstance(e.exc_info[1], errors.NoSuchFile)
508
self.assertEqual('different-packname', e.exc_info[1].path)
510
def test_missing_file_raises_no_such_file_with_no_reload(self):
511
memos = self.make_pack_file()
512
transport = self.get_transport()
513
# Note that the 'filename' has been changed to 'different-packname'
514
access = _DirectPackAccess({'foo':(transport, 'different-packname')})
515
e = self.assertListRaises(errors.NoSuchFile,
516
access.get_raw_records, memos)
518
def test_failing_readv_raises_retry(self):
519
memos = self.make_pack_file()
520
transport = self.get_transport()
521
failing_transport = MockReadvFailingTransport(
522
[transport.get_bytes('packname')])
523
reload_called, reload_func = self.make_reload_func()
524
access = _DirectPackAccess({'foo':(failing_transport, 'packname')},
525
reload_func=reload_func)
526
# Asking for a single record will not trigger the Mock failure
527
self.assertEqual(['1234567890'],
528
list(access.get_raw_records(memos[:1])))
529
self.assertEqual(['12345'],
530
list(access.get_raw_records(memos[1:2])))
531
# A multiple offset readv() will fail mid-way through
532
e = self.assertListRaises(errors.RetryWithNewPacks,
533
access.get_raw_records, memos)
534
# The file has gone missing, so we assume we need to reload
535
self.assertFalse(e.reload_occurred)
536
self.assertIsInstance(e.exc_info, tuple)
537
self.assertIs(e.exc_info[0], errors.NoSuchFile)
538
self.assertIsInstance(e.exc_info[1], errors.NoSuchFile)
539
self.assertEqual('packname', e.exc_info[1].path)
541
def test_failing_readv_raises_no_such_file_with_no_reload(self):
542
memos = self.make_pack_file()
543
transport = self.get_transport()
544
failing_transport = MockReadvFailingTransport(
545
[transport.get_bytes('packname')])
546
reload_called, reload_func = self.make_reload_func()
547
access = _DirectPackAccess({'foo':(failing_transport, 'packname')})
548
# Asking for a single record will not trigger the Mock failure
549
self.assertEqual(['1234567890'],
550
list(access.get_raw_records(memos[:1])))
551
self.assertEqual(['12345'],
552
list(access.get_raw_records(memos[1:2])))
553
# A multiple offset readv() will fail mid-way through
554
e = self.assertListRaises(errors.NoSuchFile,
555
access.get_raw_records, memos)
557
def test_reload_or_raise_no_reload(self):
558
access = _DirectPackAccess({}, reload_func=None)
559
retry_exc = self.make_retry_exception()
560
# Without a reload_func, we will just re-raise the original exception
561
self.assertRaises(_TestException, access.reload_or_raise, retry_exc)
563
def test_reload_or_raise_reload_changed(self):
564
reload_called, reload_func = self.make_reload_func(return_val=True)
565
access = _DirectPackAccess({}, reload_func=reload_func)
566
retry_exc = self.make_retry_exception()
567
access.reload_or_raise(retry_exc)
568
self.assertEqual([1], reload_called)
569
retry_exc.reload_occurred=True
570
access.reload_or_raise(retry_exc)
571
self.assertEqual([2], reload_called)
573
def test_reload_or_raise_reload_no_change(self):
574
reload_called, reload_func = self.make_reload_func(return_val=False)
575
access = _DirectPackAccess({}, reload_func=reload_func)
576
retry_exc = self.make_retry_exception()
577
# If reload_occurred is False, then we consider it an error to have
578
# reload_func() return False (no changes).
579
self.assertRaises(_TestException, access.reload_or_raise, retry_exc)
580
self.assertEqual([1], reload_called)
581
retry_exc.reload_occurred=True
582
# If reload_occurred is True, then we assume nothing changed because
583
# it had changed earlier, but didn't change again
584
access.reload_or_raise(retry_exc)
585
self.assertEqual([2], reload_called)
587
def test_annotate_retries(self):
588
vf, reload_counter = self.make_vf_for_retrying()
589
# It is a little bit bogus to annotate the Revision VF, but it works,
590
# as we have ancestry stored there
592
reload_lines = vf.annotate(key)
593
self.assertEqual([1, 1, 0], reload_counter)
594
plain_lines = vf.annotate(key)
595
self.assertEqual([1, 1, 0], reload_counter) # No extra reloading
596
if reload_lines != plain_lines:
597
self.fail('Annotation was not identical with reloading.')
598
# Now delete the packs-in-use, which should trigger another reload, but
599
# this time we just raise an exception because we can't recover
600
for trans, name in vf._access._indices.itervalues():
602
self.assertRaises(errors.NoSuchFile, vf.annotate, key)
603
self.assertEqual([2, 1, 1], reload_counter)
605
def test__get_record_map_retries(self):
606
vf, reload_counter = self.make_vf_for_retrying()
607
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
608
records = vf._get_record_map(keys)
609
self.assertEqual(keys, sorted(records.keys()))
610
self.assertEqual([1, 1, 0], reload_counter)
611
# Now delete the packs-in-use, which should trigger another reload, but
612
# this time we just raise an exception because we can't recover
613
for trans, name in vf._access._indices.itervalues():
615
self.assertRaises(errors.NoSuchFile, vf._get_record_map, keys)
616
self.assertEqual([2, 1, 1], reload_counter)
618
def test_get_record_stream_retries(self):
619
vf, reload_counter = self.make_vf_for_retrying()
620
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
621
record_stream = vf.get_record_stream(keys, 'topological', False)
622
record = record_stream.next()
623
self.assertEqual(('rev-1',), record.key)
624
self.assertEqual([0, 0, 0], reload_counter)
625
record = record_stream.next()
626
self.assertEqual(('rev-2',), record.key)
627
self.assertEqual([1, 1, 0], reload_counter)
628
record = record_stream.next()
629
self.assertEqual(('rev-3',), record.key)
630
self.assertEqual([1, 1, 0], reload_counter)
631
# Now delete all pack files, and see that we raise the right error
632
for trans, name in vf._access._indices.itervalues():
634
self.assertListRaises(errors.NoSuchFile,
635
vf.get_record_stream, keys, 'topological', False)
637
def test_iter_lines_added_or_present_in_keys_retries(self):
638
vf, reload_counter = self.make_vf_for_retrying()
639
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
640
# Unfortunately, iter_lines_added_or_present_in_keys iterates the
641
# result in random order (determined by the iteration order from a
642
# set()), so we don't have any solid way to trigger whether data is
643
# read before or after. However we tried to delete the middle node to
644
# exercise the code well.
645
# What we care about is that all lines are always yielded, but not
648
reload_lines = sorted(vf.iter_lines_added_or_present_in_keys(keys))
649
self.assertEqual([1, 1, 0], reload_counter)
650
# Now do it again, to make sure the result is equivalent
651
plain_lines = sorted(vf.iter_lines_added_or_present_in_keys(keys))
652
self.assertEqual([1, 1, 0], reload_counter) # No extra reloading
653
self.assertEqual(plain_lines, reload_lines)
654
self.assertEqual(21, len(plain_lines))
655
# Now delete all pack files, and see that we raise the right error
656
for trans, name in vf._access._indices.itervalues():
658
self.assertListRaises(errors.NoSuchFile,
659
vf.iter_lines_added_or_present_in_keys, keys)
660
self.assertEqual([2, 1, 1], reload_counter)
662
def test_get_record_stream_yields_disk_sorted_order(self):
663
# if we get 'unordered' pick a semi-optimal order for reading. The
664
# order should be grouped by pack file, and then by position in file
665
repo = self.make_repository('test', format='pack-0.92')
667
self.addCleanup(repo.unlock)
668
repo.start_write_group()
670
vf.add_lines(('f-id', 'rev-5'), [('f-id', 'rev-4')], ['lines\n'])
671
vf.add_lines(('f-id', 'rev-1'), [], ['lines\n'])
672
vf.add_lines(('f-id', 'rev-2'), [('f-id', 'rev-1')], ['lines\n'])
673
repo.commit_write_group()
674
# We inserted them as rev-5, rev-1, rev-2, we should get them back in
676
stream = vf.get_record_stream([('f-id', 'rev-1'), ('f-id', 'rev-5'),
677
('f-id', 'rev-2')], 'unordered', False)
678
keys = [r.key for r in stream]
679
self.assertEqual([('f-id', 'rev-5'), ('f-id', 'rev-1'),
680
('f-id', 'rev-2')], keys)
681
repo.start_write_group()
682
vf.add_lines(('f-id', 'rev-4'), [('f-id', 'rev-3')], ['lines\n'])
683
vf.add_lines(('f-id', 'rev-3'), [('f-id', 'rev-2')], ['lines\n'])
684
vf.add_lines(('f-id', 'rev-6'), [('f-id', 'rev-5')], ['lines\n'])
685
repo.commit_write_group()
686
# Request in random order, to make sure the output order isn't based on
688
request_keys = set(('f-id', 'rev-%d' % i) for i in range(1, 7))
689
stream = vf.get_record_stream(request_keys, 'unordered', False)
690
keys = [r.key for r in stream]
691
# We want to get the keys back in disk order, but it doesn't matter
692
# which pack we read from first. So this can come back in 2 orders
693
alt1 = [('f-id', 'rev-%d' % i) for i in [4, 3, 6, 5, 1, 2]]
694
alt2 = [('f-id', 'rev-%d' % i) for i in [5, 1, 2, 4, 3, 6]]
695
if keys != alt1 and keys != alt2:
696
self.fail('Returned key order did not match either expected order.'
697
' expected %s or %s, not %s'
698
% (alt1, alt2, keys))
127
701
class LowLevelKnitDataTests(TestCase):
129
703
def create_gz_content(self, text):
228
850
# Change 2 bytes in the middle to \xff
229
851
gz_txt = gz_txt[:10] + '\xff\xff' + gz_txt[12:]
230
852
transport = MockTransport([gz_txt])
231
data = _KnitData(transport, 'filename', mode='r')
232
records = [('rev-id-1', 0, len(gz_txt))]
234
self.assertRaises(errors.KnitCorrupt, data.read_records, records)
236
# read_records_iter_raw will notice if we request the wrong version.
237
self.assertRaises(errors.KnitCorrupt, list,
238
data.read_records_iter_raw(records))
853
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
854
knit = KnitVersionedFiles(None, access)
855
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
856
self.assertRaises(errors.KnitCorrupt, list,
857
knit._read_records_iter(records))
858
# read_records_iter_raw will barf on bad gz data
859
self.assertRaises(errors.KnitCorrupt, list,
860
knit._read_records_iter_raw(records))
241
863
class LowLevelKnitIndexTests(TestCase):
243
def test_no_such_file(self):
244
transport = MockTransport()
246
self.assertRaises(NoSuchFile, _KnitIndex, transport, "filename", "r")
247
self.assertRaises(NoSuchFile, _KnitIndex, transport,
248
"filename", "w", create=False)
865
def get_knit_index(self, transport, name, mode):
866
mapper = ConstantMapper(name)
867
orig = knit._load_data
869
knit._load_data = orig
870
self.addCleanup(reset)
871
from bzrlib._knit_load_data_py import _load_data_py
872
knit._load_data = _load_data_py
873
allow_writes = lambda: 'w' in mode
874
return _KndxIndex(transport, mapper, lambda:None, allow_writes, lambda:True)
250
876
def test_create_file(self):
251
877
transport = MockTransport()
253
index = _KnitIndex(transport, "filename", "w",
254
file_mode="wb", create=True)
256
("put_bytes_non_atomic",
257
("filename", index.HEADER), {"mode": "wb"}),
258
transport.calls.pop(0))
260
def test_delay_create_file(self):
261
transport = MockTransport()
263
index = _KnitIndex(transport, "filename", "w",
264
create=True, file_mode="wb", create_parent_dir=True,
265
delay_create=True, dir_mode=0777)
266
self.assertEqual([], transport.calls)
268
index.add_versions([])
269
name, (filename, f), kwargs = transport.calls.pop(0)
270
self.assertEqual("put_file_non_atomic", name)
272
{"dir_mode": 0777, "create_parent_dir": True, "mode": "wb"},
274
self.assertEqual("filename", filename)
275
self.assertEqual(index.HEADER, f.read())
277
index.add_versions([])
278
self.assertEqual(("append_bytes", ("filename", ""), {}),
279
transport.calls.pop(0))
878
index = self.get_knit_index(transport, "filename", "w")
880
call = transport.calls.pop(0)
881
# call[1][1] is a StringIO - we can't test it by simple equality.
882
self.assertEqual('put_file_non_atomic', call[0])
883
self.assertEqual('filename.kndx', call[1][0])
884
# With no history, _KndxIndex writes a new index:
885
self.assertEqual(_KndxIndex.HEADER,
886
call[1][1].getvalue())
887
self.assertEqual({'create_parent_dir': True}, call[2])
281
889
def test_read_utf8_version_id(self):
282
890
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
283
891
utf8_revision_id = unicode_revision_id.encode('utf-8')
284
892
transport = MockTransport([
286
894
'%s option 0 1 :' % (utf8_revision_id,)
288
index = _KnitIndex(transport, "filename", "r")
289
# _KnitIndex is a private class, and deals in utf8 revision_ids, not
896
index = self.get_knit_index(transport, "filename", "r")
897
# _KndxIndex is a private class, and deals in utf8 revision_ids, not
290
898
# Unicode revision_ids.
291
self.assertTrue(index.has_version(utf8_revision_id))
292
self.assertFalse(index.has_version(unicode_revision_id))
899
self.assertEqual({(utf8_revision_id,):()},
900
index.get_parent_map(index.keys()))
901
self.assertFalse((unicode_revision_id,) in index.keys())
294
903
def test_read_utf8_parents(self):
295
904
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
296
905
utf8_revision_id = unicode_revision_id.encode('utf-8')
297
906
transport = MockTransport([
299
908
"version option 0 1 .%s :" % (utf8_revision_id,)
301
index = _KnitIndex(transport, "filename", "r")
302
self.assertEqual([utf8_revision_id],
303
index.get_parents_with_ghosts("version"))
910
index = self.get_knit_index(transport, "filename", "r")
911
self.assertEqual({("version",):((utf8_revision_id,),)},
912
index.get_parent_map(index.keys()))
305
914
def test_read_ignore_corrupted_lines(self):
306
915
transport = MockTransport([
309
918
"corrupted options 0 1 .b .c ",
310
919
"version options 0 1 :"
312
index = _KnitIndex(transport, "filename", "r")
313
self.assertEqual(1, index.num_versions())
314
self.assertTrue(index.has_version("version"))
921
index = self.get_knit_index(transport, "filename", "r")
922
self.assertEqual(1, len(index.keys()))
923
self.assertEqual(set([("version",)]), index.keys())
316
925
def test_read_corrupted_header(self):
317
926
transport = MockTransport(['not a bzr knit index header\n'])
318
self.assertRaises(KnitHeaderError,
319
_KnitIndex, transport, "filename", "r")
927
index = self.get_knit_index(transport, "filename", "r")
928
self.assertRaises(KnitHeaderError, index.keys)
321
930
def test_read_duplicate_entries(self):
322
931
transport = MockTransport([
324
933
"parent options 0 1 :",
325
934
"version options1 0 1 0 :",
326
935
"version options2 1 2 .other :",
327
936
"version options3 3 4 0 .other :"
329
index = _KnitIndex(transport, "filename", "r")
330
self.assertEqual(2, index.num_versions())
331
self.assertEqual(1, index.lookup("version"))
332
self.assertEqual((3, 4), index.get_position("version"))
333
self.assertEqual(["options3"], index.get_options("version"))
334
self.assertEqual(["parent", "other"],
335
index.get_parents_with_ghosts("version"))
938
index = self.get_knit_index(transport, "filename", "r")
939
self.assertEqual(2, len(index.keys()))
940
# check that the index used is the first one written. (Specific
941
# to KnitIndex style indices.
942
self.assertEqual("1", index._dictionary_compress([("version",)]))
943
self.assertEqual((("version",), 3, 4), index.get_position(("version",)))
944
self.assertEqual(["options3"], index.get_options(("version",)))
945
self.assertEqual({("version",):(("parent",), ("other",))},
946
index.get_parent_map([("version",)]))
337
948
def test_read_compressed_parents(self):
338
949
transport = MockTransport([
340
951
"a option 0 1 :",
341
952
"b option 0 1 0 :",
342
953
"c option 0 1 1 0 :",
344
index = _KnitIndex(transport, "filename", "r")
345
self.assertEqual(["a"], index.get_parents("b"))
346
self.assertEqual(["b", "a"], index.get_parents("c"))
955
index = self.get_knit_index(transport, "filename", "r")
956
self.assertEqual({("b",):(("a",),), ("c",):(("b",), ("a",))},
957
index.get_parent_map([("b",), ("c",)]))
348
959
def test_write_utf8_version_id(self):
349
960
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
350
961
utf8_revision_id = unicode_revision_id.encode('utf-8')
351
962
transport = MockTransport([
354
index = _KnitIndex(transport, "filename", "r")
355
index.add_version(utf8_revision_id, ["option"], 0, 1, [])
356
self.assertEqual(("append_bytes", ("filename",
357
"\n%s option 0 1 :" % (utf8_revision_id,)),
359
transport.calls.pop(0))
965
index = self.get_knit_index(transport, "filename", "r")
967
((utf8_revision_id,), ["option"], ((utf8_revision_id,), 0, 1), [])])
968
call = transport.calls.pop(0)
969
# call[1][1] is a StringIO - we can't test it by simple equality.
970
self.assertEqual('put_file_non_atomic', call[0])
971
self.assertEqual('filename.kndx', call[1][0])
972
# With no history, _KndxIndex writes a new index:
973
self.assertEqual(_KndxIndex.HEADER +
974
"\n%s option 0 1 :" % (utf8_revision_id,),
975
call[1][1].getvalue())
976
self.assertEqual({'create_parent_dir': True}, call[2])
361
978
def test_write_utf8_parents(self):
362
979
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
363
980
utf8_revision_id = unicode_revision_id.encode('utf-8')
364
981
transport = MockTransport([
367
index = _KnitIndex(transport, "filename", "r")
368
index.add_version("version", ["option"], 0, 1, [utf8_revision_id])
369
self.assertEqual(("append_bytes", ("filename",
370
"\nversion option 0 1 .%s :" % (utf8_revision_id,)),
372
transport.calls.pop(0))
374
def test_get_graph(self):
375
transport = MockTransport()
376
index = _KnitIndex(transport, "filename", "w", create=True)
377
self.assertEqual([], index.get_graph())
379
index.add_version("a", ["option"], 0, 1, ["b"])
380
self.assertEqual([("a", ["b"])], index.get_graph())
382
index.add_version("c", ["option"], 0, 1, ["d"])
383
self.assertEqual([("a", ["b"]), ("c", ["d"])],
384
sorted(index.get_graph()))
386
def test_get_ancestry(self):
387
transport = MockTransport([
390
"b option 0 1 0 .e :",
391
"c option 0 1 1 0 :",
392
"d option 0 1 2 .f :"
394
index = _KnitIndex(transport, "filename", "r")
396
self.assertEqual([], index.get_ancestry([]))
397
self.assertEqual(["a"], index.get_ancestry(["a"]))
398
self.assertEqual(["a", "b"], index.get_ancestry(["b"]))
399
self.assertEqual(["a", "b", "c"], index.get_ancestry(["c"]))
400
self.assertEqual(["a", "b", "c", "d"], index.get_ancestry(["d"]))
401
self.assertEqual(["a", "b"], index.get_ancestry(["a", "b"]))
402
self.assertEqual(["a", "b", "c"], index.get_ancestry(["a", "c"]))
404
self.assertRaises(RevisionNotPresent, index.get_ancestry, ["e"])
406
def test_get_ancestry_with_ghosts(self):
407
transport = MockTransport([
410
"b option 0 1 0 .e :",
411
"c option 0 1 0 .f .g :",
412
"d option 0 1 2 .h .j .k :"
414
index = _KnitIndex(transport, "filename", "r")
416
self.assertEqual([], index.get_ancestry_with_ghosts([]))
417
self.assertEqual(["a"], index.get_ancestry_with_ghosts(["a"]))
418
self.assertEqual(["a", "e", "b"],
419
index.get_ancestry_with_ghosts(["b"]))
420
self.assertEqual(["a", "g", "f", "c"],
421
index.get_ancestry_with_ghosts(["c"]))
422
self.assertEqual(["a", "g", "f", "c", "k", "j", "h", "d"],
423
index.get_ancestry_with_ghosts(["d"]))
424
self.assertEqual(["a", "e", "b"],
425
index.get_ancestry_with_ghosts(["a", "b"]))
426
self.assertEqual(["a", "g", "f", "c"],
427
index.get_ancestry_with_ghosts(["a", "c"]))
984
index = self.get_knit_index(transport, "filename", "r")
986
(("version",), ["option"], (("version",), 0, 1), [(utf8_revision_id,)])])
987
call = transport.calls.pop(0)
988
# call[1][1] is a StringIO - we can't test it by simple equality.
989
self.assertEqual('put_file_non_atomic', call[0])
990
self.assertEqual('filename.kndx', call[1][0])
991
# With no history, _KndxIndex writes a new index:
992
self.assertEqual(_KndxIndex.HEADER +
993
"\nversion option 0 1 .%s :" % (utf8_revision_id,),
994
call[1][1].getvalue())
995
self.assertEqual({'create_parent_dir': True}, call[2])
998
transport = MockTransport([
1001
index = self.get_knit_index(transport, "filename", "r")
1003
self.assertEqual(set(), index.keys())
1005
index.add_records([(("a",), ["option"], (("a",), 0, 1), [])])
1006
self.assertEqual(set([("a",)]), index.keys())
1008
index.add_records([(("a",), ["option"], (("a",), 0, 1), [])])
1009
self.assertEqual(set([("a",)]), index.keys())
1011
index.add_records([(("b",), ["option"], (("b",), 0, 1), [])])
1012
self.assertEqual(set([("a",), ("b",)]), index.keys())
1014
def add_a_b(self, index, random_id=None):
1016
if random_id is not None:
1017
kwargs["random_id"] = random_id
1019
(("a",), ["option"], (("a",), 0, 1), [("b",)]),
1020
(("a",), ["opt"], (("a",), 1, 2), [("c",)]),
1021
(("b",), ["option"], (("b",), 2, 3), [("a",)])
1024
def assertIndexIsAB(self, index):
1029
index.get_parent_map(index.keys()))
1030
self.assertEqual((("a",), 1, 2), index.get_position(("a",)))
1031
self.assertEqual((("b",), 2, 3), index.get_position(("b",)))
1032
self.assertEqual(["opt"], index.get_options(("a",)))
1034
def test_add_versions(self):
1035
transport = MockTransport([
1038
index = self.get_knit_index(transport, "filename", "r")
1041
call = transport.calls.pop(0)
1042
# call[1][1] is a StringIO - we can't test it by simple equality.
1043
self.assertEqual('put_file_non_atomic', call[0])
1044
self.assertEqual('filename.kndx', call[1][0])
1045
# With no history, _KndxIndex writes a new index:
428
1046
self.assertEqual(
429
["a", "g", "f", "c", "e", "b", "k", "j", "h", "d"],
430
index.get_ancestry_with_ghosts(["b", "d"]))
432
self.assertRaises(RevisionNotPresent,
433
index.get_ancestry_with_ghosts, ["e"])
435
def test_num_versions(self):
436
transport = MockTransport([
439
index = _KnitIndex(transport, "filename", "r")
441
self.assertEqual(0, index.num_versions())
442
self.assertEqual(0, len(index))
444
index.add_version("a", ["option"], 0, 1, [])
445
self.assertEqual(1, index.num_versions())
446
self.assertEqual(1, len(index))
448
index.add_version("a", ["option2"], 1, 2, [])
449
self.assertEqual(1, index.num_versions())
450
self.assertEqual(1, len(index))
452
index.add_version("b", ["option"], 0, 1, [])
453
self.assertEqual(2, index.num_versions())
454
self.assertEqual(2, len(index))
456
def test_get_versions(self):
457
transport = MockTransport([
460
index = _KnitIndex(transport, "filename", "r")
462
self.assertEqual([], index.get_versions())
464
index.add_version("a", ["option"], 0, 1, [])
465
self.assertEqual(["a"], index.get_versions())
467
index.add_version("a", ["option"], 0, 1, [])
468
self.assertEqual(["a"], index.get_versions())
470
index.add_version("b", ["option"], 0, 1, [])
471
self.assertEqual(["a", "b"], index.get_versions())
473
def test_idx_to_name(self):
474
transport = MockTransport([
479
index = _KnitIndex(transport, "filename", "r")
481
self.assertEqual("a", index.idx_to_name(0))
482
self.assertEqual("b", index.idx_to_name(1))
483
self.assertEqual("b", index.idx_to_name(-1))
484
self.assertEqual("a", index.idx_to_name(-2))
486
def test_lookup(self):
487
transport = MockTransport([
492
index = _KnitIndex(transport, "filename", "r")
494
self.assertEqual(0, index.lookup("a"))
495
self.assertEqual(1, index.lookup("b"))
497
def test_add_version(self):
498
transport = MockTransport([
501
index = _KnitIndex(transport, "filename", "r")
503
index.add_version("a", ["option"], 0, 1, ["b"])
504
self.assertEqual(("append_bytes",
505
("filename", "\na option 0 1 .b :"),
506
{}), transport.calls.pop(0))
507
self.assertTrue(index.has_version("a"))
508
self.assertEqual(1, index.num_versions())
509
self.assertEqual((0, 1), index.get_position("a"))
510
self.assertEqual(["option"], index.get_options("a"))
511
self.assertEqual(["b"], index.get_parents_with_ghosts("a"))
513
index.add_version("a", ["opt"], 1, 2, ["c"])
514
self.assertEqual(("append_bytes",
515
("filename", "\na opt 1 2 .c :"),
516
{}), transport.calls.pop(0))
517
self.assertTrue(index.has_version("a"))
518
self.assertEqual(1, index.num_versions())
519
self.assertEqual((1, 2), index.get_position("a"))
520
self.assertEqual(["opt"], index.get_options("a"))
521
self.assertEqual(["c"], index.get_parents_with_ghosts("a"))
523
index.add_version("b", ["option"], 2, 3, ["a"])
524
self.assertEqual(("append_bytes",
525
("filename", "\nb option 2 3 0 :"),
526
{}), transport.calls.pop(0))
527
self.assertTrue(index.has_version("b"))
528
self.assertEqual(2, index.num_versions())
529
self.assertEqual((2, 3), index.get_position("b"))
530
self.assertEqual(["option"], index.get_options("b"))
531
self.assertEqual(["a"], index.get_parents_with_ghosts("b"))
533
def test_add_versions(self):
534
transport = MockTransport([
537
index = _KnitIndex(transport, "filename", "r")
540
("a", ["option"], 0, 1, ["b"]),
541
("a", ["opt"], 1, 2, ["c"]),
542
("b", ["option"], 2, 3, ["a"])
544
self.assertEqual(("append_bytes", ("filename",
545
1048
"\na option 0 1 .b :"
546
1049
"\na opt 1 2 .c :"
548
), {}), transport.calls.pop(0))
549
self.assertTrue(index.has_version("a"))
550
self.assertTrue(index.has_version("b"))
551
self.assertEqual(2, index.num_versions())
552
self.assertEqual((1, 2), index.get_position("a"))
553
self.assertEqual((2, 3), index.get_position("b"))
554
self.assertEqual(["opt"], index.get_options("a"))
555
self.assertEqual(["option"], index.get_options("b"))
556
self.assertEqual(["c"], index.get_parents_with_ghosts("a"))
557
self.assertEqual(["a"], index.get_parents_with_ghosts("b"))
1050
"\nb option 2 3 0 :",
1051
call[1][1].getvalue())
1052
self.assertEqual({'create_parent_dir': True}, call[2])
1053
self.assertIndexIsAB(index)
1055
def test_add_versions_random_id_is_accepted(self):
1056
transport = MockTransport([
1059
index = self.get_knit_index(transport, "filename", "r")
1060
self.add_a_b(index, random_id=True)
559
1062
def test_delay_create_and_add_versions(self):
560
1063
transport = MockTransport()
562
index = _KnitIndex(transport, "filename", "w",
563
create=True, file_mode="wb", create_parent_dir=True,
564
delay_create=True, dir_mode=0777)
1065
index = self.get_knit_index(transport, "filename", "w")
565
1067
self.assertEqual([], transport.calls)
568
("a", ["option"], 0, 1, ["b"]),
569
("a", ["opt"], 1, 2, ["c"]),
570
("b", ["option"], 2, 3, ["a"])
572
name, (filename, f), kwargs = transport.calls.pop(0)
573
self.assertEqual("put_file_non_atomic", name)
575
{"dir_mode": 0777, "create_parent_dir": True, "mode": "wb"},
577
self.assertEqual("filename", filename)
1070
#[ {"dir_mode": 0777, "create_parent_dir": True, "mode": "wb"},
1072
# Two calls: one during which we load the existing index (and when its
1073
# missing create it), then a second where we write the contents out.
1074
self.assertEqual(2, len(transport.calls))
1075
call = transport.calls.pop(0)
1076
self.assertEqual('put_file_non_atomic', call[0])
1077
self.assertEqual('filename.kndx', call[1][0])
1078
# With no history, _KndxIndex writes a new index:
1079
self.assertEqual(_KndxIndex.HEADER, call[1][1].getvalue())
1080
self.assertEqual({'create_parent_dir': True}, call[2])
1081
call = transport.calls.pop(0)
1082
# call[1][1] is a StringIO - we can't test it by simple equality.
1083
self.assertEqual('put_file_non_atomic', call[0])
1084
self.assertEqual('filename.kndx', call[1][0])
1085
# With no history, _KndxIndex writes a new index:
580
1088
"\na option 0 1 .b :"
581
1089
"\na opt 1 2 .c :"
582
1090
"\nb option 2 3 0 :",
585
def test_has_version(self):
586
transport = MockTransport([
590
index = _KnitIndex(transport, "filename", "r")
592
self.assertTrue(index.has_version("a"))
593
self.assertFalse(index.has_version("b"))
1091
call[1][1].getvalue())
1092
self.assertEqual({'create_parent_dir': True}, call[2])
1094
def assertTotalBuildSize(self, size, keys, positions):
1095
self.assertEqual(size,
1096
knit._get_total_build_size(None, keys, positions))
1098
def test__get_total_build_size(self):
1100
('a',): (('fulltext', False), (('a',), 0, 100), None),
1101
('b',): (('line-delta', False), (('b',), 100, 21), ('a',)),
1102
('c',): (('line-delta', False), (('c',), 121, 35), ('b',)),
1103
('d',): (('line-delta', False), (('d',), 156, 12), ('b',)),
1105
self.assertTotalBuildSize(100, [('a',)], positions)
1106
self.assertTotalBuildSize(121, [('b',)], positions)
1107
# c needs both a & b
1108
self.assertTotalBuildSize(156, [('c',)], positions)
1109
# we shouldn't count 'b' twice
1110
self.assertTotalBuildSize(156, [('b',), ('c',)], positions)
1111
self.assertTotalBuildSize(133, [('d',)], positions)
1112
self.assertTotalBuildSize(168, [('c',), ('d',)], positions)
595
1114
def test_get_position(self):
596
1115
transport = MockTransport([
598
1117
"a option 0 1 :",
599
1118
"b option 1 2 :"
601
index = _KnitIndex(transport, "filename", "r")
1120
index = self.get_knit_index(transport, "filename", "r")
603
self.assertEqual((0, 1), index.get_position("a"))
604
self.assertEqual((1, 2), index.get_position("b"))
1122
self.assertEqual((("a",), 0, 1), index.get_position(("a",)))
1123
self.assertEqual((("b",), 1, 2), index.get_position(("b",)))
606
1125
def test_get_method(self):
607
1126
transport = MockTransport([
609
1128
"a fulltext,unknown 0 1 :",
610
1129
"b unknown,line-delta 1 2 :",
613
index = _KnitIndex(transport, "filename", "r")
1132
index = self.get_knit_index(transport, "filename", "r")
615
1134
self.assertEqual("fulltext", index.get_method("a"))
616
1135
self.assertEqual("line-delta", index.get_method("b"))
619
1138
def test_get_options(self):
620
1139
transport = MockTransport([
623
1142
"b opt2,opt3 1 2 :"
625
index = _KnitIndex(transport, "filename", "r")
1144
index = self.get_knit_index(transport, "filename", "r")
627
1146
self.assertEqual(["opt1"], index.get_options("a"))
628
1147
self.assertEqual(["opt2", "opt3"], index.get_options("b"))
630
def test_get_parents(self):
631
transport = MockTransport([
634
"b option 1 2 0 .c :",
635
"c option 1 2 1 0 .e :"
637
index = _KnitIndex(transport, "filename", "r")
639
self.assertEqual([], index.get_parents("a"))
640
self.assertEqual(["a", "c"], index.get_parents("b"))
641
self.assertEqual(["b", "a"], index.get_parents("c"))
643
def test_get_parents_with_ghosts(self):
644
transport = MockTransport([
647
"b option 1 2 0 .c :",
648
"c option 1 2 1 0 .e :"
650
index = _KnitIndex(transport, "filename", "r")
652
self.assertEqual([], index.get_parents_with_ghosts("a"))
653
self.assertEqual(["a", "c"], index.get_parents_with_ghosts("b"))
654
self.assertEqual(["b", "a", "e"],
655
index.get_parents_with_ghosts("c"))
657
def test_check_versions_present(self):
658
transport = MockTransport([
663
index = _KnitIndex(transport, "filename", "r")
665
check = index.check_versions_present
671
self.assertRaises(RevisionNotPresent, check, ["c"])
672
self.assertRaises(RevisionNotPresent, check, ["a", "b", "c"])
1149
def test_get_parent_map(self):
1150
transport = MockTransport([
1153
"b option 1 2 0 .c :",
1154
"c option 1 2 1 0 .e :"
1156
index = self.get_knit_index(transport, "filename", "r")
1160
("b",):(("a",), ("c",)),
1161
("c",):(("b",), ("a",), ("e",)),
1162
}, index.get_parent_map(index.keys()))
1164
def test_impossible_parent(self):
1165
"""Test we get KnitCorrupt if the parent couldn't possibly exist."""
1166
transport = MockTransport([
1169
"b option 0 1 4 :" # We don't have a 4th record
1171
index = self.get_knit_index(transport, 'filename', 'r')
1173
self.assertRaises(errors.KnitCorrupt, index.keys)
1174
except TypeError, e:
1175
if (str(e) == ('exceptions must be strings, classes, or instances,'
1176
' not exceptions.IndexError')
1177
and sys.version_info[0:2] >= (2,5)):
1178
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1179
' raising new style exceptions with python'
1184
def test_corrupted_parent(self):
1185
transport = MockTransport([
1189
"c option 0 1 1v :", # Can't have a parent of '1v'
1191
index = self.get_knit_index(transport, 'filename', 'r')
1193
self.assertRaises(errors.KnitCorrupt, index.keys)
1194
except TypeError, e:
1195
if (str(e) == ('exceptions must be strings, classes, or instances,'
1196
' not exceptions.ValueError')
1197
and sys.version_info[0:2] >= (2,5)):
1198
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1199
' raising new style exceptions with python'
1204
def test_corrupted_parent_in_list(self):
1205
transport = MockTransport([
1209
"c option 0 1 1 v :", # Can't have a parent of 'v'
1211
index = self.get_knit_index(transport, 'filename', 'r')
1213
self.assertRaises(errors.KnitCorrupt, index.keys)
1214
except TypeError, e:
1215
if (str(e) == ('exceptions must be strings, classes, or instances,'
1216
' not exceptions.ValueError')
1217
and sys.version_info[0:2] >= (2,5)):
1218
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1219
' raising new style exceptions with python'
1224
def test_invalid_position(self):
1225
transport = MockTransport([
1229
index = self.get_knit_index(transport, 'filename', 'r')
1231
self.assertRaises(errors.KnitCorrupt, index.keys)
1232
except TypeError, e:
1233
if (str(e) == ('exceptions must be strings, classes, or instances,'
1234
' not exceptions.ValueError')
1235
and sys.version_info[0:2] >= (2,5)):
1236
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1237
' raising new style exceptions with python'
1242
def test_invalid_size(self):
1243
transport = MockTransport([
1247
index = self.get_knit_index(transport, 'filename', 'r')
1249
self.assertRaises(errors.KnitCorrupt, index.keys)
1250
except TypeError, e:
1251
if (str(e) == ('exceptions must be strings, classes, or instances,'
1252
' not exceptions.ValueError')
1253
and sys.version_info[0:2] >= (2,5)):
1254
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1255
' raising new style exceptions with python'
1260
def test_scan_unvalidated_index_not_implemented(self):
1261
transport = MockTransport()
1262
index = self.get_knit_index(transport, 'filename', 'r')
1264
NotImplementedError, index.scan_unvalidated_index,
1265
'dummy graph_index')
1267
NotImplementedError, index.get_missing_compression_parents)
1269
def test_short_line(self):
1270
transport = MockTransport([
1273
"b option 10 10 0", # This line isn't terminated, ignored
1275
index = self.get_knit_index(transport, "filename", "r")
1276
self.assertEqual(set([('a',)]), index.keys())
1278
def test_skip_incomplete_record(self):
1279
# A line with bogus data should just be skipped
1280
transport = MockTransport([
1283
"b option 10 10 0", # This line isn't terminated, ignored
1284
"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1286
index = self.get_knit_index(transport, "filename", "r")
1287
self.assertEqual(set([('a',), ('c',)]), index.keys())
1289
def test_trailing_characters(self):
1290
# A line with bogus data should just be skipped
1291
transport = MockTransport([
1294
"b option 10 10 0 :a", # This line has extra trailing characters
1295
"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1297
index = self.get_knit_index(transport, "filename", "r")
1298
self.assertEqual(set([('a',), ('c',)]), index.keys())
1301
class LowLevelKnitIndexTests_c(LowLevelKnitIndexTests):
1303
_test_needs_features = [CompiledKnitFeature]
1305
def get_knit_index(self, transport, name, mode):
1306
mapper = ConstantMapper(name)
1307
orig = knit._load_data
1309
knit._load_data = orig
1310
self.addCleanup(reset)
1311
from bzrlib._knit_load_data_c import _load_data_c
1312
knit._load_data = _load_data_c
1313
allow_writes = lambda: mode == 'w'
1314
return _KndxIndex(transport, mapper, lambda:None, allow_writes, lambda:True)
675
1317
class KnitTests(TestCaseWithTransport):
676
1318
"""Class containing knit test helper routines."""
678
def make_test_knit(self, annotate=False, delay_create=False):
680
factory = KnitPlainFactory()
683
return KnitVersionedFile('test', get_transport('.'), access_mode='w',
684
factory=factory, create=True,
685
delay_create=delay_create)
688
class BasicKnitTests(KnitTests):
690
def add_stock_one_and_one_a(self, k):
691
k.add_lines('text-1', [], split_lines(TEXT_1))
692
k.add_lines('text-1a', ['text-1'], split_lines(TEXT_1A))
694
def test_knit_constructor(self):
695
"""Construct empty k"""
696
self.make_test_knit()
698
def test_knit_add(self):
699
"""Store one text in knit and retrieve"""
700
k = self.make_test_knit()
701
k.add_lines('text-1', [], split_lines(TEXT_1))
702
self.assertTrue(k.has_version('text-1'))
703
self.assertEqualDiff(''.join(k.get_lines('text-1')), TEXT_1)
705
def test_knit_reload(self):
706
# test that the content in a reloaded knit is correct
707
k = self.make_test_knit()
708
k.add_lines('text-1', [], split_lines(TEXT_1))
710
k2 = KnitVersionedFile('test', get_transport('.'), access_mode='r', factory=KnitPlainFactory(), create=True)
711
self.assertTrue(k2.has_version('text-1'))
712
self.assertEqualDiff(''.join(k2.get_lines('text-1')), TEXT_1)
714
def test_knit_several(self):
715
"""Store several texts in a knit"""
716
k = self.make_test_knit()
717
k.add_lines('text-1', [], split_lines(TEXT_1))
718
k.add_lines('text-2', [], split_lines(TEXT_2))
719
self.assertEqualDiff(''.join(k.get_lines('text-1')), TEXT_1)
720
self.assertEqualDiff(''.join(k.get_lines('text-2')), TEXT_2)
722
def test_repeated_add(self):
723
"""Knit traps attempt to replace existing version"""
724
k = self.make_test_knit()
725
k.add_lines('text-1', [], split_lines(TEXT_1))
726
self.assertRaises(RevisionAlreadyPresent,
728
'text-1', [], split_lines(TEXT_1))
730
def test_empty(self):
731
k = self.make_test_knit(True)
732
k.add_lines('text-1', [], [])
733
self.assertEquals(k.get_lines('text-1'), [])
735
def test_incomplete(self):
736
"""Test if texts without a ending line-end can be inserted and
738
k = KnitVersionedFile('test', get_transport('.'), delta=False, create=True)
739
k.add_lines('text-1', [], ['a\n', 'b' ])
740
k.add_lines('text-2', ['text-1'], ['a\rb\n', 'b\n'])
741
# reopening ensures maximum room for confusion
742
k = KnitVersionedFile('test', get_transport('.'), delta=False, create=True)
743
self.assertEquals(k.get_lines('text-1'), ['a\n', 'b' ])
744
self.assertEquals(k.get_lines('text-2'), ['a\rb\n', 'b\n'])
746
def test_delta(self):
747
"""Expression of knit delta as lines"""
748
k = self.make_test_knit()
749
td = list(line_delta(TEXT_1.splitlines(True),
750
TEXT_1A.splitlines(True)))
751
self.assertEqualDiff(''.join(td), delta_1_1a)
752
out = apply_line_delta(TEXT_1.splitlines(True), td)
753
self.assertEqualDiff(''.join(out), TEXT_1A)
755
def test_add_with_parents(self):
756
"""Store in knit with parents"""
757
k = self.make_test_knit()
758
self.add_stock_one_and_one_a(k)
759
self.assertEquals(k.get_parents('text-1'), [])
760
self.assertEquals(k.get_parents('text-1a'), ['text-1'])
762
def test_ancestry(self):
763
"""Store in knit with parents"""
764
k = self.make_test_knit()
765
self.add_stock_one_and_one_a(k)
766
self.assertEquals(set(k.get_ancestry(['text-1a'])), set(['text-1a', 'text-1']))
768
def test_add_delta(self):
769
"""Store in knit with parents"""
770
k = KnitVersionedFile('test', get_transport('.'), factory=KnitPlainFactory(),
771
delta=True, create=True)
772
self.add_stock_one_and_one_a(k)
774
self.assertEqualDiff(''.join(k.get_lines('text-1a')), TEXT_1A)
776
def test_annotate(self):
778
k = KnitVersionedFile('knit', get_transport('.'), factory=KnitAnnotateFactory(),
779
delta=True, create=True)
780
self.insert_and_test_small_annotate(k)
782
def insert_and_test_small_annotate(self, k):
783
"""test annotation with k works correctly."""
784
k.add_lines('text-1', [], ['a\n', 'b\n'])
785
k.add_lines('text-2', ['text-1'], ['a\n', 'c\n'])
787
origins = k.annotate('text-2')
788
self.assertEquals(origins[0], ('text-1', 'a\n'))
789
self.assertEquals(origins[1], ('text-2', 'c\n'))
791
def test_annotate_fulltext(self):
793
k = KnitVersionedFile('knit', get_transport('.'), factory=KnitAnnotateFactory(),
794
delta=False, create=True)
795
self.insert_and_test_small_annotate(k)
797
def test_annotate_merge_1(self):
798
k = self.make_test_knit(True)
799
k.add_lines('text-a1', [], ['a\n', 'b\n'])
800
k.add_lines('text-a2', [], ['d\n', 'c\n'])
801
k.add_lines('text-am', ['text-a1', 'text-a2'], ['d\n', 'b\n'])
802
origins = k.annotate('text-am')
803
self.assertEquals(origins[0], ('text-a2', 'd\n'))
804
self.assertEquals(origins[1], ('text-a1', 'b\n'))
806
def test_annotate_merge_2(self):
807
k = self.make_test_knit(True)
808
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
809
k.add_lines('text-a2', [], ['x\n', 'y\n', 'z\n'])
810
k.add_lines('text-am', ['text-a1', 'text-a2'], ['a\n', 'y\n', 'c\n'])
811
origins = k.annotate('text-am')
812
self.assertEquals(origins[0], ('text-a1', 'a\n'))
813
self.assertEquals(origins[1], ('text-a2', 'y\n'))
814
self.assertEquals(origins[2], ('text-a1', 'c\n'))
816
def test_annotate_merge_9(self):
817
k = self.make_test_knit(True)
818
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
819
k.add_lines('text-a2', [], ['x\n', 'y\n', 'z\n'])
820
k.add_lines('text-am', ['text-a1', 'text-a2'], ['k\n', 'y\n', 'c\n'])
821
origins = k.annotate('text-am')
822
self.assertEquals(origins[0], ('text-am', 'k\n'))
823
self.assertEquals(origins[1], ('text-a2', 'y\n'))
824
self.assertEquals(origins[2], ('text-a1', 'c\n'))
826
def test_annotate_merge_3(self):
827
k = self.make_test_knit(True)
828
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
829
k.add_lines('text-a2', [] ,['x\n', 'y\n', 'z\n'])
830
k.add_lines('text-am', ['text-a1', 'text-a2'], ['k\n', 'y\n', 'z\n'])
831
origins = k.annotate('text-am')
832
self.assertEquals(origins[0], ('text-am', 'k\n'))
833
self.assertEquals(origins[1], ('text-a2', 'y\n'))
834
self.assertEquals(origins[2], ('text-a2', 'z\n'))
836
def test_annotate_merge_4(self):
837
k = self.make_test_knit(True)
838
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
839
k.add_lines('text-a2', [], ['x\n', 'y\n', 'z\n'])
840
k.add_lines('text-a3', ['text-a1'], ['a\n', 'b\n', 'p\n'])
841
k.add_lines('text-am', ['text-a2', 'text-a3'], ['a\n', 'b\n', 'z\n'])
842
origins = k.annotate('text-am')
843
self.assertEquals(origins[0], ('text-a1', 'a\n'))
844
self.assertEquals(origins[1], ('text-a1', 'b\n'))
845
self.assertEquals(origins[2], ('text-a2', 'z\n'))
847
def test_annotate_merge_5(self):
848
k = self.make_test_knit(True)
849
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
850
k.add_lines('text-a2', [], ['d\n', 'e\n', 'f\n'])
851
k.add_lines('text-a3', [], ['x\n', 'y\n', 'z\n'])
852
k.add_lines('text-am',
853
['text-a1', 'text-a2', 'text-a3'],
854
['a\n', 'e\n', 'z\n'])
855
origins = k.annotate('text-am')
856
self.assertEquals(origins[0], ('text-a1', 'a\n'))
857
self.assertEquals(origins[1], ('text-a2', 'e\n'))
858
self.assertEquals(origins[2], ('text-a3', 'z\n'))
860
def test_annotate_file_cherry_pick(self):
861
k = self.make_test_knit(True)
862
k.add_lines('text-1', [], ['a\n', 'b\n', 'c\n'])
863
k.add_lines('text-2', ['text-1'], ['d\n', 'e\n', 'f\n'])
864
k.add_lines('text-3', ['text-2', 'text-1'], ['a\n', 'b\n', 'c\n'])
865
origins = k.annotate('text-3')
866
self.assertEquals(origins[0], ('text-1', 'a\n'))
867
self.assertEquals(origins[1], ('text-1', 'b\n'))
868
self.assertEquals(origins[2], ('text-1', 'c\n'))
870
def test_knit_join(self):
871
"""Store in knit with parents"""
872
k1 = KnitVersionedFile('test1', get_transport('.'), factory=KnitPlainFactory(), create=True)
873
k1.add_lines('text-a', [], split_lines(TEXT_1))
874
k1.add_lines('text-b', ['text-a'], split_lines(TEXT_1))
876
k1.add_lines('text-c', [], split_lines(TEXT_1))
877
k1.add_lines('text-d', ['text-c'], split_lines(TEXT_1))
879
k1.add_lines('text-m', ['text-b', 'text-d'], split_lines(TEXT_1))
881
k2 = KnitVersionedFile('test2', get_transport('.'), factory=KnitPlainFactory(), create=True)
882
count = k2.join(k1, version_ids=['text-m'])
883
self.assertEquals(count, 5)
884
self.assertTrue(k2.has_version('text-a'))
885
self.assertTrue(k2.has_version('text-c'))
887
def test_reannotate(self):
888
k1 = KnitVersionedFile('knit1', get_transport('.'),
889
factory=KnitAnnotateFactory(), create=True)
891
k1.add_lines('text-a', [], ['a\n', 'b\n'])
893
k1.add_lines('text-b', ['text-a'], ['a\n', 'c\n'])
895
k2 = KnitVersionedFile('test2', get_transport('.'),
896
factory=KnitAnnotateFactory(), create=True)
897
k2.join(k1, version_ids=['text-b'])
900
k1.add_lines('text-X', ['text-b'], ['a\n', 'b\n'])
902
k2.add_lines('text-c', ['text-b'], ['z\n', 'c\n'])
904
k2.add_lines('text-Y', ['text-b'], ['b\n', 'c\n'])
906
# test-c will have index 3
907
k1.join(k2, version_ids=['text-c'])
909
lines = k1.get_lines('text-c')
910
self.assertEquals(lines, ['z\n', 'c\n'])
912
origins = k1.annotate('text-c')
913
self.assertEquals(origins[0], ('text-c', 'z\n'))
914
self.assertEquals(origins[1], ('text-b', 'c\n'))
916
def test_get_line_delta_texts(self):
917
"""Make sure we can call get_texts on text with reused line deltas"""
918
k1 = KnitVersionedFile('test1', get_transport('.'),
919
factory=KnitPlainFactory(), create=True)
924
parents = ['%d' % (t-1)]
925
k1.add_lines('%d' % t, parents, ['hello\n'] * t)
926
k1.get_texts(('%d' % t) for t in range(3))
928
def test_iter_lines_reads_in_order(self):
929
t = MemoryTransport()
930
instrumented_t = TransportLogger(t)
931
k1 = KnitVersionedFile('id', instrumented_t, create=True, delta=True)
932
self.assertEqual([('id.kndx',)], instrumented_t._calls)
933
# add texts with no required ordering
934
k1.add_lines('base', [], ['text\n'])
935
k1.add_lines('base2', [], ['text2\n'])
937
instrumented_t._calls = []
938
# request a last-first iteration
939
results = list(k1.iter_lines_added_or_present_in_versions(['base2', 'base']))
940
self.assertEqual([('id.knit', [(0, 87), (87, 89)])], instrumented_t._calls)
941
self.assertEqual(['text\n', 'text2\n'], results)
943
def test_create_empty_annotated(self):
944
k1 = self.make_test_knit(True)
946
k1.add_lines('text-a', [], ['a\n', 'b\n'])
947
k2 = k1.create_empty('t', MemoryTransport())
948
self.assertTrue(isinstance(k2.factory, KnitAnnotateFactory))
949
self.assertEqual(k1.delta, k2.delta)
950
# the generic test checks for empty content and file class
952
def test_knit_format(self):
953
# this tests that a new knit index file has the expected content
954
# and that is writes the data we expect as records are added.
955
knit = self.make_test_knit(True)
956
# Now knit files are not created until we first add data to them
957
self.assertFileEqual("# bzr knit index 8\n", 'test.kndx')
958
knit.add_lines_with_ghosts('revid', ['a_ghost'], ['a\n'])
959
self.assertFileEqual(
960
"# bzr knit index 8\n"
962
"revid fulltext 0 84 .a_ghost :",
964
knit.add_lines_with_ghosts('revid2', ['revid'], ['a\n'])
965
self.assertFileEqual(
966
"# bzr knit index 8\n"
967
"\nrevid fulltext 0 84 .a_ghost :"
968
"\nrevid2 line-delta 84 82 0 :",
970
# we should be able to load this file again
971
knit = KnitVersionedFile('test', get_transport('.'), access_mode='r')
972
self.assertEqual(['revid', 'revid2'], knit.versions())
973
# write a short write to the file and ensure that its ignored
974
indexfile = file('test.kndx', 'at')
975
indexfile.write('\nrevid3 line-delta 166 82 1 2 3 4 5 .phwoar:demo ')
977
# we should be able to load this file again
978
knit = KnitVersionedFile('test', get_transport('.'), access_mode='w')
979
self.assertEqual(['revid', 'revid2'], knit.versions())
980
# and add a revision with the same id the failed write had
981
knit.add_lines('revid3', ['revid2'], ['a\n'])
982
# and when reading it revid3 should now appear.
983
knit = KnitVersionedFile('test', get_transport('.'), access_mode='r')
984
self.assertEqual(['revid', 'revid2', 'revid3'], knit.versions())
985
self.assertEqual(['revid2'], knit.get_parents('revid3'))
987
def test_delay_create(self):
988
"""Test that passing delay_create=True creates files late"""
989
knit = self.make_test_knit(annotate=True, delay_create=True)
990
self.failIfExists('test.knit')
991
self.failIfExists('test.kndx')
992
knit.add_lines_with_ghosts('revid', ['a_ghost'], ['a\n'])
993
self.failUnlessExists('test.knit')
994
self.assertFileEqual(
995
"# bzr knit index 8\n"
997
"revid fulltext 0 84 .a_ghost :",
1000
def test_create_parent_dir(self):
1001
"""create_parent_dir can create knits in nonexistant dirs"""
1002
# Has no effect if we don't set 'delay_create'
1003
trans = get_transport('.')
1004
self.assertRaises(NoSuchFile, KnitVersionedFile, 'dir/test',
1005
trans, access_mode='w', factory=None,
1006
create=True, create_parent_dir=True)
1007
# Nothing should have changed yet
1008
knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1009
factory=None, create=True,
1010
create_parent_dir=True,
1012
self.failIfExists('dir/test.knit')
1013
self.failIfExists('dir/test.kndx')
1014
self.failIfExists('dir')
1015
knit.add_lines('revid', [], ['a\n'])
1016
self.failUnlessExists('dir')
1017
self.failUnlessExists('dir/test.knit')
1018
self.assertFileEqual(
1019
"# bzr knit index 8\n"
1021
"revid fulltext 0 84 :",
1024
def test_create_mode_700(self):
1025
trans = get_transport('.')
1026
if not trans._can_roundtrip_unix_modebits():
1027
# Can't roundtrip, so no need to run this test
1029
knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1030
factory=None, create=True,
1031
create_parent_dir=True,
1035
knit.add_lines('revid', [], ['a\n'])
1036
self.assertTransportMode(trans, 'dir', 0700)
1037
self.assertTransportMode(trans, 'dir/test.knit', 0600)
1038
self.assertTransportMode(trans, 'dir/test.kndx', 0600)
1040
def test_create_mode_770(self):
1041
trans = get_transport('.')
1042
if not trans._can_roundtrip_unix_modebits():
1043
# Can't roundtrip, so no need to run this test
1045
knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1046
factory=None, create=True,
1047
create_parent_dir=True,
1051
knit.add_lines('revid', [], ['a\n'])
1052
self.assertTransportMode(trans, 'dir', 0770)
1053
self.assertTransportMode(trans, 'dir/test.knit', 0660)
1054
self.assertTransportMode(trans, 'dir/test.kndx', 0660)
1056
def test_create_mode_777(self):
1057
trans = get_transport('.')
1058
if not trans._can_roundtrip_unix_modebits():
1059
# Can't roundtrip, so no need to run this test
1061
knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1062
factory=None, create=True,
1063
create_parent_dir=True,
1067
knit.add_lines('revid', [], ['a\n'])
1068
self.assertTransportMode(trans, 'dir', 0777)
1069
self.assertTransportMode(trans, 'dir/test.knit', 0666)
1070
self.assertTransportMode(trans, 'dir/test.kndx', 0666)
1072
def test_plan_merge(self):
1073
my_knit = self.make_test_knit(annotate=True)
1074
my_knit.add_lines('text1', [], split_lines(TEXT_1))
1075
my_knit.add_lines('text1a', ['text1'], split_lines(TEXT_1A))
1076
my_knit.add_lines('text1b', ['text1'], split_lines(TEXT_1B))
1077
plan = list(my_knit.plan_merge('text1a', 'text1b'))
1078
for plan_line, expected_line in zip(plan, AB_MERGE):
1079
self.assertEqual(plan_line, expected_line)
1091
Banana cup cake recipe
1097
- self-raising flour
1101
Banana cup cake recipe
1103
- bananas (do not use plantains!!!)
1110
Banana cup cake recipe
1113
- self-raising flour
1126
AB_MERGE_TEXT="""unchanged|Banana cup cake recipe
1131
new-b|- bananas (do not use plantains!!!)
1132
unchanged|- broken tea cups
1133
new-a|- self-raising flour
1136
AB_MERGE=[tuple(l.split('|')) for l in AB_MERGE_TEXT.splitlines(True)]
1139
def line_delta(from_lines, to_lines):
1140
"""Generate line-based delta from one text to another"""
1141
s = difflib.SequenceMatcher(None, from_lines, to_lines)
1142
for op in s.get_opcodes():
1143
if op[0] == 'equal':
1145
yield '%d,%d,%d\n' % (op[1], op[2], op[4]-op[3])
1146
for i in range(op[3], op[4]):
1150
def apply_line_delta(basis_lines, delta_lines):
1151
"""Apply a line-based perfect diff
1153
basis_lines -- text to apply the patch to
1154
delta_lines -- diff instructions and content
1156
out = basis_lines[:]
1159
while i < len(delta_lines):
1161
a, b, c = map(long, l.split(','))
1163
out[offset+a:offset+b] = delta_lines[i:i+c]
1165
offset = offset + (b - a) + c
1169
class TestWeaveToKnit(KnitTests):
1171
def test_weave_to_knit_matches(self):
1172
# check that the WeaveToKnit is_compatible function
1173
# registers True for a Weave to a Knit.
1175
k = self.make_test_knit()
1176
self.failUnless(WeaveToKnit.is_compatible(w, k))
1177
self.failIf(WeaveToKnit.is_compatible(k, w))
1178
self.failIf(WeaveToKnit.is_compatible(w, w))
1179
self.failIf(WeaveToKnit.is_compatible(k, k))
1182
class TestKnitCaching(KnitTests):
1184
def create_knit(self, cache_add=False):
1185
k = self.make_test_knit(True)
1189
k.add_lines('text-1', [], split_lines(TEXT_1))
1190
k.add_lines('text-2', [], split_lines(TEXT_2))
1193
def test_no_caching(self):
1194
k = self.create_knit()
1195
# Nothing should be cached without setting 'enable_cache'
1196
self.assertEqual({}, k._data._cache)
1198
def test_cache_add_and_clear(self):
1199
k = self.create_knit(True)
1201
self.assertEqual(['text-1', 'text-2'], sorted(k._data._cache.keys()))
1204
self.assertEqual({}, k._data._cache)
1206
def test_cache_data_read_raw(self):
1207
k = self.create_knit()
1209
# Now cache and read
1212
def read_one_raw(version):
1213
pos_map = k._get_components_positions([version])
1214
method, pos, size, next = pos_map[version]
1215
lst = list(k._data.read_records_iter_raw([(version, pos, size)]))
1216
self.assertEqual(1, len(lst))
1219
val = read_one_raw('text-1')
1220
self.assertEqual({'text-1':val[1]}, k._data._cache)
1223
# After clear, new reads are not cached
1224
self.assertEqual({}, k._data._cache)
1226
val2 = read_one_raw('text-1')
1227
self.assertEqual(val, val2)
1228
self.assertEqual({}, k._data._cache)
1230
def test_cache_data_read(self):
1231
k = self.create_knit()
1233
def read_one(version):
1234
pos_map = k._get_components_positions([version])
1235
method, pos, size, next = pos_map[version]
1236
lst = list(k._data.read_records_iter([(version, pos, size)]))
1237
self.assertEqual(1, len(lst))
1240
# Now cache and read
1243
val = read_one('text-2')
1244
self.assertEqual(['text-2'], k._data._cache.keys())
1245
self.assertEqual('text-2', val[0])
1246
content, digest = k._data._parse_record('text-2',
1247
k._data._cache['text-2'])
1248
self.assertEqual(content, val[1])
1249
self.assertEqual(digest, val[2])
1252
self.assertEqual({}, k._data._cache)
1254
val2 = read_one('text-2')
1255
self.assertEqual(val, val2)
1256
self.assertEqual({}, k._data._cache)
1258
def test_cache_read(self):
1259
k = self.create_knit()
1262
text = k.get_text('text-1')
1263
self.assertEqual(TEXT_1, text)
1264
self.assertEqual(['text-1'], k._data._cache.keys())
1267
self.assertEqual({}, k._data._cache)
1269
text = k.get_text('text-1')
1270
self.assertEqual(TEXT_1, text)
1271
self.assertEqual({}, k._data._cache)
1320
def make_test_knit(self, annotate=False, name='test'):
1321
mapper = ConstantMapper(name)
1322
return make_file_factory(annotate, mapper)(self.get_transport())
1325
class TestBadShaError(KnitTests):
1326
"""Tests for handling of sha errors."""
1328
def test_sha_exception_has_text(self):
1329
# having the failed text included in the error allows for recovery.
1330
source = self.make_test_knit()
1331
target = self.make_test_knit(name="target")
1332
if not source._max_delta_chain:
1333
raise TestNotApplicable(
1334
"cannot get delta-caused sha failures without deltas.")
1337
broken = ('broken',)
1338
source.add_lines(basis, (), ['foo\n'])
1339
source.add_lines(broken, (basis,), ['foo\n', 'bar\n'])
1340
# Seed target with a bad basis text
1341
target.add_lines(basis, (), ['gam\n'])
1342
target.insert_record_stream(
1343
source.get_record_stream([broken], 'unordered', False))
1344
err = self.assertRaises(errors.KnitCorrupt,
1345
target.get_record_stream([broken], 'unordered', True
1346
).next().get_bytes_as, 'chunked')
1347
self.assertEqual(['gam\n', 'bar\n'], err.content)
1348
# Test for formatting with live data
1349
self.assertStartsWith(str(err), "Knit ")
1274
1352
class TestKnitIndex(KnitTests):
1347
1434
def test_knit_index_checks_header(self):
1348
1435
t = get_transport('.')
1349
1436
t.put_bytes('test.kndx', '# not really a knit header\n\n')
1351
self.assertRaises(KnitHeaderError, self.make_test_knit)
1437
k = self.make_test_knit()
1438
self.assertRaises(KnitHeaderError, k.keys)
1441
class TestGraphIndexKnit(KnitTests):
1442
"""Tests for knits using a GraphIndex rather than a KnitIndex."""
1444
def make_g_index(self, name, ref_lists=0, nodes=[]):
1445
builder = GraphIndexBuilder(ref_lists)
1446
for node, references, value in nodes:
1447
builder.add_node(node, references, value)
1448
stream = builder.finish()
1449
trans = self.get_transport()
1450
size = trans.put_file(name, stream)
1451
return GraphIndex(trans, name, size)
1453
def two_graph_index(self, deltas=False, catch_adds=False):
1454
"""Build a two-graph index.
1456
:param deltas: If true, use underlying indices with two node-ref
1457
lists and 'parent' set to a delta-compressed against tail.
1459
# build a complex graph across several indices.
1461
# delta compression inn the index
1462
index1 = self.make_g_index('1', 2, [
1463
(('tip', ), 'N0 100', ([('parent', )], [], )),
1464
(('tail', ), '', ([], []))])
1465
index2 = self.make_g_index('2', 2, [
1466
(('parent', ), ' 100 78', ([('tail', ), ('ghost', )], [('tail', )])),
1467
(('separate', ), '', ([], []))])
1469
# just blob location and graph in the index.
1470
index1 = self.make_g_index('1', 1, [
1471
(('tip', ), 'N0 100', ([('parent', )], )),
1472
(('tail', ), '', ([], ))])
1473
index2 = self.make_g_index('2', 1, [
1474
(('parent', ), ' 100 78', ([('tail', ), ('ghost', )], )),
1475
(('separate', ), '', ([], ))])
1476
combined_index = CombinedGraphIndex([index1, index2])
1478
self.combined_index = combined_index
1479
self.caught_entries = []
1480
add_callback = self.catch_add
1483
return _KnitGraphIndex(combined_index, lambda:True, deltas=deltas,
1484
add_callback=add_callback)
1486
def test_keys(self):
1487
index = self.two_graph_index()
1488
self.assertEqual(set([('tail',), ('tip',), ('parent',), ('separate',)]),
1491
def test_get_position(self):
1492
index = self.two_graph_index()
1493
self.assertEqual((index._graph_index._indices[0], 0, 100), index.get_position(('tip',)))
1494
self.assertEqual((index._graph_index._indices[1], 100, 78), index.get_position(('parent',)))
1496
def test_get_method_deltas(self):
1497
index = self.two_graph_index(deltas=True)
1498
self.assertEqual('fulltext', index.get_method(('tip',)))
1499
self.assertEqual('line-delta', index.get_method(('parent',)))
1501
def test_get_method_no_deltas(self):
1502
# check that the parent-history lookup is ignored with deltas=False.
1503
index = self.two_graph_index(deltas=False)
1504
self.assertEqual('fulltext', index.get_method(('tip',)))
1505
self.assertEqual('fulltext', index.get_method(('parent',)))
1507
def test_get_options_deltas(self):
1508
index = self.two_graph_index(deltas=True)
1509
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1510
self.assertEqual(['line-delta'], index.get_options(('parent',)))
1512
def test_get_options_no_deltas(self):
1513
# check that the parent-history lookup is ignored with deltas=False.
1514
index = self.two_graph_index(deltas=False)
1515
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1516
self.assertEqual(['fulltext'], index.get_options(('parent',)))
1518
def test_get_parent_map(self):
1519
index = self.two_graph_index()
1520
self.assertEqual({('parent',):(('tail',), ('ghost',))},
1521
index.get_parent_map([('parent',), ('ghost',)]))
1523
def catch_add(self, entries):
1524
self.caught_entries.append(entries)
1526
def test_add_no_callback_errors(self):
1527
index = self.two_graph_index()
1528
self.assertRaises(errors.ReadOnlyError, index.add_records,
1529
[(('new',), 'fulltext,no-eol', (None, 50, 60), ['separate'])])
1531
def test_add_version_smoke(self):
1532
index = self.two_graph_index(catch_adds=True)
1533
index.add_records([(('new',), 'fulltext,no-eol', (None, 50, 60),
1535
self.assertEqual([[(('new', ), 'N50 60', ((('separate',),),))]],
1536
self.caught_entries)
1538
def test_add_version_delta_not_delta_index(self):
1539
index = self.two_graph_index(catch_adds=True)
1540
self.assertRaises(errors.KnitCorrupt, index.add_records,
1541
[(('new',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
1542
self.assertEqual([], self.caught_entries)
1544
def test_add_version_same_dup(self):
1545
index = self.two_graph_index(catch_adds=True)
1546
# options can be spelt two different ways
1547
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
1548
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100), [('parent',)])])
1549
# position/length are ignored (because each pack could have fulltext or
1550
# delta, and be at a different position.
1551
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100),
1553
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000),
1555
# but neither should have added data:
1556
self.assertEqual([[], [], [], []], self.caught_entries)
1558
def test_add_version_different_dup(self):
1559
index = self.two_graph_index(deltas=True, catch_adds=True)
1561
self.assertRaises(errors.KnitCorrupt, index.add_records,
1562
[(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
1563
self.assertRaises(errors.KnitCorrupt, index.add_records,
1564
[(('tip',), 'fulltext', (None, 0, 100), [('parent',)])])
1566
self.assertRaises(errors.KnitCorrupt, index.add_records,
1567
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1568
self.assertEqual([], self.caught_entries)
1570
def test_add_versions_nodeltas(self):
1571
index = self.two_graph_index(catch_adds=True)
1573
(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)]),
1574
(('new2',), 'fulltext', (None, 0, 6), [('new',)]),
1576
self.assertEqual([(('new', ), 'N50 60', ((('separate',),),)),
1577
(('new2', ), ' 0 6', ((('new',),),))],
1578
sorted(self.caught_entries[0]))
1579
self.assertEqual(1, len(self.caught_entries))
1581
def test_add_versions_deltas(self):
1582
index = self.two_graph_index(deltas=True, catch_adds=True)
1584
(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)]),
1585
(('new2',), 'line-delta', (None, 0, 6), [('new',)]),
1587
self.assertEqual([(('new', ), 'N50 60', ((('separate',),), ())),
1588
(('new2', ), ' 0 6', ((('new',),), (('new',),), ))],
1589
sorted(self.caught_entries[0]))
1590
self.assertEqual(1, len(self.caught_entries))
1592
def test_add_versions_delta_not_delta_index(self):
1593
index = self.two_graph_index(catch_adds=True)
1594
self.assertRaises(errors.KnitCorrupt, index.add_records,
1595
[(('new',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
1596
self.assertEqual([], self.caught_entries)
1598
def test_add_versions_random_id_accepted(self):
1599
index = self.two_graph_index(catch_adds=True)
1600
index.add_records([], random_id=True)
1602
def test_add_versions_same_dup(self):
1603
index = self.two_graph_index(catch_adds=True)
1604
# options can be spelt two different ways
1605
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100),
1607
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100),
1609
# position/length are ignored (because each pack could have fulltext or
1610
# delta, and be at a different position.
1611
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100),
1613
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000),
1615
# but neither should have added data.
1616
self.assertEqual([[], [], [], []], self.caught_entries)
1618
def test_add_versions_different_dup(self):
1619
index = self.two_graph_index(deltas=True, catch_adds=True)
1621
self.assertRaises(errors.KnitCorrupt, index.add_records,
1622
[(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
1623
self.assertRaises(errors.KnitCorrupt, index.add_records,
1624
[(('tip',), 'fulltext', (None, 0, 100), [('parent',)])])
1626
self.assertRaises(errors.KnitCorrupt, index.add_records,
1627
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1628
# change options in the second record
1629
self.assertRaises(errors.KnitCorrupt, index.add_records,
1630
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)]),
1631
(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
1632
self.assertEqual([], self.caught_entries)
1634
def make_g_index_missing_compression_parent(self):
1635
graph_index = self.make_g_index('missing_comp', 2,
1636
[(('tip', ), ' 100 78',
1637
([('missing-parent', ), ('ghost', )], [('missing-parent', )]))])
1640
def make_g_index_no_external_refs(self):
1641
graph_index = self.make_g_index('no_external_refs', 2,
1642
[(('rev', ), ' 100 78',
1643
([('parent', ), ('ghost', )], []))])
1646
def test_add_good_unvalidated_index(self):
1647
unvalidated = self.make_g_index_no_external_refs()
1648
combined = CombinedGraphIndex([unvalidated])
1649
index = _KnitGraphIndex(combined, lambda: True, deltas=True)
1650
index.scan_unvalidated_index(unvalidated)
1651
self.assertEqual(frozenset(), index.get_missing_compression_parents())
1653
def test_add_incomplete_unvalidated_index(self):
1654
unvalidated = self.make_g_index_missing_compression_parent()
1655
combined = CombinedGraphIndex([unvalidated])
1656
index = _KnitGraphIndex(combined, lambda: True, deltas=True)
1657
index.scan_unvalidated_index(unvalidated)
1658
# This also checks that its only the compression parent that is
1659
# examined, otherwise 'ghost' would also be reported as a missing
1662
frozenset([('missing-parent',)]),
1663
index.get_missing_compression_parents())
1665
def test_add_unvalidated_index_with_present_external_references(self):
1666
index = self.two_graph_index(deltas=True)
1667
# Ugly hack to get at one of the underlying GraphIndex objects that
1668
# two_graph_index built.
1669
unvalidated = index._graph_index._indices[1]
1670
# 'parent' is an external ref of _indices[1] (unvalidated), but is
1671
# present in _indices[0].
1672
index.scan_unvalidated_index(unvalidated)
1673
self.assertEqual(frozenset(), index.get_missing_compression_parents())
1675
def make_new_missing_parent_g_index(self, name):
1676
missing_parent = name + '-missing-parent'
1677
graph_index = self.make_g_index(name, 2,
1678
[((name + 'tip', ), ' 100 78',
1679
([(missing_parent, ), ('ghost', )], [(missing_parent, )]))])
1682
def test_add_mulitiple_unvalidated_indices_with_missing_parents(self):
1683
g_index_1 = self.make_new_missing_parent_g_index('one')
1684
g_index_2 = self.make_new_missing_parent_g_index('two')
1685
combined = CombinedGraphIndex([g_index_1, g_index_2])
1686
index = _KnitGraphIndex(combined, lambda: True, deltas=True)
1687
index.scan_unvalidated_index(g_index_1)
1688
index.scan_unvalidated_index(g_index_2)
1690
frozenset([('one-missing-parent',), ('two-missing-parent',)]),
1691
index.get_missing_compression_parents())
1693
def test_add_mulitiple_unvalidated_indices_with_mutual_dependencies(self):
1694
graph_index_a = self.make_g_index('one', 2,
1695
[(('parent-one', ), ' 100 78', ([('non-compression-parent',)], [])),
1696
(('child-of-two', ), ' 100 78',
1697
([('parent-two',)], [('parent-two',)]))])
1698
graph_index_b = self.make_g_index('two', 2,
1699
[(('parent-two', ), ' 100 78', ([('non-compression-parent',)], [])),
1700
(('child-of-one', ), ' 100 78',
1701
([('parent-one',)], [('parent-one',)]))])
1702
combined = CombinedGraphIndex([graph_index_a, graph_index_b])
1703
index = _KnitGraphIndex(combined, lambda: True, deltas=True)
1704
index.scan_unvalidated_index(graph_index_a)
1705
index.scan_unvalidated_index(graph_index_b)
1707
frozenset([]), index.get_missing_compression_parents())
1710
class TestNoParentsGraphIndexKnit(KnitTests):
1711
"""Tests for knits using _KnitGraphIndex with no parents."""
1713
def make_g_index(self, name, ref_lists=0, nodes=[]):
1714
builder = GraphIndexBuilder(ref_lists)
1715
for node, references in nodes:
1716
builder.add_node(node, references)
1717
stream = builder.finish()
1718
trans = self.get_transport()
1719
size = trans.put_file(name, stream)
1720
return GraphIndex(trans, name, size)
1722
def test_add_good_unvalidated_index(self):
1723
unvalidated = self.make_g_index('unvalidated')
1724
combined = CombinedGraphIndex([unvalidated])
1725
index = _KnitGraphIndex(combined, lambda: True, parents=False)
1726
index.scan_unvalidated_index(unvalidated)
1727
self.assertEqual(frozenset(),
1728
index.get_missing_compression_parents())
1730
def test_parents_deltas_incompatible(self):
1731
index = CombinedGraphIndex([])
1732
self.assertRaises(errors.KnitError, _KnitGraphIndex, lambda:True,
1733
index, deltas=True, parents=False)
1735
def two_graph_index(self, catch_adds=False):
1736
"""Build a two-graph index.
1738
:param deltas: If true, use underlying indices with two node-ref
1739
lists and 'parent' set to a delta-compressed against tail.
1741
# put several versions in the index.
1742
index1 = self.make_g_index('1', 0, [
1743
(('tip', ), 'N0 100'),
1745
index2 = self.make_g_index('2', 0, [
1746
(('parent', ), ' 100 78'),
1747
(('separate', ), '')])
1748
combined_index = CombinedGraphIndex([index1, index2])
1750
self.combined_index = combined_index
1751
self.caught_entries = []
1752
add_callback = self.catch_add
1755
return _KnitGraphIndex(combined_index, lambda:True, parents=False,
1756
add_callback=add_callback)
1758
def test_keys(self):
1759
index = self.two_graph_index()
1760
self.assertEqual(set([('tail',), ('tip',), ('parent',), ('separate',)]),
1763
def test_get_position(self):
1764
index = self.two_graph_index()
1765
self.assertEqual((index._graph_index._indices[0], 0, 100),
1766
index.get_position(('tip',)))
1767
self.assertEqual((index._graph_index._indices[1], 100, 78),
1768
index.get_position(('parent',)))
1770
def test_get_method(self):
1771
index = self.two_graph_index()
1772
self.assertEqual('fulltext', index.get_method(('tip',)))
1773
self.assertEqual(['fulltext'], index.get_options(('parent',)))
1775
def test_get_options(self):
1776
index = self.two_graph_index()
1777
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1778
self.assertEqual(['fulltext'], index.get_options(('parent',)))
1780
def test_get_parent_map(self):
1781
index = self.two_graph_index()
1782
self.assertEqual({('parent',):None},
1783
index.get_parent_map([('parent',), ('ghost',)]))
1785
def catch_add(self, entries):
1786
self.caught_entries.append(entries)
1788
def test_add_no_callback_errors(self):
1789
index = self.two_graph_index()
1790
self.assertRaises(errors.ReadOnlyError, index.add_records,
1791
[(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)])])
1793
def test_add_version_smoke(self):
1794
index = self.two_graph_index(catch_adds=True)
1795
index.add_records([(('new',), 'fulltext,no-eol', (None, 50, 60), [])])
1796
self.assertEqual([[(('new', ), 'N50 60')]],
1797
self.caught_entries)
1799
def test_add_version_delta_not_delta_index(self):
1800
index = self.two_graph_index(catch_adds=True)
1801
self.assertRaises(errors.KnitCorrupt, index.add_records,
1802
[(('new',), 'no-eol,line-delta', (None, 0, 100), [])])
1803
self.assertEqual([], self.caught_entries)
1805
def test_add_version_same_dup(self):
1806
index = self.two_graph_index(catch_adds=True)
1807
# options can be spelt two different ways
1808
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1809
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100), [])])
1810
# position/length are ignored (because each pack could have fulltext or
1811
# delta, and be at a different position.
1812
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100), [])])
1813
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000), [])])
1814
# but neither should have added data.
1815
self.assertEqual([[], [], [], []], self.caught_entries)
1817
def test_add_version_different_dup(self):
1818
index = self.two_graph_index(catch_adds=True)
1820
self.assertRaises(errors.KnitCorrupt, index.add_records,
1821
[(('tip',), 'no-eol,line-delta', (None, 0, 100), [])])
1822
self.assertRaises(errors.KnitCorrupt, index.add_records,
1823
[(('tip',), 'line-delta,no-eol', (None, 0, 100), [])])
1824
self.assertRaises(errors.KnitCorrupt, index.add_records,
1825
[(('tip',), 'fulltext', (None, 0, 100), [])])
1827
self.assertRaises(errors.KnitCorrupt, index.add_records,
1828
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
1829
self.assertEqual([], self.caught_entries)
1831
def test_add_versions(self):
1832
index = self.two_graph_index(catch_adds=True)
1834
(('new',), 'fulltext,no-eol', (None, 50, 60), []),
1835
(('new2',), 'fulltext', (None, 0, 6), []),
1837
self.assertEqual([(('new', ), 'N50 60'), (('new2', ), ' 0 6')],
1838
sorted(self.caught_entries[0]))
1839
self.assertEqual(1, len(self.caught_entries))
1841
def test_add_versions_delta_not_delta_index(self):
1842
index = self.two_graph_index(catch_adds=True)
1843
self.assertRaises(errors.KnitCorrupt, index.add_records,
1844
[(('new',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
1845
self.assertEqual([], self.caught_entries)
1847
def test_add_versions_parents_not_parents_index(self):
1848
index = self.two_graph_index(catch_adds=True)
1849
self.assertRaises(errors.KnitCorrupt, index.add_records,
1850
[(('new',), 'no-eol,fulltext', (None, 0, 100), [('parent',)])])
1851
self.assertEqual([], self.caught_entries)
1853
def test_add_versions_random_id_accepted(self):
1854
index = self.two_graph_index(catch_adds=True)
1855
index.add_records([], random_id=True)
1857
def test_add_versions_same_dup(self):
1858
index = self.two_graph_index(catch_adds=True)
1859
# options can be spelt two different ways
1860
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1861
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100), [])])
1862
# position/length are ignored (because each pack could have fulltext or
1863
# delta, and be at a different position.
1864
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100), [])])
1865
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000), [])])
1866
# but neither should have added data.
1867
self.assertEqual([[], [], [], []], self.caught_entries)
1869
def test_add_versions_different_dup(self):
1870
index = self.two_graph_index(catch_adds=True)
1872
self.assertRaises(errors.KnitCorrupt, index.add_records,
1873
[(('tip',), 'no-eol,line-delta', (None, 0, 100), [])])
1874
self.assertRaises(errors.KnitCorrupt, index.add_records,
1875
[(('tip',), 'line-delta,no-eol', (None, 0, 100), [])])
1876
self.assertRaises(errors.KnitCorrupt, index.add_records,
1877
[(('tip',), 'fulltext', (None, 0, 100), [])])
1879
self.assertRaises(errors.KnitCorrupt, index.add_records,
1880
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
1881
# change options in the second record
1882
self.assertRaises(errors.KnitCorrupt, index.add_records,
1883
[(('tip',), 'fulltext,no-eol', (None, 0, 100), []),
1884
(('tip',), 'no-eol,line-delta', (None, 0, 100), [])])
1885
self.assertEqual([], self.caught_entries)
1888
class TestKnitVersionedFiles(KnitTests):
1890
def assertGroupKeysForIo(self, exp_groups, keys, non_local_keys,
1891
positions, _min_buffer_size=None):
1892
kvf = self.make_test_knit()
1893
if _min_buffer_size is None:
1894
_min_buffer_size = knit._STREAM_MIN_BUFFER_SIZE
1895
self.assertEqual(exp_groups, kvf._group_keys_for_io(keys,
1896
non_local_keys, positions,
1897
_min_buffer_size=_min_buffer_size))
1899
def assertSplitByPrefix(self, expected_map, expected_prefix_order,
1901
split, prefix_order = KnitVersionedFiles._split_by_prefix(keys)
1902
self.assertEqual(expected_map, split)
1903
self.assertEqual(expected_prefix_order, prefix_order)
1905
def test__group_keys_for_io(self):
1906
ft_detail = ('fulltext', False)
1907
ld_detail = ('line-delta', False)
1915
f_a: (ft_detail, (f_a, 0, 100), None),
1916
f_b: (ld_detail, (f_b, 100, 21), f_a),
1917
f_c: (ld_detail, (f_c, 180, 15), f_b),
1918
g_a: (ft_detail, (g_a, 121, 35), None),
1919
g_b: (ld_detail, (g_b, 156, 12), g_a),
1920
g_c: (ld_detail, (g_c, 195, 13), g_a),
1922
self.assertGroupKeysForIo([([f_a], set())],
1923
[f_a], [], positions)
1924
self.assertGroupKeysForIo([([f_a], set([f_a]))],
1925
[f_a], [f_a], positions)
1926
self.assertGroupKeysForIo([([f_a, f_b], set([]))],
1927
[f_a, f_b], [], positions)
1928
self.assertGroupKeysForIo([([f_a, f_b], set([f_b]))],
1929
[f_a, f_b], [f_b], positions)
1930
self.assertGroupKeysForIo([([f_a, f_b, g_a, g_b], set())],
1931
[f_a, g_a, f_b, g_b], [], positions)
1932
self.assertGroupKeysForIo([([f_a, f_b, g_a, g_b], set())],
1933
[f_a, g_a, f_b, g_b], [], positions,
1934
_min_buffer_size=150)
1935
self.assertGroupKeysForIo([([f_a, f_b], set()), ([g_a, g_b], set())],
1936
[f_a, g_a, f_b, g_b], [], positions,
1937
_min_buffer_size=100)
1938
self.assertGroupKeysForIo([([f_c], set()), ([g_b], set())],
1939
[f_c, g_b], [], positions,
1940
_min_buffer_size=125)
1941
self.assertGroupKeysForIo([([g_b, f_c], set())],
1942
[g_b, f_c], [], positions,
1943
_min_buffer_size=125)
1945
def test__split_by_prefix(self):
1946
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
1947
'g': [('g', 'b'), ('g', 'a')],
1949
[('f', 'a'), ('g', 'b'),
1950
('g', 'a'), ('f', 'b')])
1952
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
1953
'g': [('g', 'b'), ('g', 'a')],
1955
[('f', 'a'), ('f', 'b'),
1956
('g', 'b'), ('g', 'a')])
1958
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
1959
'g': [('g', 'b'), ('g', 'a')],
1961
[('f', 'a'), ('f', 'b'),
1962
('g', 'b'), ('g', 'a')])
1964
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
1965
'g': [('g', 'b'), ('g', 'a')],
1966
'': [('a',), ('b',)]
1968
[('f', 'a'), ('g', 'b'),
1970
('g', 'a'), ('f', 'b')])
1973
class TestStacking(KnitTests):
1975
def get_basis_and_test_knit(self):
1976
basis = self.make_test_knit(name='basis')
1977
basis = RecordingVersionedFilesDecorator(basis)
1978
test = self.make_test_knit(name='test')
1979
test.add_fallback_versioned_files(basis)
1982
def test_add_fallback_versioned_files(self):
1983
basis = self.make_test_knit(name='basis')
1984
test = self.make_test_knit(name='test')
1985
# It must not error; other tests test that the fallback is referred to
1986
# when accessing data.
1987
test.add_fallback_versioned_files(basis)
1989
def test_add_lines(self):
1990
# lines added to the test are not added to the basis
1991
basis, test = self.get_basis_and_test_knit()
1993
key_basis = ('bar',)
1994
key_cross_border = ('quux',)
1995
key_delta = ('zaphod',)
1996
test.add_lines(key, (), ['foo\n'])
1997
self.assertEqual({}, basis.get_parent_map([key]))
1998
# lines added to the test that reference across the stack do a
2000
basis.add_lines(key_basis, (), ['foo\n'])
2002
test.add_lines(key_cross_border, (key_basis,), ['foo\n'])
2003
self.assertEqual('fulltext', test._index.get_method(key_cross_border))
2004
# we don't even need to look at the basis to see that this should be
2005
# stored as a fulltext
2006
self.assertEqual([], basis.calls)
2007
# Subsequent adds do delta.
2009
test.add_lines(key_delta, (key_cross_border,), ['foo\n'])
2010
self.assertEqual('line-delta', test._index.get_method(key_delta))
2011
self.assertEqual([], basis.calls)
2013
def test_annotate(self):
2014
# annotations from the test knit are answered without asking the basis
2015
basis, test = self.get_basis_and_test_knit()
2017
key_basis = ('bar',)
2018
key_missing = ('missing',)
2019
test.add_lines(key, (), ['foo\n'])
2020
details = test.annotate(key)
2021
self.assertEqual([(key, 'foo\n')], details)
2022
self.assertEqual([], basis.calls)
2023
# But texts that are not in the test knit are looked for in the basis
2025
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2027
details = test.annotate(key_basis)
2028
self.assertEqual([(key_basis, 'foo\n'), (key_basis, 'bar\n')], details)
2029
# Not optimised to date:
2030
# self.assertEqual([("annotate", key_basis)], basis.calls)
2031
self.assertEqual([('get_parent_map', set([key_basis])),
2032
('get_parent_map', set([key_basis])),
2033
('get_parent_map', set([key_basis])),
2034
('get_record_stream', [key_basis], 'unordered', True)],
2037
def test_check(self):
2038
# At the moment checking a stacked knit does implicitly check the
2040
basis, test = self.get_basis_and_test_knit()
2043
def test_get_parent_map(self):
2044
# parents in the test knit are answered without asking the basis
2045
basis, test = self.get_basis_and_test_knit()
2047
key_basis = ('bar',)
2048
key_missing = ('missing',)
2049
test.add_lines(key, (), [])
2050
parent_map = test.get_parent_map([key])
2051
self.assertEqual({key: ()}, parent_map)
2052
self.assertEqual([], basis.calls)
2053
# But parents that are not in the test knit are looked for in the basis
2054
basis.add_lines(key_basis, (), [])
2056
parent_map = test.get_parent_map([key, key_basis, key_missing])
2057
self.assertEqual({key: (),
2058
key_basis: ()}, parent_map)
2059
self.assertEqual([("get_parent_map", set([key_basis, key_missing]))],
2062
def test_get_record_stream_unordered_fulltexts(self):
2063
# records from the test knit are answered without asking the basis:
2064
basis, test = self.get_basis_and_test_knit()
2066
key_basis = ('bar',)
2067
key_missing = ('missing',)
2068
test.add_lines(key, (), ['foo\n'])
2069
records = list(test.get_record_stream([key], 'unordered', True))
2070
self.assertEqual(1, len(records))
2071
self.assertEqual([], basis.calls)
2072
# Missing (from test knit) objects are retrieved from the basis:
2073
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2075
records = list(test.get_record_stream([key_basis, key_missing],
2077
self.assertEqual(2, len(records))
2078
calls = list(basis.calls)
2079
for record in records:
2080
self.assertSubset([record.key], (key_basis, key_missing))
2081
if record.key == key_missing:
2082
self.assertIsInstance(record, AbsentContentFactory)
2084
reference = list(basis.get_record_stream([key_basis],
2085
'unordered', True))[0]
2086
self.assertEqual(reference.key, record.key)
2087
self.assertEqual(reference.sha1, record.sha1)
2088
self.assertEqual(reference.storage_kind, record.storage_kind)
2089
self.assertEqual(reference.get_bytes_as(reference.storage_kind),
2090
record.get_bytes_as(record.storage_kind))
2091
self.assertEqual(reference.get_bytes_as('fulltext'),
2092
record.get_bytes_as('fulltext'))
2093
# It's not strictly minimal, but it seems reasonable for now for it to
2094
# ask which fallbacks have which parents.
2096
("get_parent_map", set([key_basis, key_missing])),
2097
("get_record_stream", [key_basis], 'unordered', True)],
2100
def test_get_record_stream_ordered_fulltexts(self):
2101
# ordering is preserved down into the fallback store.
2102
basis, test = self.get_basis_and_test_knit()
2104
key_basis = ('bar',)
2105
key_basis_2 = ('quux',)
2106
key_missing = ('missing',)
2107
test.add_lines(key, (key_basis,), ['foo\n'])
2108
# Missing (from test knit) objects are retrieved from the basis:
2109
basis.add_lines(key_basis, (key_basis_2,), ['foo\n', 'bar\n'])
2110
basis.add_lines(key_basis_2, (), ['quux\n'])
2112
# ask for in non-topological order
2113
records = list(test.get_record_stream(
2114
[key, key_basis, key_missing, key_basis_2], 'topological', True))
2115
self.assertEqual(4, len(records))
2117
for record in records:
2118
self.assertSubset([record.key],
2119
(key_basis, key_missing, key_basis_2, key))
2120
if record.key == key_missing:
2121
self.assertIsInstance(record, AbsentContentFactory)
2123
results.append((record.key, record.sha1, record.storage_kind,
2124
record.get_bytes_as('fulltext')))
2125
calls = list(basis.calls)
2126
order = [record[0] for record in results]
2127
self.assertEqual([key_basis_2, key_basis, key], order)
2128
for result in results:
2129
if result[0] == key:
2133
record = source.get_record_stream([result[0]], 'unordered',
2135
self.assertEqual(record.key, result[0])
2136
self.assertEqual(record.sha1, result[1])
2137
# We used to check that the storage kind matched, but actually it
2138
# depends on whether it was sourced from the basis, or in a single
2139
# group, because asking for full texts returns proxy objects to a
2140
# _ContentMapGenerator object; so checking the kind is unneeded.
2141
self.assertEqual(record.get_bytes_as('fulltext'), result[3])
2142
# It's not strictly minimal, but it seems reasonable for now for it to
2143
# ask which fallbacks have which parents.
2145
("get_parent_map", set([key_basis, key_basis_2, key_missing])),
2146
# unordered is asked for by the underlying worker as it still
2147
# buffers everything while answering - which is a problem!
2148
("get_record_stream", [key_basis_2, key_basis], 'unordered', True)],
2151
def test_get_record_stream_unordered_deltas(self):
2152
# records from the test knit are answered without asking the basis:
2153
basis, test = self.get_basis_and_test_knit()
2155
key_basis = ('bar',)
2156
key_missing = ('missing',)
2157
test.add_lines(key, (), ['foo\n'])
2158
records = list(test.get_record_stream([key], 'unordered', False))
2159
self.assertEqual(1, len(records))
2160
self.assertEqual([], basis.calls)
2161
# Missing (from test knit) objects are retrieved from the basis:
2162
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2164
records = list(test.get_record_stream([key_basis, key_missing],
2165
'unordered', False))
2166
self.assertEqual(2, len(records))
2167
calls = list(basis.calls)
2168
for record in records:
2169
self.assertSubset([record.key], (key_basis, key_missing))
2170
if record.key == key_missing:
2171
self.assertIsInstance(record, AbsentContentFactory)
2173
reference = list(basis.get_record_stream([key_basis],
2174
'unordered', False))[0]
2175
self.assertEqual(reference.key, record.key)
2176
self.assertEqual(reference.sha1, record.sha1)
2177
self.assertEqual(reference.storage_kind, record.storage_kind)
2178
self.assertEqual(reference.get_bytes_as(reference.storage_kind),
2179
record.get_bytes_as(record.storage_kind))
2180
# It's not strictly minimal, but it seems reasonable for now for it to
2181
# ask which fallbacks have which parents.
2183
("get_parent_map", set([key_basis, key_missing])),
2184
("get_record_stream", [key_basis], 'unordered', False)],
2187
def test_get_record_stream_ordered_deltas(self):
2188
# ordering is preserved down into the fallback store.
2189
basis, test = self.get_basis_and_test_knit()
2191
key_basis = ('bar',)
2192
key_basis_2 = ('quux',)
2193
key_missing = ('missing',)
2194
test.add_lines(key, (key_basis,), ['foo\n'])
2195
# Missing (from test knit) objects are retrieved from the basis:
2196
basis.add_lines(key_basis, (key_basis_2,), ['foo\n', 'bar\n'])
2197
basis.add_lines(key_basis_2, (), ['quux\n'])
2199
# ask for in non-topological order
2200
records = list(test.get_record_stream(
2201
[key, key_basis, key_missing, key_basis_2], 'topological', False))
2202
self.assertEqual(4, len(records))
2204
for record in records:
2205
self.assertSubset([record.key],
2206
(key_basis, key_missing, key_basis_2, key))
2207
if record.key == key_missing:
2208
self.assertIsInstance(record, AbsentContentFactory)
2210
results.append((record.key, record.sha1, record.storage_kind,
2211
record.get_bytes_as(record.storage_kind)))
2212
calls = list(basis.calls)
2213
order = [record[0] for record in results]
2214
self.assertEqual([key_basis_2, key_basis, key], order)
2215
for result in results:
2216
if result[0] == key:
2220
record = source.get_record_stream([result[0]], 'unordered',
2222
self.assertEqual(record.key, result[0])
2223
self.assertEqual(record.sha1, result[1])
2224
self.assertEqual(record.storage_kind, result[2])
2225
self.assertEqual(record.get_bytes_as(record.storage_kind), result[3])
2226
# It's not strictly minimal, but it seems reasonable for now for it to
2227
# ask which fallbacks have which parents.
2229
("get_parent_map", set([key_basis, key_basis_2, key_missing])),
2230
("get_record_stream", [key_basis_2, key_basis], 'topological', False)],
2233
def test_get_sha1s(self):
2234
# sha1's in the test knit are answered without asking the basis
2235
basis, test = self.get_basis_and_test_knit()
2237
key_basis = ('bar',)
2238
key_missing = ('missing',)
2239
test.add_lines(key, (), ['foo\n'])
2240
key_sha1sum = osutils.sha('foo\n').hexdigest()
2241
sha1s = test.get_sha1s([key])
2242
self.assertEqual({key: key_sha1sum}, sha1s)
2243
self.assertEqual([], basis.calls)
2244
# But texts that are not in the test knit are looked for in the basis
2245
# directly (rather than via text reconstruction) so that remote servers
2246
# etc don't have to answer with full content.
2247
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2248
basis_sha1sum = osutils.sha('foo\nbar\n').hexdigest()
2250
sha1s = test.get_sha1s([key, key_missing, key_basis])
2251
self.assertEqual({key: key_sha1sum,
2252
key_basis: basis_sha1sum}, sha1s)
2253
self.assertEqual([("get_sha1s", set([key_basis, key_missing]))],
2256
def test_insert_record_stream(self):
2257
# records are inserted as normal; insert_record_stream builds on
2258
# add_lines, so a smoke test should be all that's needed:
2260
key_basis = ('bar',)
2261
key_delta = ('zaphod',)
2262
basis, test = self.get_basis_and_test_knit()
2263
source = self.make_test_knit(name='source')
2264
basis.add_lines(key_basis, (), ['foo\n'])
2266
source.add_lines(key_basis, (), ['foo\n'])
2267
source.add_lines(key_delta, (key_basis,), ['bar\n'])
2268
stream = source.get_record_stream([key_delta], 'unordered', False)
2269
test.insert_record_stream(stream)
2270
# XXX: this does somewhat too many calls in making sure of whether it
2271
# has to recreate the full text.
2272
self.assertEqual([("get_parent_map", set([key_basis])),
2273
('get_parent_map', set([key_basis])),
2274
('get_record_stream', [key_basis], 'unordered', True)],
2276
self.assertEqual({key_delta:(key_basis,)},
2277
test.get_parent_map([key_delta]))
2278
self.assertEqual('bar\n', test.get_record_stream([key_delta],
2279
'unordered', True).next().get_bytes_as('fulltext'))
2281
def test_iter_lines_added_or_present_in_keys(self):
2282
# Lines from the basis are returned, and lines for a given key are only
2286
# all sources are asked for keys:
2287
basis, test = self.get_basis_and_test_knit()
2288
basis.add_lines(key1, (), ["foo"])
2290
lines = list(test.iter_lines_added_or_present_in_keys([key1]))
2291
self.assertEqual([("foo\n", key1)], lines)
2292
self.assertEqual([("iter_lines_added_or_present_in_keys", set([key1]))],
2294
# keys in both are not duplicated:
2295
test.add_lines(key2, (), ["bar\n"])
2296
basis.add_lines(key2, (), ["bar\n"])
2298
lines = list(test.iter_lines_added_or_present_in_keys([key2]))
2299
self.assertEqual([("bar\n", key2)], lines)
2300
self.assertEqual([], basis.calls)
2302
def test_keys(self):
2305
# all sources are asked for keys:
2306
basis, test = self.get_basis_and_test_knit()
2308
self.assertEqual(set(), set(keys))
2309
self.assertEqual([("keys",)], basis.calls)
2310
# keys from a basis are returned:
2311
basis.add_lines(key1, (), [])
2314
self.assertEqual(set([key1]), set(keys))
2315
self.assertEqual([("keys",)], basis.calls)
2316
# keys in both are not duplicated:
2317
test.add_lines(key2, (), [])
2318
basis.add_lines(key2, (), [])
2321
self.assertEqual(2, len(keys))
2322
self.assertEqual(set([key1, key2]), set(keys))
2323
self.assertEqual([("keys",)], basis.calls)
2325
def test_add_mpdiffs(self):
2326
# records are inserted as normal; add_mpdiff builds on
2327
# add_lines, so a smoke test should be all that's needed:
2329
key_basis = ('bar',)
2330
key_delta = ('zaphod',)
2331
basis, test = self.get_basis_and_test_knit()
2332
source = self.make_test_knit(name='source')
2333
basis.add_lines(key_basis, (), ['foo\n'])
2335
source.add_lines(key_basis, (), ['foo\n'])
2336
source.add_lines(key_delta, (key_basis,), ['bar\n'])
2337
diffs = source.make_mpdiffs([key_delta])
2338
test.add_mpdiffs([(key_delta, (key_basis,),
2339
source.get_sha1s([key_delta])[key_delta], diffs[0])])
2340
self.assertEqual([("get_parent_map", set([key_basis])),
2341
('get_record_stream', [key_basis], 'unordered', True),],
2343
self.assertEqual({key_delta:(key_basis,)},
2344
test.get_parent_map([key_delta]))
2345
self.assertEqual('bar\n', test.get_record_stream([key_delta],
2346
'unordered', True).next().get_bytes_as('fulltext'))
2348
def test_make_mpdiffs(self):
2349
# Generating an mpdiff across a stacking boundary should detect parent
2353
key_right = ('zaphod',)
2354
basis, test = self.get_basis_and_test_knit()
2355
basis.add_lines(key_left, (), ['bar\n'])
2356
basis.add_lines(key_right, (), ['zaphod\n'])
2358
test.add_lines(key, (key_left, key_right),
2359
['bar\n', 'foo\n', 'zaphod\n'])
2360
diffs = test.make_mpdiffs([key])
2362
multiparent.MultiParent([multiparent.ParentText(0, 0, 0, 1),
2363
multiparent.NewText(['foo\n']),
2364
multiparent.ParentText(1, 0, 2, 1)])],
2366
self.assertEqual(3, len(basis.calls))
2368
("get_parent_map", set([key_left, key_right])),
2369
("get_parent_map", set([key_left, key_right])),
2372
last_call = basis.calls[-1]
2373
self.assertEqual('get_record_stream', last_call[0])
2374
self.assertEqual(set([key_left, key_right]), set(last_call[1]))
2375
self.assertEqual('unordered', last_call[2])
2376
self.assertEqual(True, last_call[3])
2379
class TestNetworkBehaviour(KnitTests):
2380
"""Tests for getting data out of/into knits over the network."""
2382
def test_include_delta_closure_generates_a_knit_delta_closure(self):
2383
vf = self.make_test_knit(name='test')
2384
# put in three texts, giving ft, delta, delta
2385
vf.add_lines(('base',), (), ['base\n', 'content\n'])
2386
vf.add_lines(('d1',), (('base',),), ['d1\n'])
2387
vf.add_lines(('d2',), (('d1',),), ['d2\n'])
2388
# But heuristics could interfere, so check what happened:
2389
self.assertEqual(['knit-ft-gz', 'knit-delta-gz', 'knit-delta-gz'],
2390
[record.storage_kind for record in
2391
vf.get_record_stream([('base',), ('d1',), ('d2',)],
2392
'topological', False)])
2393
# generate a stream of just the deltas include_delta_closure=True,
2394
# serialise to the network, and check that we get a delta closure on the wire.
2395
stream = vf.get_record_stream([('d1',), ('d2',)], 'topological', True)
2396
netb = [record.get_bytes_as(record.storage_kind) for record in stream]
2397
# The first bytes should be a memo from _ContentMapGenerator, and the
2398
# second bytes should be empty (because its a API proxy not something
2399
# for wire serialisation.
2400
self.assertEqual('', netb[1])
2402
kind, line_end = network_bytes_to_kind_and_offset(bytes)
2403
self.assertEqual('knit-delta-closure', kind)
2406
class TestContentMapGenerator(KnitTests):
2407
"""Tests for ContentMapGenerator"""
2409
def test_get_record_stream_gives_records(self):
2410
vf = self.make_test_knit(name='test')
2411
# put in three texts, giving ft, delta, delta
2412
vf.add_lines(('base',), (), ['base\n', 'content\n'])
2413
vf.add_lines(('d1',), (('base',),), ['d1\n'])
2414
vf.add_lines(('d2',), (('d1',),), ['d2\n'])
2415
keys = [('d1',), ('d2',)]
2416
generator = _VFContentMapGenerator(vf, keys,
2417
global_map=vf.get_parent_map(keys))
2418
for record in generator.get_record_stream():
2419
if record.key == ('d1',):
2420
self.assertEqual('d1\n', record.get_bytes_as('fulltext'))
2422
self.assertEqual('d2\n', record.get_bytes_as('fulltext'))
2424
def test_get_record_stream_kinds_are_raw(self):
2425
vf = self.make_test_knit(name='test')
2426
# put in three texts, giving ft, delta, delta
2427
vf.add_lines(('base',), (), ['base\n', 'content\n'])
2428
vf.add_lines(('d1',), (('base',),), ['d1\n'])
2429
vf.add_lines(('d2',), (('d1',),), ['d2\n'])
2430
keys = [('base',), ('d1',), ('d2',)]
2431
generator = _VFContentMapGenerator(vf, keys,
2432
global_map=vf.get_parent_map(keys))
2433
kinds = {('base',): 'knit-delta-closure',
2434
('d1',): 'knit-delta-closure-ref',
2435
('d2',): 'knit-delta-closure-ref',
2437
for record in generator.get_record_stream():
2438
self.assertEqual(kinds[record.key], record.storage_kind)
added
removed
bzrlib/tests/test_knit.py
