Mercurial > hg
comparison tests/test-commit-amend.t @ 49777:e1953a34c110
bundle: emit full snapshot as is, without doing a redelta
With the new `forced` delta-reused policy, it become important to be able to
send full snapshot where full snapshot are needed. Otherwise, the fallback delta
will simply be used on the client side… creating monstrous delta chain, since
revision that are meant as a reset of delta-chain chain becoming too complex are
simply adding a new full delta-tree on the leaf of another one.
In the `non-forced` cases, client process full snapshot from the bundle
differently from deltas, so client will still try to convert the full snapshot
into a delta if possible. So this will no lead to pathological storage
explosion.
I have considered making this configurable, but the impact seems limited enough
that it does not seems to be worth it. Especially with the current
sparse-revlog format that use "delta-tree" with multiple level snapshots, full
snapshot are much less frequent and not that different from other intermediate
snapshot that we are already sending over the wire anyway.
CPU wise, this will help the bundling side a little as it will not need to
reconstruct revisions and compute deltas. The unbundling side might save a tiny
amount of CPU as it won't need to reconstruct the delta-base to reconstruct the
revision full text. This only slightly visible in some of the benchmarks. And
have no real impact on most of them.
### data-env-vars.name = pypy-2018-08-01-zstd-sparse-revlog
# benchmark.name = perf-bundle
# benchmark.variants.revs = last-40000
before: 11.467186 seconds
just-emit-full: 11.190576 seconds (-2.41%)
with-pull-force: 11.041091 seconds (-3.72%)
# benchmark.name = perf-unbundle
# benchmark.variants.revs = last-40000
before: 16.744862
just-emit-full:: 16.561036 seconds (-1.10%)
with-pull-force: 16.389344 seconds (-2.12%)
# benchmark.name = pull
# benchmark.variants.revs = last-40000
before: 26.870569
just-emit-full: 26.391188 seconds (-1.78%)
with-pull-force: 25.633184 seconds (-4.60%)
Space wise (so network-wise) the impact is fairly small. When taking compression into
account.
Below are tests the size of `hg bundle --all` for a handful of benchmark repositories
(with bzip, zstd compression and without it)
This show a small increase in the bundle size, but nothing really significant
except maybe for mozilla-try (+12%) that nobody really pulls large chunk of anyway.
Mozilla-try is also the repository that benefit the most for not having to
recompute deltas client size.
### mercurial:
bzip-before: 26 406 342 bytes
bzip-after: 26 691 543 bytes +1.08%
zstd-before: 27 918 645 bytes
zstd-after: 28 075 896 bytes +0.56%
none-before: 98 675 601 bytes
none-after: 100 411 237 bytes +1.76%
### pypy
bzip-before: 201 295 752 bytes
bzip-after: 209 780 282 bytes +4.21%
zstd-before: 202 974 795 bytes
zstd-after: 205 165 780 bytes +1.08%
none-before: 871 070 261 bytes
none-after: 993 595 057 bytes +14.07%
### netbeans
bzip-before: 601 314 330 bytes
bzip-after: 614 246 241 bytes +2.15%
zstd-before: 604 745 136 bytes
zstd-after: 615 497 705 bytes +1.78%
none-before: 3 338 238 571 bytes
none-after: 3 439 422 535 bytes +3.03%
### mozilla-central
bzip-before: 1 493 006 921 bytes
bzip-after: 1 549 650 570 bytes +3.79%
zstd-before: 1 481 910 102 bytes
zstd-after: 1 513 052 415 bytes +2.10%
none-before: 6 535 929 910 bytes
none-after: 7 010 191 342 bytes +7.26%
### mozilla-try
bzip-before: 6 583 425 999 bytes
bzip-after: 7 423 536 928 bytes +12.76%
zstd-before: 6 021 009 212 bytes
zstd-after: 6 674 922 420 bytes +10.86%
none-before: 22 954 739 558 bytes
none-after: 26 013 854 771 bytes +13.32%
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 07 Dec 2022 20:12:23 +0100 |
| parents | 55c6ebd11cb9 |
| children | 2cf264e9aa75 |
comparison
equal
deleted
inserted
replaced
| 49776:acdb9a15137c | 49777:e1953a34c110 |
|---|---|
| 121 committing changelog | 121 committing changelog |
| 122 1 changesets found | 122 1 changesets found |
| 123 uncompressed size of bundle content: | 123 uncompressed size of bundle content: |
| 124 254 (changelog) | 124 254 (changelog) |
| 125 163 (manifests) | 125 163 (manifests) |
| 126 131 a | 126 133 a |
| 127 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/47343646fa3d-c2758885-amend.hg | 127 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/47343646fa3d-c2758885-amend.hg |
| 128 1 changesets found | 128 1 changesets found |
| 129 uncompressed size of bundle content: | 129 uncompressed size of bundle content: |
| 130 250 (changelog) | 130 250 (changelog) |
| 131 163 (manifests) | 131 163 (manifests) |
| 132 131 a | 132 133 a |
| 133 adding branch | 133 adding branch |
| 134 adding changesets | 134 adding changesets |
| 135 adding manifests | 135 adding manifests |
| 136 adding file changes | 136 adding file changes |
| 137 added 1 changesets with 1 changes to 1 files | 137 added 1 changesets with 1 changes to 1 files |
| 265 committing changelog | 265 committing changelog |
| 266 1 changesets found | 266 1 changesets found |
| 267 uncompressed size of bundle content: | 267 uncompressed size of bundle content: |
| 268 249 (changelog) | 268 249 (changelog) |
| 269 163 (manifests) | 269 163 (manifests) |
| 270 133 a | 270 135 a |
| 271 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a9a13940fc03-7c2e8674-amend.hg | 271 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a9a13940fc03-7c2e8674-amend.hg |
| 272 1 changesets found | 272 1 changesets found |
| 273 uncompressed size of bundle content: | 273 uncompressed size of bundle content: |
| 274 257 (changelog) | 274 257 (changelog) |
| 275 163 (manifests) | 275 163 (manifests) |
| 276 133 a | 276 135 a |
| 277 adding branch | 277 adding branch |
| 278 adding changesets | 278 adding changesets |
| 279 adding manifests | 279 adding manifests |
| 280 adding file changes | 280 adding file changes |
| 281 added 1 changesets with 1 changes to 1 files | 281 added 1 changesets with 1 changes to 1 files |
| 301 committing changelog | 301 committing changelog |
| 302 1 changesets found | 302 1 changesets found |
| 303 uncompressed size of bundle content: | 303 uncompressed size of bundle content: |
| 304 257 (changelog) | 304 257 (changelog) |
| 305 163 (manifests) | 305 163 (manifests) |
| 306 133 a | 306 135 a |
| 307 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/64a124ba1b44-10374b8f-amend.hg | 307 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/64a124ba1b44-10374b8f-amend.hg |
| 308 1 changesets found | 308 1 changesets found |
| 309 uncompressed size of bundle content: | 309 uncompressed size of bundle content: |
| 310 257 (changelog) | 310 257 (changelog) |
| 311 163 (manifests) | 311 163 (manifests) |
| 312 135 a | 312 137 a |
| 313 adding branch | 313 adding branch |
| 314 adding changesets | 314 adding changesets |
| 315 adding manifests | 315 adding manifests |
| 316 adding file changes | 316 adding file changes |
| 317 added 1 changesets with 1 changes to 1 files | 317 added 1 changesets with 1 changes to 1 files |