2052.3.2
by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical |
1 |
# Copyright (C) 2005, 2006 Canonical Ltd
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
2 |
#
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
17 |
"""Knit versionedfile implementation.
|
|
18 |
||
19 |
A knit is a versioned file implementation that supports efficient append only
|
|
20 |
updates.
|
|
1563.2.6
by Robert Collins
Start check tests for knits (pending), and remove dead code. |
21 |
|
22 |
Knit file layout:
|
|
23 |
lifeless: the data file is made up of "delta records". each delta record has a delta header
|
|
24 |
that contains; (1) a version id, (2) the size of the delta (in lines), and (3) the digest of
|
|
25 |
the -expanded data- (ie, the delta applied to the parent). the delta also ends with a
|
|
26 |
end-marker; simply "end VERSION"
|
|
27 |
||
28 |
delta can be line or full contents.a
|
|
29 |
... the 8's there are the index number of the annotation.
|
|
30 |
version robertc@robertcollins.net-20051003014215-ee2990904cc4c7ad 7 c7d23b2a5bd6ca00e8e266cec0ec228158ee9f9e
|
|
31 |
59,59,3
|
|
32 |
8
|
|
33 |
8 if ie.executable:
|
|
34 |
8 e.set('executable', 'yes')
|
|
35 |
130,130,2
|
|
36 |
8 if elt.get('executable') == 'yes':
|
|
37 |
8 ie.executable = True
|
|
38 |
end robertc@robertcollins.net-20051003014215-ee2990904cc4c7ad
|
|
39 |
||
40 |
||
41 |
whats in an index:
|
|
42 |
09:33 < jrydberg> lifeless: each index is made up of a tuple of; version id, options, position, size, parents
|
|
43 |
09:33 < jrydberg> lifeless: the parents are currently dictionary compressed
|
|
44 |
09:33 < jrydberg> lifeless: (meaning it currently does not support ghosts)
|
|
45 |
09:33 < lifeless> right
|
|
46 |
09:33 < jrydberg> lifeless: the position and size is the range in the data file
|
|
47 |
||
48 |
||
49 |
so the index sequence is the dictionary compressed sequence number used
|
|
50 |
in the deltas to provide line annotation
|
|
51 |
||
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
52 |
"""
|
53 |
||
1563.2.6
by Robert Collins
Start check tests for knits (pending), and remove dead code. |
54 |
# TODOS:
|
55 |
# 10:16 < lifeless> make partial index writes safe
|
|
56 |
# 10:16 < lifeless> implement 'knit.check()' like weave.check()
|
|
57 |
# 10:17 < lifeless> record known ghosts so we can detect when they are filled in rather than the current 'reweave
|
|
58 |
# always' approach.
|
|
1563.2.11
by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis. |
59 |
# move sha1 out of the content so that join is faster at verifying parents
|
60 |
# record content length ?
|
|
1563.2.6
by Robert Collins
Start check tests for knits (pending), and remove dead code. |
61 |
|
62 |
||
1594.2.24
by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching. |
63 |
from copy import copy |
1563.2.11
by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis. |
64 |
from cStringIO import StringIO |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
65 |
import difflib |
1596.2.28
by Robert Collins
more knit profile based tuning. |
66 |
from itertools import izip, chain |
1756.2.17
by Aaron Bentley
Fixes suggested by John Meinel |
67 |
import operator |
1563.2.6
by Robert Collins
Start check tests for knits (pending), and remove dead code. |
68 |
import os |
1628.1.2
by Robert Collins
More knit micro-optimisations. |
69 |
import sys |
1756.2.29
by Aaron Bentley
Remove basis knit support |
70 |
import warnings |
1594.2.19
by Robert Collins
More coalescing tweaks, and knit feedback. |
71 |
|
1594.2.17
by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading. |
72 |
import bzrlib |
1911.2.3
by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids |
73 |
from bzrlib import ( |
74 |
cache_utf8, |
|
75 |
errors, |
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
76 |
osutils, |
2104.4.2
by John Arbash Meinel
Small cleanup and NEWS entry about fixing bug #65714 |
77 |
patiencediff, |
2039.1.1
by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000) |
78 |
progress, |
2196.2.1
by John Arbash Meinel
Merge Dmitry's optimizations and minimize the actual diff. |
79 |
ui, |
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
80 |
)
|
81 |
from bzrlib.errors import ( |
|
82 |
FileExists, |
|
83 |
NoSuchFile, |
|
84 |
KnitError, |
|
85 |
InvalidRevisionId, |
|
86 |
KnitCorrupt, |
|
87 |
KnitHeaderError, |
|
88 |
RevisionNotPresent, |
|
89 |
RevisionAlreadyPresent, |
|
90 |
)
|
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
91 |
from bzrlib.tuned_gzip import GzipFile |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
92 |
from bzrlib.trace import mutter |
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
93 |
from bzrlib.osutils import ( |
94 |
contains_whitespace, |
|
95 |
contains_linebreaks, |
|
96 |
sha_strings, |
|
97 |
)
|
|
1756.2.29
by Aaron Bentley
Remove basis knit support |
98 |
from bzrlib.symbol_versioning import DEPRECATED_PARAMETER, deprecated_passed |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
99 |
from bzrlib.tsort import topo_sort |
2094.3.5
by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used |
100 |
import bzrlib.ui |
1684.3.3
by Robert Collins
Add a special cased weaves to knit converter. |
101 |
import bzrlib.weave |
1911.2.1
by John Arbash Meinel
Cache encode/decode operations, saves memory and time. Especially when committing a new kernel tree with 7.7M new lines to annotate |
102 |
from bzrlib.versionedfile import VersionedFile, InterVersionedFile |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
103 |
|
104 |
||
105 |
# TODO: Split out code specific to this format into an associated object.
|
|
106 |
||
107 |
# TODO: Can we put in some kind of value to check that the index and data
|
|
108 |
# files belong together?
|
|
109 |
||
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
110 |
# TODO: accommodate binaries, perhaps by storing a byte count
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
111 |
|
112 |
# TODO: function to check whole file
|
|
113 |
||
114 |
# TODO: atomically append data, then measure backwards from the cursor
|
|
115 |
# position after writing to work out where it was located. we may need to
|
|
116 |
# bypass python file buffering.
|
|
117 |
||
118 |
DATA_SUFFIX = '.knit' |
|
119 |
INDEX_SUFFIX = '.kndx' |
|
120 |
||
121 |
||
122 |
class KnitContent(object): |
|
123 |
"""Content of a knit version to which deltas can be applied."""
|
|
124 |
||
125 |
def __init__(self, lines): |
|
126 |
self._lines = lines |
|
127 |
||
128 |
def annotate_iter(self): |
|
129 |
"""Yield tuples of (origin, text) for each content line."""
|
|
2151.1.1
by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests |
130 |
return iter(self._lines) |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
131 |
|
132 |
def annotate(self): |
|
133 |
"""Return a list of (origin, text) tuples."""
|
|
134 |
return list(self.annotate_iter()) |
|
135 |
||
136 |
def line_delta_iter(self, new_lines): |
|
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
137 |
"""Generate line-based delta from this content to new_lines."""
|
2151.1.1
by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests |
138 |
new_texts = new_lines.text() |
139 |
old_texts = self.text() |
|
1711.2.11
by John Arbash Meinel
Rename patiencediff.SequenceMatcher => PatienceSequenceMatcher and knit.SequenceMatcher => KnitSequenceMatcher |
140 |
s = KnitSequenceMatcher(None, old_texts, new_texts) |
2151.1.1
by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests |
141 |
for tag, i1, i2, j1, j2 in s.get_opcodes(): |
142 |
if tag == 'equal': |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
143 |
continue
|
2151.1.1
by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests |
144 |
# ofrom, oto, length, data
|
145 |
yield i1, i2, j2 - j1, new_lines._lines[j1:j2] |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
146 |
|
147 |
def line_delta(self, new_lines): |
|
148 |
return list(self.line_delta_iter(new_lines)) |
|
149 |
||
150 |
def text(self): |
|
151 |
return [text for origin, text in self._lines] |
|
152 |
||
1756.3.7
by Aaron Bentley
Avoid re-parsing texts version components |
153 |
def copy(self): |
154 |
return KnitContent(self._lines[:]) |
|
155 |
||
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
156 |
|
157 |
class _KnitFactory(object): |
|
158 |
"""Base factory for creating content objects."""
|
|
159 |
||
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
160 |
def make(self, lines, version_id): |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
161 |
num_lines = len(lines) |
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
162 |
return KnitContent(zip([version_id] * num_lines, lines)) |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
163 |
|
164 |
||
165 |
class KnitAnnotateFactory(_KnitFactory): |
|
166 |
"""Factory for creating annotated Content objects."""
|
|
167 |
||
168 |
annotated = True |
|
169 |
||
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
170 |
def parse_fulltext(self, content, version_id): |
1596.2.7
by Robert Collins
Remove the requirement for reannotation in knit joins. |
171 |
"""Convert fulltext to internal representation
|
172 |
||
173 |
fulltext content is of the format
|
|
174 |
revid(utf8) plaintext\n
|
|
175 |
internal representation is of the format:
|
|
176 |
(revid, plaintext)
|
|
177 |
"""
|
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
178 |
# TODO: jam 20070209 The tests expect this to be returned as tuples,
|
179 |
# but the code itself doesn't really depend on that.
|
|
180 |
# Figure out a way to not require the overhead of turning the
|
|
181 |
# list back into tuples.
|
|
182 |
lines = [tuple(line.split(' ', 1)) for line in content] |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
183 |
return KnitContent(lines) |
184 |
||
185 |
def parse_line_delta_iter(self, lines): |
|
2163.1.2
by John Arbash Meinel
Don't modify the list during parse_line_delta |
186 |
return iter(self.parse_line_delta(lines)) |
1628.1.2
by Robert Collins
More knit micro-optimisations. |
187 |
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
188 |
def parse_line_delta(self, lines, version_id): |
1596.2.7
by Robert Collins
Remove the requirement for reannotation in knit joins. |
189 |
"""Convert a line based delta into internal representation.
|
190 |
||
191 |
line delta is in the form of:
|
|
192 |
intstart intend intcount
|
|
193 |
1..count lines:
|
|
194 |
revid(utf8) newline\n
|
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
195 |
internal representation is
|
1596.2.7
by Robert Collins
Remove the requirement for reannotation in knit joins. |
196 |
(start, end, count, [1..count tuples (revid, newline)])
|
197 |
"""
|
|
1628.1.2
by Robert Collins
More knit micro-optimisations. |
198 |
result = [] |
199 |
lines = iter(lines) |
|
200 |
next = lines.next |
|
2249.5.1
by John Arbash Meinel
Leave revision-ids in utf-8 when reading. |
201 |
|
2249.5.15
by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down. |
202 |
cache = {} |
203 |
def cache_and_return(line): |
|
204 |
origin, text = line.split(' ', 1) |
|
205 |
return cache.setdefault(origin, origin), text |
|
206 |
||
1628.1.2
by Robert Collins
More knit micro-optimisations. |
207 |
# walk through the lines parsing.
|
208 |
for header in lines: |
|
209 |
start, end, count = [int(n) for n in header.split(',')] |
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
210 |
contents = [tuple(next().split(' ', 1)) for i in xrange(count)] |
1628.1.2
by Robert Collins
More knit micro-optimisations. |
211 |
result.append((start, end, count, contents)) |
212 |
return result |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
213 |
|
2163.2.2
by John Arbash Meinel
Don't deal with annotations when we don't care about them. Saves another 300+ms |
214 |
def get_fulltext_content(self, lines): |
215 |
"""Extract just the content lines from a fulltext."""
|
|
216 |
return (line.split(' ', 1)[1] for line in lines) |
|
217 |
||
218 |
def get_linedelta_content(self, lines): |
|
219 |
"""Extract just the content from a line delta.
|
|
220 |
||
221 |
This doesn't return all of the extra information stored in a delta.
|
|
222 |
Only the actual content lines.
|
|
223 |
"""
|
|
224 |
lines = iter(lines) |
|
225 |
next = lines.next |
|
226 |
for header in lines: |
|
227 |
header = header.split(',') |
|
228 |
count = int(header[2]) |
|
229 |
for i in xrange(count): |
|
230 |
origin, text = next().split(' ', 1) |
|
231 |
yield text |
|
232 |
||
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
233 |
def lower_fulltext(self, content): |
1596.2.7
by Robert Collins
Remove the requirement for reannotation in knit joins. |
234 |
"""convert a fulltext content record into a serializable form.
|
235 |
||
236 |
see parse_fulltext which this inverts.
|
|
237 |
"""
|
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
238 |
# TODO: jam 20070209 We only do the caching thing to make sure that
|
239 |
# the origin is a valid utf-8 line, eventually we could remove it
|
|
2249.5.15
by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down. |
240 |
return ['%s %s' % (o, t) for o, t in content._lines] |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
241 |
|
242 |
def lower_line_delta(self, delta): |
|
1596.2.7
by Robert Collins
Remove the requirement for reannotation in knit joins. |
243 |
"""convert a delta into a serializable form.
|
244 |
||
1628.1.2
by Robert Collins
More knit micro-optimisations. |
245 |
See parse_line_delta which this inverts.
|
1596.2.7
by Robert Collins
Remove the requirement for reannotation in knit joins. |
246 |
"""
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
247 |
# TODO: jam 20070209 We only do the caching thing to make sure that
|
248 |
# the origin is a valid utf-8 line, eventually we could remove it
|
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
249 |
out = [] |
250 |
for start, end, c, lines in delta: |
|
251 |
out.append('%d,%d,%d\n' % (start, end, c)) |
|
2249.5.15
by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down. |
252 |
out.extend(origin + ' ' + text |
1911.2.1
by John Arbash Meinel
Cache encode/decode operations, saves memory and time. Especially when committing a new kernel tree with 7.7M new lines to annotate |
253 |
for origin, text in lines) |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
254 |
return out |
255 |
||
256 |
||
257 |
class KnitPlainFactory(_KnitFactory): |
|
258 |
"""Factory for creating plain Content objects."""
|
|
259 |
||
260 |
annotated = False |
|
261 |
||
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
262 |
def parse_fulltext(self, content, version_id): |
1596.2.7
by Robert Collins
Remove the requirement for reannotation in knit joins. |
263 |
"""This parses an unannotated fulltext.
|
264 |
||
265 |
Note that this is not a noop - the internal representation
|
|
266 |
has (versionid, line) - its just a constant versionid.
|
|
267 |
"""
|
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
268 |
return self.make(content, version_id) |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
269 |
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
270 |
def parse_line_delta_iter(self, lines, version_id): |
2163.1.2
by John Arbash Meinel
Don't modify the list during parse_line_delta |
271 |
cur = 0 |
272 |
num_lines = len(lines) |
|
273 |
while cur < num_lines: |
|
274 |
header = lines[cur] |
|
275 |
cur += 1 |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
276 |
start, end, c = [int(n) for n in header.split(',')] |
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
277 |
yield start, end, c, zip([version_id] * c, lines[cur:cur+c]) |
2163.1.2
by John Arbash Meinel
Don't modify the list during parse_line_delta |
278 |
cur += c |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
279 |
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
280 |
def parse_line_delta(self, lines, version_id): |
281 |
return list(self.parse_line_delta_iter(lines, version_id)) |
|
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
282 |
|
2163.2.2
by John Arbash Meinel
Don't deal with annotations when we don't care about them. Saves another 300+ms |
283 |
def get_fulltext_content(self, lines): |
284 |
"""Extract just the content lines from a fulltext."""
|
|
285 |
return iter(lines) |
|
286 |
||
287 |
def get_linedelta_content(self, lines): |
|
288 |
"""Extract just the content from a line delta.
|
|
289 |
||
290 |
This doesn't return all of the extra information stored in a delta.
|
|
291 |
Only the actual content lines.
|
|
292 |
"""
|
|
293 |
lines = iter(lines) |
|
294 |
next = lines.next |
|
295 |
for header in lines: |
|
296 |
header = header.split(',') |
|
297 |
count = int(header[2]) |
|
298 |
for i in xrange(count): |
|
299 |
yield next() |
|
300 |
||
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
301 |
def lower_fulltext(self, content): |
302 |
return content.text() |
|
303 |
||
304 |
def lower_line_delta(self, delta): |
|
305 |
out = [] |
|
306 |
for start, end, c, lines in delta: |
|
307 |
out.append('%d,%d,%d\n' % (start, end, c)) |
|
308 |
out.extend([text for origin, text in lines]) |
|
309 |
return out |
|
310 |
||
311 |
||
312 |
def make_empty_knit(transport, relpath): |
|
313 |
"""Construct a empty knit at the specified location."""
|
|
1563.2.5
by Robert Collins
Remove unused transaction references from knit.py and the versionedfile interface. |
314 |
k = KnitVersionedFile(transport, relpath, 'w', KnitPlainFactory) |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
315 |
k._data._open_file() |
316 |
||
317 |
||
318 |
class KnitVersionedFile(VersionedFile): |
|
319 |
"""Weave-like structure with faster random access.
|
|
320 |
||
321 |
A knit stores a number of texts and a summary of the relationships
|
|
322 |
between them. Texts are identified by a string version-id. Texts
|
|
323 |
are normally stored and retrieved as a series of lines, but can
|
|
324 |
also be passed as single strings.
|
|
325 |
||
326 |
Lines are stored with the trailing newline (if any) included, to
|
|
327 |
avoid special cases for files with no final newline. Lines are
|
|
328 |
composed of 8-bit characters, not unicode. The combination of
|
|
329 |
these approaches should mean any 'binary' file can be safely
|
|
330 |
stored and retrieved.
|
|
331 |
"""
|
|
332 |
||
1946.2.12
by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put |
333 |
def __init__(self, relpath, transport, file_mode=None, access_mode=None, |
1756.2.29
by Aaron Bentley
Remove basis knit support |
334 |
factory=None, basis_knit=DEPRECATED_PARAMETER, delta=True, |
1946.2.12
by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put |
335 |
create=False, create_parent_dir=False, delay_create=False, |
336 |
dir_mode=None): |
|
1563.2.25
by Robert Collins
Merge in upstream. |
337 |
"""Construct a knit at location specified by relpath.
|
338 |
|
|
339 |
:param create: If not True, only open an existing knit.
|
|
1946.2.1
by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories |
340 |
:param create_parent_dir: If True, create the parent directory if
|
341 |
creating the file fails. (This is used for stores with
|
|
342 |
hash-prefixes that may not exist yet)
|
|
343 |
:param delay_create: The calling code is aware that the knit won't
|
|
344 |
actually be created until the first data is stored.
|
|
1563.2.25
by Robert Collins
Merge in upstream. |
345 |
"""
|
1756.2.29
by Aaron Bentley
Remove basis knit support |
346 |
if deprecated_passed(basis_knit): |
347 |
warnings.warn("KnitVersionedFile.__(): The basis_knit parameter is" |
|
348 |
" deprecated as of bzr 0.9.", |
|
349 |
DeprecationWarning, stacklevel=2) |
|
1563.2.16
by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable. |
350 |
if access_mode is None: |
351 |
access_mode = 'w' |
|
1594.2.23
by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files. |
352 |
super(KnitVersionedFile, self).__init__(access_mode) |
1563.2.16
by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable. |
353 |
assert access_mode in ('r', 'w'), "invalid mode specified %r" % access_mode |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
354 |
self.transport = transport |
355 |
self.filename = relpath |
|
1563.2.16
by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable. |
356 |
self.factory = factory or KnitAnnotateFactory() |
357 |
self.writable = (access_mode == 'w') |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
358 |
self.delta = delta |
359 |
||
2147.1.1
by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size |
360 |
self._max_delta_chain = 200 |
361 |
||
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
362 |
self._index = _KnitIndex(transport, relpath + INDEX_SUFFIX, |
1946.2.1
by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories |
363 |
access_mode, create=create, file_mode=file_mode, |
1946.2.12
by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put |
364 |
create_parent_dir=create_parent_dir, delay_create=delay_create, |
365 |
dir_mode=dir_mode) |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
366 |
self._data = _KnitData(transport, relpath + DATA_SUFFIX, |
1946.2.1
by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories |
367 |
access_mode, create=create and not len(self), file_mode=file_mode, |
1946.2.12
by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put |
368 |
create_parent_dir=create_parent_dir, delay_create=delay_create, |
369 |
dir_mode=dir_mode) |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
370 |
|
1704.2.10
by Martin Pool
Add KnitVersionedFile.__repr__ method |
371 |
def __repr__(self): |
372 |
return '%s(%s)' % (self.__class__.__name__, |
|
373 |
self.transport.abspath(self.filename)) |
|
374 |
||
2147.1.1
by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size |
375 |
def _check_should_delta(self, first_parents): |
376 |
"""Iterate back through the parent listing, looking for a fulltext.
|
|
377 |
||
378 |
This is used when we want to decide whether to add a delta or a new
|
|
379 |
fulltext. It searches for _max_delta_chain parents. When it finds a
|
|
380 |
fulltext parent, it sees if the total size of the deltas leading up to
|
|
381 |
it is large enough to indicate that we want a new full text anyway.
|
|
382 |
||
383 |
Return True if we should create a new delta, False if we should use a
|
|
384 |
full text.
|
|
385 |
"""
|
|
386 |
delta_size = 0 |
|
387 |
fulltext_size = None |
|
388 |
delta_parents = first_parents |
|
2147.1.2
by John Arbash Meinel
Simplify the knit max-chain detection code. |
389 |
for count in xrange(self._max_delta_chain): |
2147.1.1
by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size |
390 |
parent = delta_parents[0] |
391 |
method = self._index.get_method(parent) |
|
392 |
pos, size = self._index.get_position(parent) |
|
393 |
if method == 'fulltext': |
|
394 |
fulltext_size = size |
|
395 |
break
|
|
396 |
delta_size += size |
|
397 |
delta_parents = self._index.get_parents(parent) |
|
2147.1.2
by John Arbash Meinel
Simplify the knit max-chain detection code. |
398 |
else: |
399 |
# We couldn't find a fulltext, so we must create a new one
|
|
2147.1.1
by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size |
400 |
return False |
2147.1.2
by John Arbash Meinel
Simplify the knit max-chain detection code. |
401 |
|
402 |
return fulltext_size > delta_size |
|
2147.1.1
by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size |
403 |
|
1596.2.37
by Robert Collins
Switch to delta based content copying in the generic versioned file copier. |
404 |
def _add_delta(self, version_id, parents, delta_parent, sha1, noeol, delta): |
405 |
"""See VersionedFile._add_delta()."""
|
|
406 |
self._check_add(version_id, []) # should we check the lines ? |
|
407 |
self._check_versions_present(parents) |
|
408 |
present_parents = [] |
|
409 |
ghosts = [] |
|
410 |
parent_texts = {} |
|
411 |
for parent in parents: |
|
412 |
if not self.has_version(parent): |
|
413 |
ghosts.append(parent) |
|
414 |
else: |
|
415 |
present_parents.append(parent) |
|
416 |
||
417 |
if delta_parent is None: |
|
418 |
# reconstitute as full text.
|
|
419 |
assert len(delta) == 1 or len(delta) == 0 |
|
420 |
if len(delta): |
|
421 |
assert delta[0][0] == 0 |
|
1596.2.38
by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready. |
422 |
assert delta[0][1] == 0, delta[0][1] |
1596.2.37
by Robert Collins
Switch to delta based content copying in the generic versioned file copier. |
423 |
return super(KnitVersionedFile, self)._add_delta(version_id, |
424 |
parents, |
|
425 |
delta_parent, |
|
426 |
sha1, |
|
427 |
noeol, |
|
428 |
delta) |
|
429 |
||
430 |
digest = sha1 |
|
431 |
||
432 |
options = [] |
|
433 |
if noeol: |
|
434 |
options.append('no-eol') |
|
435 |
||
436 |
if delta_parent is not None: |
|
437 |
# determine the current delta chain length.
|
|
438 |
# To speed the extract of texts the delta chain is limited
|
|
439 |
# to a fixed number of deltas. This should minimize both
|
|
440 |
# I/O and the time spend applying deltas.
|
|
2147.1.1
by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size |
441 |
# The window was changed to a maximum of 200 deltas, but also added
|
442 |
# was a check that the total compressed size of the deltas is
|
|
443 |
# smaller than the compressed size of the fulltext.
|
|
444 |
if not self._check_should_delta([delta_parent]): |
|
445 |
# We don't want a delta here, just do a normal insertion.
|
|
1596.2.37
by Robert Collins
Switch to delta based content copying in the generic versioned file copier. |
446 |
return super(KnitVersionedFile, self)._add_delta(version_id, |
447 |
parents, |
|
448 |
delta_parent, |
|
449 |
sha1, |
|
450 |
noeol, |
|
451 |
delta) |
|
452 |
||
453 |
options.append('line-delta') |
|
454 |
store_lines = self.factory.lower_line_delta(delta) |
|
455 |
||
456 |
where, size = self._data.add_record(version_id, digest, store_lines) |
|
457 |
self._index.add_version(version_id, options, where, size, parents) |
|
458 |
||
1692.2.1
by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions. |
459 |
def _add_raw_records(self, records, data): |
460 |
"""Add all the records 'records' with data pre-joined in 'data'.
|
|
461 |
||
462 |
:param records: A list of tuples(version_id, options, parents, size).
|
|
463 |
:param data: The data for the records. When it is written, the records
|
|
464 |
are adjusted to have pos pointing into data by the sum of
|
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
465 |
the preceding records sizes.
|
1692.2.1
by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions. |
466 |
"""
|
467 |
# write all the data
|
|
468 |
pos = self._data.add_raw_record(data) |
|
1863.1.1
by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit |
469 |
offset = 0 |
1692.2.1
by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions. |
470 |
index_entries = [] |
471 |
for (version_id, options, parents, size) in records: |
|
1863.1.1
by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit |
472 |
index_entries.append((version_id, options, pos+offset, |
473 |
size, parents)) |
|
474 |
if self._data._do_cache: |
|
475 |
self._data._cache[version_id] = data[offset:offset+size] |
|
476 |
offset += size |
|
1692.2.1
by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions. |
477 |
self._index.add_versions(index_entries) |
478 |
||
1863.1.1
by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit |
479 |
def enable_cache(self): |
480 |
"""Start caching data for this knit"""
|
|
481 |
self._data.enable_cache() |
|
482 |
||
1594.2.24
by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching. |
483 |
def clear_cache(self): |
484 |
"""Clear the data cache only."""
|
|
485 |
self._data.clear_cache() |
|
486 |
||
1563.2.15
by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages. |
487 |
def copy_to(self, name, transport): |
488 |
"""See VersionedFile.copy_to()."""
|
|
489 |
# copy the current index to a temp index to avoid racing with local
|
|
490 |
# writes
|
|
1955.3.30
by John Arbash Meinel
fix small bug |
491 |
transport.put_file_non_atomic(name + INDEX_SUFFIX + '.tmp', |
1955.3.24
by John Arbash Meinel
Update Knit to use the new non_atomic_foo functions |
492 |
self.transport.get(self._index._filename)) |
1563.2.15
by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages. |
493 |
# copy the data file
|
1711.7.25
by John Arbash Meinel
try/finally to close files, _KnitData was keeping a handle to a file it never used again, and using transport.rename() when it wanted transport.move() |
494 |
f = self._data._open_file() |
495 |
try: |
|
1955.3.8
by John Arbash Meinel
avoid some deprecation warnings in other parts of the code |
496 |
transport.put_file(name + DATA_SUFFIX, f) |
1711.7.25
by John Arbash Meinel
try/finally to close files, _KnitData was keeping a handle to a file it never used again, and using transport.rename() when it wanted transport.move() |
497 |
finally: |
498 |
f.close() |
|
499 |
# move the copied index into place
|
|
500 |
transport.move(name + INDEX_SUFFIX + '.tmp', name + INDEX_SUFFIX) |
|
1563.2.15
by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages. |
501 |
|
1563.2.13
by Robert Collins
InterVersionedFile implemented. |
502 |
def create_empty(self, name, transport, mode=None): |
1955.3.8
by John Arbash Meinel
avoid some deprecation warnings in other parts of the code |
503 |
return KnitVersionedFile(name, transport, factory=self.factory, |
504 |
delta=self.delta, create=True) |
|
1563.2.15
by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages. |
505 |
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
506 |
def _fix_parents(self, version_id, new_parents): |
1594.2.7
by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc. |
507 |
"""Fix the parents list for version.
|
508 |
|
|
509 |
This is done by appending a new version to the index
|
|
510 |
with identical data except for the parents list.
|
|
511 |
the parents list must be a superset of the current
|
|
512 |
list.
|
|
513 |
"""
|
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
514 |
current_values = self._index._cache[version_id] |
1594.2.7
by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc. |
515 |
assert set(current_values[4]).difference(set(new_parents)) == set() |
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
516 |
self._index.add_version(version_id, |
1594.2.7
by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc. |
517 |
current_values[1], |
518 |
current_values[2], |
|
519 |
current_values[3], |
|
520 |
new_parents) |
|
521 |
||
1596.2.36
by Robert Collins
add a get_delta api to versioned_file. |
522 |
def get_delta(self, version_id): |
523 |
"""Get a delta for constructing version from some other version."""
|
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
524 |
version_id = osutils.safe_revision_id(version_id) |
2229.2.3
by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY |
525 |
self.check_not_reserved_id(version_id) |
1596.2.36
by Robert Collins
add a get_delta api to versioned_file. |
526 |
if not self.has_version(version_id): |
527 |
raise RevisionNotPresent(version_id, self.filename) |
|
528 |
||
529 |
parents = self.get_parents(version_id) |
|
530 |
if len(parents): |
|
531 |
parent = parents[0] |
|
532 |
else: |
|
533 |
parent = None |
|
534 |
data_pos, data_size = self._index.get_position(version_id) |
|
535 |
data, sha1 = self._data.read_records(((version_id, data_pos, data_size),))[version_id] |
|
1596.2.37
by Robert Collins
Switch to delta based content copying in the generic versioned file copier. |
536 |
noeol = 'no-eol' in self._index.get_options(version_id) |
1596.2.36
by Robert Collins
add a get_delta api to versioned_file. |
537 |
if 'fulltext' == self._index.get_method(version_id): |
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
538 |
new_content = self.factory.parse_fulltext(data, version_id) |
1596.2.36
by Robert Collins
add a get_delta api to versioned_file. |
539 |
if parent is not None: |
540 |
reference_content = self._get_content(parent) |
|
541 |
old_texts = reference_content.text() |
|
542 |
else: |
|
543 |
old_texts = [] |
|
544 |
new_texts = new_content.text() |
|
1711.2.11
by John Arbash Meinel
Rename patiencediff.SequenceMatcher => PatienceSequenceMatcher and knit.SequenceMatcher => KnitSequenceMatcher |
545 |
delta_seq = KnitSequenceMatcher(None, old_texts, new_texts) |
1596.2.37
by Robert Collins
Switch to delta based content copying in the generic versioned file copier. |
546 |
return parent, sha1, noeol, self._make_line_delta(delta_seq, new_content) |
1596.2.36
by Robert Collins
add a get_delta api to versioned_file. |
547 |
else: |
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
548 |
delta = self.factory.parse_line_delta(data, version_id) |
1596.2.37
by Robert Collins
Switch to delta based content copying in the generic versioned file copier. |
549 |
return parent, sha1, noeol, delta |
1596.2.36
by Robert Collins
add a get_delta api to versioned_file. |
550 |
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
551 |
def get_graph_with_ghosts(self): |
552 |
"""See VersionedFile.get_graph_with_ghosts()."""
|
|
553 |
graph_items = self._index.get_graph() |
|
554 |
return dict(graph_items) |
|
555 |
||
1666.1.6
by Robert Collins
Make knit the default format. |
556 |
def get_sha1(self, version_id): |
557 |
"""See VersionedFile.get_sha1()."""
|
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
558 |
version_id = osutils.safe_revision_id(version_id) |
1910.2.65
by Aaron Bentley
Remove the check-parent patch |
559 |
record_map = self._get_record_map([version_id]) |
560 |
method, content, digest, next = record_map[version_id] |
|
561 |
return digest |
|
1666.1.6
by Robert Collins
Make knit the default format. |
562 |
|
1563.2.15
by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages. |
563 |
@staticmethod
|
564 |
def get_suffixes(): |
|
565 |
"""See VersionedFile.get_suffixes()."""
|
|
566 |
return [DATA_SUFFIX, INDEX_SUFFIX] |
|
1563.2.13
by Robert Collins
InterVersionedFile implemented. |
567 |
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
568 |
def has_ghost(self, version_id): |
569 |
"""True if there is a ghost reference in the file to version_id."""
|
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
570 |
version_id = osutils.safe_revision_id(version_id) |
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
571 |
# maybe we have it
|
572 |
if self.has_version(version_id): |
|
573 |
return False |
|
1759.2.2
by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron. |
574 |
# optimisable if needed by memoising the _ghosts set.
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
575 |
items = self._index.get_graph() |
576 |
for node, parents in items: |
|
577 |
for parent in parents: |
|
578 |
if parent not in self._index._cache: |
|
579 |
if parent == version_id: |
|
580 |
return True |
|
581 |
return False |
|
582 |
||
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
583 |
def versions(self): |
584 |
"""See VersionedFile.versions."""
|
|
585 |
return self._index.get_versions() |
|
586 |
||
587 |
def has_version(self, version_id): |
|
588 |
"""See VersionedFile.has_version."""
|
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
589 |
version_id = osutils.safe_revision_id(version_id) |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
590 |
return self._index.has_version(version_id) |
591 |
||
592 |
__contains__ = has_version |
|
593 |
||
1596.2.34
by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation. |
594 |
def _merge_annotations(self, content, parents, parent_texts={}, |
595 |
delta=None, annotated=None): |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
596 |
"""Merge annotations for content. This is done by comparing
|
1596.2.27
by Robert Collins
Note potential improvements in knit adds. |
597 |
the annotations based on changed to the text.
|
598 |
"""
|
|
1596.2.34
by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation. |
599 |
if annotated: |
1596.2.36
by Robert Collins
add a get_delta api to versioned_file. |
600 |
delta_seq = None |
601 |
for parent_id in parents: |
|
1596.2.34
by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation. |
602 |
merge_content = self._get_content(parent_id, parent_texts) |
2104.4.2
by John Arbash Meinel
Small cleanup and NEWS entry about fixing bug #65714 |
603 |
seq = patiencediff.PatienceSequenceMatcher( |
2100.2.1
by wang
Replace python's difflib by patiencediff because the worst case |
604 |
None, merge_content.text(), content.text()) |
1596.2.36
by Robert Collins
add a get_delta api to versioned_file. |
605 |
if delta_seq is None: |
606 |
# setup a delta seq to reuse.
|
|
607 |
delta_seq = seq |
|
1596.2.34
by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation. |
608 |
for i, j, n in seq.get_matching_blocks(): |
609 |
if n == 0: |
|
610 |
continue
|
|
611 |
# this appears to copy (origin, text) pairs across to the new
|
|
612 |
# content for any line that matches the last-checked parent.
|
|
613 |
# FIXME: save the sequence control data for delta compression
|
|
614 |
# against the most relevant parent rather than rediffing.
|
|
615 |
content._lines[j:j+n] = merge_content._lines[i:i+n] |
|
1596.2.36
by Robert Collins
add a get_delta api to versioned_file. |
616 |
if delta: |
617 |
if not annotated: |
|
618 |
reference_content = self._get_content(parents[0], parent_texts) |
|
619 |
new_texts = content.text() |
|
620 |
old_texts = reference_content.text() |
|
2104.4.2
by John Arbash Meinel
Small cleanup and NEWS entry about fixing bug #65714 |
621 |
delta_seq = patiencediff.PatienceSequenceMatcher( |
2100.2.1
by wang
Replace python's difflib by patiencediff because the worst case |
622 |
None, old_texts, new_texts) |
1596.2.36
by Robert Collins
add a get_delta api to versioned_file. |
623 |
return self._make_line_delta(delta_seq, content) |
624 |
||
625 |
def _make_line_delta(self, delta_seq, new_content): |
|
626 |
"""Generate a line delta from delta_seq and new_content."""
|
|
627 |
diff_hunks = [] |
|
628 |
for op in delta_seq.get_opcodes(): |
|
629 |
if op[0] == 'equal': |
|
630 |
continue
|
|
631 |
diff_hunks.append((op[1], op[2], op[4]-op[3], new_content._lines[op[3]:op[4]])) |
|
1596.2.34
by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation. |
632 |
return diff_hunks |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
633 |
|
1756.3.17
by Aaron Bentley
Combine get_components_positions with get_components_versions |
634 |
def _get_components_positions(self, version_ids): |
1756.3.19
by Aaron Bentley
Documentation and cleanups |
635 |
"""Produce a map of position data for the components of versions.
|
636 |
||
1756.3.22
by Aaron Bentley
Tweaks from review |
637 |
This data is intended to be used for retrieving the knit records.
|
1756.3.19
by Aaron Bentley
Documentation and cleanups |
638 |
|
639 |
A dict of version_id to (method, data_pos, data_size, next) is
|
|
640 |
returned.
|
|
641 |
method is the way referenced data should be applied.
|
|
642 |
data_pos is the position of the data in the knit.
|
|
643 |
data_size is the size of the data in the knit.
|
|
644 |
next is the build-parent of the version, or None for fulltexts.
|
|
645 |
"""
|
|
1756.3.9
by Aaron Bentley
More optimization refactoring |
646 |
component_data = {} |
647 |
for version_id in version_ids: |
|
648 |
cursor = version_id |
|
649 |
||
1756.3.10
by Aaron Bentley
Optimize selection and retrieval of records |
650 |
while cursor is not None and cursor not in component_data: |
1756.2.29
by Aaron Bentley
Remove basis knit support |
651 |
method = self._index.get_method(cursor) |
1756.3.10
by Aaron Bentley
Optimize selection and retrieval of records |
652 |
if method == 'fulltext': |
653 |
next = None |
|
654 |
else: |
|
1756.2.29
by Aaron Bentley
Remove basis knit support |
655 |
next = self.get_parents(cursor)[0] |
1756.3.17
by Aaron Bentley
Combine get_components_positions with get_components_versions |
656 |
data_pos, data_size = self._index.get_position(cursor) |
657 |
component_data[cursor] = (method, data_pos, data_size, next) |
|
1756.3.10
by Aaron Bentley
Optimize selection and retrieval of records |
658 |
cursor = next |
659 |
return component_data |
|
1756.3.18
by Aaron Bentley
More cleanup |
660 |
|
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
661 |
def _get_content(self, version_id, parent_texts={}): |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
662 |
"""Returns a content object that makes up the specified
|
663 |
version."""
|
|
664 |
if not self.has_version(version_id): |
|
665 |
raise RevisionNotPresent(version_id, self.filename) |
|
666 |
||
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
667 |
cached_version = parent_texts.get(version_id, None) |
668 |
if cached_version is not None: |
|
669 |
return cached_version |
|
670 |
||
1756.3.22
by Aaron Bentley
Tweaks from review |
671 |
text_map, contents_map = self._get_content_maps([version_id]) |
672 |
return contents_map[version_id] |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
673 |
|
674 |
def _check_versions_present(self, version_ids): |
|
675 |
"""Check that all specified versions are present."""
|
|
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
676 |
self._index.check_versions_present(version_ids) |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
677 |
|
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
678 |
def _add_lines_with_ghosts(self, version_id, parents, lines, parent_texts): |
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
679 |
"""See VersionedFile.add_lines_with_ghosts()."""
|
680 |
self._check_add(version_id, lines) |
|
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
681 |
return self._add(version_id, lines[:], parents, self.delta, parent_texts) |
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
682 |
|
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
683 |
def _add_lines(self, version_id, parents, lines, parent_texts): |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
684 |
"""See VersionedFile.add_lines."""
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
685 |
self._check_add(version_id, lines) |
686 |
self._check_versions_present(parents) |
|
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
687 |
return self._add(version_id, lines[:], parents, self.delta, parent_texts) |
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
688 |
|
689 |
def _check_add(self, version_id, lines): |
|
690 |
"""check that version_id and lines are safe to add."""
|
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
691 |
assert self.writable, "knit is not opened for write" |
692 |
### FIXME escape. RBC 20060228
|
|
693 |
if contains_whitespace(version_id): |
|
1668.5.1
by Olaf Conradi
Fix bug in knits when raising InvalidRevisionId without the required |
694 |
raise InvalidRevisionId(version_id, self.filename) |
2229.2.3
by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY |
695 |
self.check_not_reserved_id(version_id) |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
696 |
if self.has_version(version_id): |
697 |
raise RevisionAlreadyPresent(version_id, self.filename) |
|
1666.1.6
by Robert Collins
Make knit the default format. |
698 |
self._check_lines_not_unicode(lines) |
699 |
self._check_lines_are_lines(lines) |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
700 |
|
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
701 |
def _add(self, version_id, lines, parents, delta, parent_texts): |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
702 |
"""Add a set of lines on top of version specified by parents.
|
703 |
||
704 |
If delta is true, compress the text as a line-delta against
|
|
705 |
the first parent.
|
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
706 |
|
707 |
Any versions not present will be converted into ghosts.
|
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
708 |
"""
|
1596.2.28
by Robert Collins
more knit profile based tuning. |
709 |
# 461 0 6546.0390 43.9100 bzrlib.knit:489(_add)
|
710 |
# +400 0 889.4890 418.9790 +bzrlib.knit:192(lower_fulltext)
|
|
711 |
# +461 0 1364.8070 108.8030 +bzrlib.knit:996(add_record)
|
|
712 |
# +461 0 193.3940 41.5720 +bzrlib.knit:898(add_version)
|
|
713 |
# +461 0 134.0590 18.3810 +bzrlib.osutils:361(sha_strings)
|
|
714 |
# +461 0 36.3420 15.4540 +bzrlib.knit:146(make)
|
|
715 |
# +1383 0 8.0370 8.0370 +<len>
|
|
716 |
# +61 0 13.5770 7.9190 +bzrlib.knit:199(lower_line_delta)
|
|
717 |
# +61 0 963.3470 7.8740 +bzrlib.knit:427(_get_content)
|
|
718 |
# +61 0 973.9950 5.2950 +bzrlib.knit:136(line_delta)
|
|
719 |
# +61 0 1918.1800 5.2640 +bzrlib.knit:359(_merge_annotations)
|
|
720 |
||
1596.2.10
by Robert Collins
Reviewer feedback on knit branches. |
721 |
present_parents = [] |
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
722 |
ghosts = [] |
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
723 |
if parent_texts is None: |
724 |
parent_texts = {} |
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
725 |
for parent in parents: |
726 |
if not self.has_version(parent): |
|
727 |
ghosts.append(parent) |
|
1594.2.9
by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all. |
728 |
else: |
1596.2.10
by Robert Collins
Reviewer feedback on knit branches. |
729 |
present_parents.append(parent) |
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
730 |
|
1596.2.10
by Robert Collins
Reviewer feedback on knit branches. |
731 |
if delta and not len(present_parents): |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
732 |
delta = False |
733 |
||
734 |
digest = sha_strings(lines) |
|
735 |
options = [] |
|
736 |
if lines: |
|
737 |
if lines[-1][-1] != '\n': |
|
738 |
options.append('no-eol') |
|
739 |
lines[-1] = lines[-1] + '\n' |
|
740 |
||
1596.2.10
by Robert Collins
Reviewer feedback on knit branches. |
741 |
if len(present_parents) and delta: |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
742 |
# To speed the extract of texts the delta chain is limited
|
743 |
# to a fixed number of deltas. This should minimize both
|
|
744 |
# I/O and the time spend applying deltas.
|
|
2147.1.1
by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size |
745 |
delta = self._check_should_delta(present_parents) |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
746 |
|
2249.5.15
by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down. |
747 |
assert isinstance(version_id, str) |
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
748 |
lines = self.factory.make(lines, version_id) |
1596.2.34
by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation. |
749 |
if delta or (self.factory.annotated and len(present_parents) > 0): |
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
750 |
# Merge annotations from parent texts if so is needed.
|
1596.2.34
by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation. |
751 |
delta_hunks = self._merge_annotations(lines, present_parents, parent_texts, |
752 |
delta, self.factory.annotated) |
|
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
753 |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
754 |
if delta: |
755 |
options.append('line-delta') |
|
756 |
store_lines = self.factory.lower_line_delta(delta_hunks) |
|
757 |
else: |
|
758 |
options.append('fulltext') |
|
759 |
store_lines = self.factory.lower_fulltext(lines) |
|
760 |
||
761 |
where, size = self._data.add_record(version_id, digest, store_lines) |
|
762 |
self._index.add_version(version_id, options, where, size, parents) |
|
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
763 |
return lines |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
764 |
|
1563.2.19
by Robert Collins
stub out a check for knits. |
765 |
def check(self, progress_bar=None): |
766 |
"""See VersionedFile.check()."""
|
|
767 |
||
1594.2.24
by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching. |
768 |
def _clone_text(self, new_version_id, old_version_id, parents): |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
769 |
"""See VersionedFile.clone_text()."""
|
1756.2.8
by Aaron Bentley
Implement get_line_list, cleanups |
770 |
# FIXME RBC 20060228 make fast by only inserting an index with null
|
771 |
# delta.
|
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
772 |
self.add_lines(new_version_id, parents, self.get_lines(old_version_id)) |
773 |
||
774 |
def get_lines(self, version_id): |
|
775 |
"""See VersionedFile.get_lines()."""
|
|
1756.2.8
by Aaron Bentley
Implement get_line_list, cleanups |
776 |
return self.get_line_list([version_id])[0] |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
777 |
|
1756.3.12
by Aaron Bentley
Stuff all text-building data in record_map |
778 |
def _get_record_map(self, version_ids): |
1756.3.19
by Aaron Bentley
Documentation and cleanups |
779 |
"""Produce a dictionary of knit records.
|
780 |
|
|
781 |
The keys are version_ids, the values are tuples of (method, content,
|
|
782 |
digest, next).
|
|
783 |
method is the way the content should be applied.
|
|
784 |
content is a KnitContent object.
|
|
785 |
digest is the SHA1 digest of this version id after all steps are done
|
|
786 |
next is the build-parent of the version, i.e. the leftmost ancestor.
|
|
787 |
If the method is fulltext, next will be None.
|
|
788 |
"""
|
|
1756.3.12
by Aaron Bentley
Stuff all text-building data in record_map |
789 |
position_map = self._get_components_positions(version_ids) |
1756.3.22
by Aaron Bentley
Tweaks from review |
790 |
# c = component_id, m = method, p = position, s = size, n = next
|
1756.3.10
by Aaron Bentley
Optimize selection and retrieval of records |
791 |
records = [(c, p, s) for c, (m, p, s, n) in position_map.iteritems()] |
1756.3.12
by Aaron Bentley
Stuff all text-building data in record_map |
792 |
record_map = {} |
1863.1.5
by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order. |
793 |
for component_id, content, digest in \ |
1863.1.9
by John Arbash Meinel
Switching to have 'read_records_iter' return in random order. |
794 |
self._data.read_records_iter(records): |
1756.3.12
by Aaron Bentley
Stuff all text-building data in record_map |
795 |
method, position, size, next = position_map[component_id] |
796 |
record_map[component_id] = method, content, digest, next |
|
797 |
||
1756.3.10
by Aaron Bentley
Optimize selection and retrieval of records |
798 |
return record_map |
1756.2.5
by Aaron Bentley
Reduced read_records calls to 1 |
799 |
|
1756.2.7
by Aaron Bentley
Implement get_text in terms of get_texts |
800 |
def get_text(self, version_id): |
801 |
"""See VersionedFile.get_text"""
|
|
802 |
return self.get_texts([version_id])[0] |
|
803 |
||
1756.2.1
by Aaron Bentley
Implement get_texts |
804 |
def get_texts(self, version_ids): |
1756.2.8
by Aaron Bentley
Implement get_line_list, cleanups |
805 |
return [''.join(l) for l in self.get_line_list(version_ids)] |
806 |
||
807 |
def get_line_list(self, version_ids): |
|
1756.2.1
by Aaron Bentley
Implement get_texts |
808 |
"""Return the texts of listed versions as a list of strings."""
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
809 |
version_ids = [osutils.safe_revision_id(v) for v in version_ids] |
2229.2.1
by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository |
810 |
for version_id in version_ids: |
2229.2.3
by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY |
811 |
self.check_not_reserved_id(version_id) |
1756.3.13
by Aaron Bentley
Refactor get_line_list into _get_content |
812 |
text_map, content_map = self._get_content_maps(version_ids) |
813 |
return [text_map[v] for v in version_ids] |
|
814 |
||
815 |
def _get_content_maps(self, version_ids): |
|
1756.3.19
by Aaron Bentley
Documentation and cleanups |
816 |
"""Produce maps of text and KnitContents
|
817 |
|
|
818 |
:return: (text_map, content_map) where text_map contains the texts for
|
|
819 |
the requested versions and content_map contains the KnitContents.
|
|
1756.3.22
by Aaron Bentley
Tweaks from review |
820 |
Both dicts take version_ids as their keys.
|
1756.3.19
by Aaron Bentley
Documentation and cleanups |
821 |
"""
|
1756.3.10
by Aaron Bentley
Optimize selection and retrieval of records |
822 |
for version_id in version_ids: |
1756.2.1
by Aaron Bentley
Implement get_texts |
823 |
if not self.has_version(version_id): |
824 |
raise RevisionNotPresent(version_id, self.filename) |
|
1756.3.12
by Aaron Bentley
Stuff all text-building data in record_map |
825 |
record_map = self._get_record_map(version_ids) |
1756.2.5
by Aaron Bentley
Reduced read_records calls to 1 |
826 |
|
1756.2.8
by Aaron Bentley
Implement get_line_list, cleanups |
827 |
text_map = {} |
1756.3.7
by Aaron Bentley
Avoid re-parsing texts version components |
828 |
content_map = {} |
1756.3.14
by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts |
829 |
final_content = {} |
1756.3.10
by Aaron Bentley
Optimize selection and retrieval of records |
830 |
for version_id in version_ids: |
831 |
components = [] |
|
832 |
cursor = version_id |
|
833 |
while cursor is not None: |
|
1756.3.12
by Aaron Bentley
Stuff all text-building data in record_map |
834 |
method, data, digest, next = record_map[cursor] |
1756.3.10
by Aaron Bentley
Optimize selection and retrieval of records |
835 |
components.append((cursor, method, data, digest)) |
836 |
if cursor in content_map: |
|
837 |
break
|
|
838 |
cursor = next |
|
839 |
||
1756.2.1
by Aaron Bentley
Implement get_texts |
840 |
content = None |
1756.2.7
by Aaron Bentley
Implement get_text in terms of get_texts |
841 |
for component_id, method, data, digest in reversed(components): |
1756.3.7
by Aaron Bentley
Avoid re-parsing texts version components |
842 |
if component_id in content_map: |
843 |
content = content_map[component_id] |
|
1756.3.8
by Aaron Bentley
Avoid unused calls, use generators, sets instead of lists |
844 |
else: |
845 |
if method == 'fulltext': |
|
846 |
assert content is None |
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
847 |
content = self.factory.parse_fulltext(data, version_id) |
1756.3.8
by Aaron Bentley
Avoid unused calls, use generators, sets instead of lists |
848 |
elif method == 'line-delta': |
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
849 |
delta = self.factory.parse_line_delta(data, version_id) |
1756.3.8
by Aaron Bentley
Avoid unused calls, use generators, sets instead of lists |
850 |
content = content.copy() |
851 |
content._lines = self._apply_delta(content._lines, |
|
852 |
delta) |
|
1756.3.14
by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts |
853 |
content_map[component_id] = content |
1756.2.1
by Aaron Bentley
Implement get_texts |
854 |
|
855 |
if 'no-eol' in self._index.get_options(version_id): |
|
1756.3.14
by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts |
856 |
content = content.copy() |
1756.2.1
by Aaron Bentley
Implement get_texts |
857 |
line = content._lines[-1][1].rstrip('\n') |
858 |
content._lines[-1] = (content._lines[-1][0], line) |
|
1756.3.14
by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts |
859 |
final_content[version_id] = content |
1756.2.1
by Aaron Bentley
Implement get_texts |
860 |
|
861 |
# digest here is the digest from the last applied component.
|
|
1756.3.6
by Aaron Bentley
More multi-text extraction |
862 |
text = content.text() |
863 |
if sha_strings(text) != digest: |
|
1756.2.8
by Aaron Bentley
Implement get_line_list, cleanups |
864 |
raise KnitCorrupt(self.filename, |
865 |
'sha-1 does not match %s' % version_id) |
|
1756.2.1
by Aaron Bentley
Implement get_texts |
866 |
|
1756.3.6
by Aaron Bentley
More multi-text extraction |
867 |
text_map[version_id] = text |
1756.3.14
by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts |
868 |
return text_map, final_content |
1756.2.1
by Aaron Bentley
Implement get_texts |
869 |
|
2039.1.1
by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000) |
870 |
def iter_lines_added_or_present_in_versions(self, version_ids=None, |
871 |
pb=None): |
|
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
872 |
"""See VersionedFile.iter_lines_added_or_present_in_versions()."""
|
873 |
if version_ids is None: |
|
874 |
version_ids = self.versions() |
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
875 |
else: |
876 |
version_ids = [osutils.safe_revision_id(v) for v in version_ids] |
|
2039.1.1
by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000) |
877 |
if pb is None: |
878 |
pb = progress.DummyProgress() |
|
1759.2.2
by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron. |
879 |
# we don't care about inclusions, the caller cares.
|
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
880 |
# but we need to setup a list of records to visit.
|
881 |
# we need version_id, position, length
|
|
882 |
version_id_records = [] |
|
2163.1.1
by John Arbash Meinel
Use a set to make iter_lines_added_or_present *much* faster |
883 |
requested_versions = set(version_ids) |
1594.3.1
by Robert Collins
Merge transaction finalisation and ensure iter_lines_added_or_present in knits does a old-to-new read in the knit. |
884 |
# filter for available versions
|
885 |
for version_id in requested_versions: |
|
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
886 |
if not self.has_version(version_id): |
887 |
raise RevisionNotPresent(version_id, self.filename) |
|
1594.3.1
by Robert Collins
Merge transaction finalisation and ensure iter_lines_added_or_present in knits does a old-to-new read in the knit. |
888 |
# get a in-component-order queue:
|
889 |
for version_id in self.versions(): |
|
890 |
if version_id in requested_versions: |
|
891 |
data_pos, length = self._index.get_position(version_id) |
|
892 |
version_id_records.append((version_id, data_pos, length)) |
|
893 |
||
1594.2.17
by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading. |
894 |
total = len(version_id_records) |
2147.1.3
by John Arbash Meinel
In knit.py we were re-using a variable in 2 loops, causing bogus progress messages to be generated. |
895 |
for version_idx, (version_id, data, sha_value) in \ |
896 |
enumerate(self._data.read_records_iter(version_id_records)): |
|
897 |
pb.update('Walking content.', version_idx, total) |
|
2039.1.1
by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000) |
898 |
method = self._index.get_method(version_id) |
2163.1.7
by John Arbash Meinel
Switch the line iterator as suggested by Aaron Bentley |
899 |
|
2039.1.1
by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000) |
900 |
assert method in ('fulltext', 'line-delta') |
901 |
if method == 'fulltext': |
|
2163.1.7
by John Arbash Meinel
Switch the line iterator as suggested by Aaron Bentley |
902 |
line_iterator = self.factory.get_fulltext_content(data) |
2039.1.1
by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000) |
903 |
else: |
2163.1.7
by John Arbash Meinel
Switch the line iterator as suggested by Aaron Bentley |
904 |
line_iterator = self.factory.get_linedelta_content(data) |
905 |
for line in line_iterator: |
|
906 |
yield line |
|
907 |
||
2039.1.1
by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000) |
908 |
pb.update('Walking content.', total, total) |
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
909 |
|
1563.2.18
by Robert Collins
get knit repositories really using knits for text storage. |
910 |
def num_versions(self): |
911 |
"""See VersionedFile.num_versions()."""
|
|
912 |
return self._index.num_versions() |
|
913 |
||
914 |
__len__ = num_versions |
|
915 |
||
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
916 |
def annotate_iter(self, version_id): |
917 |
"""See VersionedFile.annotate_iter."""
|
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
918 |
version_id = osutils.safe_revision_id(version_id) |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
919 |
content = self._get_content(version_id) |
920 |
for origin, text in content.annotate_iter(): |
|
1596.2.7
by Robert Collins
Remove the requirement for reannotation in knit joins. |
921 |
yield origin, text |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
922 |
|
923 |
def get_parents(self, version_id): |
|
924 |
"""See VersionedFile.get_parents."""
|
|
1628.1.2
by Robert Collins
More knit micro-optimisations. |
925 |
# perf notes:
|
926 |
# optimism counts!
|
|
927 |
# 52554 calls in 1264 872 internal down from 3674
|
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
928 |
version_id = osutils.safe_revision_id(version_id) |
1628.1.2
by Robert Collins
More knit micro-optimisations. |
929 |
try: |
930 |
return self._index.get_parents(version_id) |
|
931 |
except KeyError: |
|
932 |
raise RevisionNotPresent(version_id, self.filename) |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
933 |
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
934 |
def get_parents_with_ghosts(self, version_id): |
935 |
"""See VersionedFile.get_parents."""
|
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
936 |
version_id = osutils.safe_revision_id(version_id) |
1628.1.2
by Robert Collins
More knit micro-optimisations. |
937 |
try: |
938 |
return self._index.get_parents_with_ghosts(version_id) |
|
939 |
except KeyError: |
|
940 |
raise RevisionNotPresent(version_id, self.filename) |
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
941 |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
942 |
def get_ancestry(self, versions): |
943 |
"""See VersionedFile.get_ancestry."""
|
|
944 |
if isinstance(versions, basestring): |
|
945 |
versions = [versions] |
|
946 |
if not versions: |
|
947 |
return [] |
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
948 |
versions = [osutils.safe_revision_id(v) for v in versions] |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
949 |
return self._index.get_ancestry(versions) |
950 |
||
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
951 |
def get_ancestry_with_ghosts(self, versions): |
952 |
"""See VersionedFile.get_ancestry_with_ghosts."""
|
|
953 |
if isinstance(versions, basestring): |
|
954 |
versions = [versions] |
|
955 |
if not versions: |
|
956 |
return [] |
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
957 |
versions = [osutils.safe_revision_id(v) for v in versions] |
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
958 |
return self._index.get_ancestry_with_ghosts(versions) |
959 |
||
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
960 |
#@deprecated_method(zero_eight)
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
961 |
def walk(self, version_ids): |
962 |
"""See VersionedFile.walk."""
|
|
963 |
# We take the short path here, and extract all relevant texts
|
|
964 |
# and put them in a weave and let that do all the work. Far
|
|
965 |
# from optimal, but is much simpler.
|
|
1563.2.6
by Robert Collins
Start check tests for knits (pending), and remove dead code. |
966 |
# FIXME RB 20060228 this really is inefficient!
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
967 |
from bzrlib.weave import Weave |
968 |
||
969 |
w = Weave(self.filename) |
|
970 |
ancestry = self.get_ancestry(version_ids) |
|
971 |
sorted_graph = topo_sort(self._index.get_graph()) |
|
972 |
version_list = [vid for vid in sorted_graph if vid in ancestry] |
|
973 |
||
974 |
for version_id in version_list: |
|
975 |
lines = self.get_lines(version_id) |
|
976 |
w.add_lines(version_id, self.get_parents(version_id), lines) |
|
977 |
||
978 |
for lineno, insert_id, dset, line in w.walk(version_ids): |
|
979 |
yield lineno, insert_id, dset, line |
|
980 |
||
1664.2.3
by Aaron Bentley
Add failing test case |
981 |
def plan_merge(self, ver_a, ver_b): |
1664.2.11
by Aaron Bentley
Clarifications from merge review |
982 |
"""See VersionedFile.plan_merge."""
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
983 |
ver_a = osutils.safe_revision_id(ver_a) |
984 |
ver_b = osutils.safe_revision_id(ver_b) |
|
1664.2.6
by Aaron Bentley
Got plan-merge passing tests |
985 |
ancestors_b = set(self.get_ancestry(ver_b)) |
986 |
def status_a(revision, text): |
|
987 |
if revision in ancestors_b: |
|
988 |
return 'killed-b', text |
|
989 |
else: |
|
990 |
return 'new-a', text |
|
991 |
||
992 |
ancestors_a = set(self.get_ancestry(ver_a)) |
|
993 |
def status_b(revision, text): |
|
994 |
if revision in ancestors_a: |
|
995 |
return 'killed-a', text |
|
996 |
else: |
|
997 |
return 'new-b', text |
|
998 |
||
1664.2.4
by Aaron Bentley
Identify unchanged lines correctly |
999 |
annotated_a = self.annotate(ver_a) |
1000 |
annotated_b = self.annotate(ver_b) |
|
1664.2.11
by Aaron Bentley
Clarifications from merge review |
1001 |
plain_a = [t for (a, t) in annotated_a] |
1002 |
plain_b = [t for (a, t) in annotated_b] |
|
1711.2.11
by John Arbash Meinel
Rename patiencediff.SequenceMatcher => PatienceSequenceMatcher and knit.SequenceMatcher => KnitSequenceMatcher |
1003 |
blocks = KnitSequenceMatcher(None, plain_a, plain_b).get_matching_blocks() |
1664.2.4
by Aaron Bentley
Identify unchanged lines correctly |
1004 |
a_cur = 0 |
1005 |
b_cur = 0 |
|
1006 |
for ai, bi, l in blocks: |
|
1664.2.13
by Aaron Bentley
Knit plan_merge uses slices instead of xenumerate |
1007 |
# process all mismatched sections
|
1008 |
# (last mismatched section is handled because blocks always
|
|
1009 |
# includes a 0-length last block)
|
|
1010 |
for revision, text in annotated_a[a_cur:ai]: |
|
1664.2.6
by Aaron Bentley
Got plan-merge passing tests |
1011 |
yield status_a(revision, text) |
1664.2.13
by Aaron Bentley
Knit plan_merge uses slices instead of xenumerate |
1012 |
for revision, text in annotated_b[b_cur:bi]: |
1664.2.6
by Aaron Bentley
Got plan-merge passing tests |
1013 |
yield status_b(revision, text) |
1664.2.13
by Aaron Bentley
Knit plan_merge uses slices instead of xenumerate |
1014 |
|
1664.2.11
by Aaron Bentley
Clarifications from merge review |
1015 |
# and now the matched section
|
1664.2.13
by Aaron Bentley
Knit plan_merge uses slices instead of xenumerate |
1016 |
a_cur = ai + l |
1017 |
b_cur = bi + l |
|
1018 |
for text_a, text_b in zip(plain_a[ai:a_cur], plain_b[bi:b_cur]): |
|
1664.2.4
by Aaron Bentley
Identify unchanged lines correctly |
1019 |
assert text_a == text_b |
1020 |
yield "unchanged", text_a |
|
1021 |
||
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1022 |
|
1023 |
class _KnitComponentFile(object): |
|
1024 |
"""One of the files used to implement a knit database"""
|
|
1025 |
||
1946.2.1
by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories |
1026 |
def __init__(self, transport, filename, mode, file_mode=None, |
1946.2.12
by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put |
1027 |
create_parent_dir=False, dir_mode=None): |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1028 |
self._transport = transport |
1029 |
self._filename = filename |
|
1030 |
self._mode = mode |
|
1946.2.3
by John Arbash Meinel
Pass around the file mode correctly |
1031 |
self._file_mode = file_mode |
1946.2.12
by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put |
1032 |
self._dir_mode = dir_mode |
1946.2.1
by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories |
1033 |
self._create_parent_dir = create_parent_dir |
1034 |
self._need_to_create = False |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1035 |
|
2196.2.5
by John Arbash Meinel
Add an exception class when the knit index storage method is unknown, and properly test for it |
1036 |
def _full_path(self): |
1037 |
"""Return the full path to this file."""
|
|
1038 |
return self._transport.base + self._filename |
|
1039 |
||
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1040 |
def check_header(self, fp): |
1641.1.2
by Robert Collins
Change knit index files to be robust in the presence of partial writes. |
1041 |
line = fp.readline() |
2171.1.1
by John Arbash Meinel
Knit index files should ignore empty indexes rather than consider them corrupt. |
1042 |
if line == '': |
1043 |
# An empty file can actually be treated as though the file doesn't
|
|
1044 |
# exist yet.
|
|
2196.2.5
by John Arbash Meinel
Add an exception class when the knit index storage method is unknown, and properly test for it |
1045 |
raise errors.NoSuchFile(self._full_path()) |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1046 |
if line != self.HEADER: |
2171.1.1
by John Arbash Meinel
Knit index files should ignore empty indexes rather than consider them corrupt. |
1047 |
raise KnitHeaderError(badline=line, |
1048 |
filename=self._transport.abspath(self._filename)) |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1049 |
|
1050 |
def commit(self): |
|
1051 |
"""Commit is a nop."""
|
|
1052 |
||
1053 |
def __repr__(self): |
|
1054 |
return '%s(%s)' % (self.__class__.__name__, self._filename) |
|
1055 |
||
1056 |
||
1057 |
class _KnitIndex(_KnitComponentFile): |
|
1058 |
"""Manages knit index file.
|
|
1059 |
||
1060 |
The index is already kept in memory and read on startup, to enable
|
|
1061 |
fast lookups of revision information. The cursor of the index
|
|
1062 |
file is always pointing to the end, making it easy to append
|
|
1063 |
entries.
|
|
1064 |
||
1065 |
_cache is a cache for fast mapping from version id to a Index
|
|
1066 |
object.
|
|
1067 |
||
1068 |
_history is a cache for fast mapping from indexes to version ids.
|
|
1069 |
||
1070 |
The index data format is dictionary compressed when it comes to
|
|
1071 |
parent references; a index entry may only have parents that with a
|
|
1072 |
lover index number. As a result, the index is topological sorted.
|
|
1563.2.11
by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis. |
1073 |
|
1074 |
Duplicate entries may be written to the index for a single version id
|
|
1075 |
if this is done then the latter one completely replaces the former:
|
|
1076 |
this allows updates to correct version and parent information.
|
|
1077 |
Note that the two entries may share the delta, and that successive
|
|
1078 |
annotations and references MUST point to the first entry.
|
|
1641.1.2
by Robert Collins
Change knit index files to be robust in the presence of partial writes. |
1079 |
|
1080 |
The index file on disc contains a header, followed by one line per knit
|
|
1081 |
record. The same revision can be present in an index file more than once.
|
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
1082 |
The first occurrence gets assigned a sequence number starting from 0.
|
1641.1.2
by Robert Collins
Change knit index files to be robust in the presence of partial writes. |
1083 |
|
1084 |
The format of a single line is
|
|
1085 |
REVISION_ID FLAGS BYTE_OFFSET LENGTH( PARENT_ID|PARENT_SEQUENCE_ID)* :\n
|
|
1086 |
REVISION_ID is a utf8-encoded revision id
|
|
1087 |
FLAGS is a comma separated list of flags about the record. Values include
|
|
1088 |
no-eol, line-delta, fulltext.
|
|
1089 |
BYTE_OFFSET is the ascii representation of the byte offset in the data file
|
|
1090 |
that the the compressed data starts at.
|
|
1091 |
LENGTH is the ascii representation of the length of the data file.
|
|
1092 |
PARENT_ID a utf-8 revision id prefixed by a '.' that is a parent of
|
|
1093 |
REVISION_ID.
|
|
1094 |
PARENT_SEQUENCE_ID the ascii representation of the sequence number of a
|
|
1095 |
revision id already in the knit that is a parent of REVISION_ID.
|
|
1096 |
The ' :' marker is the end of record marker.
|
|
1097 |
|
|
1098 |
partial writes:
|
|
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1099 |
when a write is interrupted to the index file, it will result in a line
|
1100 |
that does not end in ' :'. If the ' :' is not present at the end of a line,
|
|
1101 |
or at the end of the file, then the record that is missing it will be
|
|
1102 |
ignored by the parser.
|
|
1641.1.2
by Robert Collins
Change knit index files to be robust in the presence of partial writes. |
1103 |
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
1104 |
When writing new records to the index file, the data is preceded by '\n'
|
1641.1.2
by Robert Collins
Change knit index files to be robust in the presence of partial writes. |
1105 |
to ensure that records always start on new lines even if the last write was
|
1106 |
interrupted. As a result its normal for the last line in the index to be
|
|
1107 |
missing a trailing newline. One can be added with no harmful effects.
|
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1108 |
"""
|
1109 |
||
1666.1.6
by Robert Collins
Make knit the default format. |
1110 |
HEADER = "# bzr knit index 8\n" |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1111 |
|
1596.2.18
by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds. |
1112 |
# speed of knit parsing went from 280 ms to 280 ms with slots addition.
|
1113 |
# __slots__ = ['_cache', '_history', '_transport', '_filename']
|
|
1114 |
||
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1115 |
def _cache_version(self, version_id, options, pos, size, parents): |
1596.2.18
by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds. |
1116 |
"""Cache a version record in the history array and index cache.
|
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1117 |
|
1118 |
This is inlined into _load_data for performance. KEEP IN SYNC.
|
|
1596.2.18
by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds. |
1119 |
(It saves 60ms, 25% of the __init__ overhead on local 4000 record
|
1120 |
indexes).
|
|
1121 |
"""
|
|
1596.2.14
by Robert Collins
Make knit parsing non quadratic? |
1122 |
# only want the _history index to reference the 1st index entry
|
1123 |
# for version_id
|
|
1596.2.18
by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds. |
1124 |
if version_id not in self._cache: |
1628.1.1
by Robert Collins
Cache the index number of versions in the knit index's self._cache so that |
1125 |
index = len(self._history) |
1596.2.14
by Robert Collins
Make knit parsing non quadratic? |
1126 |
self._history.append(version_id) |
1628.1.1
by Robert Collins
Cache the index number of versions in the knit index's self._cache so that |
1127 |
else: |
1128 |
index = self._cache[version_id][5] |
|
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1129 |
self._cache[version_id] = (version_id, |
1628.1.1
by Robert Collins
Cache the index number of versions in the knit index's self._cache so that |
1130 |
options, |
1131 |
pos, |
|
1132 |
size, |
|
1133 |
parents, |
|
1134 |
index) |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1135 |
|
1946.2.1
by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories |
1136 |
def __init__(self, transport, filename, mode, create=False, file_mode=None, |
1946.2.12
by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put |
1137 |
create_parent_dir=False, delay_create=False, dir_mode=None): |
1138 |
_KnitComponentFile.__init__(self, transport, filename, mode, |
|
1139 |
file_mode=file_mode, |
|
1140 |
create_parent_dir=create_parent_dir, |
|
1141 |
dir_mode=dir_mode) |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1142 |
self._cache = {} |
1563.2.11
by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis. |
1143 |
# position in _history is the 'official' index for a revision
|
1144 |
# but the values may have come from a newer entry.
|
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
1145 |
# so - wc -l of a knit index is != the number of unique names
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
1146 |
# in the knit.
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1147 |
self._history = [] |
1148 |
try: |
|
2247.2.1
by John Arbash Meinel
Don't create pb for simple knit reading. |
1149 |
fp = self._transport.get(self._filename) |
1594.2.17
by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading. |
1150 |
try: |
2247.2.1
by John Arbash Meinel
Don't create pb for simple knit reading. |
1151 |
# _load_data may raise NoSuchFile if the target knit is
|
1152 |
# completely empty.
|
|
1153 |
self._load_data(fp) |
|
1154 |
finally: |
|
1155 |
fp.close() |
|
1156 |
except NoSuchFile: |
|
1157 |
if mode != 'w' or not create: |
|
1158 |
raise
|
|
1159 |
elif delay_create: |
|
1160 |
self._need_to_create = True |
|
1161 |
else: |
|
1162 |
self._transport.put_bytes_non_atomic( |
|
1163 |
self._filename, self.HEADER, mode=self._file_mode) |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1164 |
|
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1165 |
def _load_data(self, fp): |
1166 |
cache = self._cache |
|
1167 |
history = self._history |
|
1168 |
||
1169 |
self.check_header(fp) |
|
1170 |
# readlines reads the whole file at once:
|
|
1171 |
# bad for transports like http, good for local disk
|
|
1172 |
# we save 60 ms doing this one change (
|
|
1173 |
# from calling readline each time to calling
|
|
1174 |
# readlines once.
|
|
1175 |
# probably what we want for nice behaviour on
|
|
1176 |
# http is a incremental readlines that yields, or
|
|
1177 |
# a check for local vs non local indexes,
|
|
1178 |
history_top = len(history) - 1 |
|
1179 |
for line in fp.readlines(): |
|
1180 |
rec = line.split() |
|
1181 |
if len(rec) < 5 or rec[-1] != ':': |
|
1182 |
# corrupt line.
|
|
1183 |
# FIXME: in the future we should determine if its a
|
|
1184 |
# short write - and ignore it
|
|
1185 |
# or a different failure, and raise. RBC 20060407
|
|
1186 |
continue
|
|
1187 |
||
1188 |
parents = [] |
|
1189 |
for value in rec[4:-1]: |
|
1190 |
if value[0] == '.': |
|
1191 |
# uncompressed reference
|
|
2249.5.15
by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down. |
1192 |
parent_id = value[1:] |
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1193 |
else: |
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
1194 |
parent_id = history[int(value)] |
1195 |
parents.append(parent_id) |
|
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1196 |
|
1197 |
version_id, options, pos, size = rec[:4] |
|
2249.5.15
by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down. |
1198 |
version_id = version_id |
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1199 |
|
1200 |
# See self._cache_version
|
|
1201 |
# only want the _history index to reference the 1st
|
|
1202 |
# index entry for version_id
|
|
1203 |
if version_id not in cache: |
|
1204 |
history_top += 1 |
|
1205 |
index = history_top |
|
1206 |
history.append(version_id) |
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
1207 |
else: |
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1208 |
index = cache[version_id][5] |
1209 |
cache[version_id] = (version_id, |
|
1210 |
options.split(','), |
|
1211 |
int(pos), |
|
1212 |
int(size), |
|
1213 |
parents, |
|
1214 |
index) |
|
1215 |
# end self._cache_version
|
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
1216 |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1217 |
def get_graph(self): |
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1218 |
return [(vid, idx[4]) for vid, idx in self._cache.iteritems()] |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1219 |
|
1220 |
def get_ancestry(self, versions): |
|
1221 |
"""See VersionedFile.get_ancestry."""
|
|
1563.2.35
by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too. |
1222 |
# get a graph of all the mentioned versions:
|
1223 |
graph = {} |
|
1224 |
pending = set(versions) |
|
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1225 |
cache = self._cache |
1226 |
while pending: |
|
1563.2.35
by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too. |
1227 |
version = pending.pop() |
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
1228 |
# trim ghosts
|
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1229 |
try: |
1230 |
parents = [p for p in cache[version][4] if p in cache] |
|
1231 |
except KeyError: |
|
1232 |
raise RevisionNotPresent(version, self._filename) |
|
1233 |
# if not completed and not a ghost
|
|
1234 |
pending.update([p for p in parents if p not in graph]) |
|
1563.2.35
by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too. |
1235 |
graph[version] = parents |
1236 |
return topo_sort(graph.items()) |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1237 |
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
1238 |
def get_ancestry_with_ghosts(self, versions): |
1239 |
"""See VersionedFile.get_ancestry_with_ghosts."""
|
|
1240 |
# get a graph of all the mentioned versions:
|
|
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1241 |
self.check_versions_present(versions) |
1242 |
cache = self._cache |
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
1243 |
graph = {} |
1244 |
pending = set(versions) |
|
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1245 |
while pending: |
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
1246 |
version = pending.pop() |
1247 |
try: |
|
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1248 |
parents = cache[version][4] |
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
1249 |
except KeyError: |
1250 |
# ghost, fake it
|
|
1251 |
graph[version] = [] |
|
1252 |
else: |
|
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1253 |
# if not completed
|
1254 |
pending.update([p for p in parents if p not in graph]) |
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
1255 |
graph[version] = parents |
1256 |
return topo_sort(graph.items()) |
|
1257 |
||
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1258 |
def num_versions(self): |
1259 |
return len(self._history) |
|
1260 |
||
1261 |
__len__ = num_versions |
|
1262 |
||
1263 |
def get_versions(self): |
|
1264 |
return self._history |
|
1265 |
||
1266 |
def idx_to_name(self, idx): |
|
1267 |
return self._history[idx] |
|
1268 |
||
1269 |
def lookup(self, version_id): |
|
1270 |
assert version_id in self._cache |
|
1628.1.1
by Robert Collins
Cache the index number of versions in the knit index's self._cache so that |
1271 |
return self._cache[version_id][5] |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1272 |
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
1273 |
def _version_list_to_index(self, versions): |
1274 |
result_list = [] |
|
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1275 |
cache = self._cache |
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
1276 |
for version in versions: |
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1277 |
if version in cache: |
1628.1.1
by Robert Collins
Cache the index number of versions in the knit index's self._cache so that |
1278 |
# -- inlined lookup() --
|
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1279 |
result_list.append(str(cache[version][5])) |
1628.1.1
by Robert Collins
Cache the index number of versions in the knit index's self._cache so that |
1280 |
# -- end lookup () --
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
1281 |
else: |
2249.5.15
by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down. |
1282 |
result_list.append('.' + version) |
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
1283 |
return ' '.join(result_list) |
1284 |
||
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1285 |
def add_version(self, version_id, options, pos, size, parents): |
1286 |
"""Add a version record to the index."""
|
|
1692.4.1
by Robert Collins
Multiple merges: |
1287 |
self.add_versions(((version_id, options, pos, size, parents),)) |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1288 |
|
1692.2.1
by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions. |
1289 |
def add_versions(self, versions): |
1290 |
"""Add multiple versions to the index.
|
|
1291 |
|
|
1292 |
:param versions: a list of tuples:
|
|
1293 |
(version_id, options, pos, size, parents).
|
|
1294 |
"""
|
|
1295 |
lines = [] |
|
2102.2.1
by John Arbash Meinel
Fix bug #64789 _KnitIndex.add_versions() should dict compress new revisions |
1296 |
orig_history = self._history[:] |
1297 |
orig_cache = self._cache.copy() |
|
1298 |
||
1299 |
try: |
|
1300 |
for version_id, options, pos, size, parents in versions: |
|
2249.5.15
by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down. |
1301 |
line = "\n%s %s %s %s %s :" % (version_id, |
2102.2.1
by John Arbash Meinel
Fix bug #64789 _KnitIndex.add_versions() should dict compress new revisions |
1302 |
','.join(options), |
1303 |
pos, |
|
1304 |
size, |
|
1305 |
self._version_list_to_index(parents)) |
|
1306 |
assert isinstance(line, str), \ |
|
1307 |
'content must be utf-8 encoded: %r' % (line,) |
|
1308 |
lines.append(line) |
|
1309 |
self._cache_version(version_id, options, pos, size, parents) |
|
1310 |
if not self._need_to_create: |
|
1311 |
self._transport.append_bytes(self._filename, ''.join(lines)) |
|
1312 |
else: |
|
1313 |
sio = StringIO() |
|
1314 |
sio.write(self.HEADER) |
|
1315 |
sio.writelines(lines) |
|
1316 |
sio.seek(0) |
|
1317 |
self._transport.put_file_non_atomic(self._filename, sio, |
|
1318 |
create_parent_dir=self._create_parent_dir, |
|
1319 |
mode=self._file_mode, |
|
1320 |
dir_mode=self._dir_mode) |
|
1321 |
self._need_to_create = False |
|
1322 |
except: |
|
1323 |
# If any problems happen, restore the original values and re-raise
|
|
1324 |
self._history = orig_history |
|
1325 |
self._cache = orig_cache |
|
1326 |
raise
|
|
1327 |
||
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1328 |
def has_version(self, version_id): |
1329 |
"""True if the version is in the index."""
|
|
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1330 |
return version_id in self._cache |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1331 |
|
1332 |
def get_position(self, version_id): |
|
1333 |
"""Return data position and size of specified version."""
|
|
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1334 |
entry = self._cache[version_id] |
1335 |
return entry[2], entry[3] |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1336 |
|
1337 |
def get_method(self, version_id): |
|
1338 |
"""Return compression method of specified version."""
|
|
1339 |
options = self._cache[version_id][1] |
|
1340 |
if 'fulltext' in options: |
|
1341 |
return 'fulltext' |
|
1342 |
else: |
|
2196.2.5
by John Arbash Meinel
Add an exception class when the knit index storage method is unknown, and properly test for it |
1343 |
if 'line-delta' not in options: |
1344 |
raise errors.KnitIndexUnknownMethod(self._full_path(), options) |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1345 |
return 'line-delta' |
1346 |
||
1347 |
def get_options(self, version_id): |
|
1348 |
return self._cache[version_id][1] |
|
1349 |
||
1350 |
def get_parents(self, version_id): |
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
1351 |
"""Return parents of specified version ignoring ghosts."""
|
1352 |
return [parent for parent in self._cache[version_id][4] |
|
1353 |
if parent in self._cache] |
|
1354 |
||
1355 |
def get_parents_with_ghosts(self, version_id): |
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
1356 |
"""Return parents of specified version with ghosts."""
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
1357 |
return self._cache[version_id][4] |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1358 |
|
1359 |
def check_versions_present(self, version_ids): |
|
1360 |
"""Check that all specified versions are present."""
|
|
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1361 |
cache = self._cache |
1362 |
for version_id in version_ids: |
|
1363 |
if version_id not in cache: |
|
1364 |
raise RevisionNotPresent(version_id, self._filename) |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1365 |
|
1366 |
||
1367 |
class _KnitData(_KnitComponentFile): |
|
1368 |
"""Contents of the knit data file"""
|
|
1369 |
||
1946.2.1
by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories |
1370 |
def __init__(self, transport, filename, mode, create=False, file_mode=None, |
1946.2.16
by John Arbash Meinel
Small cleanup |
1371 |
create_parent_dir=False, delay_create=False, |
1372 |
dir_mode=None): |
|
1946.2.1
by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories |
1373 |
_KnitComponentFile.__init__(self, transport, filename, mode, |
1946.2.3
by John Arbash Meinel
Pass around the file mode correctly |
1374 |
file_mode=file_mode, |
1946.2.16
by John Arbash Meinel
Small cleanup |
1375 |
create_parent_dir=create_parent_dir, |
1376 |
dir_mode=dir_mode) |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1377 |
self._checked = False |
1863.1.8
by John Arbash Meinel
Removing disk-backed-cache |
1378 |
# TODO: jam 20060713 conceptually, this could spill to disk
|
1379 |
# if the cached size gets larger than a certain amount
|
|
1380 |
# but it complicates the model a bit, so for now just use
|
|
1381 |
# a simple dictionary
|
|
1863.1.1
by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit |
1382 |
self._cache = {} |
1383 |
self._do_cache = False |
|
1563.2.35
by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too. |
1384 |
if create: |
1946.2.1
by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories |
1385 |
if delay_create: |
1386 |
self._need_to_create = create |
|
1387 |
else: |
|
1946.2.10
by John Arbash Meinel
[merge] up-to-date with Transport.put_*_non_atomic |
1388 |
self._transport.put_bytes_non_atomic(self._filename, '', |
1946.2.8
by John Arbash Meinel
[merge] transport_bytes: bring knit churn up-to-date with new *{bytes,file} functions |
1389 |
mode=self._file_mode) |
1594.2.24
by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching. |
1390 |
|
1863.1.1
by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit |
1391 |
def enable_cache(self): |
1392 |
"""Enable caching of reads."""
|
|
1863.1.8
by John Arbash Meinel
Removing disk-backed-cache |
1393 |
self._do_cache = True |
1863.1.1
by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit |
1394 |
|
1594.2.24
by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching. |
1395 |
def clear_cache(self): |
1396 |
"""Clear the record cache."""
|
|
1863.1.1
by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit |
1397 |
self._do_cache = False |
1398 |
self._cache = {} |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1399 |
|
1400 |
def _open_file(self): |
|
1711.7.25
by John Arbash Meinel
try/finally to close files, _KnitData was keeping a handle to a file it never used again, and using transport.rename() when it wanted transport.move() |
1401 |
try: |
1402 |
return self._transport.get(self._filename) |
|
1403 |
except NoSuchFile: |
|
1404 |
pass
|
|
1405 |
return None |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1406 |
|
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1407 |
def _record_to_data(self, version_id, digest, lines): |
1408 |
"""Convert version_id, digest, lines into a raw data block.
|
|
1409 |
|
|
1410 |
:return: (len, a StringIO instance with the raw data ready to read.)
|
|
1411 |
"""
|
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1412 |
sio = StringIO() |
1413 |
data_file = GzipFile(None, mode='wb', fileobj=sio) |
|
1908.4.10
by John Arbash Meinel
Small cleanups |
1414 |
|
2249.5.15
by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down. |
1415 |
assert isinstance(version_id, str) |
1908.4.5
by John Arbash Meinel
Some small tweaks to knit and tuned_gzip to shave off another couple seconds |
1416 |
data_file.writelines(chain( |
2249.5.15
by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down. |
1417 |
["version %s %d %s\n" % (version_id, |
1596.2.28
by Robert Collins
more knit profile based tuning. |
1418 |
len(lines), |
1419 |
digest)], |
|
1420 |
lines, |
|
2249.5.15
by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down. |
1421 |
["end %s\n" % version_id])) |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1422 |
data_file.close() |
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1423 |
length= sio.tell() |
1596.2.28
by Robert Collins
more knit profile based tuning. |
1424 |
|
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1425 |
sio.seek(0) |
1426 |
return length, sio |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1427 |
|
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1428 |
def add_raw_record(self, raw_data): |
1692.4.1
by Robert Collins
Multiple merges: |
1429 |
"""Append a prepared record to the data file.
|
2329.1.2
by John Arbash Meinel
Remove some spurious whitespace changes. |
1430 |
|
1692.4.1
by Robert Collins
Multiple merges: |
1431 |
:return: the offset in the data file raw_data was written.
|
1432 |
"""
|
|
1596.2.9
by Robert Collins
Utf8 safety in knit indexes. |
1433 |
assert isinstance(raw_data, str), 'data must be plain bytes' |
1946.2.1
by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories |
1434 |
if not self._need_to_create: |
1946.2.8
by John Arbash Meinel
[merge] transport_bytes: bring knit churn up-to-date with new *{bytes,file} functions |
1435 |
return self._transport.append_bytes(self._filename, raw_data) |
1946.2.1
by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories |
1436 |
else: |
1946.2.10
by John Arbash Meinel
[merge] up-to-date with Transport.put_*_non_atomic |
1437 |
self._transport.put_bytes_non_atomic(self._filename, raw_data, |
1946.2.1
by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories |
1438 |
create_parent_dir=self._create_parent_dir, |
1946.2.12
by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put |
1439 |
mode=self._file_mode, |
1440 |
dir_mode=self._dir_mode) |
|
1946.2.1
by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories |
1441 |
self._need_to_create = False |
1442 |
return 0 |
|
2329.1.2
by John Arbash Meinel
Remove some spurious whitespace changes. |
1443 |
|
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1444 |
def add_record(self, version_id, digest, lines): |
1445 |
"""Write new text record to disk. Returns the position in the
|
|
1446 |
file where it was written."""
|
|
1447 |
size, sio = self._record_to_data(version_id, digest, lines) |
|
1448 |
# write to disk
|
|
1946.2.1
by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories |
1449 |
if not self._need_to_create: |
1946.2.8
by John Arbash Meinel
[merge] transport_bytes: bring knit churn up-to-date with new *{bytes,file} functions |
1450 |
start_pos = self._transport.append_file(self._filename, sio) |
1946.2.1
by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories |
1451 |
else: |
1946.2.10
by John Arbash Meinel
[merge] up-to-date with Transport.put_*_non_atomic |
1452 |
self._transport.put_file_non_atomic(self._filename, sio, |
1946.2.1
by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories |
1453 |
create_parent_dir=self._create_parent_dir, |
1946.2.12
by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put |
1454 |
mode=self._file_mode, |
1455 |
dir_mode=self._dir_mode) |
|
1946.2.1
by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories |
1456 |
self._need_to_create = False |
1457 |
start_pos = 0 |
|
1863.1.1
by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit |
1458 |
if self._do_cache: |
1459 |
self._cache[version_id] = sio.getvalue() |
|
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1460 |
return start_pos, size |
1461 |
||
1462 |
def _parse_record_header(self, version_id, raw_data): |
|
1463 |
"""Parse a record header for consistency.
|
|
1464 |
||
1465 |
:return: the header and the decompressor stream.
|
|
1466 |
as (stream, header_record)
|
|
1467 |
"""
|
|
1468 |
df = GzipFile(mode='rb', fileobj=StringIO(raw_data)) |
|
2329.1.1
by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption. |
1469 |
try: |
1470 |
rec = self._check_header(version_id, df.readline()) |
|
1471 |
except Exception, e: |
|
1472 |
raise KnitCorrupt(self._filename, |
|
1473 |
"While reading {%s} got %s(%s)" |
|
1474 |
% (version_id, e.__class__.__name__, str(e))) |
|
2163.2.4
by John Arbash Meinel
Split _KnitData._parse_header up, so that we have 1 readlines() call, rather than readline+readlines() |
1475 |
return df, rec |
1476 |
||
1477 |
def _check_header(self, version_id, line): |
|
1478 |
rec = line.split() |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1479 |
if len(rec) != 4: |
2163.2.4
by John Arbash Meinel
Split _KnitData._parse_header up, so that we have 1 readlines() call, rather than readline+readlines() |
1480 |
raise KnitCorrupt(self._filename, |
1481 |
'unexpected number of elements in record header') |
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
1482 |
if rec[1] != version_id: |
2163.2.4
by John Arbash Meinel
Split _KnitData._parse_header up, so that we have 1 readlines() call, rather than readline+readlines() |
1483 |
raise KnitCorrupt(self._filename, |
1484 |
'unexpected version, wanted %r, got %r' |
|
1485 |
% (version_id, rec[1])) |
|
1486 |
return rec |
|
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1487 |
|
1488 |
def _parse_record(self, version_id, data): |
|
1628.1.2
by Robert Collins
More knit micro-optimisations. |
1489 |
# profiling notes:
|
1490 |
# 4168 calls in 2880 217 internal
|
|
1491 |
# 4168 calls to _parse_record_header in 2121
|
|
1492 |
# 4168 calls to readlines in 330
|
|
2163.2.4
by John Arbash Meinel
Split _KnitData._parse_header up, so that we have 1 readlines() call, rather than readline+readlines() |
1493 |
df = GzipFile(mode='rb', fileobj=StringIO(data)) |
1494 |
||
2329.1.1
by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption. |
1495 |
try: |
1496 |
record_contents = df.readlines() |
|
1497 |
except Exception, e: |
|
1498 |
raise KnitCorrupt(self._filename, |
|
1499 |
"While reading {%s} got %s(%s)" |
|
1500 |
% (version_id, e.__class__.__name__, str(e))) |
|
2163.2.4
by John Arbash Meinel
Split _KnitData._parse_header up, so that we have 1 readlines() call, rather than readline+readlines() |
1501 |
header = record_contents.pop(0) |
1502 |
rec = self._check_header(version_id, header) |
|
1503 |
||
1504 |
last_line = record_contents.pop() |
|
2329.1.1
by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption. |
1505 |
if len(record_contents) != int(rec[2]): |
1506 |
raise KnitCorrupt(self._filename, |
|
1507 |
'incorrect number of lines %s != %s' |
|
1508 |
' for version {%s}' |
|
1509 |
% (len(record_contents), int(rec[2]), |
|
1510 |
version_id)) |
|
2163.2.4
by John Arbash Meinel
Split _KnitData._parse_header up, so that we have 1 readlines() call, rather than readline+readlines() |
1511 |
if last_line != 'end %s\n' % rec[1]: |
1512 |
raise KnitCorrupt(self._filename, |
|
1513 |
'unexpected version end line %r, wanted %r' |
|
1514 |
% (last_line, version_id)) |
|
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1515 |
df.close() |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1516 |
return record_contents, rec[3] |
1517 |
||
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1518 |
def read_records_iter_raw(self, records): |
1519 |
"""Read text records from data file and yield raw data.
|
|
1520 |
||
1521 |
This unpacks enough of the text record to validate the id is
|
|
1522 |
as expected but thats all.
|
|
1523 |
"""
|
|
1524 |
# setup an iterator of the external records:
|
|
1525 |
# uses readv so nice and fast we hope.
|
|
1756.3.23
by Aaron Bentley
Remove knit caches |
1526 |
if len(records): |
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1527 |
# grab the disk data needed.
|
1863.1.1
by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit |
1528 |
if self._cache: |
1529 |
# Don't check _cache if it is empty
|
|
1530 |
needed_offsets = [(pos, size) for version_id, pos, size |
|
1531 |
in records |
|
1532 |
if version_id not in self._cache] |
|
1533 |
else: |
|
1534 |
needed_offsets = [(pos, size) for version_id, pos, size |
|
1535 |
in records] |
|
1536 |
||
1537 |
raw_records = self._transport.readv(self._filename, needed_offsets) |
|
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1538 |
|
1539 |
for version_id, pos, size in records: |
|
1863.1.1
by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit |
1540 |
if version_id in self._cache: |
1541 |
# This data has already been validated
|
|
1542 |
data = self._cache[version_id] |
|
1543 |
else: |
|
1544 |
pos, data = raw_records.next() |
|
1545 |
if self._do_cache: |
|
1546 |
self._cache[version_id] = data |
|
1547 |
||
1548 |
# validate the header
|
|
1549 |
df, rec = self._parse_record_header(version_id, data) |
|
1550 |
df.close() |
|
1756.3.23
by Aaron Bentley
Remove knit caches |
1551 |
yield version_id, data |
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1552 |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1553 |
def read_records_iter(self, records): |
1554 |
"""Read text records from data file and yield result.
|
|
1555 |
||
1863.1.5
by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order. |
1556 |
The result will be returned in whatever is the fastest to read.
|
1557 |
Not by the order requested. Also, multiple requests for the same
|
|
1558 |
record will only yield 1 response.
|
|
1559 |
:param records: A list of (version_id, pos, len) entries
|
|
1560 |
:return: Yields (version_id, contents, digest) in the order
|
|
1561 |
read, not the order requested
|
|
1562 |
"""
|
|
1563 |
if not records: |
|
1564 |
return
|
|
1565 |
||
1863.1.1
by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit |
1566 |
if self._cache: |
1863.1.5
by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order. |
1567 |
# Skip records we have alread seen
|
1568 |
yielded_records = set() |
|
1863.1.1
by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit |
1569 |
needed_records = set() |
1570 |
for record in records: |
|
1571 |
if record[0] in self._cache: |
|
1863.1.5
by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order. |
1572 |
if record[0] in yielded_records: |
1573 |
continue
|
|
1574 |
yielded_records.add(record[0]) |
|
1575 |
data = self._cache[record[0]] |
|
1576 |
content, digest = self._parse_record(record[0], data) |
|
1577 |
yield (record[0], content, digest) |
|
1863.1.1
by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit |
1578 |
else: |
1579 |
needed_records.add(record) |
|
1580 |
needed_records = sorted(needed_records, key=operator.itemgetter(1)) |
|
1581 |
else: |
|
1582 |
needed_records = sorted(set(records), key=operator.itemgetter(1)) |
|
1756.3.23
by Aaron Bentley
Remove knit caches |
1583 |
|
1863.1.5
by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order. |
1584 |
if not needed_records: |
1585 |
return
|
|
1586 |
||
1587 |
# The transport optimizes the fetching as well
|
|
1588 |
# (ie, reads continuous ranges.)
|
|
1589 |
readv_response = self._transport.readv(self._filename, |
|
1590 |
[(pos, size) for version_id, pos, size in needed_records]) |
|
1591 |
||
1592 |
for (version_id, pos, size), (pos, data) in \ |
|
1593 |
izip(iter(needed_records), readv_response): |
|
1594 |
content, digest = self._parse_record(version_id, data) |
|
1863.1.1
by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit |
1595 |
if self._do_cache: |
1863.1.5
by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order. |
1596 |
self._cache[version_id] = data |
1756.3.23
by Aaron Bentley
Remove knit caches |
1597 |
yield version_id, content, digest |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1598 |
|
1599 |
def read_records(self, records): |
|
1600 |
"""Read records into a dictionary."""
|
|
1601 |
components = {} |
|
1863.1.5
by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order. |
1602 |
for record_id, content, digest in \ |
1863.1.9
by John Arbash Meinel
Switching to have 'read_records_iter' return in random order. |
1603 |
self.read_records_iter(records): |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1604 |
components[record_id] = (content, digest) |
1605 |
return components |
|
1606 |
||
1563.2.13
by Robert Collins
InterVersionedFile implemented. |
1607 |
|
1608 |
class InterKnit(InterVersionedFile): |
|
1609 |
"""Optimised code paths for knit to knit operations."""
|
|
1610 |
||
1684.3.3
by Robert Collins
Add a special cased weaves to knit converter. |
1611 |
_matching_file_from_factory = KnitVersionedFile |
1612 |
_matching_file_to_factory = KnitVersionedFile |
|
1563.2.13
by Robert Collins
InterVersionedFile implemented. |
1613 |
|
1614 |
@staticmethod
|
|
1615 |
def is_compatible(source, target): |
|
1616 |
"""Be compatible with knits. """
|
|
1617 |
try: |
|
1618 |
return (isinstance(source, KnitVersionedFile) and |
|
1619 |
isinstance(target, KnitVersionedFile)) |
|
1620 |
except AttributeError: |
|
1621 |
return False |
|
1622 |
||
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
1623 |
def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False): |
1563.2.13
by Robert Collins
InterVersionedFile implemented. |
1624 |
"""See InterVersionedFile.join."""
|
1625 |
assert isinstance(self.source, KnitVersionedFile) |
|
1626 |
assert isinstance(self.target, KnitVersionedFile) |
|
1627 |
||
1684.3.2
by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile. |
1628 |
version_ids = self._get_source_version_ids(version_ids, ignore_missing) |
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
1629 |
|
1563.2.13
by Robert Collins
InterVersionedFile implemented. |
1630 |
if not version_ids: |
1631 |
return 0 |
|
1632 |
||
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1633 |
pb = ui.ui_factory.nested_progress_bar() |
1594.2.24
by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching. |
1634 |
try: |
1635 |
version_ids = list(version_ids) |
|
1636 |
if None in version_ids: |
|
1637 |
version_ids.remove(None) |
|
1638 |
||
1639 |
self.source_ancestry = set(self.source.get_ancestry(version_ids)) |
|
1640 |
this_versions = set(self.target._index.get_versions()) |
|
1641 |
needed_versions = self.source_ancestry - this_versions |
|
1642 |
cross_check_versions = self.source_ancestry.intersection(this_versions) |
|
1643 |
mismatched_versions = set() |
|
1644 |
for version in cross_check_versions: |
|
1645 |
# scan to include needed parents.
|
|
1646 |
n1 = set(self.target.get_parents_with_ghosts(version)) |
|
1647 |
n2 = set(self.source.get_parents_with_ghosts(version)) |
|
1648 |
if n1 != n2: |
|
1649 |
# FIXME TEST this check for cycles being introduced works
|
|
1650 |
# the logic is we have a cycle if in our graph we are an
|
|
1651 |
# ancestor of any of the n2 revisions.
|
|
1652 |
for parent in n2: |
|
1653 |
if parent in n1: |
|
1654 |
# safe
|
|
1655 |
continue
|
|
1656 |
else: |
|
1657 |
parent_ancestors = self.source.get_ancestry(parent) |
|
1658 |
if version in parent_ancestors: |
|
1659 |
raise errors.GraphCycleError([parent, version]) |
|
1660 |
# ensure this parent will be available later.
|
|
1661 |
new_parents = n2.difference(n1) |
|
1662 |
needed_versions.update(new_parents.difference(this_versions)) |
|
1663 |
mismatched_versions.add(version) |
|
1664 |
||
1684.3.3
by Robert Collins
Add a special cased weaves to knit converter. |
1665 |
if not needed_versions and not mismatched_versions: |
1594.2.24
by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching. |
1666 |
return 0 |
1910.2.65
by Aaron Bentley
Remove the check-parent patch |
1667 |
full_list = topo_sort(self.source.get_graph()) |
1668 |
||
1669 |
version_list = [i for i in full_list if (not self.target.has_version(i) |
|
1670 |
and i in needed_versions)] |
|
1594.2.24
by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching. |
1671 |
|
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1672 |
# plan the join:
|
1673 |
copy_queue = [] |
|
1674 |
copy_queue_records = [] |
|
1675 |
copy_set = set() |
|
1594.2.24
by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching. |
1676 |
for version_id in version_list: |
1677 |
options = self.source._index.get_options(version_id) |
|
1678 |
parents = self.source._index.get_parents_with_ghosts(version_id) |
|
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1679 |
# check that its will be a consistent copy:
|
1594.2.24
by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching. |
1680 |
for parent in parents: |
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1681 |
# if source has the parent, we must :
|
1682 |
# * already have it or
|
|
1683 |
# * have it scheduled already
|
|
1759.2.2
by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron. |
1684 |
# otherwise we don't care
|
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1685 |
assert (self.target.has_version(parent) or |
1686 |
parent in copy_set or |
|
1687 |
not self.source.has_version(parent)) |
|
1688 |
data_pos, data_size = self.source._index.get_position(version_id) |
|
1689 |
copy_queue_records.append((version_id, data_pos, data_size)) |
|
1690 |
copy_queue.append((version_id, options, parents)) |
|
1691 |
copy_set.add(version_id) |
|
1692 |
||
1693 |
# data suck the join:
|
|
1694 |
count = 0 |
|
1695 |
total = len(version_list) |
|
1692.2.1
by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions. |
1696 |
raw_datum = [] |
1697 |
raw_records = [] |
|
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1698 |
for (version_id, raw_data), \ |
1699 |
(version_id2, options, parents) in \ |
|
1700 |
izip(self.source._data.read_records_iter_raw(copy_queue_records), |
|
1701 |
copy_queue): |
|
1702 |
assert version_id == version_id2, 'logic error, inconsistent results' |
|
1594.2.24
by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching. |
1703 |
count = count + 1 |
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1704 |
pb.update("Joining knit", count, total) |
1692.2.1
by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions. |
1705 |
raw_records.append((version_id, options, parents, len(raw_data))) |
1706 |
raw_datum.append(raw_data) |
|
1707 |
self.target._add_raw_records(raw_records, ''.join(raw_datum)) |
|
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1708 |
|
1594.2.24
by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching. |
1709 |
for version in mismatched_versions: |
1596.2.8
by Robert Collins
Join knits with the original gzipped data avoiding recompression. |
1710 |
# FIXME RBC 20060309 is this needed?
|
1594.2.24
by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching. |
1711 |
n1 = set(self.target.get_parents_with_ghosts(version)) |
1712 |
n2 = set(self.source.get_parents_with_ghosts(version)) |
|
1713 |
# write a combined record to our history preserving the current
|
|
1714 |
# parents as first in the list
|
|
1715 |
new_parents = self.target.get_parents_with_ghosts(version) + list(n2.difference(n1)) |
|
1716 |
self.target.fix_parents(version, new_parents) |
|
1717 |
return count |
|
1718 |
finally: |
|
1719 |
pb.finished() |
|
1563.2.13
by Robert Collins
InterVersionedFile implemented. |
1720 |
|
1721 |
||
1722 |
InterVersionedFile.register_optimiser(InterKnit) |
|
1596.2.24
by Robert Collins
Gzipfile was slightly slower than ideal. |
1723 |
|
1724 |
||
1684.3.3
by Robert Collins
Add a special cased weaves to knit converter. |
1725 |
class WeaveToKnit(InterVersionedFile): |
1726 |
"""Optimised code paths for weave to knit operations."""
|
|
1727 |
||
1728 |
_matching_file_from_factory = bzrlib.weave.WeaveFile |
|
1729 |
_matching_file_to_factory = KnitVersionedFile |
|
1730 |
||
1731 |
@staticmethod
|
|
1732 |
def is_compatible(source, target): |
|
1733 |
"""Be compatible with weaves to knits."""
|
|
1734 |
try: |
|
1735 |
return (isinstance(source, bzrlib.weave.Weave) and |
|
1736 |
isinstance(target, KnitVersionedFile)) |
|
1737 |
except AttributeError: |
|
1738 |
return False |
|
1739 |
||
1740 |
def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False): |
|
1741 |
"""See InterVersionedFile.join."""
|
|
1742 |
assert isinstance(self.source, bzrlib.weave.Weave) |
|
1743 |
assert isinstance(self.target, KnitVersionedFile) |
|
1744 |
||
1745 |
version_ids = self._get_source_version_ids(version_ids, ignore_missing) |
|
1746 |
||
1747 |
if not version_ids: |
|
1748 |
return 0 |
|
1749 |
||
2158.3.1
by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations |
1750 |
pb = ui.ui_factory.nested_progress_bar() |
1684.3.3
by Robert Collins
Add a special cased weaves to knit converter. |
1751 |
try: |
1752 |
version_ids = list(version_ids) |
|
1753 |
||
1754 |
self.source_ancestry = set(self.source.get_ancestry(version_ids)) |
|
1755 |
this_versions = set(self.target._index.get_versions()) |
|
1756 |
needed_versions = self.source_ancestry - this_versions |
|
1757 |
cross_check_versions = self.source_ancestry.intersection(this_versions) |
|
1758 |
mismatched_versions = set() |
|
1759 |
for version in cross_check_versions: |
|
1760 |
# scan to include needed parents.
|
|
1761 |
n1 = set(self.target.get_parents_with_ghosts(version)) |
|
1762 |
n2 = set(self.source.get_parents(version)) |
|
1763 |
# if all of n2's parents are in n1, then its fine.
|
|
1764 |
if n2.difference(n1): |
|
1765 |
# FIXME TEST this check for cycles being introduced works
|
|
1766 |
# the logic is we have a cycle if in our graph we are an
|
|
1767 |
# ancestor of any of the n2 revisions.
|
|
1768 |
for parent in n2: |
|
1769 |
if parent in n1: |
|
1770 |
# safe
|
|
1771 |
continue
|
|
1772 |
else: |
|
1773 |
parent_ancestors = self.source.get_ancestry(parent) |
|
1774 |
if version in parent_ancestors: |
|
1775 |
raise errors.GraphCycleError([parent, version]) |
|
1776 |
# ensure this parent will be available later.
|
|
1777 |
new_parents = n2.difference(n1) |
|
1778 |
needed_versions.update(new_parents.difference(this_versions)) |
|
1779 |
mismatched_versions.add(version) |
|
1780 |
||
1781 |
if not needed_versions and not mismatched_versions: |
|
1782 |
return 0 |
|
1783 |
full_list = topo_sort(self.source.get_graph()) |
|
1784 |
||
1785 |
version_list = [i for i in full_list if (not self.target.has_version(i) |
|
1786 |
and i in needed_versions)] |
|
1787 |
||
1788 |
# do the join:
|
|
1789 |
count = 0 |
|
1790 |
total = len(version_list) |
|
1791 |
for version_id in version_list: |
|
1792 |
pb.update("Converting to knit", count, total) |
|
1793 |
parents = self.source.get_parents(version_id) |
|
1794 |
# check that its will be a consistent copy:
|
|
1795 |
for parent in parents: |
|
1796 |
# if source has the parent, we must already have it
|
|
1797 |
assert (self.target.has_version(parent)) |
|
1798 |
self.target.add_lines( |
|
1799 |
version_id, parents, self.source.get_lines(version_id)) |
|
1800 |
count = count + 1 |
|
1801 |
||
1802 |
for version in mismatched_versions: |
|
1803 |
# FIXME RBC 20060309 is this needed?
|
|
1804 |
n1 = set(self.target.get_parents_with_ghosts(version)) |
|
1805 |
n2 = set(self.source.get_parents(version)) |
|
1806 |
# write a combined record to our history preserving the current
|
|
1807 |
# parents as first in the list
|
|
1808 |
new_parents = self.target.get_parents_with_ghosts(version) + list(n2.difference(n1)) |
|
1809 |
self.target.fix_parents(version, new_parents) |
|
1810 |
return count |
|
1811 |
finally: |
|
1812 |
pb.finished() |
|
1813 |
||
1814 |
||
1815 |
InterVersionedFile.register_optimiser(WeaveToKnit) |
|
1816 |
||
1817 |
||
1711.2.11
by John Arbash Meinel
Rename patiencediff.SequenceMatcher => PatienceSequenceMatcher and knit.SequenceMatcher => KnitSequenceMatcher |
1818 |
class KnitSequenceMatcher(difflib.SequenceMatcher): |
1596.2.35
by Robert Collins
Subclass SequenceMatcher to get a slightly faster (in our case) find_longest_match routine. |
1819 |
"""Knit tuned sequence matcher.
|
1820 |
||
1821 |
This is based on profiling of difflib which indicated some improvements
|
|
1822 |
for our usage pattern.
|
|
1823 |
"""
|
|
1824 |
||
1825 |
def find_longest_match(self, alo, ahi, blo, bhi): |
|
1826 |
"""Find longest matching block in a[alo:ahi] and b[blo:bhi].
|
|
1827 |
||
1828 |
If isjunk is not defined:
|
|
1829 |
||
1830 |
Return (i,j,k) such that a[i:i+k] is equal to b[j:j+k], where
|
|
1831 |
alo <= i <= i+k <= ahi
|
|
1832 |
blo <= j <= j+k <= bhi
|
|
1833 |
and for all (i',j',k') meeting those conditions,
|
|
1834 |
k >= k'
|
|
1835 |
i <= i'
|
|
1836 |
and if i == i', j <= j'
|
|
1837 |
||
1838 |
In other words, of all maximal matching blocks, return one that
|
|
1839 |
starts earliest in a, and of all those maximal matching blocks that
|
|
1840 |
start earliest in a, return the one that starts earliest in b.
|
|
1841 |
||
1842 |
>>> s = SequenceMatcher(None, " abcd", "abcd abcd")
|
|
1843 |
>>> s.find_longest_match(0, 5, 0, 9)
|
|
1844 |
(0, 4, 5)
|
|
1845 |
||
1846 |
If isjunk is defined, first the longest matching block is
|
|
1847 |
determined as above, but with the additional restriction that no
|
|
1848 |
junk element appears in the block. Then that block is extended as
|
|
1849 |
far as possible by matching (only) junk elements on both sides. So
|
|
1850 |
the resulting block never matches on junk except as identical junk
|
|
1851 |
happens to be adjacent to an "interesting" match.
|
|
1852 |
||
1853 |
Here's the same example as before, but considering blanks to be
|
|
1854 |
junk. That prevents " abcd" from matching the " abcd" at the tail
|
|
1855 |
end of the second sequence directly. Instead only the "abcd" can
|
|
1856 |
match, and matches the leftmost "abcd" in the second sequence:
|
|
1857 |
||
1858 |
>>> s = SequenceMatcher(lambda x: x==" ", " abcd", "abcd abcd")
|
|
1859 |
>>> s.find_longest_match(0, 5, 0, 9)
|
|
1860 |
(1, 0, 4)
|
|
1861 |
||
1862 |
If no blocks match, return (alo, blo, 0).
|
|
1863 |
||
1864 |
>>> s = SequenceMatcher(None, "ab", "c")
|
|
1865 |
>>> s.find_longest_match(0, 2, 0, 1)
|
|
1866 |
(0, 0, 0)
|
|
1867 |
"""
|
|
1868 |
||
1869 |
# CAUTION: stripping common prefix or suffix would be incorrect.
|
|
1870 |
# E.g.,
|
|
1871 |
# ab
|
|
1872 |
# acab
|
|
1873 |
# Longest matching block is "ab", but if common prefix is
|
|
1874 |
# stripped, it's "a" (tied with "b"). UNIX(tm) diff does so
|
|
1875 |
# strip, so ends up claiming that ab is changed to acab by
|
|
1876 |
# inserting "ca" in the middle. That's minimal but unintuitive:
|
|
1877 |
# "it's obvious" that someone inserted "ac" at the front.
|
|
1878 |
# Windiff ends up at the same place as diff, but by pairing up
|
|
1879 |
# the unique 'b's and then matching the first two 'a's.
|
|
1880 |
||
1881 |
a, b, b2j, isbjunk = self.a, self.b, self.b2j, self.isbjunk |
|
1882 |
besti, bestj, bestsize = alo, blo, 0 |
|
1883 |
# find longest junk-free match
|
|
1884 |
# during an iteration of the loop, j2len[j] = length of longest
|
|
1885 |
# junk-free match ending with a[i-1] and b[j]
|
|
1886 |
j2len = {} |
|
1887 |
# nothing = []
|
|
1888 |
b2jget = b2j.get |
|
1889 |
for i in xrange(alo, ahi): |
|
1890 |
# look at all instances of a[i] in b; note that because
|
|
1891 |
# b2j has no junk keys, the loop is skipped if a[i] is junk
|
|
1892 |
j2lenget = j2len.get |
|
1893 |
newj2len = {} |
|
1894 |
||
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
1895 |
# changing b2j.get(a[i], nothing) to a try:KeyError pair produced the
|
1596.2.35
by Robert Collins
Subclass SequenceMatcher to get a slightly faster (in our case) find_longest_match routine. |
1896 |
# following improvement
|
1897 |
# 704 0 4650.5320 2620.7410 bzrlib.knit:1336(find_longest_match)
|
|
1898 |
# +326674 0 1655.1210 1655.1210 +<method 'get' of 'dict' objects>
|
|
1899 |
# +76519 0 374.6700 374.6700 +<method 'has_key' of 'dict' objects>
|
|
1900 |
# to
|
|
1901 |
# 704 0 3733.2820 2209.6520 bzrlib.knit:1336(find_longest_match)
|
|
1902 |
# +211400 0 1147.3520 1147.3520 +<method 'get' of 'dict' objects>
|
|
1903 |
# +76519 0 376.2780 376.2780 +<method 'has_key' of 'dict' objects>
|
|
1904 |
||
1905 |
try: |
|
1906 |
js = b2j[a[i]] |
|
1907 |
except KeyError: |
|
1908 |
pass
|
|
1909 |
else: |
|
1910 |
for j in js: |
|
1911 |
# a[i] matches b[j]
|
|
1912 |
if j >= blo: |
|
1913 |
if j >= bhi: |
|
1914 |
break
|
|
1915 |
k = newj2len[j] = 1 + j2lenget(-1 + j, 0) |
|
1916 |
if k > bestsize: |
|
1917 |
besti, bestj, bestsize = 1 + i-k, 1 + j-k, k |
|
1918 |
j2len = newj2len |
|
1919 |
||
1920 |
# Extend the best by non-junk elements on each end. In particular,
|
|
1921 |
# "popular" non-junk elements aren't in b2j, which greatly speeds
|
|
1922 |
# the inner loop above, but also means "the best" match so far
|
|
1923 |
# doesn't contain any junk *or* popular non-junk elements.
|
|
1924 |
while besti > alo and bestj > blo and \ |
|
1925 |
not isbjunk(b[bestj-1]) and \ |
|
1926 |
a[besti-1] == b[bestj-1]: |
|
1927 |
besti, bestj, bestsize = besti-1, bestj-1, bestsize+1 |
|
1928 |
while besti+bestsize < ahi and bestj+bestsize < bhi and \ |
|
1929 |
not isbjunk(b[bestj+bestsize]) and \ |
|
1930 |
a[besti+bestsize] == b[bestj+bestsize]: |
|
1931 |
bestsize += 1 |
|
1932 |
||
1933 |
# Now that we have a wholly interesting match (albeit possibly
|
|
1934 |
# empty!), we may as well suck up the matching junk on each
|
|
1935 |
# side of it too. Can't think of a good reason not to, and it
|
|
1936 |
# saves post-processing the (possibly considerable) expense of
|
|
1937 |
# figuring out what to do with it. In the case of an empty
|
|
1938 |
# interesting match, this is clearly the right thing to do,
|
|
1939 |
# because no other kind of match is possible in the regions.
|
|
1940 |
while besti > alo and bestj > blo and \ |
|
1941 |
isbjunk(b[bestj-1]) and \ |
|
1942 |
a[besti-1] == b[bestj-1]: |
|
1943 |
besti, bestj, bestsize = besti-1, bestj-1, bestsize+1 |
|
1944 |
while besti+bestsize < ahi and bestj+bestsize < bhi and \ |
|
1945 |
isbjunk(b[bestj+bestsize]) and \ |
|
1946 |
a[besti+bestsize] == b[bestj+bestsize]: |
|
1947 |
bestsize = bestsize + 1 |
|
1948 |
||
1949 |
return besti, bestj, bestsize |