##// END OF EJS Templates
sparse-revlog: fast-path before computing payload size...
Boris Feld -
r40642:bfbfd15d default
parent child Browse files
Show More
@@ -1,896 +1,896 b''
1 1 # revlogdeltas.py - Logic around delta computation for revlog
2 2 #
3 3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 4 # Copyright 2018 Octobus <contact@octobus.net>
5 5 #
6 6 # This software may be used and distributed according to the terms of the
7 7 # GNU General Public License version 2 or any later version.
8 8 """Helper class to compute deltas stored inside revlogs"""
9 9
10 10 from __future__ import absolute_import
11 11
12 12 import collections
13 13 import heapq
14 14 import struct
15 15
16 16 # import stuff from node for others to import from revlog
17 17 from ..node import (
18 18 nullrev,
19 19 )
20 20 from ..i18n import _
21 21
22 22 from .constants import (
23 23 REVIDX_ISCENSORED,
24 24 REVIDX_RAWTEXT_CHANGING_FLAGS,
25 25 )
26 26
27 27 from ..thirdparty import (
28 28 attr,
29 29 )
30 30
31 31 from .. import (
32 32 error,
33 33 mdiff,
34 34 )
35 35
36 36 # maximum <delta-chain-data>/<revision-text-length> ratio
37 37 LIMIT_DELTA2TEXT = 2
38 38
39 39 class _testrevlog(object):
40 40 """minimalist fake revlog to use in doctests"""
41 41
42 42 def __init__(self, data, density=0.5, mingap=0):
43 43 """data is an list of revision payload boundaries"""
44 44 self._data = data
45 45 self._srdensitythreshold = density
46 46 self._srmingapsize = mingap
47 47
48 48 def start(self, rev):
49 49 if rev == 0:
50 50 return 0
51 51 return self._data[rev - 1]
52 52
53 53 def end(self, rev):
54 54 return self._data[rev]
55 55
56 56 def length(self, rev):
57 57 return self.end(rev) - self.start(rev)
58 58
59 59 def __len__(self):
60 60 return len(self._data)
61 61
62 62 def slicechunk(revlog, revs, targetsize=None):
63 63 """slice revs to reduce the amount of unrelated data to be read from disk.
64 64
65 65 ``revs`` is sliced into groups that should be read in one time.
66 66 Assume that revs are sorted.
67 67
68 68 The initial chunk is sliced until the overall density (payload/chunks-span
69 69 ratio) is above `revlog._srdensitythreshold`. No gap smaller than
70 70 `revlog._srmingapsize` is skipped.
71 71
72 72 If `targetsize` is set, no chunk larger than `targetsize` will be yield.
73 73 For consistency with other slicing choice, this limit won't go lower than
74 74 `revlog._srmingapsize`.
75 75
76 76 If individual revisions chunk are larger than this limit, they will still
77 77 be raised individually.
78 78
79 79 >>> revlog = _testrevlog([
80 80 ... 5, #00 (5)
81 81 ... 10, #01 (5)
82 82 ... 12, #02 (2)
83 83 ... 12, #03 (empty)
84 84 ... 27, #04 (15)
85 85 ... 31, #05 (4)
86 86 ... 31, #06 (empty)
87 87 ... 42, #07 (11)
88 88 ... 47, #08 (5)
89 89 ... 47, #09 (empty)
90 90 ... 48, #10 (1)
91 91 ... 51, #11 (3)
92 92 ... 74, #12 (23)
93 93 ... 85, #13 (11)
94 94 ... 86, #14 (1)
95 95 ... 91, #15 (5)
96 96 ... ])
97 97
98 98 >>> list(slicechunk(revlog, list(range(16))))
99 99 [[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]]
100 100 >>> list(slicechunk(revlog, [0, 15]))
101 101 [[0], [15]]
102 102 >>> list(slicechunk(revlog, [0, 11, 15]))
103 103 [[0], [11], [15]]
104 104 >>> list(slicechunk(revlog, [0, 11, 13, 15]))
105 105 [[0], [11, 13, 15]]
106 106 >>> list(slicechunk(revlog, [1, 2, 3, 5, 8, 10, 11, 14]))
107 107 [[1, 2], [5, 8, 10, 11], [14]]
108 108
109 109 Slicing with a maximum chunk size
110 110 >>> list(slicechunk(revlog, [0, 11, 13, 15], targetsize=15))
111 111 [[0], [11], [13], [15]]
112 112 >>> list(slicechunk(revlog, [0, 11, 13, 15], targetsize=20))
113 113 [[0], [11], [13, 15]]
114 114 """
115 115 if targetsize is not None:
116 116 targetsize = max(targetsize, revlog._srmingapsize)
117 117 # targetsize should not be specified when evaluating delta candidates:
118 118 # * targetsize is used to ensure we stay within specification when reading,
119 119 for chunk in _slicechunktodensity(revlog, revs,
120 120 revlog._srdensitythreshold,
121 121 revlog._srmingapsize):
122 122 for subchunk in _slicechunktosize(revlog, chunk, targetsize):
123 123 yield subchunk
124 124
125 125 def _slicechunktosize(revlog, revs, targetsize=None):
126 126 """slice revs to match the target size
127 127
128 128 This is intended to be used on chunk that density slicing selected by that
129 129 are still too large compared to the read garantee of revlog. This might
130 130 happens when "minimal gap size" interrupted the slicing or when chain are
131 131 built in a way that create large blocks next to each other.
132 132
133 133 >>> revlog = _testrevlog([
134 134 ... 3, #0 (3)
135 135 ... 5, #1 (2)
136 136 ... 6, #2 (1)
137 137 ... 8, #3 (2)
138 138 ... 8, #4 (empty)
139 139 ... 11, #5 (3)
140 140 ... 12, #6 (1)
141 141 ... 13, #7 (1)
142 142 ... 14, #8 (1)
143 143 ... ])
144 144
145 145 Cases where chunk is already small enough
146 146 >>> list(_slicechunktosize(revlog, [0], 3))
147 147 [[0]]
148 148 >>> list(_slicechunktosize(revlog, [6, 7], 3))
149 149 [[6, 7]]
150 150 >>> list(_slicechunktosize(revlog, [0], None))
151 151 [[0]]
152 152 >>> list(_slicechunktosize(revlog, [6, 7], None))
153 153 [[6, 7]]
154 154
155 155 cases where we need actual slicing
156 156 >>> list(_slicechunktosize(revlog, [0, 1], 3))
157 157 [[0], [1]]
158 158 >>> list(_slicechunktosize(revlog, [1, 3], 3))
159 159 [[1], [3]]
160 160 >>> list(_slicechunktosize(revlog, [1, 2, 3], 3))
161 161 [[1, 2], [3]]
162 162 >>> list(_slicechunktosize(revlog, [3, 5], 3))
163 163 [[3], [5]]
164 164 >>> list(_slicechunktosize(revlog, [3, 4, 5], 3))
165 165 [[3], [5]]
166 166 >>> list(_slicechunktosize(revlog, [5, 6, 7, 8], 3))
167 167 [[5], [6, 7, 8]]
168 168 >>> list(_slicechunktosize(revlog, [0, 1, 2, 3, 4, 5, 6, 7, 8], 3))
169 169 [[0], [1, 2], [3], [5], [6, 7, 8]]
170 170
171 171 Case with too large individual chunk (must return valid chunk)
172 172 >>> list(_slicechunktosize(revlog, [0, 1], 2))
173 173 [[0], [1]]
174 174 >>> list(_slicechunktosize(revlog, [1, 3], 1))
175 175 [[1], [3]]
176 176 >>> list(_slicechunktosize(revlog, [3, 4, 5], 2))
177 177 [[3], [5]]
178 178 """
179 179 assert targetsize is None or 0 <= targetsize
180 180 if targetsize is None or segmentspan(revlog, revs) <= targetsize:
181 181 yield revs
182 182 return
183 183
184 184 startrevidx = 0
185 185 startdata = revlog.start(revs[0])
186 186 endrevidx = 0
187 187 iterrevs = enumerate(revs)
188 188 next(iterrevs) # skip first rev.
189 189 for idx, r in iterrevs:
190 190 span = revlog.end(r) - startdata
191 191 if span <= targetsize:
192 192 endrevidx = idx
193 193 else:
194 194 chunk = _trimchunk(revlog, revs, startrevidx, endrevidx + 1)
195 195 if chunk:
196 196 yield chunk
197 197 startrevidx = idx
198 198 startdata = revlog.start(r)
199 199 endrevidx = idx
200 200 yield _trimchunk(revlog, revs, startrevidx)
201 201
202 202 def _slicechunktodensity(revlog, revs, targetdensity=0.5,
203 203 mingapsize=0):
204 204 """slice revs to reduce the amount of unrelated data to be read from disk.
205 205
206 206 ``revs`` is sliced into groups that should be read in one time.
207 207 Assume that revs are sorted.
208 208
209 209 The initial chunk is sliced until the overall density (payload/chunks-span
210 210 ratio) is above `targetdensity`. No gap smaller than `mingapsize` is
211 211 skipped.
212 212
213 213 >>> revlog = _testrevlog([
214 214 ... 5, #00 (5)
215 215 ... 10, #01 (5)
216 216 ... 12, #02 (2)
217 217 ... 12, #03 (empty)
218 218 ... 27, #04 (15)
219 219 ... 31, #05 (4)
220 220 ... 31, #06 (empty)
221 221 ... 42, #07 (11)
222 222 ... 47, #08 (5)
223 223 ... 47, #09 (empty)
224 224 ... 48, #10 (1)
225 225 ... 51, #11 (3)
226 226 ... 74, #12 (23)
227 227 ... 85, #13 (11)
228 228 ... 86, #14 (1)
229 229 ... 91, #15 (5)
230 230 ... ])
231 231
232 232 >>> list(_slicechunktodensity(revlog, list(range(16))))
233 233 [[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]]
234 234 >>> list(_slicechunktodensity(revlog, [0, 15]))
235 235 [[0], [15]]
236 236 >>> list(_slicechunktodensity(revlog, [0, 11, 15]))
237 237 [[0], [11], [15]]
238 238 >>> list(_slicechunktodensity(revlog, [0, 11, 13, 15]))
239 239 [[0], [11, 13, 15]]
240 240 >>> list(_slicechunktodensity(revlog, [1, 2, 3, 5, 8, 10, 11, 14]))
241 241 [[1, 2], [5, 8, 10, 11], [14]]
242 242 >>> list(_slicechunktodensity(revlog, [1, 2, 3, 5, 8, 10, 11, 14],
243 243 ... mingapsize=20))
244 244 [[1, 2, 3, 5, 8, 10, 11], [14]]
245 245 >>> list(_slicechunktodensity(revlog, [1, 2, 3, 5, 8, 10, 11, 14],
246 246 ... targetdensity=0.95))
247 247 [[1, 2], [5], [8, 10, 11], [14]]
248 248 >>> list(_slicechunktodensity(revlog, [1, 2, 3, 5, 8, 10, 11, 14],
249 249 ... targetdensity=0.95, mingapsize=12))
250 250 [[1, 2], [5, 8, 10, 11], [14]]
251 251 """
252 252 start = revlog.start
253 253 length = revlog.length
254 254
255 255 if len(revs) <= 1:
256 256 yield revs
257 257 return
258 258
259 259 deltachainspan = segmentspan(revlog, revs)
260 chainpayload = sum(length(r) for r in revs)
261 260
262 261 if deltachainspan < mingapsize:
263 262 yield revs
264 263 return
265 264
266 265 readdata = deltachainspan
266 chainpayload = sum(length(r) for r in revs)
267 267
268 268 if deltachainspan:
269 269 density = chainpayload / float(deltachainspan)
270 270 else:
271 271 density = 1.0
272 272
273 273 if density >= targetdensity:
274 274 yield revs
275 275 return
276 276
277 277 # Store the gaps in a heap to have them sorted by decreasing size
278 278 gapsheap = []
279 279 heapq.heapify(gapsheap)
280 280 prevend = None
281 281 for i, rev in enumerate(revs):
282 282 revstart = start(rev)
283 283 revlen = length(rev)
284 284
285 285 # Skip empty revisions to form larger holes
286 286 if revlen == 0:
287 287 continue
288 288
289 289 if prevend is not None:
290 290 gapsize = revstart - prevend
291 291 # only consider holes that are large enough
292 292 if gapsize > mingapsize:
293 293 heapq.heappush(gapsheap, (-gapsize, i))
294 294
295 295 prevend = revstart + revlen
296 296
297 297 # Collect the indices of the largest holes until the density is acceptable
298 298 indicesheap = []
299 299 heapq.heapify(indicesheap)
300 300 while gapsheap and density < targetdensity:
301 301 oppgapsize, gapidx = heapq.heappop(gapsheap)
302 302
303 303 heapq.heappush(indicesheap, gapidx)
304 304
305 305 # the gap sizes are stored as negatives to be sorted decreasingly
306 306 # by the heap
307 307 readdata -= (-oppgapsize)
308 308 if readdata > 0:
309 309 density = chainpayload / float(readdata)
310 310 else:
311 311 density = 1.0
312 312
313 313 # Cut the revs at collected indices
314 314 previdx = 0
315 315 while indicesheap:
316 316 idx = heapq.heappop(indicesheap)
317 317
318 318 chunk = _trimchunk(revlog, revs, previdx, idx)
319 319 if chunk:
320 320 yield chunk
321 321
322 322 previdx = idx
323 323
324 324 chunk = _trimchunk(revlog, revs, previdx)
325 325 if chunk:
326 326 yield chunk
327 327
328 328 def _trimchunk(revlog, revs, startidx, endidx=None):
329 329 """returns revs[startidx:endidx] without empty trailing revs
330 330
331 331 Doctest Setup
332 332 >>> revlog = _testrevlog([
333 333 ... 5, #0
334 334 ... 10, #1
335 335 ... 12, #2
336 336 ... 12, #3 (empty)
337 337 ... 17, #4
338 338 ... 21, #5
339 339 ... 21, #6 (empty)
340 340 ... ])
341 341
342 342 Contiguous cases:
343 343 >>> _trimchunk(revlog, [0, 1, 2, 3, 4, 5, 6], 0)
344 344 [0, 1, 2, 3, 4, 5]
345 345 >>> _trimchunk(revlog, [0, 1, 2, 3, 4, 5, 6], 0, 5)
346 346 [0, 1, 2, 3, 4]
347 347 >>> _trimchunk(revlog, [0, 1, 2, 3, 4, 5, 6], 0, 4)
348 348 [0, 1, 2]
349 349 >>> _trimchunk(revlog, [0, 1, 2, 3, 4, 5, 6], 2, 4)
350 350 [2]
351 351 >>> _trimchunk(revlog, [0, 1, 2, 3, 4, 5, 6], 3)
352 352 [3, 4, 5]
353 353 >>> _trimchunk(revlog, [0, 1, 2, 3, 4, 5, 6], 3, 5)
354 354 [3, 4]
355 355
356 356 Discontiguous cases:
357 357 >>> _trimchunk(revlog, [1, 3, 5, 6], 0)
358 358 [1, 3, 5]
359 359 >>> _trimchunk(revlog, [1, 3, 5, 6], 0, 2)
360 360 [1]
361 361 >>> _trimchunk(revlog, [1, 3, 5, 6], 1, 3)
362 362 [3, 5]
363 363 >>> _trimchunk(revlog, [1, 3, 5, 6], 1)
364 364 [3, 5]
365 365 """
366 366 length = revlog.length
367 367
368 368 if endidx is None:
369 369 endidx = len(revs)
370 370
371 371 # If we have a non-emtpy delta candidate, there are nothing to trim
372 372 if revs[endidx - 1] < len(revlog):
373 373 # Trim empty revs at the end, except the very first revision of a chain
374 374 while (endidx > 1
375 375 and endidx > startidx
376 376 and length(revs[endidx - 1]) == 0):
377 377 endidx -= 1
378 378
379 379 return revs[startidx:endidx]
380 380
381 381 def segmentspan(revlog, revs):
382 382 """Get the byte span of a segment of revisions
383 383
384 384 revs is a sorted array of revision numbers
385 385
386 386 >>> revlog = _testrevlog([
387 387 ... 5, #0
388 388 ... 10, #1
389 389 ... 12, #2
390 390 ... 12, #3 (empty)
391 391 ... 17, #4
392 392 ... ])
393 393
394 394 >>> segmentspan(revlog, [0, 1, 2, 3, 4])
395 395 17
396 396 >>> segmentspan(revlog, [0, 4])
397 397 17
398 398 >>> segmentspan(revlog, [3, 4])
399 399 5
400 400 >>> segmentspan(revlog, [1, 2, 3,])
401 401 7
402 402 >>> segmentspan(revlog, [1, 3])
403 403 7
404 404 """
405 405 if not revs:
406 406 return 0
407 407 end = revlog.end(revs[-1])
408 408 return end - revlog.start(revs[0])
409 409
410 410 def _textfromdelta(fh, revlog, baserev, delta, p1, p2, flags, expectednode):
411 411 """build full text from a (base, delta) pair and other metadata"""
412 412 # special case deltas which replace entire base; no need to decode
413 413 # base revision. this neatly avoids censored bases, which throw when
414 414 # they're decoded.
415 415 hlen = struct.calcsize(">lll")
416 416 if delta[:hlen] == mdiff.replacediffheader(revlog.rawsize(baserev),
417 417 len(delta) - hlen):
418 418 fulltext = delta[hlen:]
419 419 else:
420 420 # deltabase is rawtext before changed by flag processors, which is
421 421 # equivalent to non-raw text
422 422 basetext = revlog.revision(baserev, _df=fh, raw=False)
423 423 fulltext = mdiff.patch(basetext, delta)
424 424
425 425 try:
426 426 res = revlog._processflags(fulltext, flags, 'read', raw=True)
427 427 fulltext, validatehash = res
428 428 if validatehash:
429 429 revlog.checkhash(fulltext, expectednode, p1=p1, p2=p2)
430 430 if flags & REVIDX_ISCENSORED:
431 431 raise error.StorageError(_('node %s is not censored') %
432 432 expectednode)
433 433 except error.CensoredNodeError:
434 434 # must pass the censored index flag to add censored revisions
435 435 if not flags & REVIDX_ISCENSORED:
436 436 raise
437 437 return fulltext
438 438
439 439 @attr.s(slots=True, frozen=True)
440 440 class _deltainfo(object):
441 441 distance = attr.ib()
442 442 deltalen = attr.ib()
443 443 data = attr.ib()
444 444 base = attr.ib()
445 445 chainbase = attr.ib()
446 446 chainlen = attr.ib()
447 447 compresseddeltalen = attr.ib()
448 448 snapshotdepth = attr.ib()
449 449
450 450 def isgooddeltainfo(revlog, deltainfo, revinfo):
451 451 """Returns True if the given delta is good. Good means that it is within
452 452 the disk span, disk size, and chain length bounds that we know to be
453 453 performant."""
454 454 if deltainfo is None:
455 455 return False
456 456
457 457 # - 'deltainfo.distance' is the distance from the base revision --
458 458 # bounding it limits the amount of I/O we need to do.
459 459 # - 'deltainfo.compresseddeltalen' is the sum of the total size of
460 460 # deltas we need to apply -- bounding it limits the amount of CPU
461 461 # we consume.
462 462
463 463 textlen = revinfo.textlen
464 464 defaultmax = textlen * 4
465 465 maxdist = revlog._maxdeltachainspan
466 466 if not maxdist:
467 467 maxdist = deltainfo.distance # ensure the conditional pass
468 468 maxdist = max(maxdist, defaultmax)
469 469
470 470 # Bad delta from read span:
471 471 #
472 472 # If the span of data read is larger than the maximum allowed.
473 473 #
474 474 # In the sparse-revlog case, we rely on the associated "sparse reading"
475 475 # to avoid issue related to the span of data. In theory, it would be
476 476 # possible to build pathological revlog where delta pattern would lead
477 477 # to too many reads. However, they do not happen in practice at all. So
478 478 # we skip the span check entirely.
479 479 if not revlog._sparserevlog and maxdist < deltainfo.distance:
480 480 return False
481 481
482 482 # Bad delta from new delta size:
483 483 #
484 484 # If the delta size is larger than the target text, storing the
485 485 # delta will be inefficient.
486 486 if textlen < deltainfo.deltalen:
487 487 return False
488 488
489 489 # Bad delta from cumulated payload size:
490 490 #
491 491 # If the sum of delta get larger than K * target text length.
492 492 if textlen * LIMIT_DELTA2TEXT < deltainfo.compresseddeltalen:
493 493 return False
494 494
495 495 # Bad delta from chain length:
496 496 #
497 497 # If the number of delta in the chain gets too high.
498 498 if (revlog._maxchainlen
499 499 and revlog._maxchainlen < deltainfo.chainlen):
500 500 return False
501 501
502 502 # bad delta from intermediate snapshot size limit
503 503 #
504 504 # If an intermediate snapshot size is higher than the limit. The
505 505 # limit exist to prevent endless chain of intermediate delta to be
506 506 # created.
507 507 if (deltainfo.snapshotdepth is not None and
508 508 (textlen >> deltainfo.snapshotdepth) < deltainfo.deltalen):
509 509 return False
510 510
511 511 # bad delta if new intermediate snapshot is larger than the previous
512 512 # snapshot
513 513 if (deltainfo.snapshotdepth
514 514 and revlog.length(deltainfo.base) < deltainfo.deltalen):
515 515 return False
516 516
517 517 return True
518 518
519 519 def _candidategroups(revlog, textlen, p1, p2, cachedelta):
520 520 """Provides group of revision to be tested as delta base
521 521
522 522 This top level function focus on emitting groups with unique and worthwhile
523 523 content. See _raw_candidate_groups for details about the group order.
524 524 """
525 525 # should we try to build a delta?
526 526 if not (len(revlog) and revlog._storedeltachains):
527 527 yield None
528 528 return
529 529
530 530 deltalength = revlog.length
531 531 deltaparent = revlog.deltaparent
532 532 good = None
533 533
534 534 deltas_limit = textlen * LIMIT_DELTA2TEXT
535 535
536 536 tested = set([nullrev])
537 537 candidates = _refinedgroups(revlog, p1, p2, cachedelta)
538 538 while True:
539 539 temptative = candidates.send(good)
540 540 if temptative is None:
541 541 break
542 542 group = []
543 543 for rev in temptative:
544 544 # skip over empty delta (no need to include them in a chain)
545 545 while (revlog._generaldelta
546 546 and not (rev == nullrev
547 547 or rev in tested
548 548 or deltalength(rev))):
549 549 tested.add(rev)
550 550 rev = deltaparent(rev)
551 551 # filter out revision we tested already
552 552 if rev in tested:
553 553 continue
554 554 tested.add(rev)
555 555 # filter out delta base that will never produce good delta
556 556 if deltas_limit < revlog.length(rev):
557 557 continue
558 558 # no need to try a delta against nullrev, this will be done as a
559 559 # last resort.
560 560 if rev == nullrev:
561 561 continue
562 562 # no delta for rawtext-changing revs (see "candelta" for why)
563 563 if revlog.flags(rev) & REVIDX_RAWTEXT_CHANGING_FLAGS:
564 564 continue
565 565 group.append(rev)
566 566 if group:
567 567 # XXX: in the sparse revlog case, group can become large,
568 568 # impacting performances. Some bounding or slicing mecanism
569 569 # would help to reduce this impact.
570 570 good = yield tuple(group)
571 571 yield None
572 572
573 573 def _findsnapshots(revlog, cache, start_rev):
574 574 """find snapshot from start_rev to tip"""
575 575 deltaparent = revlog.deltaparent
576 576 issnapshot = revlog.issnapshot
577 577 for rev in revlog.revs(start_rev):
578 578 if issnapshot(rev):
579 579 cache[deltaparent(rev)].append(rev)
580 580
581 581 def _refinedgroups(revlog, p1, p2, cachedelta):
582 582 good = None
583 583 # First we try to reuse a the delta contained in the bundle.
584 584 # (or from the source revlog)
585 585 #
586 586 # This logic only applies to general delta repositories and can be disabled
587 587 # through configuration. Disabling reuse source delta is useful when
588 588 # we want to make sure we recomputed "optimal" deltas.
589 589 if cachedelta and revlog._generaldelta and revlog._lazydeltabase:
590 590 # Assume what we received from the server is a good choice
591 591 # build delta will reuse the cache
592 592 good = yield (cachedelta[0],)
593 593 if good is not None:
594 594 yield None
595 595 return
596 596 for candidates in _rawgroups(revlog, p1, p2, cachedelta):
597 597 good = yield candidates
598 598 if good is not None:
599 599 break
600 600
601 601 # If sparse revlog is enabled, we can try to refine the available deltas
602 602 if not revlog._sparserevlog:
603 603 yield None
604 604 return
605 605
606 606 # if we have a refinable value, try to refine it
607 607 if good is not None and good not in (p1, p2) and revlog.issnapshot(good):
608 608 # refine snapshot down
609 609 previous = None
610 610 while previous != good:
611 611 previous = good
612 612 base = revlog.deltaparent(good)
613 613 if base == nullrev:
614 614 break
615 615 good = yield (base,)
616 616 # refine snapshot up
617 617 #
618 618 # XXX the _findsnapshots call can be expensive and is "duplicated" with
619 619 # the one done in `_rawgroups`. Once we start working on performance,
620 620 # we should make the two logics share this computation.
621 621 snapshots = collections.defaultdict(list)
622 622 _findsnapshots(revlog, snapshots, good + 1)
623 623 previous = None
624 624 while good != previous:
625 625 previous = good
626 626 children = tuple(sorted(c for c in snapshots[good]))
627 627 good = yield children
628 628
629 629 # we have found nothing
630 630 yield None
631 631
632 632 def _rawgroups(revlog, p1, p2, cachedelta):
633 633 """Provides group of revision to be tested as delta base
634 634
635 635 This lower level function focus on emitting delta theorically interresting
636 636 without looking it any practical details.
637 637
638 638 The group order aims at providing fast or small candidates first.
639 639 """
640 640 gdelta = revlog._generaldelta
641 641 sparse = revlog._sparserevlog
642 642 curr = len(revlog)
643 643 prev = curr - 1
644 644 deltachain = lambda rev: revlog._deltachain(rev)[0]
645 645
646 646 if gdelta:
647 647 # exclude already lazy tested base if any
648 648 parents = [p for p in (p1, p2) if p != nullrev]
649 649
650 650 if not revlog._deltabothparents and len(parents) == 2:
651 651 parents.sort()
652 652 # To minimize the chance of having to build a fulltext,
653 653 # pick first whichever parent is closest to us (max rev)
654 654 yield (parents[1],)
655 655 # then the other one (min rev) if the first did not fit
656 656 yield (parents[0],)
657 657 elif len(parents) > 0:
658 658 # Test all parents (1 or 2), and keep the best candidate
659 659 yield parents
660 660
661 661 if sparse and parents:
662 662 snapshots = collections.defaultdict(list) # map: base-rev: snapshot-rev
663 663 # See if we can use an existing snapshot in the parent chains to use as
664 664 # a base for a new intermediate-snapshot
665 665 #
666 666 # search for snapshot in parents delta chain
667 667 # map: snapshot-level: snapshot-rev
668 668 parents_snaps = collections.defaultdict(set)
669 669 candidate_chains = [deltachain(p) for p in parents]
670 670 for chain in candidate_chains:
671 671 for idx, s in enumerate(chain):
672 672 if not revlog.issnapshot(s):
673 673 break
674 674 parents_snaps[idx].add(s)
675 675 snapfloor = min(parents_snaps[0]) + 1
676 676 _findsnapshots(revlog, snapshots, snapfloor)
677 677 # search for the highest "unrelated" revision
678 678 #
679 679 # Adding snapshots used by "unrelated" revision increase the odd we
680 680 # reuse an independant, yet better snapshot chain.
681 681 #
682 682 # XXX instead of building a set of revisions, we could lazily enumerate
683 683 # over the chains. That would be more efficient, however we stick to
684 684 # simple code for now.
685 685 all_revs = set()
686 686 for chain in candidate_chains:
687 687 all_revs.update(chain)
688 688 other = None
689 689 for r in revlog.revs(prev, snapfloor):
690 690 if r not in all_revs:
691 691 other = r
692 692 break
693 693 if other is not None:
694 694 # To avoid unfair competition, we won't use unrelated intermediate
695 695 # snapshot that are deeper than the ones from the parent delta
696 696 # chain.
697 697 max_depth = max(parents_snaps.keys())
698 698 chain = deltachain(other)
699 699 for idx, s in enumerate(chain):
700 700 if s < snapfloor:
701 701 continue
702 702 if max_depth < idx:
703 703 break
704 704 if not revlog.issnapshot(s):
705 705 break
706 706 parents_snaps[idx].add(s)
707 707 # Test them as possible intermediate snapshot base
708 708 # We test them from highest to lowest level. High level one are more
709 709 # likely to result in small delta
710 710 floor = None
711 711 for idx, snaps in sorted(parents_snaps.items(), reverse=True):
712 712 siblings = set()
713 713 for s in snaps:
714 714 siblings.update(snapshots[s])
715 715 # Before considering making a new intermediate snapshot, we check
716 716 # if an existing snapshot, children of base we consider, would be
717 717 # suitable.
718 718 #
719 719 # It give a change to reuse a delta chain "unrelated" to the
720 720 # current revision instead of starting our own. Without such
721 721 # re-use, topological branches would keep reopening new chains.
722 722 # Creating more and more snapshot as the repository grow.
723 723
724 724 if floor is not None:
725 725 # We only do this for siblings created after the one in our
726 726 # parent's delta chain. Those created before has less chances
727 727 # to be valid base since our ancestors had to create a new
728 728 # snapshot.
729 729 siblings = [r for r in siblings if floor < r]
730 730 yield tuple(sorted(siblings))
731 731 # then test the base from our parent's delta chain.
732 732 yield tuple(sorted(snaps))
733 733 floor = min(snaps)
734 734 # No suitable base found in the parent chain, search if any full
735 735 # snapshots emitted since parent's base would be a suitable base for an
736 736 # intermediate snapshot.
737 737 #
738 738 # It give a chance to reuse a delta chain unrelated to the current
739 739 # revisions instead of starting our own. Without such re-use,
740 740 # topological branches would keep reopening new full chains. Creating
741 741 # more and more snapshot as the repository grow.
742 742 yield tuple(snapshots[nullrev])
743 743
744 744 if not sparse:
745 745 # other approach failed try against prev to hopefully save us a
746 746 # fulltext.
747 747 yield (prev,)
748 748
749 749 class deltacomputer(object):
750 750 def __init__(self, revlog):
751 751 self.revlog = revlog
752 752
753 753 def buildtext(self, revinfo, fh):
754 754 """Builds a fulltext version of a revision
755 755
756 756 revinfo: _revisioninfo instance that contains all needed info
757 757 fh: file handle to either the .i or the .d revlog file,
758 758 depending on whether it is inlined or not
759 759 """
760 760 btext = revinfo.btext
761 761 if btext[0] is not None:
762 762 return btext[0]
763 763
764 764 revlog = self.revlog
765 765 cachedelta = revinfo.cachedelta
766 766 baserev = cachedelta[0]
767 767 delta = cachedelta[1]
768 768
769 769 fulltext = btext[0] = _textfromdelta(fh, revlog, baserev, delta,
770 770 revinfo.p1, revinfo.p2,
771 771 revinfo.flags, revinfo.node)
772 772 return fulltext
773 773
774 774 def _builddeltadiff(self, base, revinfo, fh):
775 775 revlog = self.revlog
776 776 t = self.buildtext(revinfo, fh)
777 777 if revlog.iscensored(base):
778 778 # deltas based on a censored revision must replace the
779 779 # full content in one patch, so delta works everywhere
780 780 header = mdiff.replacediffheader(revlog.rawsize(base), len(t))
781 781 delta = header + t
782 782 else:
783 783 ptext = revlog.revision(base, _df=fh, raw=True)
784 784 delta = mdiff.textdiff(ptext, t)
785 785
786 786 return delta
787 787
788 788 def _builddeltainfo(self, revinfo, base, fh):
789 789 # can we use the cached delta?
790 790 delta = None
791 791 if revinfo.cachedelta:
792 792 cachebase, cachediff = revinfo.cachedelta
793 793 #check if the diff still apply
794 794 currentbase = cachebase
795 795 while (currentbase != nullrev
796 796 and currentbase != base
797 797 and self.revlog.length(currentbase) == 0):
798 798 currentbase = self.revlog.deltaparent(currentbase)
799 799 if currentbase == base:
800 800 delta = revinfo.cachedelta[1]
801 801 if delta is None:
802 802 delta = self._builddeltadiff(base, revinfo, fh)
803 803 revlog = self.revlog
804 804 header, data = revlog.compress(delta)
805 805 deltalen = len(header) + len(data)
806 806 chainbase = revlog.chainbase(base)
807 807 offset = revlog.end(len(revlog) - 1)
808 808 dist = deltalen + offset - revlog.start(chainbase)
809 809 if revlog._generaldelta:
810 810 deltabase = base
811 811 else:
812 812 deltabase = chainbase
813 813 chainlen, compresseddeltalen = revlog._chaininfo(base)
814 814 chainlen += 1
815 815 compresseddeltalen += deltalen
816 816
817 817 revlog = self.revlog
818 818 snapshotdepth = None
819 819 if deltabase == nullrev:
820 820 snapshotdepth = 0
821 821 elif revlog._sparserevlog and revlog.issnapshot(deltabase):
822 822 # A delta chain should always be one full snapshot,
823 823 # zero or more semi-snapshots, and zero or more deltas
824 824 p1, p2 = revlog.rev(revinfo.p1), revlog.rev(revinfo.p2)
825 825 if deltabase not in (p1, p2) and revlog.issnapshot(deltabase):
826 826 snapshotdepth = len(revlog._deltachain(deltabase)[0])
827 827
828 828 return _deltainfo(dist, deltalen, (header, data), deltabase,
829 829 chainbase, chainlen, compresseddeltalen,
830 830 snapshotdepth)
831 831
832 832 def _fullsnapshotinfo(self, fh, revinfo):
833 833 curr = len(self.revlog)
834 834 rawtext = self.buildtext(revinfo, fh)
835 835 data = self.revlog.compress(rawtext)
836 836 compresseddeltalen = deltalen = dist = len(data[1]) + len(data[0])
837 837 deltabase = chainbase = curr
838 838 snapshotdepth = 0
839 839 chainlen = 1
840 840
841 841 return _deltainfo(dist, deltalen, data, deltabase,
842 842 chainbase, chainlen, compresseddeltalen,
843 843 snapshotdepth)
844 844
845 845 def finddeltainfo(self, revinfo, fh):
846 846 """Find an acceptable delta against a candidate revision
847 847
848 848 revinfo: information about the revision (instance of _revisioninfo)
849 849 fh: file handle to either the .i or the .d revlog file,
850 850 depending on whether it is inlined or not
851 851
852 852 Returns the first acceptable candidate revision, as ordered by
853 853 _candidategroups
854 854
855 855 If no suitable deltabase is found, we return delta info for a full
856 856 snapshot.
857 857 """
858 858 if not revinfo.textlen:
859 859 return self._fullsnapshotinfo(fh, revinfo)
860 860
861 861 # no delta for flag processor revision (see "candelta" for why)
862 862 # not calling candelta since only one revision needs test, also to
863 863 # avoid overhead fetching flags again.
864 864 if revinfo.flags & REVIDX_RAWTEXT_CHANGING_FLAGS:
865 865 return self._fullsnapshotinfo(fh, revinfo)
866 866
867 867 cachedelta = revinfo.cachedelta
868 868 p1 = revinfo.p1
869 869 p2 = revinfo.p2
870 870 revlog = self.revlog
871 871
872 872 deltainfo = None
873 873 p1r, p2r = revlog.rev(p1), revlog.rev(p2)
874 874 groups = _candidategroups(self.revlog, revinfo.textlen,
875 875 p1r, p2r, cachedelta)
876 876 candidaterevs = next(groups)
877 877 while candidaterevs is not None:
878 878 nominateddeltas = []
879 879 if deltainfo is not None:
880 880 # if we already found a good delta,
881 881 # challenge it against refined candidates
882 882 nominateddeltas.append(deltainfo)
883 883 for candidaterev in candidaterevs:
884 884 candidatedelta = self._builddeltainfo(revinfo, candidaterev, fh)
885 885 if isgooddeltainfo(self.revlog, candidatedelta, revinfo):
886 886 nominateddeltas.append(candidatedelta)
887 887 if nominateddeltas:
888 888 deltainfo = min(nominateddeltas, key=lambda x: x.deltalen)
889 889 if deltainfo is not None:
890 890 candidaterevs = groups.send(deltainfo.base)
891 891 else:
892 892 candidaterevs = next(groups)
893 893
894 894 if deltainfo is None:
895 895 deltainfo = self._fullsnapshotinfo(fh, revinfo)
896 896 return deltainfo
General Comments 0
You need to be logged in to leave comments. Login now