753
248
for start, end, c, lines in delta:
754
249
out.append('%d,%d,%d\n' % (start, end, c))
250
out.extend([text for origin, text in lines])
758
def annotate(self, knit, key):
759
annotator = _KnitAnnotator(knit)
760
return annotator.annotate_flat(key)
764
def make_file_factory(annotated, mapper):
765
"""Create a factory for creating a file based KnitVersionedFiles.
767
This is only functional enough to run interface tests, it doesn't try to
768
provide a full pack environment.
770
:param annotated: knit annotations are wanted.
771
:param mapper: The mapper from keys to paths.
773
def factory(transport):
774
index = _KndxIndex(transport, mapper, lambda:None, lambda:True, lambda:True)
775
access = _KnitKeyAccess(transport, mapper)
776
return KnitVersionedFiles(index, access, annotated=annotated)
780
def make_pack_factory(graph, delta, keylength):
781
"""Create a factory for creating a pack based VersionedFiles.
783
This is only functional enough to run interface tests, it doesn't try to
784
provide a full pack environment.
786
:param graph: Store a graph.
787
:param delta: Delta compress contents.
788
:param keylength: How long should keys be.
790
def factory(transport):
791
parents = graph or delta
797
max_delta_chain = 200
800
graph_index = _mod_index.InMemoryGraphIndex(reference_lists=ref_length,
801
key_elements=keylength)
802
stream = transport.open_write_stream('newpack')
803
writer = pack.ContainerWriter(stream.write)
805
index = _KnitGraphIndex(graph_index, lambda:True, parents=parents,
806
deltas=delta, add_callback=graph_index.add_nodes)
807
access = _DirectPackAccess({})
808
access.set_writer(writer, graph_index, (transport, 'newpack'))
809
result = KnitVersionedFiles(index, access,
810
max_delta_chain=max_delta_chain)
811
result.stream = stream
812
result.writer = writer
817
def cleanup_pack_knit(versioned_files):
818
versioned_files.stream.close()
819
versioned_files.writer.end()
822
def _get_total_build_size(self, keys, positions):
823
"""Determine the total bytes to build these keys.
825
(helper function because _KnitGraphIndex and _KndxIndex work the same, but
826
don't inherit from a common base.)
828
:param keys: Keys that we want to build
829
:param positions: dict of {key, (info, index_memo, comp_parent)} (such
830
as returned by _get_components_positions)
831
:return: Number of bytes to build those keys
833
all_build_index_memos = {}
837
for key in build_keys:
838
# This is mostly for the 'stacked' case
839
# Where we will be getting the data from a fallback
840
if key not in positions:
842
_, index_memo, compression_parent = positions[key]
843
all_build_index_memos[key] = index_memo
844
if compression_parent not in all_build_index_memos:
845
next_keys.add(compression_parent)
846
build_keys = next_keys
847
return sum([index_memo[2] for index_memo
848
in all_build_index_memos.itervalues()])
851
class KnitVersionedFiles(VersionedFiles):
852
"""Storage for many versioned files using knit compression.
854
Backend storage is managed by indices and data objects.
856
:ivar _index: A _KnitGraphIndex or similar that can describe the
857
parents, graph, compression and data location of entries in this
858
KnitVersionedFiles. Note that this is only the index for
859
*this* vfs; if there are fallbacks they must be queried separately.
862
def __init__(self, index, data_access, max_delta_chain=200,
863
annotated=False, reload_func=None):
864
"""Create a KnitVersionedFiles with index and data_access.
866
:param index: The index for the knit data.
867
:param data_access: The access object to store and retrieve knit
869
:param max_delta_chain: The maximum number of deltas to permit during
870
insertion. Set to 0 to prohibit the use of deltas.
871
:param annotated: Set to True to cause annotations to be calculated and
872
stored during insertion.
873
:param reload_func: An function that can be called if we think we need
874
to reload the pack listing and try again. See
875
'bzrlib.repofmt.pack_repo.AggregateIndex' for the signature.
254
def make_empty_knit(transport, relpath):
255
"""Construct a empty knit at the specified location."""
256
k = KnitVersionedFile(transport, relpath, 'w', KnitPlainFactory)
260
class KnitVersionedFile(VersionedFile):
261
"""Weave-like structure with faster random access.
263
A knit stores a number of texts and a summary of the relationships
264
between them. Texts are identified by a string version-id. Texts
265
are normally stored and retrieved as a series of lines, but can
266
also be passed as single strings.
268
Lines are stored with the trailing newline (if any) included, to
269
avoid special cases for files with no final newline. Lines are
270
composed of 8-bit characters, not unicode. The combination of
271
these approaches should mean any 'binary' file can be safely
272
stored and retrieved.
275
def __init__(self, relpath, transport, file_mode=None, access_mode=None,
276
factory=None, basis_knit=DEPRECATED_PARAMETER, delta=True,
278
"""Construct a knit at location specified by relpath.
280
:param create: If not True, only open an existing knit.
878
self._access = data_access
879
self._max_delta_chain = max_delta_chain
881
self._factory = KnitAnnotateFactory()
883
self._factory = KnitPlainFactory()
884
self._fallback_vfs = []
885
self._reload_func = reload_func
282
if deprecated_passed(basis_knit):
283
warnings.warn("KnitVersionedFile.__(): The basis_knit parameter is"
284
" deprecated as of bzr 0.9.",
285
DeprecationWarning, stacklevel=2)
286
if access_mode is None:
288
super(KnitVersionedFile, self).__init__(access_mode)
289
assert access_mode in ('r', 'w'), "invalid mode specified %r" % access_mode
290
self.transport = transport
291
self.filename = relpath
292
self.factory = factory or KnitAnnotateFactory()
293
self.writable = (access_mode == 'w')
296
self._index = _KnitIndex(transport, relpath + INDEX_SUFFIX,
297
access_mode, create=create, file_mode=file_mode)
298
self._data = _KnitData(transport, relpath + DATA_SUFFIX,
299
access_mode, create=create and not len(self), file_mode=file_mode)
887
301
def __repr__(self):
888
return "%s(%r, %r)" % (
889
self.__class__.__name__,
893
def add_fallback_versioned_files(self, a_versioned_files):
894
"""Add a source of texts for texts not present in this knit.
896
:param a_versioned_files: A VersionedFiles object.
898
self._fallback_vfs.append(a_versioned_files)
900
def add_lines(self, key, parents, lines, parent_texts=None,
901
left_matching_blocks=None, nostore_sha=None, random_id=False,
903
"""See VersionedFiles.add_lines()."""
904
self._index._check_write_ok()
905
self._check_add(key, lines, random_id, check_content)
907
# The caller might pass None if there is no graph data, but kndx
908
# indexes can't directly store that, so we give them
909
# an empty tuple instead.
911
line_bytes = ''.join(lines)
912
return self._add(key, lines, parents,
913
parent_texts, left_matching_blocks, nostore_sha, random_id,
914
line_bytes=line_bytes)
916
def _add_text(self, key, parents, text, nostore_sha=None, random_id=False):
917
"""See VersionedFiles._add_text()."""
918
self._index._check_write_ok()
919
self._check_add(key, None, random_id, check_content=False)
920
if text.__class__ is not str:
921
raise errors.BzrBadParameterUnicode("text")
923
# The caller might pass None if there is no graph data, but kndx
924
# indexes can't directly store that, so we give them
925
# an empty tuple instead.
927
return self._add(key, None, parents,
928
None, None, nostore_sha, random_id,
931
def _add(self, key, lines, parents, parent_texts,
932
left_matching_blocks, nostore_sha, random_id,
934
"""Add a set of lines on top of version specified by parents.
936
Any versions not present will be converted into ghosts.
938
:param lines: A list of strings where each one is a single line (has a
939
single newline at the end of the string) This is now optional
940
(callers can pass None). It is left in its location for backwards
941
compatibility. It should ''.join(lines) must == line_bytes
942
:param line_bytes: A single string containing the content
944
We pass both lines and line_bytes because different routes bring the
945
values to this function. And for memory efficiency, we don't want to
946
have to split/join on-demand.
948
# first thing, if the content is something we don't need to store, find
950
digest = sha_string(line_bytes)
951
if nostore_sha == digest:
952
raise errors.ExistingContent
302
return '%s(%s)' % (self.__class__.__name__,
303
self.transport.abspath(self.filename))
305
def _add_delta(self, version_id, parents, delta_parent, sha1, noeol, delta):
306
"""See VersionedFile._add_delta()."""
307
self._check_add(version_id, []) # should we check the lines ?
308
self._check_versions_present(parents)
954
309
present_parents = []
955
if parent_texts is None:
957
# Do a single query to ascertain parent presence; we only compress
958
# against parents in the same kvf.
959
present_parent_map = self._index.get_parent_map(parents)
960
312
for parent in parents:
961
if parent in present_parent_map:
313
if not self.has_version(parent):
314
ghosts.append(parent)
962
316
present_parents.append(parent)
964
# Currently we can only compress against the left most present parent.
965
if (len(present_parents) == 0 or
966
present_parents[0] != parents[0]):
318
if delta_parent is None:
319
# reconstitute as full text.
320
assert len(delta) == 1 or len(delta) == 0
322
assert delta[0][0] == 0
323
assert delta[0][1] == 0, delta[0][1]
324
return super(KnitVersionedFile, self)._add_delta(version_id,
335
options.append('no-eol')
337
if delta_parent is not None:
338
# determine the current delta chain length.
969
339
# To speed the extract of texts the delta chain is limited
970
340
# to a fixed number of deltas. This should minimize both
971
341
# I/O and the time spend applying deltas.
972
delta = self._check_should_delta(present_parents[0])
974
text_length = len(line_bytes)
977
# Note: line_bytes is not modified to add a newline, that is tracked
978
# via the no_eol flag. 'lines' *is* modified, because that is the
979
# general values needed by the Content code.
980
if line_bytes and line_bytes[-1] != '\n':
981
options.append('no-eol')
983
# Copy the existing list, or create a new one
985
lines = osutils.split_lines(line_bytes)
988
# Replace the last line with one that ends in a final newline
989
lines[-1] = lines[-1] + '\n'
991
lines = osutils.split_lines(line_bytes)
993
for element in key[:-1]:
994
if type(element) is not str:
995
raise TypeError("key contains non-strings: %r" % (key,))
997
key = key[:-1] + ('sha1:' + digest,)
998
elif type(key[-1]) is not str:
999
raise TypeError("key contains non-strings: %r" % (key,))
1000
# Knit hunks are still last-element only
1001
version_id = key[-1]
1002
content = self._factory.make(lines, version_id)
1004
# Hint to the content object that its text() call should strip the
1006
content._should_strip_eol = True
1007
if delta or (self._factory.annotated and len(present_parents) > 0):
1008
# Merge annotations from parent texts if needed.
1009
delta_hunks = self._merge_annotations(content, present_parents,
1010
parent_texts, delta, self._factory.annotated,
1011
left_matching_blocks)
1014
options.append('line-delta')
1015
store_lines = self._factory.lower_line_delta(delta_hunks)
1016
size, bytes = self._record_to_data(key, digest,
1019
options.append('fulltext')
1020
# isinstance is slower and we have no hierarchy.
1021
if self._factory.__class__ is KnitPlainFactory:
1022
# Use the already joined bytes saving iteration time in
1024
dense_lines = [line_bytes]
1026
dense_lines.append('\n')
1027
size, bytes = self._record_to_data(key, digest,
1030
# get mixed annotation + content and feed it into the
1032
store_lines = self._factory.lower_fulltext(content)
1033
size, bytes = self._record_to_data(key, digest,
1036
access_memo = self._access.add_raw_records([(key, size)], bytes)[0]
1037
self._index.add_records(
1038
((key, options, access_memo, parents),),
1039
random_id=random_id)
1040
return digest, text_length, content
1042
def annotate(self, key):
1043
"""See VersionedFiles.annotate."""
1044
return self._factory.annotate(self, key)
1046
def get_annotator(self):
1047
return _KnitAnnotator(self)
1049
def check(self, progress_bar=None, keys=None):
1050
"""See VersionedFiles.check()."""
1052
return self._logical_check()
1054
# At the moment, check does not extra work over get_record_stream
1055
return self.get_record_stream(keys, 'unordered', True)
1057
def _logical_check(self):
1058
# This doesn't actually test extraction of everything, but that will
1059
# impact 'bzr check' substantially, and needs to be integrated with
1060
# care. However, it does check for the obvious problem of a delta with
1062
keys = self._index.keys()
1063
parent_map = self.get_parent_map(keys)
1065
if self._index.get_method(key) != 'fulltext':
1066
compression_parent = parent_map[key][0]
1067
if compression_parent not in parent_map:
1068
raise errors.KnitCorrupt(self,
1069
"Missing basis parent %s for %s" % (
1070
compression_parent, key))
1071
for fallback_vfs in self._fallback_vfs:
1072
fallback_vfs.check()
1074
def _check_add(self, key, lines, random_id, check_content):
1075
"""check that version_id and lines are safe to add."""
1076
version_id = key[-1]
1077
if version_id is not None:
1078
if contains_whitespace(version_id):
1079
raise InvalidRevisionId(version_id, self)
1080
self.check_not_reserved_id(version_id)
1081
# TODO: If random_id==False and the key is already present, we should
1082
# probably check that the existing content is identical to what is
1083
# being inserted, and otherwise raise an exception. This would make
1084
# the bundle code simpler.
1086
self._check_lines_not_unicode(lines)
1087
self._check_lines_are_lines(lines)
1089
def _check_header(self, key, line):
1090
rec = self._split_header(line)
1091
self._check_header_version(rec, key[-1])
1094
def _check_header_version(self, rec, version_id):
1095
"""Checks the header version on original format knit records.
1097
These have the last component of the key embedded in the record.
1099
if rec[1] != version_id:
1100
raise KnitCorrupt(self,
1101
'unexpected version, wanted %r, got %r' % (version_id, rec[1]))
1103
def _check_should_delta(self, parent):
1104
"""Iterate back through the parent listing, looking for a fulltext.
1106
This is used when we want to decide whether to add a delta or a new
1107
fulltext. It searches for _max_delta_chain parents. When it finds a
1108
fulltext parent, it sees if the total size of the deltas leading up to
1109
it is large enough to indicate that we want a new full text anyway.
1111
Return True if we should create a new delta, False if we should use a
1115
fulltext_size = None
1116
for count in xrange(self._max_delta_chain):
1118
# Note that this only looks in the index of this particular
1119
# KnitVersionedFiles, not in the fallbacks. This ensures that
1120
# we won't store a delta spanning physical repository
1122
build_details = self._index.get_build_details([parent])
1123
parent_details = build_details[parent]
1124
except (RevisionNotPresent, KeyError), e:
1125
# Some basis is not locally present: always fulltext
1127
index_memo, compression_parent, _, _ = parent_details
1128
_, _, size = index_memo
1129
if compression_parent is None:
1130
fulltext_size = size
1133
# We don't explicitly check for presence because this is in an
1134
# inner loop, and if it's missing it'll fail anyhow.
1135
parent = compression_parent
1137
# We couldn't find a fulltext, so we must create a new one
343
delta_parents = [delta_parent]
345
parent = delta_parents[0]
346
method = self._index.get_method(parent)
347
if method == 'fulltext':
349
delta_parents = self._index.get_parents(parent)
351
if method == 'line-delta':
352
# did not find a fulltext in the delta limit.
353
# just do a normal insertion.
354
return super(KnitVersionedFile, self)._add_delta(version_id,
361
options.append('line-delta')
362
store_lines = self.factory.lower_line_delta(delta)
364
where, size = self._data.add_record(version_id, digest, store_lines)
365
self._index.add_version(version_id, options, where, size, parents)
367
def _add_raw_records(self, records, data):
368
"""Add all the records 'records' with data pre-joined in 'data'.
370
:param records: A list of tuples(version_id, options, parents, size).
371
:param data: The data for the records. When it is written, the records
372
are adjusted to have pos pointing into data by the sum of
373
the preceding records sizes.
376
pos = self._data.add_raw_record(data)
378
for (version_id, options, parents, size) in records:
379
index_entries.append((version_id, options, pos, size, parents))
381
self._index.add_versions(index_entries)
383
def clear_cache(self):
384
"""Clear the data cache only."""
385
self._data.clear_cache()
387
def copy_to(self, name, transport):
388
"""See VersionedFile.copy_to()."""
389
# copy the current index to a temp index to avoid racing with local
391
transport.put(name + INDEX_SUFFIX + '.tmp', self.transport.get(self._index._filename),)
393
f = self._data._open_file()
395
transport.put(name + DATA_SUFFIX, f)
398
# move the copied index into place
399
transport.move(name + INDEX_SUFFIX + '.tmp', name + INDEX_SUFFIX)
401
def create_empty(self, name, transport, mode=None):
402
return KnitVersionedFile(name, transport, factory=self.factory, delta=self.delta, create=True)
404
def _fix_parents(self, version, new_parents):
405
"""Fix the parents list for version.
407
This is done by appending a new version to the index
408
with identical data except for the parents list.
409
the parents list must be a superset of the current
412
current_values = self._index._cache[version]
413
assert set(current_values[4]).difference(set(new_parents)) == set()
414
self._index.add_version(version,
420
def get_delta(self, version_id):
421
"""Get a delta for constructing version from some other version."""
422
if not self.has_version(version_id):
423
raise RevisionNotPresent(version_id, self.filename)
425
parents = self.get_parents(version_id)
430
data_pos, data_size = self._index.get_position(version_id)
431
data, sha1 = self._data.read_records(((version_id, data_pos, data_size),))[version_id]
432
version_idx = self._index.lookup(version_id)
433
noeol = 'no-eol' in self._index.get_options(version_id)
434
if 'fulltext' == self._index.get_method(version_id):
435
new_content = self.factory.parse_fulltext(data, version_idx)
436
if parent is not None:
437
reference_content = self._get_content(parent)
438
old_texts = reference_content.text()
441
new_texts = new_content.text()
442
delta_seq = KnitSequenceMatcher(None, old_texts, new_texts)
443
return parent, sha1, noeol, self._make_line_delta(delta_seq, new_content)
445
delta = self.factory.parse_line_delta(data, version_idx)
446
return parent, sha1, noeol, delta
448
def get_graph_with_ghosts(self):
449
"""See VersionedFile.get_graph_with_ghosts()."""
450
graph_items = self._index.get_graph()
451
return dict(graph_items)
453
def get_sha1(self, version_id):
454
"""See VersionedFile.get_sha1()."""
455
record_map = self._get_record_map([version_id])
456
method, content, digest, next = record_map[version_id]
461
"""See VersionedFile.get_suffixes()."""
462
return [DATA_SUFFIX, INDEX_SUFFIX]
464
def has_ghost(self, version_id):
465
"""True if there is a ghost reference in the file to version_id."""
467
if self.has_version(version_id):
1139
# Simple heuristic - if the total I/O wold be greater as a delta than
1140
# the originally installed fulltext, we create a new fulltext.
1141
return fulltext_size > delta_size
1143
def _build_details_to_components(self, build_details):
1144
"""Convert a build_details tuple to a position tuple."""
1145
# record_details, access_memo, compression_parent
1146
return build_details[3], build_details[0], build_details[1]
1148
def _get_components_positions(self, keys, allow_missing=False):
1149
"""Produce a map of position data for the components of keys.
469
# optimisable if needed by memoising the _ghosts set.
470
items = self._index.get_graph()
471
for node, parents in items:
472
for parent in parents:
473
if parent not in self._index._cache:
474
if parent == version_id:
479
"""See VersionedFile.versions."""
480
return self._index.get_versions()
482
def has_version(self, version_id):
483
"""See VersionedFile.has_version."""
484
return self._index.has_version(version_id)
486
__contains__ = has_version
488
def _merge_annotations(self, content, parents, parent_texts={},
489
delta=None, annotated=None):
490
"""Merge annotations for content. This is done by comparing
491
the annotations based on changed to the text.
495
for parent_id in parents:
496
merge_content = self._get_content(parent_id, parent_texts)
497
seq = KnitSequenceMatcher(None, merge_content.text(), content.text())
498
if delta_seq is None:
499
# setup a delta seq to reuse.
501
for i, j, n in seq.get_matching_blocks():
504
# this appears to copy (origin, text) pairs across to the new
505
# content for any line that matches the last-checked parent.
506
# FIXME: save the sequence control data for delta compression
507
# against the most relevant parent rather than rediffing.
508
content._lines[j:j+n] = merge_content._lines[i:i+n]
511
reference_content = self._get_content(parents[0], parent_texts)
512
new_texts = content.text()
513
old_texts = reference_content.text()
514
delta_seq = KnitSequenceMatcher(None, old_texts, new_texts)
515
return self._make_line_delta(delta_seq, content)
517
def _make_line_delta(self, delta_seq, new_content):
518
"""Generate a line delta from delta_seq and new_content."""
520
for op in delta_seq.get_opcodes():
523
diff_hunks.append((op[1], op[2], op[4]-op[3], new_content._lines[op[3]:op[4]]))
526
def _get_components_positions(self, version_ids):
527
"""Produce a map of position data for the components of versions.
1151
529
This data is intended to be used for retrieving the knit records.
1153
A dict of key to (record_details, index_memo, next, parents) is
531
A dict of version_id to (method, data_pos, data_size, next) is
1155
533
method is the way referenced data should be applied.
1156
index_memo is the handle to pass to the data access to actually get the
534
data_pos is the position of the data in the knit.
535
data_size is the size of the data in the knit.
1158
536
next is the build-parent of the version, or None for fulltexts.
1159
parents is the version_ids of the parents of this version
1161
:param allow_missing: If True do not raise an error on a missing component,
1164
538
component_data = {}
1165
pending_components = keys
1166
while pending_components:
1167
build_details = self._index.get_build_details(pending_components)
1168
current_components = set(pending_components)
1169
pending_components = set()
1170
for key, details in build_details.iteritems():
1171
(index_memo, compression_parent, parents,
1172
record_details) = details
1173
method = record_details[0]
1174
if compression_parent is not None:
1175
pending_components.add(compression_parent)
1176
component_data[key] = self._build_details_to_components(details)
1177
missing = current_components.difference(build_details)
1178
if missing and not allow_missing:
1179
raise errors.RevisionNotPresent(missing.pop(), self)
539
for version_id in version_ids:
542
while cursor is not None and cursor not in component_data:
543
method = self._index.get_method(cursor)
544
if method == 'fulltext':
547
next = self.get_parents(cursor)[0]
548
data_pos, data_size = self._index.get_position(cursor)
549
component_data[cursor] = (method, data_pos, data_size, next)
1180
551
return component_data
1182
def _get_content(self, key, parent_texts={}):
553
def _get_content(self, version_id, parent_texts={}):
1183
554
"""Returns a content object that makes up the specified
1185
cached_version = parent_texts.get(key, None)
556
if not self.has_version(version_id):
557
raise RevisionNotPresent(version_id, self.filename)
559
cached_version = parent_texts.get(version_id, None)
1186
560
if cached_version is not None:
1187
# Ensure the cache dict is valid.
1188
if not self.get_parent_map([key]):
1189
raise RevisionNotPresent(key, self)
1190
561
return cached_version
1191
generator = _VFContentMapGenerator(self, [key])
1192
return generator._get_content(key)
1194
def get_known_graph_ancestry(self, keys):
1195
"""Get a KnownGraph instance with the ancestry of keys."""
1196
parent_map, missing_keys = self._index.find_ancestry(keys)
1197
for fallback in self._fallback_vfs:
1198
if not missing_keys:
1200
(f_parent_map, f_missing_keys) = fallback._index.find_ancestry(
1202
parent_map.update(f_parent_map)
1203
missing_keys = f_missing_keys
1204
kg = _mod_graph.KnownGraph(parent_map)
1207
def get_parent_map(self, keys):
1208
"""Get a map of the graph parents of keys.
1210
:param keys: The keys to look up parents for.
1211
:return: A mapping from keys to parents. Absent keys are absent from
1214
return self._get_parent_map_with_sources(keys)[0]
1216
def _get_parent_map_with_sources(self, keys):
1217
"""Get a map of the parents of keys.
1219
:param keys: The keys to look up parents for.
1220
:return: A tuple. The first element is a mapping from keys to parents.
1221
Absent keys are absent from the mapping. The second element is a
1222
list with the locations each key was found in. The first element
1223
is the in-this-knit parents, the second the first fallback source,
1227
sources = [self._index] + self._fallback_vfs
1230
for source in sources:
1233
new_result = source.get_parent_map(missing)
1234
source_results.append(new_result)
1235
result.update(new_result)
1236
missing.difference_update(set(new_result))
1237
return result, source_results
1239
def _get_record_map(self, keys, allow_missing=False):
563
text_map, contents_map = self._get_content_maps([version_id])
564
return contents_map[version_id]
566
def _check_versions_present(self, version_ids):
567
"""Check that all specified versions are present."""
568
version_ids = set(version_ids)
569
for r in list(version_ids):
570
if self._index.has_version(r):
571
version_ids.remove(r)
573
raise RevisionNotPresent(list(version_ids)[0], self.filename)
575
def _add_lines_with_ghosts(self, version_id, parents, lines, parent_texts):
576
"""See VersionedFile.add_lines_with_ghosts()."""
577
self._check_add(version_id, lines)
578
return self._add(version_id, lines[:], parents, self.delta, parent_texts)
580
def _add_lines(self, version_id, parents, lines, parent_texts):
581
"""See VersionedFile.add_lines."""
582
self._check_add(version_id, lines)
583
self._check_versions_present(parents)
584
return self._add(version_id, lines[:], parents, self.delta, parent_texts)
586
def _check_add(self, version_id, lines):
587
"""check that version_id and lines are safe to add."""
588
assert self.writable, "knit is not opened for write"
589
### FIXME escape. RBC 20060228
590
if contains_whitespace(version_id):
591
raise InvalidRevisionId(version_id, self.filename)
592
if self.has_version(version_id):
593
raise RevisionAlreadyPresent(version_id, self.filename)
594
self._check_lines_not_unicode(lines)
595
self._check_lines_are_lines(lines)
597
def _add(self, version_id, lines, parents, delta, parent_texts):
598
"""Add a set of lines on top of version specified by parents.
600
If delta is true, compress the text as a line-delta against
603
Any versions not present will be converted into ghosts.
605
# 461 0 6546.0390 43.9100 bzrlib.knit:489(_add)
606
# +400 0 889.4890 418.9790 +bzrlib.knit:192(lower_fulltext)
607
# +461 0 1364.8070 108.8030 +bzrlib.knit:996(add_record)
608
# +461 0 193.3940 41.5720 +bzrlib.knit:898(add_version)
609
# +461 0 134.0590 18.3810 +bzrlib.osutils:361(sha_strings)
610
# +461 0 36.3420 15.4540 +bzrlib.knit:146(make)
611
# +1383 0 8.0370 8.0370 +<len>
612
# +61 0 13.5770 7.9190 +bzrlib.knit:199(lower_line_delta)
613
# +61 0 963.3470 7.8740 +bzrlib.knit:427(_get_content)
614
# +61 0 973.9950 5.2950 +bzrlib.knit:136(line_delta)
615
# +61 0 1918.1800 5.2640 +bzrlib.knit:359(_merge_annotations)
619
if parent_texts is None:
621
for parent in parents:
622
if not self.has_version(parent):
623
ghosts.append(parent)
625
present_parents.append(parent)
627
if delta and not len(present_parents):
630
digest = sha_strings(lines)
633
if lines[-1][-1] != '\n':
634
options.append('no-eol')
635
lines[-1] = lines[-1] + '\n'
637
if len(present_parents) and delta:
638
# To speed the extract of texts the delta chain is limited
639
# to a fixed number of deltas. This should minimize both
640
# I/O and the time spend applying deltas.
642
delta_parents = present_parents
644
parent = delta_parents[0]
645
method = self._index.get_method(parent)
646
if method == 'fulltext':
648
delta_parents = self._index.get_parents(parent)
650
if method == 'line-delta':
653
lines = self.factory.make(lines, version_id)
654
if delta or (self.factory.annotated and len(present_parents) > 0):
655
# Merge annotations from parent texts if so is needed.
656
delta_hunks = self._merge_annotations(lines, present_parents, parent_texts,
657
delta, self.factory.annotated)
660
options.append('line-delta')
661
store_lines = self.factory.lower_line_delta(delta_hunks)
663
options.append('fulltext')
664
store_lines = self.factory.lower_fulltext(lines)
666
where, size = self._data.add_record(version_id, digest, store_lines)
667
self._index.add_version(version_id, options, where, size, parents)
670
def check(self, progress_bar=None):
671
"""See VersionedFile.check()."""
673
def _clone_text(self, new_version_id, old_version_id, parents):
674
"""See VersionedFile.clone_text()."""
675
# FIXME RBC 20060228 make fast by only inserting an index with null
677
self.add_lines(new_version_id, parents, self.get_lines(old_version_id))
679
def get_lines(self, version_id):
680
"""See VersionedFile.get_lines()."""
681
return self.get_line_list([version_id])[0]
683
def _get_record_map(self, version_ids):
1240
684
"""Produce a dictionary of knit records.
1242
:return: {key:(record, record_details, digest, next)}
1244
data returned from read_records (a KnitContentobject)
1246
opaque information to pass to parse_record
1248
SHA1 digest of the full text after all steps are done
1250
build-parent of the version, i.e. the leftmost ancestor.
1251
Will be None if the record is not a delta.
1252
:param keys: The keys to build a map for
1253
:param allow_missing: If some records are missing, rather than
1254
error, just return the data that could be generated.
1256
raw_map = self._get_record_map_unparsed(keys,
1257
allow_missing=allow_missing)
1258
return self._raw_map_to_record_map(raw_map)
1260
def _raw_map_to_record_map(self, raw_map):
1261
"""Parse the contents of _get_record_map_unparsed.
1263
:return: see _get_record_map.
1267
data, record_details, next = raw_map[key]
1268
content, digest = self._parse_record(key[-1], data)
1269
result[key] = content, record_details, digest, next
1272
def _get_record_map_unparsed(self, keys, allow_missing=False):
1273
"""Get the raw data for reconstructing keys without parsing it.
1275
:return: A dict suitable for parsing via _raw_map_to_record_map.
1276
key-> raw_bytes, (method, noeol), compression_parent
1278
# This retries the whole request if anything fails. Potentially we
1279
# could be a bit more selective. We could track the keys whose records
1280
# we have successfully found, and then only request the new records
1281
# from there. However, _get_components_positions grabs the whole build
1282
# chain, which means we'll likely try to grab the same records again
1283
# anyway. Also, can the build chains change as part of a pack
1284
# operation? We wouldn't want to end up with a broken chain.
1287
position_map = self._get_components_positions(keys,
1288
allow_missing=allow_missing)
1289
# key = component_id, r = record_details, i_m = index_memo,
1291
records = [(key, i_m) for key, (r, i_m, n)
1292
in position_map.iteritems()]
1293
# Sort by the index memo, so that we request records from the
1294
# same pack file together, and in forward-sorted order
1295
records.sort(key=operator.itemgetter(1))
1297
for key, data in self._read_records_iter_unchecked(records):
1298
(record_details, index_memo, next) = position_map[key]
1299
raw_record_map[key] = data, record_details, next
1300
return raw_record_map
1301
except errors.RetryWithNewPacks, e:
1302
self._access.reload_or_raise(e)
1305
def _split_by_prefix(cls, keys):
1306
"""For the given keys, split them up based on their prefix.
1308
To keep memory pressure somewhat under control, split the
1309
requests back into per-file-id requests, otherwise "bzr co"
1310
extracts the full tree into memory before writing it to disk.
1311
This should be revisited if _get_content_maps() can ever cross
1314
The keys for a given file_id are kept in the same relative order.
1315
Ordering between file_ids is not, though prefix_order will return the
1316
order that the key was first seen.
1318
:param keys: An iterable of key tuples
1319
:return: (split_map, prefix_order)
1320
split_map A dictionary mapping prefix => keys
1321
prefix_order The order that we saw the various prefixes
1323
split_by_prefix = {}
1331
if prefix in split_by_prefix:
1332
split_by_prefix[prefix].append(key)
1334
split_by_prefix[prefix] = [key]
1335
prefix_order.append(prefix)
1336
return split_by_prefix, prefix_order
1338
def _group_keys_for_io(self, keys, non_local_keys, positions,
1339
_min_buffer_size=_STREAM_MIN_BUFFER_SIZE):
1340
"""For the given keys, group them into 'best-sized' requests.
1342
The idea is to avoid making 1 request per file, but to never try to
1343
unpack an entire 1.5GB source tree in a single pass. Also when
1344
possible, we should try to group requests to the same pack file
1347
:return: list of (keys, non_local) tuples that indicate what keys
1348
should be fetched next.
1350
# TODO: Ideally we would group on 2 factors. We want to extract texts
1351
# from the same pack file together, and we want to extract all
1352
# the texts for a given build-chain together. Ultimately it
1353
# probably needs a better global view.
1354
total_keys = len(keys)
1355
prefix_split_keys, prefix_order = self._split_by_prefix(keys)
1356
prefix_split_non_local_keys, _ = self._split_by_prefix(non_local_keys)
1358
cur_non_local = set()
1362
for prefix in prefix_order:
1363
keys = prefix_split_keys[prefix]
1364
non_local = prefix_split_non_local_keys.get(prefix, [])
1366
this_size = self._index._get_total_build_size(keys, positions)
1367
cur_size += this_size
1368
cur_keys.extend(keys)
1369
cur_non_local.update(non_local)
1370
if cur_size > _min_buffer_size:
1371
result.append((cur_keys, cur_non_local))
1372
sizes.append(cur_size)
1374
cur_non_local = set()
1377
result.append((cur_keys, cur_non_local))
1378
sizes.append(cur_size)
1381
def get_record_stream(self, keys, ordering, include_delta_closure):
1382
"""Get a stream of records for keys.
1384
:param keys: The keys to include.
1385
:param ordering: Either 'unordered' or 'topological'. A topologically
1386
sorted stream has compression parents strictly before their
1388
:param include_delta_closure: If True then the closure across any
1389
compression parents will be included (in the opaque data).
1390
:return: An iterator of ContentFactory objects, each of which is only
1391
valid until the iterator is advanced.
1393
# keys might be a generator
1397
if not self._index.has_graph:
1398
# Cannot sort when no graph has been stored.
1399
ordering = 'unordered'
1401
remaining_keys = keys
1404
keys = set(remaining_keys)
1405
for content_factory in self._get_remaining_record_stream(keys,
1406
ordering, include_delta_closure):
1407
remaining_keys.discard(content_factory.key)
1408
yield content_factory
1410
except errors.RetryWithNewPacks, e:
1411
self._access.reload_or_raise(e)
1413
def _get_remaining_record_stream(self, keys, ordering,
1414
include_delta_closure):
1415
"""This function is the 'retry' portion for get_record_stream."""
1416
if include_delta_closure:
1417
positions = self._get_components_positions(keys, allow_missing=True)
1419
build_details = self._index.get_build_details(keys)
1421
# (record_details, access_memo, compression_parent_key)
1422
positions = dict((key, self._build_details_to_components(details))
1423
for key, details in build_details.iteritems())
1424
absent_keys = keys.difference(set(positions))
1425
# There may be more absent keys : if we're missing the basis component
1426
# and are trying to include the delta closure.
1427
# XXX: We should not ever need to examine remote sources because we do
1428
# not permit deltas across versioned files boundaries.
1429
if include_delta_closure:
1430
needed_from_fallback = set()
1431
# Build up reconstructable_keys dict. key:True in this dict means
1432
# the key can be reconstructed.
1433
reconstructable_keys = {}
1437
chain = [key, positions[key][2]]
1439
needed_from_fallback.add(key)
1442
while chain[-1] is not None:
1443
if chain[-1] in reconstructable_keys:
1444
result = reconstructable_keys[chain[-1]]
1448
chain.append(positions[chain[-1]][2])
1450
# missing basis component
1451
needed_from_fallback.add(chain[-1])
1454
for chain_key in chain[:-1]:
1455
reconstructable_keys[chain_key] = result
1457
needed_from_fallback.add(key)
1458
# Double index lookups here : need a unified api ?
1459
global_map, parent_maps = self._get_parent_map_with_sources(keys)
1460
if ordering in ('topological', 'groupcompress'):
1461
if ordering == 'topological':
1462
# Global topological sort
1463
present_keys = tsort.topo_sort(global_map)
1465
present_keys = sort_groupcompress(global_map)
1466
# Now group by source:
1468
current_source = None
1469
for key in present_keys:
1470
for parent_map in parent_maps:
1471
if key in parent_map:
1472
key_source = parent_map
1474
if current_source is not key_source:
1475
source_keys.append((key_source, []))
1476
current_source = key_source
1477
source_keys[-1][1].append(key)
1479
if ordering != 'unordered':
1480
raise AssertionError('valid values for ordering are:'
1481
' "unordered", "groupcompress" or "topological" not: %r'
1483
# Just group by source; remote sources first.
1486
for parent_map in reversed(parent_maps):
1487
source_keys.append((parent_map, []))
1488
for key in parent_map:
1489
present_keys.append(key)
1490
source_keys[-1][1].append(key)
1491
# We have been requested to return these records in an order that
1492
# suits us. So we ask the index to give us an optimally sorted
1494
for source, sub_keys in source_keys:
1495
if source is parent_maps[0]:
1496
# Only sort the keys for this VF
1497
self._index._sort_keys_by_io(sub_keys, positions)
1498
absent_keys = keys - set(global_map)
1499
for key in absent_keys:
1500
yield AbsentContentFactory(key)
1501
# restrict our view to the keys we can answer.
1502
# XXX: Memory: TODO: batch data here to cap buffered data at (say) 1MB.
1503
# XXX: At that point we need to consider the impact of double reads by
1504
# utilising components multiple times.
1505
if include_delta_closure:
1506
# XXX: get_content_maps performs its own index queries; allow state
1508
non_local_keys = needed_from_fallback - absent_keys
1509
for keys, non_local_keys in self._group_keys_for_io(present_keys,
1512
generator = _VFContentMapGenerator(self, keys, non_local_keys,
1515
for record in generator.get_record_stream():
1518
for source, keys in source_keys:
1519
if source is parent_maps[0]:
1520
# this KnitVersionedFiles
1521
records = [(key, positions[key][1]) for key in keys]
1522
for key, raw_data in self._read_records_iter_unchecked(records):
1523
(record_details, index_memo, _) = positions[key]
1524
yield KnitContentFactory(key, global_map[key],
1525
record_details, None, raw_data, self._factory.annotated, None)
1527
vf = self._fallback_vfs[parent_maps.index(source) - 1]
1528
for record in vf.get_record_stream(keys, ordering,
1529
include_delta_closure):
1532
def get_sha1s(self, keys):
1533
"""See VersionedFiles.get_sha1s()."""
1535
record_map = self._get_record_map(missing, allow_missing=True)
1537
for key, details in record_map.iteritems():
1538
if key not in missing:
1540
# record entry 2 is the 'digest'.
1541
result[key] = details[2]
1542
missing.difference_update(set(result))
1543
for source in self._fallback_vfs:
1546
new_result = source.get_sha1s(missing)
1547
result.update(new_result)
1548
missing.difference_update(set(new_result))
1551
def insert_record_stream(self, stream):
1552
"""Insert a record stream into this container.
1554
:param stream: A stream of records to insert.
1556
:seealso VersionedFiles.get_record_stream:
1558
def get_adapter(adapter_key):
1560
return adapters[adapter_key]
1562
adapter_factory = adapter_registry.get(adapter_key)
1563
adapter = adapter_factory(self)
1564
adapters[adapter_key] = adapter
1567
if self._factory.annotated:
1568
# self is annotated, we need annotated knits to use directly.
1569
annotated = "annotated-"
1572
# self is not annotated, but we can strip annotations cheaply.
1574
convertibles = set(["knit-annotated-ft-gz"])
1575
if self._max_delta_chain:
1576
delta_types.add("knit-annotated-delta-gz")
1577
convertibles.add("knit-annotated-delta-gz")
1578
# The set of types we can cheaply adapt without needing basis texts.
1579
native_types = set()
1580
if self._max_delta_chain:
1581
native_types.add("knit-%sdelta-gz" % annotated)
1582
delta_types.add("knit-%sdelta-gz" % annotated)
1583
native_types.add("knit-%sft-gz" % annotated)
1584
knit_types = native_types.union(convertibles)
1586
# Buffer all index entries that we can't add immediately because their
1587
# basis parent is missing. We don't buffer all because generating
1588
# annotations may require access to some of the new records. However we
1589
# can't generate annotations from new deltas until their basis parent
1590
# is present anyway, so we get away with not needing an index that
1591
# includes the new keys.
1593
# See <http://launchpad.net/bugs/300177> about ordering of compression
1594
# parents in the records - to be conservative, we insist that all
1595
# parents must be present to avoid expanding to a fulltext.
1597
# key = basis_parent, value = index entry to add
1598
buffered_index_entries = {}
1599
for record in stream:
1600
kind = record.storage_kind
1601
if kind.startswith('knit-') and kind.endswith('-gz'):
1602
# Check that the ID in the header of the raw knit bytes matches
1603
# the record metadata.
1604
raw_data = record._raw_record
1605
df, rec = self._parse_record_header(record.key, raw_data)
1608
parents = record.parents
1609
if record.storage_kind in delta_types:
1610
# TODO: eventually the record itself should track
1611
# compression_parent
1612
compression_parent = parents[0]
1614
compression_parent = None
1615
# Raise an error when a record is missing.
1616
if record.storage_kind == 'absent':
1617
raise RevisionNotPresent([record.key], self)
1618
elif ((record.storage_kind in knit_types)
1619
and (compression_parent is None
1620
or not self._fallback_vfs
1621
or self._index.has_key(compression_parent)
1622
or not self.has_key(compression_parent))):
1623
# we can insert the knit record literally if either it has no
1624
# compression parent OR we already have its basis in this kvf
1625
# OR the basis is not present even in the fallbacks. In the
1626
# last case it will either turn up later in the stream and all
1627
# will be well, or it won't turn up at all and we'll raise an
1630
# TODO: self.has_key is somewhat redundant with
1631
# self._index.has_key; we really want something that directly
1632
# asks if it's only present in the fallbacks. -- mbp 20081119
1633
if record.storage_kind not in native_types:
1635
adapter_key = (record.storage_kind, "knit-delta-gz")
1636
adapter = get_adapter(adapter_key)
1638
adapter_key = (record.storage_kind, "knit-ft-gz")
1639
adapter = get_adapter(adapter_key)
1640
bytes = adapter.get_bytes(record)
1642
# It's a knit record, it has a _raw_record field (even if
1643
# it was reconstituted from a network stream).
1644
bytes = record._raw_record
1645
options = [record._build_details[0]]
1646
if record._build_details[1]:
1647
options.append('no-eol')
1648
# Just blat it across.
1649
# Note: This does end up adding data on duplicate keys. As
1650
# modern repositories use atomic insertions this should not
1651
# lead to excessive growth in the event of interrupted fetches.
1652
# 'knit' repositories may suffer excessive growth, but as a
1653
# deprecated format this is tolerable. It can be fixed if
1654
# needed by in the kndx index support raising on a duplicate
1655
# add with identical parents and options.
1656
access_memo = self._access.add_raw_records(
1657
[(record.key, len(bytes))], bytes)[0]
1658
index_entry = (record.key, options, access_memo, parents)
1659
if 'fulltext' not in options:
1660
# Not a fulltext, so we need to make sure the compression
1661
# parent will also be present.
1662
# Note that pack backed knits don't need to buffer here
1663
# because they buffer all writes to the transaction level,
1664
# but we don't expose that difference at the index level. If
1665
# the query here has sufficient cost to show up in
1666
# profiling we should do that.
1668
# They're required to be physically in this
1669
# KnitVersionedFiles, not in a fallback.
1670
if not self._index.has_key(compression_parent):
1671
pending = buffered_index_entries.setdefault(
1672
compression_parent, [])
1673
pending.append(index_entry)
1676
self._index.add_records([index_entry])
1677
elif record.storage_kind == 'chunked':
1678
self.add_lines(record.key, parents,
1679
osutils.chunks_to_lines(record.get_bytes_as('chunked')))
1681
# Not suitable for direct insertion as a
1682
# delta, either because it's not the right format, or this
1683
# KnitVersionedFiles doesn't permit deltas (_max_delta_chain ==
1684
# 0) or because it depends on a base only present in the
1686
self._access.flush()
1688
# Try getting a fulltext directly from the record.
1689
bytes = record.get_bytes_as('fulltext')
1690
except errors.UnavailableRepresentation:
1691
adapter_key = record.storage_kind, 'fulltext'
1692
adapter = get_adapter(adapter_key)
1693
bytes = adapter.get_bytes(record)
1694
lines = split_lines(bytes)
1696
self.add_lines(record.key, parents, lines)
1697
except errors.RevisionAlreadyPresent:
1699
# Add any records whose basis parent is now available.
1701
added_keys = [record.key]
1703
key = added_keys.pop(0)
1704
if key in buffered_index_entries:
1705
index_entries = buffered_index_entries[key]
1706
self._index.add_records(index_entries)
1708
[index_entry[0] for index_entry in index_entries])
1709
del buffered_index_entries[key]
1710
if buffered_index_entries:
1711
# There were index entries buffered at the end of the stream,
1712
# So these need to be added (if the index supports holding such
1713
# entries for later insertion)
1715
for key in buffered_index_entries:
1716
index_entries = buffered_index_entries[key]
1717
all_entries.extend(index_entries)
1718
self._index.add_records(
1719
all_entries, missing_compression_parents=True)
1721
def get_missing_compression_parent_keys(self):
1722
"""Return an iterable of keys of missing compression parents.
1724
Check this after calling insert_record_stream to find out if there are
1725
any missing compression parents. If there are, the records that
1726
depend on them are not able to be inserted safely. For atomic
1727
KnitVersionedFiles built on packs, the transaction should be aborted or
1728
suspended - commit will fail at this point. Nonatomic knits will error
1729
earlier because they have no staging area to put pending entries into.
1731
return self._index.get_missing_compression_parents()
1733
def iter_lines_added_or_present_in_keys(self, keys, pb=None):
1734
"""Iterate over the lines in the versioned files from keys.
1736
This may return lines from other keys. Each item the returned
1737
iterator yields is a tuple of a line and a text version that that line
1738
is present in (not introduced in).
1740
Ordering of results is in whatever order is most suitable for the
1741
underlying storage format.
1743
If a progress bar is supplied, it may be used to indicate progress.
1744
The caller is responsible for cleaning up progress bars (because this
1748
* Lines are normalised by the underlying store: they will all have \\n
1750
* Lines are returned in arbitrary order.
1751
* If a requested key did not change any lines (or didn't have any
1752
lines), it may not be mentioned at all in the result.
1754
:param pb: Progress bar supplied by caller.
1755
:return: An iterator over (line, key).
1758
pb = progress.DummyProgress()
1764
# we don't care about inclusions, the caller cares.
1765
# but we need to setup a list of records to visit.
1766
# we need key, position, length
1768
build_details = self._index.get_build_details(keys)
1769
for key, details in build_details.iteritems():
1771
key_records.append((key, details[0]))
1772
records_iter = enumerate(self._read_records_iter(key_records))
1773
for (key_idx, (key, data, sha_value)) in records_iter:
1774
pb.update('Walking content', key_idx, total)
1775
compression_parent = build_details[key][1]
1776
if compression_parent is None:
1778
line_iterator = self._factory.get_fulltext_content(data)
1781
line_iterator = self._factory.get_linedelta_content(data)
1782
# Now that we are yielding the data for this key, remove it
1785
# XXX: It might be more efficient to yield (key,
1786
# line_iterator) in the future. However for now, this is a
1787
# simpler change to integrate into the rest of the
1788
# codebase. RBC 20071110
1789
for line in line_iterator:
1792
except errors.RetryWithNewPacks, e:
1793
self._access.reload_or_raise(e)
1794
# If there are still keys we've not yet found, we look in the fallback
1795
# vfs, and hope to find them there. Note that if the keys are found
1796
# but had no changes or no content, the fallback may not return
1798
if keys and not self._fallback_vfs:
1799
# XXX: strictly the second parameter is meant to be the file id
1800
# but it's not easily accessible here.
1801
raise RevisionNotPresent(keys, repr(self))
1802
for source in self._fallback_vfs:
1806
for line, key in source.iter_lines_added_or_present_in_keys(keys):
1807
source_keys.add(key)
1809
keys.difference_update(source_keys)
1810
pb.update('Walking content', total, total)
1812
def _make_line_delta(self, delta_seq, new_content):
1813
"""Generate a line delta from delta_seq and new_content."""
1815
for op in delta_seq.get_opcodes():
1816
if op[0] == 'equal':
1818
diff_hunks.append((op[1], op[2], op[4]-op[3], new_content._lines[op[3]:op[4]]))
1821
def _merge_annotations(self, content, parents, parent_texts={},
1822
delta=None, annotated=None,
1823
left_matching_blocks=None):
1824
"""Merge annotations for content and generate deltas.
1826
This is done by comparing the annotations based on changes to the text
1827
and generating a delta on the resulting full texts. If annotations are
1828
not being created then a simple delta is created.
1830
if left_matching_blocks is not None:
1831
delta_seq = diff._PrematchedMatcher(left_matching_blocks)
1835
for parent_key in parents:
1836
merge_content = self._get_content(parent_key, parent_texts)
1837
if (parent_key == parents[0] and delta_seq is not None):
1840
seq = patiencediff.PatienceSequenceMatcher(
1841
None, merge_content.text(), content.text())
1842
for i, j, n in seq.get_matching_blocks():
1845
# this copies (origin, text) pairs across to the new
1846
# content for any line that matches the last-checked
1848
content._lines[j:j+n] = merge_content._lines[i:i+n]
1849
# XXX: Robert says the following block is a workaround for a
1850
# now-fixed bug and it can probably be deleted. -- mbp 20080618
1851
if content._lines and content._lines[-1][1][-1] != '\n':
1852
# The copied annotation was from a line without a trailing EOL,
1853
# reinstate one for the content object, to ensure correct
1855
line = content._lines[-1][1] + '\n'
1856
content._lines[-1] = (content._lines[-1][0], line)
1858
if delta_seq is None:
1859
reference_content = self._get_content(parents[0], parent_texts)
1860
new_texts = content.text()
1861
old_texts = reference_content.text()
1862
delta_seq = patiencediff.PatienceSequenceMatcher(
1863
None, old_texts, new_texts)
1864
return self._make_line_delta(delta_seq, content)
1866
def _parse_record(self, version_id, data):
1867
"""Parse an original format knit record.
1869
These have the last element of the key only present in the stored data.
1871
rec, record_contents = self._parse_record_unchecked(data)
1872
self._check_header_version(rec, version_id)
1873
return record_contents, rec[3]
1875
def _parse_record_header(self, key, raw_data):
1876
"""Parse a record header for consistency.
1878
:return: the header and the decompressor stream.
1879
as (stream, header_record)
1881
df = tuned_gzip.GzipFile(mode='rb', fileobj=StringIO(raw_data))
1884
rec = self._check_header(key, df.readline())
1885
except Exception, e:
1886
raise KnitCorrupt(self,
1887
"While reading {%s} got %s(%s)"
1888
% (key, e.__class__.__name__, str(e)))
1891
def _parse_record_unchecked(self, data):
1893
# 4168 calls in 2880 217 internal
1894
# 4168 calls to _parse_record_header in 2121
1895
# 4168 calls to readlines in 330
1896
df = tuned_gzip.GzipFile(mode='rb', fileobj=StringIO(data))
1898
record_contents = df.readlines()
1899
except Exception, e:
1900
raise KnitCorrupt(self, "Corrupt compressed record %r, got %s(%s)" %
1901
(data, e.__class__.__name__, str(e)))
1902
header = record_contents.pop(0)
1903
rec = self._split_header(header)
1904
last_line = record_contents.pop()
1905
if len(record_contents) != int(rec[2]):
1906
raise KnitCorrupt(self,
1907
'incorrect number of lines %s != %s'
1908
' for version {%s} %s'
1909
% (len(record_contents), int(rec[2]),
1910
rec[1], record_contents))
1911
if last_line != 'end %s\n' % rec[1]:
1912
raise KnitCorrupt(self,
1913
'unexpected version end line %r, wanted %r'
1914
% (last_line, rec[1]))
1916
return rec, record_contents
1918
def _read_records_iter(self, records):
1919
"""Read text records from data file and yield result.
1921
The result will be returned in whatever is the fastest to read.
1922
Not by the order requested. Also, multiple requests for the same
1923
record will only yield 1 response.
1924
:param records: A list of (key, access_memo) entries
1925
:return: Yields (key, contents, digest) in the order
1926
read, not the order requested
1931
# XXX: This smells wrong, IO may not be getting ordered right.
1932
needed_records = sorted(set(records), key=operator.itemgetter(1))
1933
if not needed_records:
1936
# The transport optimizes the fetching as well
1937
# (ie, reads continuous ranges.)
1938
raw_data = self._access.get_raw_records(
1939
[index_memo for key, index_memo in needed_records])
1941
for (key, index_memo), data in \
1942
izip(iter(needed_records), raw_data):
1943
content, digest = self._parse_record(key[-1], data)
1944
yield key, content, digest
1946
def _read_records_iter_raw(self, records):
1947
"""Read text records from data file and yield raw data.
1949
This unpacks enough of the text record to validate the id is
1950
as expected but thats all.
1952
Each item the iterator yields is (key, bytes,
1953
expected_sha1_of_full_text).
1955
for key, data in self._read_records_iter_unchecked(records):
1956
# validate the header (note that we can only use the suffix in
1957
# current knit records).
1958
df, rec = self._parse_record_header(key, data)
1960
yield key, data, rec[3]
1962
def _read_records_iter_unchecked(self, records):
1963
"""Read text records from data file and yield raw data.
1965
No validation is done.
1967
Yields tuples of (key, data).
1969
# setup an iterator of the external records:
1970
# uses readv so nice and fast we hope.
1972
# grab the disk data needed.
1973
needed_offsets = [index_memo for key, index_memo
1975
raw_records = self._access.get_raw_records(needed_offsets)
1977
for key, index_memo in records:
1978
data = raw_records.next()
1981
def _record_to_data(self, key, digest, lines, dense_lines=None):
1982
"""Convert key, digest, lines into a raw data block.
1984
:param key: The key of the record. Currently keys are always serialised
1985
using just the trailing component.
1986
:param dense_lines: The bytes of lines but in a denser form. For
1987
instance, if lines is a list of 1000 bytestrings each ending in \n,
1988
dense_lines may be a list with one line in it, containing all the
1989
1000's lines and their \n's. Using dense_lines if it is already
1990
known is a win because the string join to create bytes in this
1991
function spends less time resizing the final string.
1992
:return: (len, a StringIO instance with the raw data ready to read.)
1994
chunks = ["version %s %d %s\n" % (key[-1], len(lines), digest)]
1995
chunks.extend(dense_lines or lines)
1996
chunks.append("end %s\n" % key[-1])
1997
for chunk in chunks:
1998
if type(chunk) is not str:
1999
raise AssertionError(
2000
'data must be plain bytes was %s' % type(chunk))
2001
if lines and lines[-1][-1] != '\n':
2002
raise ValueError('corrupt lines value %r' % lines)
2003
compressed_bytes = tuned_gzip.chunks_to_gzip(chunks)
2004
return len(compressed_bytes), compressed_bytes
2006
def _split_header(self, line):
2009
raise KnitCorrupt(self,
2010
'unexpected number of elements in record header')
2014
"""See VersionedFiles.keys."""
2015
if 'evil' in debug.debug_flags:
2016
trace.mutter_callsite(2, "keys scales with size of history")
2017
sources = [self._index] + self._fallback_vfs
2019
for source in sources:
2020
result.update(source.keys())
2024
class _ContentMapGenerator(object):
2025
"""Generate texts or expose raw deltas for a set of texts."""
2027
def __init__(self, ordering='unordered'):
2028
self._ordering = ordering
2030
def _get_content(self, key):
2031
"""Get the content object for key."""
2032
# Note that _get_content is only called when the _ContentMapGenerator
2033
# has been constructed with just one key requested for reconstruction.
2034
if key in self.nonlocal_keys:
2035
record = self.get_record_stream().next()
2036
# Create a content object on the fly
2037
lines = osutils.chunks_to_lines(record.get_bytes_as('chunked'))
2038
return PlainKnitContent(lines, record.key)
2040
# local keys we can ask for directly
2041
return self._get_one_work(key)
2043
def get_record_stream(self):
2044
"""Get a record stream for the keys requested during __init__."""
2045
for record in self._work():
2049
"""Produce maps of text and KnitContents as dicts.
686
The keys are version_ids, the values are tuples of (method, content,
688
method is the way the content should be applied.
689
content is a KnitContent object.
690
digest is the SHA1 digest of this version id after all steps are done
691
next is the build-parent of the version, i.e. the leftmost ancestor.
692
If the method is fulltext, next will be None.
694
position_map = self._get_components_positions(version_ids)
695
# c = component_id, m = method, p = position, s = size, n = next
696
records = [(c, p, s) for c, (m, p, s, n) in position_map.iteritems()]
698
for component_id, content, digest in\
699
self._data.read_records_iter(records):
700
method, position, size, next = position_map[component_id]
701
record_map[component_id] = method, content, digest, next
705
def get_text(self, version_id):
706
"""See VersionedFile.get_text"""
707
return self.get_texts([version_id])[0]
709
def get_texts(self, version_ids):
710
return [''.join(l) for l in self.get_line_list(version_ids)]
712
def get_line_list(self, version_ids):
713
"""Return the texts of listed versions as a list of strings."""
714
text_map, content_map = self._get_content_maps(version_ids)
715
return [text_map[v] for v in version_ids]
717
def _get_content_maps(self, version_ids):
718
"""Produce maps of text and KnitContents
2051
720
:return: (text_map, content_map) where text_map contains the texts for
2052
the requested versions and content_map contains the KnitContents.
721
the requested versions and content_map contains the KnitContents.
722
Both dicts take version_ids as their keys.
2054
# NB: By definition we never need to read remote sources unless texts
2055
# are requested from them: we don't delta across stores - and we
2056
# explicitly do not want to to prevent data loss situations.
2057
if self.global_map is None:
2058
self.global_map = self.vf.get_parent_map(self.keys)
2059
nonlocal_keys = self.nonlocal_keys
2061
missing_keys = set(nonlocal_keys)
2062
# Read from remote versioned file instances and provide to our caller.
2063
for source in self.vf._fallback_vfs:
2064
if not missing_keys:
2066
# Loop over fallback repositories asking them for texts - ignore
2067
# any missing from a particular fallback.
2068
for record in source.get_record_stream(missing_keys,
2069
self._ordering, True):
2070
if record.storage_kind == 'absent':
2071
# Not in thie particular stream, may be in one of the
2072
# other fallback vfs objects.
2074
missing_keys.remove(record.key)
2077
if self._raw_record_map is None:
2078
raise AssertionError('_raw_record_map should have been filled')
2080
for key in self.keys:
2081
if key in self.nonlocal_keys:
2083
yield LazyKnitContentFactory(key, self.global_map[key], self, first)
2086
def _get_one_work(self, requested_key):
2087
# Now, if we have calculated everything already, just return the
2089
if requested_key in self._contents_map:
2090
return self._contents_map[requested_key]
2091
# To simplify things, parse everything at once - code that wants one text
2092
# probably wants them all.
2093
# FUTURE: This function could be improved for the 'extract many' case
2094
# by tracking each component and only doing the copy when the number of
2095
# children than need to apply delta's to it is > 1 or it is part of the
2097
multiple_versions = len(self.keys) != 1
2098
if self._record_map is None:
2099
self._record_map = self.vf._raw_map_to_record_map(
2100
self._raw_record_map)
2101
record_map = self._record_map
2102
# raw_record_map is key:
2103
# Have read and parsed records at this point.
2104
for key in self.keys:
2105
if key in self.nonlocal_keys:
724
for version_id in version_ids:
725
if not self.has_version(version_id):
726
raise RevisionNotPresent(version_id, self.filename)
727
record_map = self._get_record_map(version_ids)
732
for version_id in version_ids:
2110
735
while cursor is not None:
2112
record, record_details, digest, next = record_map[cursor]
2114
raise RevisionNotPresent(cursor, self)
2115
components.append((cursor, record, record_details, digest))
736
method, data, digest, next = record_map[cursor]
737
components.append((cursor, method, data, digest))
738
if cursor in content_map:
2117
if cursor in self._contents_map:
2118
# no need to plan further back
2119
components.append((cursor, None, None, None))
2123
for (component_id, record, record_details,
2124
digest) in reversed(components):
2125
if component_id in self._contents_map:
2126
content = self._contents_map[component_id]
743
for component_id, method, data, digest in reversed(components):
744
if component_id in content_map:
745
content = content_map[component_id]
2128
content, delta = self._factory.parse_record(key[-1],
2129
record, record_details, content,
2130
copy_base_content=multiple_versions)
2131
if multiple_versions:
2132
self._contents_map[component_id] = content
747
version_idx = self._index.lookup(component_id)
748
if method == 'fulltext':
749
assert content is None
750
content = self.factory.parse_fulltext(data, version_idx)
751
elif method == 'line-delta':
752
delta = self.factory.parse_line_delta(data[:],
754
content = content.copy()
755
content._lines = self._apply_delta(content._lines,
757
content_map[component_id] = content
759
if 'no-eol' in self._index.get_options(version_id):
760
content = content.copy()
761
line = content._lines[-1][1].rstrip('\n')
762
content._lines[-1] = (content._lines[-1][0], line)
763
final_content[version_id] = content
2134
765
# digest here is the digest from the last applied component.
2135
766
text = content.text()
2136
actual_sha = sha_strings(text)
2137
if actual_sha != digest:
2138
raise SHA1KnitCorrupt(self, actual_sha, digest, key, text)
2139
if multiple_versions:
2140
return self._contents_map[requested_key]
2144
def _wire_bytes(self):
2145
"""Get the bytes to put on the wire for 'key'.
2147
The first collection of bytes asked for returns the serialised
2148
raw_record_map and the additional details (key, parent) for key.
2149
Subsequent calls return just the additional details (key, parent).
2150
The wire storage_kind given for the first key is 'knit-delta-closure',
2151
For subsequent keys it is 'knit-delta-closure-ref'.
2153
:param key: A key from the content generator.
2154
:return: Bytes to put on the wire.
2157
# kind marker for dispatch on the far side,
2158
lines.append('knit-delta-closure')
2160
if self.vf._factory.annotated:
2161
lines.append('annotated')
2164
# then the list of keys
2165
lines.append('\t'.join(['\x00'.join(key) for key in self.keys
2166
if key not in self.nonlocal_keys]))
2167
# then the _raw_record_map in serialised form:
2169
# for each item in the map:
2171
# 1 line with parents if the key is to be yielded (None: for None, '' for ())
2172
# one line with method
2173
# one line with noeol
2174
# one line with next ('' for None)
2175
# one line with byte count of the record bytes
2177
for key, (record_bytes, (method, noeol), next) in \
2178
self._raw_record_map.iteritems():
2179
key_bytes = '\x00'.join(key)
2180
parents = self.global_map.get(key, None)
2182
parent_bytes = 'None:'
2184
parent_bytes = '\t'.join('\x00'.join(key) for key in parents)
2185
method_bytes = method
2191
next_bytes = '\x00'.join(next)
2194
map_byte_list.append('%s\n%s\n%s\n%s\n%s\n%d\n%s' % (
2195
key_bytes, parent_bytes, method_bytes, noeol_bytes, next_bytes,
2196
len(record_bytes), record_bytes))
2197
map_bytes = ''.join(map_byte_list)
2198
lines.append(map_bytes)
2199
bytes = '\n'.join(lines)
2203
class _VFContentMapGenerator(_ContentMapGenerator):
2204
"""Content map generator reading from a VersionedFiles object."""
2206
def __init__(self, versioned_files, keys, nonlocal_keys=None,
2207
global_map=None, raw_record_map=None, ordering='unordered'):
2208
"""Create a _ContentMapGenerator.
2210
:param versioned_files: The versioned files that the texts are being
2212
:param keys: The keys to produce content maps for.
2213
:param nonlocal_keys: An iterable of keys(possibly intersecting keys)
2214
which are known to not be in this knit, but rather in one of the
2216
:param global_map: The result of get_parent_map(keys) (or a supermap).
2217
This is required if get_record_stream() is to be used.
2218
:param raw_record_map: A unparsed raw record map to use for answering
2221
_ContentMapGenerator.__init__(self, ordering=ordering)
2222
# The vf to source data from
2223
self.vf = versioned_files
2225
self.keys = list(keys)
2226
# Keys known to be in fallback vfs objects
2227
if nonlocal_keys is None:
2228
self.nonlocal_keys = set()
2230
self.nonlocal_keys = frozenset(nonlocal_keys)
2231
# Parents data for keys to be returned in get_record_stream
2232
self.global_map = global_map
2233
# The chunked lists for self.keys in text form
2235
# A cache of KnitContent objects used in extracting texts.
2236
self._contents_map = {}
2237
# All the knit records needed to assemble the requested keys as full
2239
self._record_map = None
2240
if raw_record_map is None:
2241
self._raw_record_map = self.vf._get_record_map_unparsed(keys,
2244
self._raw_record_map = raw_record_map
2245
# the factory for parsing records
2246
self._factory = self.vf._factory
2249
class _NetworkContentMapGenerator(_ContentMapGenerator):
2250
"""Content map generator sourced from a network stream."""
2252
def __init__(self, bytes, line_end):
2253
"""Construct a _NetworkContentMapGenerator from a bytes block."""
2255
self.global_map = {}
2256
self._raw_record_map = {}
2257
self._contents_map = {}
2258
self._record_map = None
2259
self.nonlocal_keys = []
2260
# Get access to record parsing facilities
2261
self.vf = KnitVersionedFiles(None, None)
2264
line_end = bytes.find('\n', start)
2265
line = bytes[start:line_end]
2266
start = line_end + 1
2267
if line == 'annotated':
2268
self._factory = KnitAnnotateFactory()
2270
self._factory = KnitPlainFactory()
2271
# list of keys to emit in get_record_stream
2272
line_end = bytes.find('\n', start)
2273
line = bytes[start:line_end]
2274
start = line_end + 1
2276
tuple(segment.split('\x00')) for segment in line.split('\t')
2278
# now a loop until the end. XXX: It would be nice if this was just a
2279
# bunch of the same records as get_record_stream(..., False) gives, but
2280
# there is a decent sized gap stopping that at the moment.
2284
line_end = bytes.find('\n', start)
2285
key = tuple(bytes[start:line_end].split('\x00'))
2286
start = line_end + 1
2287
# 1 line with parents (None: for None, '' for ())
2288
line_end = bytes.find('\n', start)
2289
line = bytes[start:line_end]
2294
[tuple(segment.split('\x00')) for segment in line.split('\t')
2296
self.global_map[key] = parents
2297
start = line_end + 1
2298
# one line with method
2299
line_end = bytes.find('\n', start)
2300
line = bytes[start:line_end]
2302
start = line_end + 1
2303
# one line with noeol
2304
line_end = bytes.find('\n', start)
2305
line = bytes[start:line_end]
2307
start = line_end + 1
2308
# one line with next ('' for None)
2309
line_end = bytes.find('\n', start)
2310
line = bytes[start:line_end]
2314
next = tuple(bytes[start:line_end].split('\x00'))
2315
start = line_end + 1
2316
# one line with byte count of the record bytes
2317
line_end = bytes.find('\n', start)
2318
line = bytes[start:line_end]
2320
start = line_end + 1
2322
record_bytes = bytes[start:start+count]
2323
start = start + count
2325
self._raw_record_map[key] = (record_bytes, (method, noeol), next)
2327
def get_record_stream(self):
2328
"""Get a record stream for for keys requested by the bytestream."""
2330
for key in self.keys:
2331
yield LazyKnitContentFactory(key, self.global_map[key], self, first)
2334
def _wire_bytes(self):
2338
class _KndxIndex(object):
2339
"""Manages knit index files
2341
The index is kept in memory and read on startup, to enable
767
if sha_strings(text) != digest:
768
raise KnitCorrupt(self.filename,
769
'sha-1 does not match %s' % version_id)
771
text_map[version_id] = text
772
return text_map, final_content
774
def iter_lines_added_or_present_in_versions(self, version_ids=None):
775
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
776
if version_ids is None:
777
version_ids = self.versions()
778
# we don't care about inclusions, the caller cares.
779
# but we need to setup a list of records to visit.
780
# we need version_id, position, length
781
version_id_records = []
782
requested_versions = list(version_ids)
783
# filter for available versions
784
for version_id in requested_versions:
785
if not self.has_version(version_id):
786
raise RevisionNotPresent(version_id, self.filename)
787
# get a in-component-order queue:
789
for version_id in self.versions():
790
if version_id in requested_versions:
791
version_ids.append(version_id)
792
data_pos, length = self._index.get_position(version_id)
793
version_id_records.append((version_id, data_pos, length))
795
pb = bzrlib.ui.ui_factory.nested_progress_bar()
797
total = len(version_id_records)
799
pb.update('Walking content.', count, total)
800
for version_id, data, sha_value in \
801
self._data.read_records_iter(version_id_records):
802
pb.update('Walking content.', count, total)
803
method = self._index.get_method(version_id)
804
version_idx = self._index.lookup(version_id)
805
assert method in ('fulltext', 'line-delta')
806
if method == 'fulltext':
807
content = self.factory.parse_fulltext(data, version_idx)
808
for line in content.text():
811
delta = self.factory.parse_line_delta(data, version_idx)
812
for start, end, count, lines in delta:
813
for origin, line in lines:
816
pb.update('Walking content.', total, total)
819
pb.update('Walking content.', total, total)
823
def num_versions(self):
824
"""See VersionedFile.num_versions()."""
825
return self._index.num_versions()
827
__len__ = num_versions
829
def annotate_iter(self, version_id):
830
"""See VersionedFile.annotate_iter."""
831
content = self._get_content(version_id)
832
for origin, text in content.annotate_iter():
835
def get_parents(self, version_id):
836
"""See VersionedFile.get_parents."""
839
# 52554 calls in 1264 872 internal down from 3674
841
return self._index.get_parents(version_id)
843
raise RevisionNotPresent(version_id, self.filename)
845
def get_parents_with_ghosts(self, version_id):
846
"""See VersionedFile.get_parents."""
848
return self._index.get_parents_with_ghosts(version_id)
850
raise RevisionNotPresent(version_id, self.filename)
852
def get_ancestry(self, versions):
853
"""See VersionedFile.get_ancestry."""
854
if isinstance(versions, basestring):
855
versions = [versions]
858
self._check_versions_present(versions)
859
return self._index.get_ancestry(versions)
861
def get_ancestry_with_ghosts(self, versions):
862
"""See VersionedFile.get_ancestry_with_ghosts."""
863
if isinstance(versions, basestring):
864
versions = [versions]
867
self._check_versions_present(versions)
868
return self._index.get_ancestry_with_ghosts(versions)
870
#@deprecated_method(zero_eight)
871
def walk(self, version_ids):
872
"""See VersionedFile.walk."""
873
# We take the short path here, and extract all relevant texts
874
# and put them in a weave and let that do all the work. Far
875
# from optimal, but is much simpler.
876
# FIXME RB 20060228 this really is inefficient!
877
from bzrlib.weave import Weave
879
w = Weave(self.filename)
880
ancestry = self.get_ancestry(version_ids)
881
sorted_graph = topo_sort(self._index.get_graph())
882
version_list = [vid for vid in sorted_graph if vid in ancestry]
884
for version_id in version_list:
885
lines = self.get_lines(version_id)
886
w.add_lines(version_id, self.get_parents(version_id), lines)
888
for lineno, insert_id, dset, line in w.walk(version_ids):
889
yield lineno, insert_id, dset, line
891
def plan_merge(self, ver_a, ver_b):
892
"""See VersionedFile.plan_merge."""
893
ancestors_b = set(self.get_ancestry(ver_b))
894
def status_a(revision, text):
895
if revision in ancestors_b:
896
return 'killed-b', text
900
ancestors_a = set(self.get_ancestry(ver_a))
901
def status_b(revision, text):
902
if revision in ancestors_a:
903
return 'killed-a', text
907
annotated_a = self.annotate(ver_a)
908
annotated_b = self.annotate(ver_b)
909
plain_a = [t for (a, t) in annotated_a]
910
plain_b = [t for (a, t) in annotated_b]
911
blocks = KnitSequenceMatcher(None, plain_a, plain_b).get_matching_blocks()
914
for ai, bi, l in blocks:
915
# process all mismatched sections
916
# (last mismatched section is handled because blocks always
917
# includes a 0-length last block)
918
for revision, text in annotated_a[a_cur:ai]:
919
yield status_a(revision, text)
920
for revision, text in annotated_b[b_cur:bi]:
921
yield status_b(revision, text)
923
# and now the matched section
926
for text_a, text_b in zip(plain_a[ai:a_cur], plain_b[bi:b_cur]):
927
assert text_a == text_b
928
yield "unchanged", text_a
931
class _KnitComponentFile(object):
932
"""One of the files used to implement a knit database"""
934
def __init__(self, transport, filename, mode, file_mode=None):
935
self._transport = transport
936
self._filename = filename
938
self._file_mode=file_mode
940
def write_header(self):
941
if self._transport.append(self._filename, StringIO(self.HEADER),
942
mode=self._file_mode):
943
raise KnitCorrupt(self._filename, 'misaligned after writing header')
945
def check_header(self, fp):
947
if line != self.HEADER:
948
raise KnitHeaderError(badline=line)
951
"""Commit is a nop."""
954
return '%s(%s)' % (self.__class__.__name__, self._filename)
957
class _KnitIndex(_KnitComponentFile):
958
"""Manages knit index file.
960
The index is already kept in memory and read on startup, to enable
2342
961
fast lookups of revision information. The cursor of the index
2343
962
file is always pointing to the end, making it easy to append
2355
974
Duplicate entries may be written to the index for a single version id
2356
975
if this is done then the latter one completely replaces the former:
2357
this allows updates to correct version and parent information.
976
this allows updates to correct version and parent information.
2358
977
Note that the two entries may share the delta, and that successive
2359
978
annotations and references MUST point to the first entry.
2361
980
The index file on disc contains a header, followed by one line per knit
2362
981
record. The same revision can be present in an index file more than once.
2363
The first occurrence gets assigned a sequence number starting from 0.
982
The first occurrence gets assigned a sequence number starting from 0.
2365
984
The format of a single line is
2366
985
REVISION_ID FLAGS BYTE_OFFSET LENGTH( PARENT_ID|PARENT_SEQUENCE_ID)* :\n
2367
986
REVISION_ID is a utf8-encoded revision id
2368
FLAGS is a comma separated list of flags about the record. Values include
987
FLAGS is a comma separated list of flags about the record. Values include
2369
988
no-eol, line-delta, fulltext.
2370
989
BYTE_OFFSET is the ascii representation of the byte offset in the data file
2371
that the compressed data starts at.
990
that the the compressed data starts at.
2372
991
LENGTH is the ascii representation of the length of the data file.
2373
992
PARENT_ID a utf-8 revision id prefixed by a '.' that is a parent of
2375
994
PARENT_SEQUENCE_ID the ascii representation of the sequence number of a
2376
995
revision id already in the knit that is a parent of REVISION_ID.
2377
996
The ' :' marker is the end of record marker.
2380
when a write is interrupted to the index file, it will result in a line
2381
that does not end in ' :'. If the ' :' is not present at the end of a line,
2382
or at the end of the file, then the record that is missing it will be
2383
ignored by the parser.
999
when a write is interrupted to the index file, it will result in a line that
1000
does not end in ' :'. If the ' :' is not present at the end of a line, or at
1001
the end of the file, then the record that is missing it will be ignored by
2385
1004
When writing new records to the index file, the data is preceded by '\n'
2386
1005
to ensure that records always start on new lines even if the last write was
2387
1006
interrupted. As a result its normal for the last line in the index to be
2388
1007
missing a trailing newline. One can be added with no harmful effects.
2390
:ivar _kndx_cache: dict from prefix to the old state of KnitIndex objects,
2391
where prefix is e.g. the (fileid,) for .texts instances or () for
2392
constant-mapped things like .revisions, and the old state is
2393
tuple(history_vector, cache_dict). This is used to prevent having an
2394
ABI change with the C extension that reads .kndx files.
2397
1010
HEADER = "# bzr knit index 8\n"
2399
def __init__(self, transport, mapper, get_scope, allow_writes, is_locked):
2400
"""Create a _KndxIndex on transport using mapper."""
2401
self._transport = transport
2402
self._mapper = mapper
2403
self._get_scope = get_scope
2404
self._allow_writes = allow_writes
2405
self._is_locked = is_locked
2407
self.has_graph = True
2409
def add_records(self, records, random_id=False, missing_compression_parents=False):
2410
"""Add multiple records to the index.
2412
:param records: a list of tuples:
2413
(key, options, access_memo, parents).
2414
:param random_id: If True the ids being added were randomly generated
2415
and no check for existence will be performed.
2416
:param missing_compression_parents: If True the records being added are
2417
only compressed against texts already in the index (or inside
2418
records). If False the records all refer to unavailable texts (or
2419
texts inside records) as compression parents.
2421
if missing_compression_parents:
2422
# It might be nice to get the edge of the records. But keys isn't
2424
keys = sorted(record[0] for record in records)
2425
raise errors.RevisionNotPresent(keys, self)
2427
for record in records:
2430
path = self._mapper.map(key) + '.kndx'
2431
path_keys = paths.setdefault(path, (prefix, []))
2432
path_keys[1].append(record)
2433
for path in sorted(paths):
2434
prefix, path_keys = paths[path]
2435
self._load_prefixes([prefix])
2437
orig_history = self._kndx_cache[prefix][1][:]
2438
orig_cache = self._kndx_cache[prefix][0].copy()
2441
for key, options, (_, pos, size), parents in path_keys:
2443
# kndx indices cannot be parentless.
2445
line = "\n%s %s %s %s %s :" % (
2446
key[-1], ','.join(options), pos, size,
2447
self._dictionary_compress(parents))
2448
if type(line) is not str:
2449
raise AssertionError(
2450
'data must be utf8 was %s' % type(line))
2452
self._cache_key(key, options, pos, size, parents)
2453
if len(orig_history):
2454
self._transport.append_bytes(path, ''.join(lines))
2456
self._init_index(path, lines)
2458
# If any problems happen, restore the original values and re-raise
2459
self._kndx_cache[prefix] = (orig_cache, orig_history)
2462
def scan_unvalidated_index(self, graph_index):
2463
"""See _KnitGraphIndex.scan_unvalidated_index."""
2464
# Because kndx files do not support atomic insertion via separate index
2465
# files, they do not support this method.
2466
raise NotImplementedError(self.scan_unvalidated_index)
2468
def get_missing_compression_parents(self):
2469
"""See _KnitGraphIndex.get_missing_compression_parents."""
2470
# Because kndx files do not support atomic insertion via separate index
2471
# files, they do not support this method.
2472
raise NotImplementedError(self.get_missing_compression_parents)
2474
def _cache_key(self, key, options, pos, size, parent_keys):
1012
# speed of knit parsing went from 280 ms to 280 ms with slots addition.
1013
# __slots__ = ['_cache', '_history', '_transport', '_filename']
1015
def _cache_version(self, version_id, options, pos, size, parents):
2475
1016
"""Cache a version record in the history array and index cache.
2477
This is inlined into _load_data for performance. KEEP IN SYNC.
1018
This is inlined into __init__ for performance. KEEP IN SYNC.
2478
1019
(It saves 60ms, 25% of the __init__ overhead on local 4000 record
2482
version_id = key[-1]
2483
# last-element only for compatibilty with the C load_data.
2484
parents = tuple(parent[-1] for parent in parent_keys)
2485
for parent in parent_keys:
2486
if parent[:-1] != prefix:
2487
raise ValueError("mismatched prefixes for %r, %r" % (
2489
cache, history = self._kndx_cache[prefix]
2490
1022
# only want the _history index to reference the 1st index entry
2491
1023
# for version_id
2492
if version_id not in cache:
2493
index = len(history)
2494
history.append(version_id)
1024
if version_id not in self._cache:
1025
index = len(self._history)
1026
self._history.append(version_id)
2496
index = cache[version_id][5]
2497
cache[version_id] = (version_id,
1028
index = self._cache[version_id][5]
1029
self._cache[version_id] = (version_id,
2504
def check_header(self, fp):
2505
line = fp.readline()
2507
# An empty file can actually be treated as though the file doesn't
2509
raise errors.NoSuchFile(self)
2510
if line != self.HEADER:
2511
raise KnitHeaderError(badline=line, filename=self)
2513
def _check_read(self):
2514
if not self._is_locked():
2515
raise errors.ObjectNotLocked(self)
2516
if self._get_scope() != self._scope:
2519
def _check_write_ok(self):
2520
"""Assert if not writes are permitted."""
2521
if not self._is_locked():
2522
raise errors.ObjectNotLocked(self)
2523
if self._get_scope() != self._scope:
2525
if self._mode != 'w':
2526
raise errors.ReadOnlyObjectDirtiedError(self)
2528
def get_build_details(self, keys):
2529
"""Get the method, index_memo and compression parent for keys.
2531
Ghosts are omitted from the result.
2533
:param keys: An iterable of keys.
2534
:return: A dict of key:(index_memo, compression_parent, parents,
2537
opaque structure to pass to read_records to extract the raw
2540
Content that this record is built upon, may be None
2542
Logical parents of this node
2544
extra information about the content which needs to be passed to
2545
Factory.parse_record
2547
parent_map = self.get_parent_map(keys)
2550
if key not in parent_map:
2552
method = self.get_method(key)
2553
parents = parent_map[key]
2554
if method == 'fulltext':
2555
compression_parent = None
2557
compression_parent = parents[0]
2558
noeol = 'no-eol' in self.get_options(key)
2559
index_memo = self.get_position(key)
2560
result[key] = (index_memo, compression_parent,
2561
parents, (method, noeol))
2564
def get_method(self, key):
2565
"""Return compression method of specified key."""
2566
options = self.get_options(key)
2567
if 'fulltext' in options:
2569
elif 'line-delta' in options:
2572
raise errors.KnitIndexUnknownMethod(self, options)
2574
def get_options(self, key):
2575
"""Return a list representing options.
2579
prefix, suffix = self._split_key(key)
2580
self._load_prefixes([prefix])
1036
def __init__(self, transport, filename, mode, create=False, file_mode=None):
1037
_KnitComponentFile.__init__(self, transport, filename, mode, file_mode)
1039
# position in _history is the 'official' index for a revision
1040
# but the values may have come from a newer entry.
1041
# so - wc -l of a knit index is != the number of unique names
1044
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2582
return self._kndx_cache[prefix][0][suffix][1]
2584
raise RevisionNotPresent(key, self)
2586
def find_ancestry(self, keys):
2587
"""See CombinedGraphIndex.find_ancestry()"""
2588
prefixes = set(key[:-1] for key in keys)
2589
self._load_prefixes(prefixes)
2592
missing_keys = set()
2593
pending_keys = list(keys)
2594
# This assumes that keys will not reference parents in a different
2595
# prefix, which is accurate so far.
2597
key = pending_keys.pop()
2598
if key in parent_map:
2602
suffix_parents = self._kndx_cache[prefix][0][key[-1]][4]
2604
missing_keys.add(key)
1049
pb.update('read knit index', count, total)
1050
fp = self._transport.get(self._filename)
1052
self.check_header(fp)
1053
# readlines reads the whole file at once:
1054
# bad for transports like http, good for local disk
1055
# we save 60 ms doing this one change (
1056
# from calling readline each time to calling
1058
# probably what we want for nice behaviour on
1059
# http is a incremental readlines that yields, or
1060
# a check for local vs non local indexes,
1061
for l in fp.readlines():
1063
if len(rec) < 5 or rec[-1] != ':':
1065
# FIXME: in the future we should determine if its a
1066
# short write - and ignore it
1067
# or a different failure, and raise. RBC 20060407
1071
#pb.update('read knit index', count, total)
1072
# See self._parse_parents
1074
for value in rec[4:-1]:
1076
# uncompressed reference
1077
parents.append(value[1:])
1079
# this is 15/4000ms faster than isinstance,
1081
# this function is called thousands of times a
1082
# second so small variations add up.
1083
assert value.__class__ is str
1084
parents.append(self._history[int(value)])
1085
# end self._parse_parents
1086
# self._cache_version(rec[0],
1087
# rec[1].split(','),
1091
# --- self._cache_version
1092
# only want the _history index to reference the 1st
1093
# index entry for version_id
1095
if version_id not in self._cache:
1096
index = len(self._history)
1097
self._history.append(version_id)
1099
index = self._cache[version_id][5]
1100
self._cache[version_id] = (version_id,
1106
# --- self._cache_version
1109
except NoSuchFile, e:
1110
if mode != 'w' or not create:
1114
pb.update('read knit index', total, total)
1117
def _parse_parents(self, compressed_parents):
1118
"""convert a list of string parent values into version ids.
1120
ints are looked up in the index.
1121
.FOO values are ghosts and converted in to FOO.
1123
NOTE: the function is retained here for clarity, and for possible
1124
use in partial index reads. However bulk processing now has
1125
it inlined in __init__ for inner-loop optimisation.
1128
for value in compressed_parents:
1129
if value[-1] == '.':
1130
# uncompressed reference
1131
result.append(value[1:])
2606
parent_keys = tuple([prefix + (suffix,)
2607
for suffix in suffix_parents])
2608
parent_map[key] = parent_keys
2609
pending_keys.extend([p for p in parent_keys
2610
if p not in parent_map])
2611
return parent_map, missing_keys
2613
def get_parent_map(self, keys):
2614
"""Get a map of the parents of keys.
2616
:param keys: The keys to look up parents for.
2617
:return: A mapping from keys to parents. Absent keys are absent from
2620
# Parse what we need to up front, this potentially trades off I/O
2621
# locality (.kndx and .knit in the same block group for the same file
2622
# id) for less checking in inner loops.
2623
prefixes = set(key[:-1] for key in keys)
2624
self._load_prefixes(prefixes)
1133
# this is 15/4000ms faster than isinstance,
1134
# this function is called thousands of times a
1135
# second so small variations add up.
1136
assert value.__class__ is str
1137
result.append(self._history[int(value)])
1140
def get_graph(self):
1142
for version_id, index in self._cache.iteritems():
1143
graph.append((version_id, index[4]))
1146
def get_ancestry(self, versions):
1147
"""See VersionedFile.get_ancestry."""
1148
# get a graph of all the mentioned versions:
1150
pending = set(versions)
1152
version = pending.pop()
1153
parents = self._cache[version][4]
1154
# got the parents ok
1156
parents = [parent for parent in parents if parent in self._cache]
1157
for parent in parents:
1158
# if not completed and not a ghost
1159
if parent not in graph:
1161
graph[version] = parents
1162
return topo_sort(graph.items())
1164
def get_ancestry_with_ghosts(self, versions):
1165
"""See VersionedFile.get_ancestry_with_ghosts."""
1166
# get a graph of all the mentioned versions:
1168
pending = set(versions)
1170
version = pending.pop()
2629
suffix_parents = self._kndx_cache[prefix][0][key[-1]][4]
1172
parents = self._cache[version][4]
2630
1173
except KeyError:
2633
result[key] = tuple(prefix + (suffix,) for
2634
suffix in suffix_parents)
2637
def get_position(self, key):
2638
"""Return details needed to access the version.
2640
:return: a tuple (key, data position, size) to hand to the access
2641
logic to get the record.
2643
prefix, suffix = self._split_key(key)
2644
self._load_prefixes([prefix])
2645
entry = self._kndx_cache[prefix][0][suffix]
2646
return key, entry[2], entry[3]
2648
has_key = _mod_index._has_key_from_parent_map
2650
def _init_index(self, path, extra_lines=[]):
2651
"""Initialize an index."""
2653
sio.write(self.HEADER)
2654
sio.writelines(extra_lines)
2656
self._transport.put_file_non_atomic(path, sio,
2657
create_parent_dir=True)
2658
# self._create_parent_dir)
2659
# mode=self._file_mode,
2660
# dir_mode=self._dir_mode)
2663
"""Get all the keys in the collection.
2665
The keys are not ordered.
2668
# Identify all key prefixes.
2669
# XXX: A bit hacky, needs polish.
2670
if type(self._mapper) is ConstantMapper:
2674
for quoted_relpath in self._transport.iter_files_recursive():
2675
path, ext = os.path.splitext(quoted_relpath)
2677
prefixes = [self._mapper.unmap(path) for path in relpaths]
2678
self._load_prefixes(prefixes)
2679
for prefix in prefixes:
2680
for suffix in self._kndx_cache[prefix][1]:
2681
result.add(prefix + (suffix,))
2684
def _load_prefixes(self, prefixes):
2685
"""Load the indices for prefixes."""
2687
for prefix in prefixes:
2688
if prefix not in self._kndx_cache:
2689
# the load_data interface writes to these variables.
2692
self._filename = prefix
2694
path = self._mapper.map(prefix) + '.kndx'
2695
fp = self._transport.get(path)
2697
# _load_data may raise NoSuchFile if the target knit is
2699
_load_data(self, fp)
2702
self._kndx_cache[prefix] = (self._cache, self._history)
2707
self._kndx_cache[prefix] = ({}, [])
2708
if type(self._mapper) is ConstantMapper:
2709
# preserve behaviour for revisions.kndx etc.
2710
self._init_index(path)
2715
missing_keys = _mod_index._missing_keys_from_parent_map
2717
def _partition_keys(self, keys):
2718
"""Turn keys into a dict of prefix:suffix_list."""
2721
prefix_keys = result.setdefault(key[:-1], [])
2722
prefix_keys.append(key[-1])
2725
def _dictionary_compress(self, keys):
2726
"""Dictionary compress keys.
2728
:param keys: The keys to generate references to.
2729
:return: A string representation of keys. keys which are present are
2730
dictionary compressed, and others are emitted as fulltext with a
1178
# got the parents ok
1179
for parent in parents:
1180
if parent not in graph:
1182
graph[version] = parents
1183
return topo_sort(graph.items())
1185
def num_versions(self):
1186
return len(self._history)
1188
__len__ = num_versions
1190
def get_versions(self):
1191
return self._history
1193
def idx_to_name(self, idx):
1194
return self._history[idx]
1196
def lookup(self, version_id):
1197
assert version_id in self._cache
1198
return self._cache[version_id][5]
1200
def _version_list_to_index(self, versions):
2735
1201
result_list = []
2736
prefix = keys[0][:-1]
2737
cache = self._kndx_cache[prefix][0]
2739
if key[:-1] != prefix:
2740
# kndx indices cannot refer across partitioned storage.
2741
raise ValueError("mismatched prefixes for %r" % keys)
2742
if key[-1] in cache:
1202
for version in versions:
1203
if version in self._cache:
2743
1204
# -- inlined lookup() --
2744
result_list.append(str(cache[key[-1]][5]))
1205
result_list.append(str(self._cache[version][5]))
2745
1206
# -- end lookup () --
2747
result_list.append('.' + key[-1])
1208
result_list.append('.' + version.encode('utf-8'))
2748
1209
return ' '.join(result_list)
2750
def _reset_cache(self):
2751
# Possibly this should be a LRU cache. A dictionary from key_prefix to
2752
# (cache_dict, history_vector) for parsed kndx files.
2753
self._kndx_cache = {}
2754
self._scope = self._get_scope()
2755
allow_writes = self._allow_writes()
2761
def _sort_keys_by_io(self, keys, positions):
2762
"""Figure out an optimal order to read the records for the given keys.
2764
Sort keys, grouped by index and sorted by position.
2766
:param keys: A list of keys whose records we want to read. This will be
2768
:param positions: A dict, such as the one returned by
2769
_get_components_positions()
1211
def add_version(self, version_id, options, pos, size, parents):
1212
"""Add a version record to the index."""
1213
self.add_versions(((version_id, options, pos, size, parents),))
1215
def add_versions(self, versions):
1216
"""Add multiple versions to the index.
1218
:param versions: a list of tuples:
1219
(version_id, options, pos, size, parents).
2772
def get_sort_key(key):
2773
index_memo = positions[key][1]
2774
# Group by prefix and position. index_memo[0] is the key, so it is
2775
# (file_id, revision_id) and we don't want to sort on revision_id,
2776
# index_memo[1] is the position, and index_memo[2] is the size,
2777
# which doesn't matter for the sort
2778
return index_memo[0][:-1], index_memo[1]
2779
return keys.sort(key=get_sort_key)
2781
_get_total_build_size = _get_total_build_size
2783
def _split_key(self, key):
2784
"""Split key into a prefix and suffix."""
2785
return key[:-1], key[-1]
2788
class _KeyRefs(object):
2790
def __init__(self, track_new_keys=False):
2791
# dict mapping 'key' to 'set of keys referring to that key'
2794
# set remembering all new keys
2795
self.new_keys = set()
1222
for version_id, options, pos, size, parents in versions:
1223
line = "\n%s %s %s %s %s :" % (version_id.encode('utf-8'),
1227
self._version_list_to_index(parents))
1228
assert isinstance(line, str), \
1229
'content must be utf-8 encoded: %r' % (line,)
1231
self._transport.append(self._filename, StringIO(''.join(lines)))
1232
# cache after writing, so that a failed write leads to missing cache
1233
# entries not extra ones. XXX TODO: RBC 20060502 in the event of a
1234
# failure, reload the index or flush it or some such, to prevent
1235
# writing records that did complete twice.
1236
for version_id, options, pos, size, parents in versions:
1237
self._cache_version(version_id, options, pos, size, parents)
1239
def has_version(self, version_id):
1240
"""True if the version is in the index."""
1241
return self._cache.has_key(version_id)
1243
def get_position(self, version_id):
1244
"""Return data position and size of specified version."""
1245
return (self._cache[version_id][2], \
1246
self._cache[version_id][3])
1248
def get_method(self, version_id):
1249
"""Return compression method of specified version."""
1250
options = self._cache[version_id][1]
1251
if 'fulltext' in options:
2797
self.new_keys = None
2803
self.new_keys.clear()
2805
def add_references(self, key, refs):
2806
# Record the new references
2807
for referenced in refs:
2809
needed_by = self.refs[referenced]
2811
needed_by = self.refs[referenced] = set()
2813
# Discard references satisfied by the new key
2816
def get_new_keys(self):
2817
return self.new_keys
2819
def get_unsatisfied_refs(self):
2820
return self.refs.iterkeys()
2822
def _satisfy_refs_for_key(self, key):
1254
assert 'line-delta' in options
1257
def get_options(self, version_id):
1258
return self._cache[version_id][1]
1260
def get_parents(self, version_id):
1261
"""Return parents of specified version ignoring ghosts."""
1262
return [parent for parent in self._cache[version_id][4]
1263
if parent in self._cache]
1265
def get_parents_with_ghosts(self, version_id):
1266
"""Return parents of specified version with ghosts."""
1267
return self._cache[version_id][4]
1269
def check_versions_present(self, version_ids):
1270
"""Check that all specified versions are present."""
1271
version_ids = set(version_ids)
1272
for version_id in list(version_ids):
1273
if version_id in self._cache:
1274
version_ids.remove(version_id)
1276
raise RevisionNotPresent(list(version_ids)[0], self.filename)
1279
class _KnitData(_KnitComponentFile):
1280
"""Contents of the knit data file"""
1282
HEADER = "# bzr knit data 8\n"
1284
def __init__(self, transport, filename, mode, create=False, file_mode=None):
1285
_KnitComponentFile.__init__(self, transport, filename, mode)
1286
self._checked = False
1288
self._transport.put(self._filename, StringIO(''), mode=file_mode)
1290
def clear_cache(self):
1291
"""Clear the record cache."""
1294
def _open_file(self):
2826
# No keys depended on this key. That's ok.
1296
return self._transport.get(self._filename)
2829
def add_key(self, key):
2830
# satisfy refs for key, and remember that we've seen this key.
2831
self._satisfy_refs_for_key(key)
2832
if self.new_keys is not None:
2833
self.new_keys.add(key)
2835
def satisfy_refs_for_keys(self, keys):
2837
self._satisfy_refs_for_key(key)
2839
def get_referrers(self):
2841
for referrers in self.refs.itervalues():
2842
result.update(referrers)
2846
class _KnitGraphIndex(object):
2847
"""A KnitVersionedFiles index layered on GraphIndex."""
2849
def __init__(self, graph_index, is_locked, deltas=False, parents=True,
2850
add_callback=None, track_external_parent_refs=False):
2851
"""Construct a KnitGraphIndex on a graph_index.
2853
:param graph_index: An implementation of bzrlib.index.GraphIndex.
2854
:param is_locked: A callback to check whether the object should answer
2856
:param deltas: Allow delta-compressed records.
2857
:param parents: If True, record knits parents, if not do not record
2859
:param add_callback: If not None, allow additions to the index and call
2860
this callback with a list of added GraphIndex nodes:
2861
[(node, value, node_refs), ...]
2862
:param is_locked: A callback, returns True if the index is locked and
2864
:param track_external_parent_refs: If True, record all external parent
2865
references parents from added records. These can be retrieved
2866
later by calling get_missing_parents().
2868
self._add_callback = add_callback
2869
self._graph_index = graph_index
2870
self._deltas = deltas
2871
self._parents = parents
2872
if deltas and not parents:
2873
# XXX: TODO: Delta tree and parent graph should be conceptually
2875
raise KnitCorrupt(self, "Cannot do delta compression without "
2877
self.has_graph = parents
2878
self._is_locked = is_locked
2879
self._missing_compression_parents = set()
2880
if track_external_parent_refs:
2881
self._key_dependencies = _KeyRefs()
2883
self._key_dependencies = None
2886
return "%s(%r)" % (self.__class__.__name__, self._graph_index)
2888
def add_records(self, records, random_id=False,
2889
missing_compression_parents=False):
2890
"""Add multiple records to the index.
2892
This function does not insert data into the Immutable GraphIndex
2893
backing the KnitGraphIndex, instead it prepares data for insertion by
2894
the caller and checks that it is safe to insert then calls
2895
self._add_callback with the prepared GraphIndex nodes.
2897
:param records: a list of tuples:
2898
(key, options, access_memo, parents).
2899
:param random_id: If True the ids being added were randomly generated
2900
and no check for existence will be performed.
2901
:param missing_compression_parents: If True the records being added are
2902
only compressed against texts already in the index (or inside
2903
records). If False the records all refer to unavailable texts (or
2904
texts inside records) as compression parents.
2906
if not self._add_callback:
2907
raise errors.ReadOnlyError(self)
2908
# we hope there are no repositories with inconsistent parentage
2912
compression_parents = set()
2913
key_dependencies = self._key_dependencies
2914
for (key, options, access_memo, parents) in records:
2916
parents = tuple(parents)
2917
if key_dependencies is not None:
2918
key_dependencies.add_references(key, parents)
2919
index, pos, size = access_memo
2920
if 'no-eol' in options:
2924
value += "%d %d" % (pos, size)
2925
if not self._deltas:
2926
if 'line-delta' in options:
2927
raise KnitCorrupt(self, "attempt to add line-delta in non-delta knit")
2930
if 'line-delta' in options:
2931
node_refs = (parents, (parents[0],))
2932
if missing_compression_parents:
2933
compression_parents.add(parents[0])
2935
node_refs = (parents, ())
2937
node_refs = (parents, )
2940
raise KnitCorrupt(self, "attempt to add node with parents "
2941
"in parentless index.")
2943
keys[key] = (value, node_refs)
2946
present_nodes = self._get_entries(keys)
2947
for (index, key, value, node_refs) in present_nodes:
2948
parents = node_refs[:1]
2949
# Sometimes these are passed as a list rather than a tuple
2950
passed = static_tuple.as_tuples(keys[key])
2951
passed_parents = passed[1][:1]
2952
if (value[0] != keys[key][0][0] or
2953
parents != passed_parents):
2954
node_refs = static_tuple.as_tuples(node_refs)
2955
raise KnitCorrupt(self, "inconsistent details in add_records"
2956
": %s %s" % ((value, node_refs), passed))
2960
for key, (value, node_refs) in keys.iteritems():
2961
result.append((key, value, node_refs))
2963
for key, (value, node_refs) in keys.iteritems():
2964
result.append((key, value))
2965
self._add_callback(result)
2966
if missing_compression_parents:
2967
# This may appear to be incorrect (it does not check for
2968
# compression parents that are in the existing graph index),
2969
# but such records won't have been buffered, so this is
2970
# actually correct: every entry when
2971
# missing_compression_parents==True either has a missing parent, or
2972
# a parent that is one of the keys in records.
2973
compression_parents.difference_update(keys)
2974
self._missing_compression_parents.update(compression_parents)
2975
# Adding records may have satisfied missing compression parents.
2976
self._missing_compression_parents.difference_update(keys)
2978
def scan_unvalidated_index(self, graph_index):
2979
"""Inform this _KnitGraphIndex that there is an unvalidated index.
2981
This allows this _KnitGraphIndex to keep track of any missing
2982
compression parents we may want to have filled in to make those
2985
:param graph_index: A GraphIndex
2988
new_missing = graph_index.external_references(ref_list_num=1)
2989
new_missing.difference_update(self.get_parent_map(new_missing))
2990
self._missing_compression_parents.update(new_missing)
2991
if self._key_dependencies is not None:
2992
# Add parent refs from graph_index (and discard parent refs that
2993
# the graph_index has).
2994
for node in graph_index.iter_all_entries():
2995
self._key_dependencies.add_references(node[1], node[3][0])
2997
def get_missing_compression_parents(self):
2998
"""Return the keys of missing compression parents.
3000
Missing compression parents occur when a record stream was missing
3001
basis texts, or a index was scanned that had missing basis texts.
3003
return frozenset(self._missing_compression_parents)
3005
def get_missing_parents(self):
3006
"""Return the keys of missing parents."""
3007
# If updating this, you should also update
3008
# groupcompress._GCGraphIndex.get_missing_parents
3009
# We may have false positives, so filter those out.
3010
self._key_dependencies.satisfy_refs_for_keys(
3011
self.get_parent_map(self._key_dependencies.get_unsatisfied_refs()))
3012
return frozenset(self._key_dependencies.get_unsatisfied_refs())
3014
def _check_read(self):
3015
"""raise if reads are not permitted."""
3016
if not self._is_locked():
3017
raise errors.ObjectNotLocked(self)
3019
def _check_write_ok(self):
3020
"""Assert if writes are not permitted."""
3021
if not self._is_locked():
3022
raise errors.ObjectNotLocked(self)
3024
def _compression_parent(self, an_entry):
3025
# return the key that an_entry is compressed against, or None
3026
# Grab the second parent list (as deltas implies parents currently)
3027
compression_parents = an_entry[3][1]
3028
if not compression_parents:
3030
if len(compression_parents) != 1:
3031
raise AssertionError(
3032
"Too many compression parents: %r" % compression_parents)
3033
return compression_parents[0]
3035
def get_build_details(self, keys):
3036
"""Get the method, index_memo and compression parent for version_ids.
3038
Ghosts are omitted from the result.
3040
:param keys: An iterable of keys.
3041
:return: A dict of key:
3042
(index_memo, compression_parent, parents, record_details).
3044
opaque structure to pass to read_records to extract the raw
3047
Content that this record is built upon, may be None
3049
Logical parents of this node
3051
extra information about the content which needs to be passed to
3052
Factory.parse_record
3056
entries = self._get_entries(keys, False)
3057
for entry in entries:
3059
if not self._parents:
3062
parents = entry[3][0]
3063
if not self._deltas:
3064
compression_parent_key = None
3066
compression_parent_key = self._compression_parent(entry)
3067
noeol = (entry[2][0] == 'N')
3068
if compression_parent_key:
3069
method = 'line-delta'
3072
result[key] = (self._node_to_position(entry),
3073
compression_parent_key, parents,
3077
def _get_entries(self, keys, check_present=False):
3078
"""Get the entries for keys.
3080
:param keys: An iterable of index key tuples.
3085
for node in self._graph_index.iter_entries(keys):
3087
found_keys.add(node[1])
3089
# adapt parentless index to the rest of the code.
3090
for node in self._graph_index.iter_entries(keys):
3091
yield node[0], node[1], node[2], ()
3092
found_keys.add(node[1])
3094
missing_keys = keys.difference(found_keys)
3096
raise RevisionNotPresent(missing_keys.pop(), self)
3098
def get_method(self, key):
3099
"""Return compression method of specified key."""
3100
return self._get_method(self._get_node(key))
3102
def _get_method(self, node):
3103
if not self._deltas:
3105
if self._compression_parent(node):
3110
def _get_node(self, key):
3112
return list(self._get_entries([key]))[0]
3114
raise RevisionNotPresent(key, self)
3116
def get_options(self, key):
3117
"""Return a list representing options.
3121
node = self._get_node(key)
3122
options = [self._get_method(node)]
3123
if node[2][0] == 'N':
3124
options.append('no-eol')
3127
def find_ancestry(self, keys):
3128
"""See CombinedGraphIndex.find_ancestry()"""
3129
return self._graph_index.find_ancestry(keys, 0)
3131
def get_parent_map(self, keys):
3132
"""Get a map of the parents of keys.
3134
:param keys: The keys to look up parents for.
3135
:return: A mapping from keys to parents. Absent keys are absent from
3139
nodes = self._get_entries(keys)
3143
result[node[1]] = node[3][0]
3146
result[node[1]] = None
3149
def get_position(self, key):
3150
"""Return details needed to access the version.
3152
:return: a tuple (index, data position, size) to hand to the access
3153
logic to get the record.
3155
node = self._get_node(key)
3156
return self._node_to_position(node)
3158
has_key = _mod_index._has_key_from_parent_map
3161
"""Get all the keys in the collection.
3163
The keys are not ordered.
3166
return [node[1] for node in self._graph_index.iter_all_entries()]
3168
missing_keys = _mod_index._missing_keys_from_parent_map
3170
def _node_to_position(self, node):
3171
"""Convert an index value to position details."""
3172
bits = node[2][1:].split(' ')
3173
return node[0], int(bits[0]), int(bits[1])
3175
def _sort_keys_by_io(self, keys, positions):
3176
"""Figure out an optimal order to read the records for the given keys.
3178
Sort keys, grouped by index and sorted by position.
3180
:param keys: A list of keys whose records we want to read. This will be
3182
:param positions: A dict, such as the one returned by
3183
_get_components_positions()
3186
def get_index_memo(key):
3187
# index_memo is at offset [1]. It is made up of (GraphIndex,
3188
# position, size). GI is an object, which will be unique for each
3189
# pack file. This causes us to group by pack file, then sort by
3190
# position. Size doesn't matter, but it isn't worth breaking up the
3192
return positions[key][1]
3193
return keys.sort(key=get_index_memo)
3195
_get_total_build_size = _get_total_build_size
3198
class _KnitKeyAccess(object):
3199
"""Access to records in .knit files."""
3201
def __init__(self, transport, mapper):
3202
"""Create a _KnitKeyAccess with transport and mapper.
3204
:param transport: The transport the access object is rooted at.
3205
:param mapper: The mapper used to map keys to .knit files.
3207
self._transport = transport
3208
self._mapper = mapper
3210
def add_raw_records(self, key_sizes, raw_data):
3211
"""Add raw knit bytes to a storage area.
3213
The data is spooled to the container writer in one bytes-record per
3216
:param sizes: An iterable of tuples containing the key and size of each
3218
:param raw_data: A bytestring containing the data.
3219
:return: A list of memos to retrieve the record later. Each memo is an
3220
opaque index memo. For _KnitKeyAccess the memo is (key, pos,
3221
length), where the key is the record key.
3223
if type(raw_data) is not str:
3224
raise AssertionError(
3225
'data must be plain bytes was %s' % type(raw_data))
3228
# TODO: This can be tuned for writing to sftp and other servers where
3229
# append() is relatively expensive by grouping the writes to each key
3231
for key, size in key_sizes:
3232
path = self._mapper.map(key)
3234
base = self._transport.append_bytes(path + '.knit',
3235
raw_data[offset:offset+size])
3236
except errors.NoSuchFile:
3237
self._transport.mkdir(osutils.dirname(path))
3238
base = self._transport.append_bytes(path + '.knit',
3239
raw_data[offset:offset+size])
3243
result.append((key, base, size))
3247
"""Flush pending writes on this access object.
3249
For .knit files this is a no-op.
3253
def get_raw_records(self, memos_for_retrieval):
3254
"""Get the raw bytes for a records.
3256
:param memos_for_retrieval: An iterable containing the access memo for
3257
retrieving the bytes.
3258
:return: An iterator over the bytes of the records.
3260
# first pass, group into same-index request to minimise readv's issued.
3262
current_prefix = None
3263
for (key, offset, length) in memos_for_retrieval:
3264
if current_prefix == key[:-1]:
3265
current_list.append((offset, length))
3267
if current_prefix is not None:
3268
request_lists.append((current_prefix, current_list))
3269
current_prefix = key[:-1]
3270
current_list = [(offset, length)]
3271
# handle the last entry
3272
if current_prefix is not None:
3273
request_lists.append((current_prefix, current_list))
3274
for prefix, read_vector in request_lists:
3275
path = self._mapper.map(prefix) + '.knit'
3276
for pos, data in self._transport.readv(path, read_vector):
3280
class _DirectPackAccess(object):
3281
"""Access to data in one or more packs with less translation."""
3283
def __init__(self, index_to_packs, reload_func=None, flush_func=None):
3284
"""Create a _DirectPackAccess object.
3286
:param index_to_packs: A dict mapping index objects to the transport
3287
and file names for obtaining data.
3288
:param reload_func: A function to call if we determine that the pack
3289
files have moved and we need to reload our caches. See
3290
bzrlib.repo_fmt.pack_repo.AggregateIndex for more details.
3292
self._container_writer = None
3293
self._write_index = None
3294
self._indices = index_to_packs
3295
self._reload_func = reload_func
3296
self._flush_func = flush_func
3298
def add_raw_records(self, key_sizes, raw_data):
3299
"""Add raw knit bytes to a storage area.
3301
The data is spooled to the container writer in one bytes-record per
3304
:param sizes: An iterable of tuples containing the key and size of each
3306
:param raw_data: A bytestring containing the data.
3307
:return: A list of memos to retrieve the record later. Each memo is an
3308
opaque index memo. For _DirectPackAccess the memo is (index, pos,
3309
length), where the index field is the write_index object supplied
3310
to the PackAccess object.
3312
if type(raw_data) is not str:
3313
raise AssertionError(
3314
'data must be plain bytes was %s' % type(raw_data))
3317
for key, size in key_sizes:
3318
p_offset, p_length = self._container_writer.add_bytes_record(
3319
raw_data[offset:offset+size], [])
3321
result.append((self._write_index, p_offset, p_length))
3325
"""Flush pending writes on this access object.
3327
This will flush any buffered writes to a NewPack.
3329
if self._flush_func is not None:
1301
def _record_to_data(self, version_id, digest, lines):
1302
"""Convert version_id, digest, lines into a raw data block.
1304
:return: (len, a StringIO instance with the raw data ready to read.)
1307
data_file = GzipFile(None, mode='wb', fileobj=sio)
1308
data_file.writelines(chain(
1309
["version %s %d %s\n" % (version_id.encode('utf-8'),
1313
["end %s\n" % version_id.encode('utf-8')]))
1320
def add_raw_record(self, raw_data):
1321
"""Append a prepared record to the data file.
1323
:return: the offset in the data file raw_data was written.
1325
assert isinstance(raw_data, str), 'data must be plain bytes'
1326
return self._transport.append(self._filename, StringIO(raw_data))
1328
def add_record(self, version_id, digest, lines):
1329
"""Write new text record to disk. Returns the position in the
1330
file where it was written."""
1331
size, sio = self._record_to_data(version_id, digest, lines)
1333
start_pos = self._transport.append(self._filename, sio)
1334
return start_pos, size
1336
def _parse_record_header(self, version_id, raw_data):
1337
"""Parse a record header for consistency.
1339
:return: the header and the decompressor stream.
1340
as (stream, header_record)
1342
df = GzipFile(mode='rb', fileobj=StringIO(raw_data))
1343
rec = df.readline().split()
1345
raise KnitCorrupt(self._filename, 'unexpected number of elements in record header')
1346
if rec[1].decode('utf-8')!= version_id:
1347
raise KnitCorrupt(self._filename,
1348
'unexpected version, wanted %r, got %r' % (
1349
version_id, rec[1]))
1352
def _parse_record(self, version_id, data):
1354
# 4168 calls in 2880 217 internal
1355
# 4168 calls to _parse_record_header in 2121
1356
# 4168 calls to readlines in 330
1357
df, rec = self._parse_record_header(version_id, data)
1358
record_contents = df.readlines()
1359
l = record_contents.pop()
1360
assert len(record_contents) == int(rec[2])
1361
if l.decode('utf-8') != 'end %s\n' % version_id:
1362
raise KnitCorrupt(self._filename, 'unexpected version end line %r, wanted %r'
1365
return record_contents, rec[3]
1367
def read_records_iter_raw(self, records):
1368
"""Read text records from data file and yield raw data.
1370
This unpacks enough of the text record to validate the id is
1371
as expected but thats all.
1373
It will actively recompress currently cached records on the
1374
basis that that is cheaper than I/O activity.
1376
# setup an iterator of the external records:
1377
# uses readv so nice and fast we hope.
1379
# grab the disk data needed.
1380
raw_records = self._transport.readv(self._filename,
1381
[(pos, size) for version_id, pos, size in records])
1383
for version_id, pos, size in records:
1384
pos, data = raw_records.next()
1385
# validate the header
1386
df, rec = self._parse_record_header(version_id, data)
1388
yield version_id, data
1390
def read_records_iter(self, records):
1391
"""Read text records from data file and yield result.
1393
Each passed record is a tuple of (version_id, pos, len) and
1394
will be read in the given order. Yields (version_id,
1397
if len(records) == 0:
1400
# 60890 calls for 4168 extractions in 5045, 683 internal.
1401
# 4168 calls to readv in 1411
1402
# 4168 calls to parse_record in 2880
1404
# Get unique records, sorted by position
1405
needed_records = sorted(set(records), key=operator.itemgetter(1))
1407
# We take it that the transport optimizes the fetching as good
1408
# as possible (ie, reads continuous ranges.)
1409
response = self._transport.readv(self._filename,
1410
[(pos, size) for version_id, pos, size in needed_records])
1413
for (record_id, pos, size), (pos, data) in \
1414
izip(iter(needed_records), response):
1415
content, digest = self._parse_record(record_id, data)
1416
record_map[record_id] = (digest, content)
1418
for version_id, pos, size in records:
1419
digest, content = record_map[version_id]
1420
yield version_id, content, digest
1422
def read_records(self, records):
1423
"""Read records into a dictionary."""
1425
for record_id, content, digest in self.read_records_iter(records):
1426
components[record_id] = (content, digest)
1430
class InterKnit(InterVersionedFile):
1431
"""Optimised code paths for knit to knit operations."""
1433
_matching_file_from_factory = KnitVersionedFile
1434
_matching_file_to_factory = KnitVersionedFile
1437
def is_compatible(source, target):
1438
"""Be compatible with knits. """
1440
return (isinstance(source, KnitVersionedFile) and
1441
isinstance(target, KnitVersionedFile))
1442
except AttributeError:
1445
def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1446
"""See InterVersionedFile.join."""
1447
assert isinstance(self.source, KnitVersionedFile)
1448
assert isinstance(self.target, KnitVersionedFile)
1450
version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1455
pb = bzrlib.ui.ui_factory.nested_progress_bar()
1457
version_ids = list(version_ids)
1458
if None in version_ids:
1459
version_ids.remove(None)
1461
self.source_ancestry = set(self.source.get_ancestry(version_ids))
1462
this_versions = set(self.target._index.get_versions())
1463
needed_versions = self.source_ancestry - this_versions
1464
cross_check_versions = self.source_ancestry.intersection(this_versions)
1465
mismatched_versions = set()
1466
for version in cross_check_versions:
1467
# scan to include needed parents.
1468
n1 = set(self.target.get_parents_with_ghosts(version))
1469
n2 = set(self.source.get_parents_with_ghosts(version))
1471
# FIXME TEST this check for cycles being introduced works
1472
# the logic is we have a cycle if in our graph we are an
1473
# ancestor of any of the n2 revisions.
1479
parent_ancestors = self.source.get_ancestry(parent)
1480
if version in parent_ancestors:
1481
raise errors.GraphCycleError([parent, version])
1482
# ensure this parent will be available later.
1483
new_parents = n2.difference(n1)
1484
needed_versions.update(new_parents.difference(this_versions))
1485
mismatched_versions.add(version)
1487
if not needed_versions and not mismatched_versions:
1489
full_list = topo_sort(self.source.get_graph())
1491
version_list = [i for i in full_list if (not self.target.has_version(i)
1492
and i in needed_versions)]
1496
copy_queue_records = []
1498
for version_id in version_list:
1499
options = self.source._index.get_options(version_id)
1500
parents = self.source._index.get_parents_with_ghosts(version_id)
1501
# check that its will be a consistent copy:
1502
for parent in parents:
1503
# if source has the parent, we must :
1504
# * already have it or
1505
# * have it scheduled already
1506
# otherwise we don't care
1507
assert (self.target.has_version(parent) or
1508
parent in copy_set or
1509
not self.source.has_version(parent))
1510
data_pos, data_size = self.source._index.get_position(version_id)
1511
copy_queue_records.append((version_id, data_pos, data_size))
1512
copy_queue.append((version_id, options, parents))
1513
copy_set.add(version_id)
1515
# data suck the join:
1517
total = len(version_list)
1520
for (version_id, raw_data), \
1521
(version_id2, options, parents) in \
1522
izip(self.source._data.read_records_iter_raw(copy_queue_records),
1524
assert version_id == version_id2, 'logic error, inconsistent results'
1526
pb.update("Joining knit", count, total)
1527
raw_records.append((version_id, options, parents, len(raw_data)))
1528
raw_datum.append(raw_data)
1529
self.target._add_raw_records(raw_records, ''.join(raw_datum))
1531
for version in mismatched_versions:
1532
# FIXME RBC 20060309 is this needed?
1533
n1 = set(self.target.get_parents_with_ghosts(version))
1534
n2 = set(self.source.get_parents_with_ghosts(version))
1535
# write a combined record to our history preserving the current
1536
# parents as first in the list
1537
new_parents = self.target.get_parents_with_ghosts(version) + list(n2.difference(n1))
1538
self.target.fix_parents(version, new_parents)
1544
InterVersionedFile.register_optimiser(InterKnit)
1547
class WeaveToKnit(InterVersionedFile):
1548
"""Optimised code paths for weave to knit operations."""
1550
_matching_file_from_factory = bzrlib.weave.WeaveFile
1551
_matching_file_to_factory = KnitVersionedFile
1554
def is_compatible(source, target):
1555
"""Be compatible with weaves to knits."""
1557
return (isinstance(source, bzrlib.weave.Weave) and
1558
isinstance(target, KnitVersionedFile))
1559
except AttributeError:
1562
def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1563
"""See InterVersionedFile.join."""
1564
assert isinstance(self.source, bzrlib.weave.Weave)
1565
assert isinstance(self.target, KnitVersionedFile)
1567
version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1572
pb = bzrlib.ui.ui_factory.nested_progress_bar()
1574
version_ids = list(version_ids)
1576
self.source_ancestry = set(self.source.get_ancestry(version_ids))
1577
this_versions = set(self.target._index.get_versions())
1578
needed_versions = self.source_ancestry - this_versions
1579
cross_check_versions = self.source_ancestry.intersection(this_versions)
1580
mismatched_versions = set()
1581
for version in cross_check_versions:
1582
# scan to include needed parents.
1583
n1 = set(self.target.get_parents_with_ghosts(version))
1584
n2 = set(self.source.get_parents(version))
1585
# if all of n2's parents are in n1, then its fine.
1586
if n2.difference(n1):
1587
# FIXME TEST this check for cycles being introduced works
1588
# the logic is we have a cycle if in our graph we are an
1589
# ancestor of any of the n2 revisions.
1595
parent_ancestors = self.source.get_ancestry(parent)
1596
if version in parent_ancestors:
1597
raise errors.GraphCycleError([parent, version])
1598
# ensure this parent will be available later.
1599
new_parents = n2.difference(n1)
1600
needed_versions.update(new_parents.difference(this_versions))
1601
mismatched_versions.add(version)
1603
if not needed_versions and not mismatched_versions:
1605
full_list = topo_sort(self.source.get_graph())
1607
version_list = [i for i in full_list if (not self.target.has_version(i)
1608
and i in needed_versions)]
1612
total = len(version_list)
1613
for version_id in version_list:
1614
pb.update("Converting to knit", count, total)
1615
parents = self.source.get_parents(version_id)
1616
# check that its will be a consistent copy:
1617
for parent in parents:
1618
# if source has the parent, we must already have it
1619
assert (self.target.has_version(parent))
1620
self.target.add_lines(
1621
version_id, parents, self.source.get_lines(version_id))
1624
for version in mismatched_versions:
1625
# FIXME RBC 20060309 is this needed?
1626
n1 = set(self.target.get_parents_with_ghosts(version))
1627
n2 = set(self.source.get_parents(version))
1628
# write a combined record to our history preserving the current
1629
# parents as first in the list
1630
new_parents = self.target.get_parents_with_ghosts(version) + list(n2.difference(n1))
1631
self.target.fix_parents(version, new_parents)
1637
InterVersionedFile.register_optimiser(WeaveToKnit)
1640
class KnitSequenceMatcher(difflib.SequenceMatcher):
1641
"""Knit tuned sequence matcher.
1643
This is based on profiling of difflib which indicated some improvements
1644
for our usage pattern.
1647
def find_longest_match(self, alo, ahi, blo, bhi):
1648
"""Find longest matching block in a[alo:ahi] and b[blo:bhi].
1650
If isjunk is not defined:
1652
Return (i,j,k) such that a[i:i+k] is equal to b[j:j+k], where
1653
alo <= i <= i+k <= ahi
1654
blo <= j <= j+k <= bhi
1655
and for all (i',j',k') meeting those conditions,
1658
and if i == i', j <= j'
1660
In other words, of all maximal matching blocks, return one that
1661
starts earliest in a, and of all those maximal matching blocks that
1662
start earliest in a, return the one that starts earliest in b.
1664
>>> s = SequenceMatcher(None, " abcd", "abcd abcd")
1665
>>> s.find_longest_match(0, 5, 0, 9)
1668
If isjunk is defined, first the longest matching block is
1669
determined as above, but with the additional restriction that no
1670
junk element appears in the block. Then that block is extended as
1671
far as possible by matching (only) junk elements on both sides. So
1672
the resulting block never matches on junk except as identical junk
1673
happens to be adjacent to an "interesting" match.
1675
Here's the same example as before, but considering blanks to be
1676
junk. That prevents " abcd" from matching the " abcd" at the tail
1677
end of the second sequence directly. Instead only the "abcd" can
1678
match, and matches the leftmost "abcd" in the second sequence:
1680
>>> s = SequenceMatcher(lambda x: x==" ", " abcd", "abcd abcd")
1681
>>> s.find_longest_match(0, 5, 0, 9)
1684
If no blocks match, return (alo, blo, 0).
1686
>>> s = SequenceMatcher(None, "ab", "c")
1687
>>> s.find_longest_match(0, 2, 0, 1)
1691
# CAUTION: stripping common prefix or suffix would be incorrect.
1695
# Longest matching block is "ab", but if common prefix is
1696
# stripped, it's "a" (tied with "b"). UNIX(tm) diff does so
1697
# strip, so ends up claiming that ab is changed to acab by
1698
# inserting "ca" in the middle. That's minimal but unintuitive:
1699
# "it's obvious" that someone inserted "ac" at the front.
1700
# Windiff ends up at the same place as diff, but by pairing up
1701
# the unique 'b's and then matching the first two 'a's.
1703
a, b, b2j, isbjunk = self.a, self.b, self.b2j, self.isbjunk
1704
besti, bestj, bestsize = alo, blo, 0
1705
# find longest junk-free match
1706
# during an iteration of the loop, j2len[j] = length of longest
1707
# junk-free match ending with a[i-1] and b[j]
1711
for i in xrange(alo, ahi):
1712
# look at all instances of a[i] in b; note that because
1713
# b2j has no junk keys, the loop is skipped if a[i] is junk
1714
j2lenget = j2len.get
3332
def get_raw_records(self, memos_for_retrieval):
3333
"""Get the raw bytes for a records.
1717
# changing b2j.get(a[i], nothing) to a try:KeyError pair produced the
1718
# following improvement
1719
# 704 0 4650.5320 2620.7410 bzrlib.knit:1336(find_longest_match)
1720
# +326674 0 1655.1210 1655.1210 +<method 'get' of 'dict' objects>
1721
# +76519 0 374.6700 374.6700 +<method 'has_key' of 'dict' objects>
1723
# 704 0 3733.2820 2209.6520 bzrlib.knit:1336(find_longest_match)
1724
# +211400 0 1147.3520 1147.3520 +<method 'get' of 'dict' objects>
1725
# +76519 0 376.2780 376.2780 +<method 'has_key' of 'dict' objects>
3335
:param memos_for_retrieval: An iterable containing the (index, pos,
3336
length) memo for retrieving the bytes. The Pack access method
3337
looks up the pack to use for a given record in its index_to_pack
3339
:return: An iterator over the bytes of the records.
3341
# first pass, group into same-index requests
3343
current_index = None
3344
for (index, offset, length) in memos_for_retrieval:
3345
if current_index == index:
3346
current_list.append((offset, length))
3348
if current_index is not None:
3349
request_lists.append((current_index, current_list))
3350
current_index = index
3351
current_list = [(offset, length)]
3352
# handle the last entry
3353
if current_index is not None:
3354
request_lists.append((current_index, current_list))
3355
for index, offsets in request_lists:
3357
transport, path = self._indices[index]
3358
1729
except KeyError:
3359
# A KeyError here indicates that someone has triggered an index
3360
# reload, and this index has gone missing, we need to start
3362
if self._reload_func is None:
3363
# If we don't have a _reload_func there is nothing that can
3366
raise errors.RetryWithNewPacks(index,
3367
reload_occurred=True,
3368
exc_info=sys.exc_info())
3370
reader = pack.make_readv_reader(transport, path, offsets)
3371
for names, read_func in reader.iter_records():
3372
yield read_func(None)
3373
except errors.NoSuchFile:
3374
# A NoSuchFile error indicates that a pack file has gone
3375
# missing on disk, we need to trigger a reload, and start over.
3376
if self._reload_func is None:
3378
raise errors.RetryWithNewPacks(transport.abspath(path),
3379
reload_occurred=False,
3380
exc_info=sys.exc_info())
3382
def set_writer(self, writer, index, transport_packname):
3383
"""Set a writer to use for adding data."""
3384
if index is not None:
3385
self._indices[index] = transport_packname
3386
self._container_writer = writer
3387
self._write_index = index
3389
def reload_or_raise(self, retry_exc):
3390
"""Try calling the reload function, or re-raise the original exception.
3392
This should be called after _DirectPackAccess raises a
3393
RetryWithNewPacks exception. This function will handle the common logic
3394
of determining when the error is fatal versus being temporary.
3395
It will also make sure that the original exception is raised, rather
3396
than the RetryWithNewPacks exception.
3398
If this function returns, then the calling function should retry
3399
whatever operation was being performed. Otherwise an exception will
3402
:param retry_exc: A RetryWithNewPacks exception.
3405
if self._reload_func is None:
3407
elif not self._reload_func():
3408
# The reload claimed that nothing changed
3409
if not retry_exc.reload_occurred:
3410
# If there wasn't an earlier reload, then we really were
3411
# expecting to find changes. We didn't find them, so this is a
3415
exc_class, exc_value, exc_traceback = retry_exc.exc_info
3416
raise exc_class, exc_value, exc_traceback
3419
# Deprecated, use PatienceSequenceMatcher instead
3420
KnitSequenceMatcher = patiencediff.PatienceSequenceMatcher
3423
def annotate_knit(knit, revision_id):
3424
"""Annotate a knit with no cached annotations.
3426
This implementation is for knits with no cached annotations.
3427
It will work for knits with cached annotations, but this is not
3430
annotator = _KnitAnnotator(knit)
3431
return iter(annotator.annotate_flat(revision_id))
3434
class _KnitAnnotator(annotate.Annotator):
3435
"""Build up the annotations for a text."""
3437
def __init__(self, vf):
3438
annotate.Annotator.__init__(self, vf)
3440
# TODO: handle Nodes which cannot be extracted
3441
# self._ghosts = set()
3443
# Map from (key, parent_key) => matching_blocks, should be 'use once'
3444
self._matching_blocks = {}
3446
# KnitContent objects
3447
self._content_objects = {}
3448
# The number of children that depend on this fulltext content object
3449
self._num_compression_children = {}
3450
# Delta records that need their compression parent before they can be
3452
self._pending_deltas = {}
3453
# Fulltext records that are waiting for their parents fulltexts before
3454
# they can be yielded for annotation
3455
self._pending_annotation = {}
3457
self._all_build_details = {}
3459
def _get_build_graph(self, key):
3460
"""Get the graphs for building texts and annotations.
3462
The data you need for creating a full text may be different than the
3463
data you need to annotate that text. (At a minimum, you need both
3464
parents to create an annotation, but only need 1 parent to generate the
3467
:return: A list of (key, index_memo) records, suitable for
3468
passing to read_records_iter to start reading in the raw data from
3471
pending = set([key])
3474
self._num_needed_children[key] = 1
3476
# get all pending nodes
3477
this_iteration = pending
3478
build_details = self._vf._index.get_build_details(this_iteration)
3479
self._all_build_details.update(build_details)
3480
# new_nodes = self._vf._index._get_entries(this_iteration)
3482
for key, details in build_details.iteritems():
3483
(index_memo, compression_parent, parent_keys,
3484
record_details) = details
3485
self._parent_map[key] = parent_keys
3486
self._heads_provider = None
3487
records.append((key, index_memo))
3488
# Do we actually need to check _annotated_lines?
3489
pending.update([p for p in parent_keys
3490
if p not in self._all_build_details])
3492
for parent_key in parent_keys:
3493
if parent_key in self._num_needed_children:
3494
self._num_needed_children[parent_key] += 1
3496
self._num_needed_children[parent_key] = 1
3497
if compression_parent:
3498
if compression_parent in self._num_compression_children:
3499
self._num_compression_children[compression_parent] += 1
3501
self._num_compression_children[compression_parent] = 1
3503
missing_versions = this_iteration.difference(build_details.keys())
3504
if missing_versions:
3505
for key in missing_versions:
3506
if key in self._parent_map and key in self._text_cache:
3507
# We already have this text ready, we just need to
3508
# yield it later so we get it annotated
3510
parent_keys = self._parent_map[key]
3511
for parent_key in parent_keys:
3512
if parent_key in self._num_needed_children:
3513
self._num_needed_children[parent_key] += 1
3515
self._num_needed_children[parent_key] = 1
3516
pending.update([p for p in parent_keys
3517
if p not in self._all_build_details])
3519
raise errors.RevisionNotPresent(key, self._vf)
3520
# Generally we will want to read the records in reverse order, because
3521
# we find the parent nodes after the children
3523
return records, ann_keys
3525
def _get_needed_texts(self, key, pb=None):
3526
# if True or len(self._vf._fallback_vfs) > 0:
3527
if len(self._vf._fallback_vfs) > 0:
3528
# If we have fallbacks, go to the generic path
3529
for v in annotate.Annotator._get_needed_texts(self, key, pb=pb):
3534
records, ann_keys = self._get_build_graph(key)
3535
for idx, (sub_key, text, num_lines) in enumerate(
3536
self._extract_texts(records)):
3538
pb.update('annotating', idx, len(records))
3539
yield sub_key, text, num_lines
3540
for sub_key in ann_keys:
3541
text = self._text_cache[sub_key]
3542
num_lines = len(text) # bad assumption
3543
yield sub_key, text, num_lines
3545
except errors.RetryWithNewPacks, e:
3546
self._vf._access.reload_or_raise(e)
3547
# The cached build_details are no longer valid
3548
self._all_build_details.clear()
3550
def _cache_delta_blocks(self, key, compression_parent, delta, lines):
3551
parent_lines = self._text_cache[compression_parent]
3552
blocks = list(KnitContent.get_line_delta_blocks(delta, parent_lines, lines))
3553
self._matching_blocks[(key, compression_parent)] = blocks
3555
def _expand_record(self, key, parent_keys, compression_parent, record,
3558
if compression_parent:
3559
if compression_parent not in self._content_objects:
3560
# Waiting for the parent
3561
self._pending_deltas.setdefault(compression_parent, []).append(
3562
(key, parent_keys, record, record_details))
3564
# We have the basis parent, so expand the delta
3565
num = self._num_compression_children[compression_parent]
3568
base_content = self._content_objects.pop(compression_parent)
3569
self._num_compression_children.pop(compression_parent)
3571
self._num_compression_children[compression_parent] = num
3572
base_content = self._content_objects[compression_parent]
3573
# It is tempting to want to copy_base_content=False for the last
3574
# child object. However, whenever noeol=False,
3575
# self._text_cache[parent_key] is content._lines. So mutating it
3576
# gives very bad results.
3577
# The alternative is to copy the lines into text cache, but then we
3578
# are copying anyway, so just do it here.
3579
content, delta = self._vf._factory.parse_record(
3580
key, record, record_details, base_content,
3581
copy_base_content=True)
3584
content, _ = self._vf._factory.parse_record(
3585
key, record, record_details, None)
3586
if self._num_compression_children.get(key, 0) > 0:
3587
self._content_objects[key] = content
3588
lines = content.text()
3589
self._text_cache[key] = lines
3590
if delta is not None:
3591
self._cache_delta_blocks(key, compression_parent, delta, lines)
3594
def _get_parent_annotations_and_matches(self, key, text, parent_key):
3595
"""Get the list of annotations for the parent, and the matching lines.
3597
:param text: The opaque value given by _get_needed_texts
3598
:param parent_key: The key for the parent text
3599
:return: (parent_annotations, matching_blocks)
3600
parent_annotations is a list as long as the number of lines in
3602
matching_blocks is a list of (parent_idx, text_idx, len) tuples
3603
indicating which lines match between the two texts
3605
block_key = (key, parent_key)
3606
if block_key in self._matching_blocks:
3607
blocks = self._matching_blocks.pop(block_key)
3608
parent_annotations = self._annotations_cache[parent_key]
3609
return parent_annotations, blocks
3610
return annotate.Annotator._get_parent_annotations_and_matches(self,
3611
key, text, parent_key)
3613
def _process_pending(self, key):
3614
"""The content for 'key' was just processed.
3616
Determine if there is any more pending work to be processed.
3619
if key in self._pending_deltas:
3620
compression_parent = key
3621
children = self._pending_deltas.pop(key)
3622
for child_key, parent_keys, record, record_details in children:
3623
lines = self._expand_record(child_key, parent_keys,
3625
record, record_details)
3626
if self._check_ready_for_annotations(child_key, parent_keys):
3627
to_return.append(child_key)
3628
# Also check any children that are waiting for this parent to be
3630
if key in self._pending_annotation:
3631
children = self._pending_annotation.pop(key)
3632
to_return.extend([c for c, p_keys in children
3633
if self._check_ready_for_annotations(c, p_keys)])
3636
def _check_ready_for_annotations(self, key, parent_keys):
3637
"""return true if this text is ready to be yielded.
3639
Otherwise, this will return False, and queue the text into
3640
self._pending_annotation
3642
for parent_key in parent_keys:
3643
if parent_key not in self._annotations_cache:
3644
# still waiting on at least one parent text, so queue it up
3645
# Note that if there are multiple parents, we need to wait
3647
self._pending_annotation.setdefault(parent_key,
3648
[]).append((key, parent_keys))
3652
def _extract_texts(self, records):
3653
"""Extract the various texts needed based on records"""
3654
# We iterate in the order read, rather than a strict order requested
3655
# However, process what we can, and put off to the side things that
3656
# still need parents, cleaning them up when those parents are
3659
# 1) As 'records' are read, see if we can expand these records into
3660
# Content objects (and thus lines)
3661
# 2) If a given line-delta is waiting on its compression parent, it
3662
# gets queued up into self._pending_deltas, otherwise we expand
3663
# it, and put it into self._text_cache and self._content_objects
3664
# 3) If we expanded the text, we will then check to see if all
3665
# parents have also been processed. If so, this text gets yielded,
3666
# else this record gets set aside into pending_annotation
3667
# 4) Further, if we expanded the text in (2), we will then check to
3668
# see if there are any children in self._pending_deltas waiting to
3669
# also be processed. If so, we go back to (2) for those
3670
# 5) Further again, if we yielded the text, we can then check if that
3671
# 'unlocks' any of the texts in pending_annotations, which should
3672
# then get yielded as well
3673
# Note that both steps 4 and 5 are 'recursive' in that unlocking one
3674
# compression child could unlock yet another, and yielding a fulltext
3675
# will also 'unlock' the children that are waiting on that annotation.
3676
# (Though also, unlocking 1 parent's fulltext, does not unlock a child
3677
# if other parents are also waiting.)
3678
# We want to yield content before expanding child content objects, so
3679
# that we know when we can re-use the content lines, and the annotation
3680
# code can know when it can stop caching fulltexts, as well.
3682
# Children that are missing their compression parent
3684
for (key, record, digest) in self._vf._read_records_iter(records):
3686
details = self._all_build_details[key]
3687
(_, compression_parent, parent_keys, record_details) = details
3688
lines = self._expand_record(key, parent_keys, compression_parent,
3689
record, record_details)
3691
# Pending delta should be queued up
3693
# At this point, we may be able to yield this content, if all
3694
# parents are also finished
3695
yield_this_text = self._check_ready_for_annotations(key,
3698
# All parents present
3699
yield key, lines, len(lines)
3700
to_process = self._process_pending(key)
3702
this_process = to_process
3704
for key in this_process:
3705
lines = self._text_cache[key]
3706
yield key, lines, len(lines)
3707
to_process.extend(self._process_pending(key))
3710
from bzrlib._knit_load_data_pyx import _load_data_c as _load_data
3711
except ImportError, e:
3712
osutils.failed_to_load_extension(e)
3713
from bzrlib._knit_load_data_py import _load_data_py as _load_data
1737
k = newj2len[j] = 1 + j2lenget(-1 + j, 0)
1739
besti, bestj, bestsize = 1 + i-k, 1 + j-k, k
1742
# Extend the best by non-junk elements on each end. In particular,
1743
# "popular" non-junk elements aren't in b2j, which greatly speeds
1744
# the inner loop above, but also means "the best" match so far
1745
# doesn't contain any junk *or* popular non-junk elements.
1746
while besti > alo and bestj > blo and \
1747
not isbjunk(b[bestj-1]) and \
1748
a[besti-1] == b[bestj-1]:
1749
besti, bestj, bestsize = besti-1, bestj-1, bestsize+1
1750
while besti+bestsize < ahi and bestj+bestsize < bhi and \
1751
not isbjunk(b[bestj+bestsize]) and \
1752
a[besti+bestsize] == b[bestj+bestsize]:
1755
# Now that we have a wholly interesting match (albeit possibly
1756
# empty!), we may as well suck up the matching junk on each
1757
# side of it too. Can't think of a good reason not to, and it
1758
# saves post-processing the (possibly considerable) expense of
1759
# figuring out what to do with it. In the case of an empty
1760
# interesting match, this is clearly the right thing to do,
1761
# because no other kind of match is possible in the regions.
1762
while besti > alo and bestj > blo and \
1763
isbjunk(b[bestj-1]) and \
1764
a[besti-1] == b[bestj-1]:
1765
besti, bestj, bestsize = besti-1, bestj-1, bestsize+1
1766
while besti+bestsize < ahi and bestj+bestsize < bhi and \
1767
isbjunk(b[bestj+bestsize]) and \
1768
a[besti+bestsize] == b[bestj+bestsize]:
1769
bestsize = bestsize + 1
1771
return besti, bestj, bestsize
added
removed
bzrlib/knit.py
