Mercurial > public > mercurial-scm > hg
annotate mercurial/pure/base85.py @ 26117:4dc5b51f38fe
revlog: change generaldelta delta parent heuristic
The old generaldelta heuristic was "if p1 (or p2) was closer than the last full text,
use it, otherwise use prev". This was problematic when a repo contained multiple
branches that were very different. If commits to branch A were pushed, and the
last full text was branch B, it would generate a fulltext. Then if branch B was
pushed, it would generate another fulltext. The problem is that the last
fulltext (and delta'ing against `prev` in general) has no correlation with the
contents of the incoming revision, and therefore will always have degenerate
cases.
According to the blame, that algorithm was chosen to minimize the chain length.
Since there is already code that protects against that (the delta-vs-fulltext
code), and since it has been improved since the original generaldelta algorithm
went in (2011), I believe the chain length criteria will still be preserved.
The new algorithm always diffs against p1 (or p2 if it's closer), unless the
resulting delta will fail the delta-vs-fulltext check, in which case we delta
against prev.
Some before and after stats on manifest.d size.
internal large repo
old heuristic - 2.0 GB
new heuristic - 1.2 GB
mozilla-central
old heuristic - 242 MB
new heuristic - 261 MB
The regression in mozilla central is due to the new heuristic choosing p2r as
the delta when it's closer to the tip. Switching the algorithm to always prefer
p1r brings the size back down (242 MB). This is result of the way in which
mozilla does merges and pushes, and the result could easily swing the other
direction in other repos (depending on if they merge X into Y or Y into X), but
will never be as degenerate as before.
I future patch will address the regression by introducing an optional, even more
aggressive delta heuristic which will knock the mozilla manifest size down
dramatically.
author | Durham Goode <durham@fb.com> |
---|---|
date | Sun, 30 Aug 2015 13:58:11 -0700 |
parents | 20a9d823f242 |
children | 9007f697e8ef |
rev | line source |
---|---|
7701 | 1 # base85.py: pure python base85 codec |
2 # | |
3 # Copyright (C) 2009 Brendan Cully <brendan@kublai.com> | |
4 # | |
8225
46293a0c7e9f
updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents:
7881
diff
changeset
|
5 # This software may be used and distributed according to the terms of the |
10263 | 6 # GNU General Public License version 2 or any later version. |
7701 | 7 |
8 import struct | |
9 | |
10 _b85chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ" \ | |
11 "abcdefghijklmnopqrstuvwxyz!#$%&()*+-;<=>?@^_`{|}~" | |
7835
2505e9f84153
Optimization of pure.base85.b85encode
Mads Kiilerich <mads@kiilerich.com>
parents:
7701
diff
changeset
|
12 _b85chars2 = [(a + b) for a in _b85chars for b in _b85chars] |
7701 | 13 _b85dec = {} |
14 | |
15 def _mkb85dec(): | |
8632
9e055cfdd620
replace "i in range(len(xs))" with "i, x in enumerate(xs)"
Martin Geisler <mg@lazybytes.net>
parents:
8225
diff
changeset
|
16 for i, c in enumerate(_b85chars): |
9e055cfdd620
replace "i in range(len(xs))" with "i, x in enumerate(xs)"
Martin Geisler <mg@lazybytes.net>
parents:
8225
diff
changeset
|
17 _b85dec[c] = i |
7701 | 18 |
19 def b85encode(text, pad=False): | |
20 """encode text in base85 format""" | |
21 l = len(text) | |
22 r = l % 4 | |
23 if r: | |
24 text += '\0' * (4 - r) | |
25 longs = len(text) >> 2 | |
26 words = struct.unpack('>%dL' % (longs), text) | |
27 | |
9029
0001e49f1c11
compat: use // for integer division
Alejandro Santos <alejolp@alejolp.com>
parents:
8632
diff
changeset
|
28 out = ''.join(_b85chars[(word // 52200625) % 85] + |
0001e49f1c11
compat: use // for integer division
Alejandro Santos <alejolp@alejolp.com>
parents:
8632
diff
changeset
|
29 _b85chars2[(word // 7225) % 7225] + |
7835
2505e9f84153
Optimization of pure.base85.b85encode
Mads Kiilerich <mads@kiilerich.com>
parents:
7701
diff
changeset
|
30 _b85chars2[word % 7225] |
2505e9f84153
Optimization of pure.base85.b85encode
Mads Kiilerich <mads@kiilerich.com>
parents:
7701
diff
changeset
|
31 for word in words) |
7701 | 32 |
33 if pad: | |
34 return out | |
35 | |
36 # Trim padding | |
37 olen = l % 4 | |
38 if olen: | |
39 olen += 1 | |
9029
0001e49f1c11
compat: use // for integer division
Alejandro Santos <alejolp@alejolp.com>
parents:
8632
diff
changeset
|
40 olen += l // 4 * 5 |
7701 | 41 return out[:olen] |
42 | |
43 def b85decode(text): | |
44 """decode base85-encoded text""" | |
45 if not _b85dec: | |
46 _mkb85dec() | |
47 | |
48 l = len(text) | |
49 out = [] | |
50 for i in range(0, len(text), 5): | |
10282
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10263
diff
changeset
|
51 chunk = text[i:i + 5] |
7701 | 52 acc = 0 |
8632
9e055cfdd620
replace "i in range(len(xs))" with "i, x in enumerate(xs)"
Martin Geisler <mg@lazybytes.net>
parents:
8225
diff
changeset
|
53 for j, c in enumerate(chunk): |
7701 | 54 try: |
8632
9e055cfdd620
replace "i in range(len(xs))" with "i, x in enumerate(xs)"
Martin Geisler <mg@lazybytes.net>
parents:
8225
diff
changeset
|
55 acc = acc * 85 + _b85dec[c] |
7701 | 56 except KeyError: |
16598
20a9d823f242
pure/base85: align exception type/msg on base85.c
Patrick Mezard <patrick@mezard.eu>
parents:
10282
diff
changeset
|
57 raise ValueError('bad base85 character at position %d' |
20a9d823f242
pure/base85: align exception type/msg on base85.c
Patrick Mezard <patrick@mezard.eu>
parents:
10282
diff
changeset
|
58 % (i + j)) |
7701 | 59 if acc > 4294967295: |
16598
20a9d823f242
pure/base85: align exception type/msg on base85.c
Patrick Mezard <patrick@mezard.eu>
parents:
10282
diff
changeset
|
60 raise ValueError('Base85 overflow in hunk starting at byte %d' % i) |
7701 | 61 out.append(acc) |
62 | |
63 # Pad final chunk if necessary | |
64 cl = l % 5 | |
65 if cl: | |
66 acc *= 85 ** (5 - cl) | |
67 if cl > 1: | |
68 acc += 0xffffff >> (cl - 2) * 8 | |
69 out[-1] = acc | |
70 | |
71 out = struct.pack('>%dL' % (len(out)), *out) | |
72 if cl: | |
73 out = out[:-(5 - cl)] | |
74 | |
75 return out |