Mercurial > hg
view tests/test-narrow-exchange-merges.t @ 42044:bb271ec2fbfb
compression: introduce a `storage.revlog.zstd.level` configuration
This option control the zstd compression level used when compressing revlog
chunk. The usage of zstd for revlog compression has not graduated from
experimental yet, but we intend to fix that soon.
The option name for the compression level is more straight forward to pick, so
this changesets comes first. Having a dedicated option for each compression
engine is useful because they don't support the same range of values.
I ran the same measurement as for the zlib compression level (in the parent
changesets). The variation in repository size is stay mostly in the same (small)
range. The "read/write" performance see smallish variation, but are overall much
better than zlib. Write performance show the same tend of having better write
performance for when reaching high-end compression.
Again, we don't intend to change the default zstd compression level (currently:
3) in this series. However this is worth investigating in the future.
The Performance comparison of zlib vs zstd is quite impressive. The repository
size stay in the same range, but the performance are much better in all
situations.
Comparison summary
==================
We are looking at:
- performance range for zlib
- performance range for zstd
- comparison of default zstd (level-3) to default zlib (level 6)
- comparison of the slowest zstd time to the fastest zlib time
Read performance:
-----------------
| zlib | zstd | cmp | f2s
mercurial | 0.170159 - 0.189219 | 0.144127 - 0.149624 | 80% | 88%
pypy | 2.679217 - 2.768691 | 1.532317 - 1.705044 | 60% | 63%
netbeans | 122.477027 - 141.620281 | 72.996346 - 89.731560 | 58% | 73%
mozilla | 147.867662 - 170.572118 | 91.700995 - 105.853099 | 56% | 71%
Write performance:
------------------
| zlib | zstd | cmp | f2s
mercurial | 53.250304 - 56.2936129 | 40.877025 - 45.677286 | 75% | 86%
pypy | 460.721984 - 476.589918 | 270.545409 - 301.002219 | 63% | 65%
netbeans | 520.560316 - 715.930400 | 370.356311 - 428.329652 | 55% | 82%
mozilla | 739.803002 - 987.056093 | 505.152906 - 591.930683 | 57% | 80%
Raw data
--------
repo alg lvl .hg/store size 00manifest.d read write
mercurial zlib 1 49,402,813 5,963,475 0.170159 53.250304
mercurial zlib 6 47,197,397 5,875,730 0.182820 56.264320
mercurial zlib 9 47,121,596 5,849,781 0.189219 56.293612
mercurial zstd 1 49,737,084 5,966,355 0.144127 40.877025
mercurial zstd 3 48,961,867 5,895,208 0.146376 42.268142
mercurial zstd 5 48,200,592 5,938,676 0.149624 43.162875
mercurial zstd 10 47,833,520 5,913,353 0.145185 44.012489
mercurial zstd 15 47,314,604 5,728,679 0.147686 45.677286
mercurial zstd 20 47,330,502 5,830,539 0.145789 45.025407
mercurial zstd 22 47,330,076 5,830,539 0.143996 44.690460
pypy zlib 1 370,830,572 28,462,425 2.679217 460.721984
pypy zlib 6 340,112,317 27,648,747 2.768691 467.537158
pypy zlib 9 338,360,736 27,639,003 2.763495 476.589918
pypy zstd 1 362,377,479 27,916,214 1.532317 270.545409
pypy zstd 3 354,137,693 27,905,988 1.686718 294.951509
pypy zstd 5 342,640,043 27,655,774 1.705044 301.002219
pypy zstd 10 334,224,327 27,164,493 1.567287 285.186239
pypy zstd 15 329,000,363 26,645,965 1.637729 299.561332
pypy zstd 20 324,534,039 26,199,547 1.526813 302.149827
pypy zstd 22 324,530,595 26,198,932 1.525718 307.821218
netbeans zlib 1 1,281,847,810 165,495,457 122.477027 520.560316
netbeans zlib 6 1,205,284,353 159,161,207 139.876147 715.930400
netbeans zlib 9 1,197,135,671 155,034,586 141.620281 678.297064
netbeans zstd 1 1,259,581,737 160,840,613 72.996346 370.356311
netbeans zstd 3 1,232,978,122 157,691,551 81.622317 396.733087
netbeans zstd 5 1,208,034,075 160,246,880 83.080549 364.342626
netbeans zstd 10 1,188,624,176 156,083,417 79.323935 403.594602
netbeans zstd 15 1,176,973,589 153,859,477 89.731560 428.329652
netbeans zstd 20 1,162,958,258 151,147,535 82.842667 392.335349
netbeans zstd 22 1,162,707,029 151,150,220 82.565695 402.840655
mozilla zlib 1 2,775,497,186 298,527,987 147.867662 751.263721
mozilla zlib 6 2,596,856,420 286,597,671 170.572118 987.056093
mozilla zlib 9 2,587,542,494 287,018,264 163.622338 739.803002
mozilla zstd 1 2,723,159,348 286,617,532 91.700995 570.042751
mozilla zstd 3 2,665,055,001 286,152,013 95.240155 561.412805
mozilla zstd 5 2,607,819,817 288,060,030 101.978048 505.152906
mozilla zstd 10 2,558,761,085 283,967,648 104.113481 497.771202
mozilla zstd 15 2,526,216,060 275,581,300 105.853099 591.930683
mozilla zstd 20 2,485,114,806 266,478,859 95.268795 576.515389
mozilla zstd 22 2,484,869,080 266,456,505 94.429282 572.785537
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 27 Mar 2019 18:35:59 +0100 |
parents | a2a6e724d61a |
children | 7e5be4a7cda7 |
line wrap: on
line source
$ . "$TESTDIR/narrow-library.sh" create full repo $ hg init master $ cd master $ cat >> .hg/hgrc <<EOF > [narrow] > serveellipses=True > EOF $ mkdir inside $ echo 1 > inside/f $ hg commit -Aqm 'initial inside' $ mkdir outside $ echo 1 > outside/f $ hg commit -Aqm 'initial outside' $ echo 2a > outside/f $ hg commit -Aqm 'outside 2a' $ echo 3 > inside/f $ hg commit -Aqm 'inside 3' $ echo 4a > outside/f $ hg commit -Aqm 'outside 4a' $ hg update '.~3' 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo 2b > outside/f $ hg commit -Aqm 'outside 2b' $ echo 3 > inside/f $ hg commit -Aqm 'inside 3' $ echo 4b > outside/f $ hg commit -Aqm 'outside 4b' $ hg update '.~3' 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo 2c > outside/f $ hg commit -Aqm 'outside 2c' $ echo 3 > inside/f $ hg commit -Aqm 'inside 3' $ echo 4c > outside/f $ hg commit -Aqm 'outside 4c' $ hg update '.~3' 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo 2d > outside/f $ hg commit -Aqm 'outside 2d' $ echo 3 > inside/f $ hg commit -Aqm 'inside 3' $ echo 4d > outside/f $ hg commit -Aqm 'outside 4d' $ hg update -r 'desc("outside 4a")' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg merge -r 'desc("outside 4b")' 2>&1 | egrep -v '(warning:|incomplete!)' merging outside/f 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon $ echo 5 > outside/f $ rm outside/f.orig $ hg resolve --mark outside/f (no more unresolved files) $ hg commit -m 'merge a/b 5' $ echo 6 > outside/f $ hg commit -Aqm 'outside 6' $ hg merge -r 'desc("outside 4c")' 2>&1 | egrep -v '(warning:|incomplete!)' merging outside/f 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon $ echo 7 > outside/f $ rm outside/f.orig $ hg resolve --mark outside/f (no more unresolved files) $ hg commit -Aqm 'merge a/b/c 7' $ echo 8 > outside/f $ hg commit -Aqm 'outside 8' $ hg merge -r 'desc("outside 4d")' 2>&1 | egrep -v '(warning:|incomplete!)' merging outside/f 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon $ echo 9 > outside/f $ rm outside/f.orig $ hg resolve --mark outside/f (no more unresolved files) $ hg commit -Aqm 'merge a/b/c/d 9' $ echo 10 > outside/f $ hg commit -Aqm 'outside 10' $ echo 11 > inside/f $ hg commit -Aqm 'inside 11' $ echo 12 > outside/f $ hg commit -Aqm 'outside 12' $ hg log -G -T '{rev} {node|short} {desc}\n' @ 21 8d874d57adea outside 12 | o 20 7ef88b4dd4fa inside 11 | o 19 2a20009de83e outside 10 | o 18 3ac1f5779de3 merge a/b/c/d 9 |\ | o 17 38a9c2f7e546 outside 8 | | | o 16 094aa62fc898 merge a/b/c 7 | |\ | | o 15 f29d083d32e4 outside 6 | | | | | o 14 2dc11382541d merge a/b 5 | | |\ o | | | 13 27d07ef97221 outside 4d | | | | o | | | 12 465567bdfb2d inside 3 | | | | o | | | 11 d1c61993ec83 outside 2d | | | | | o | | 10 56859a8e33b9 outside 4c | | | | | o | | 9 bb96a08b062a inside 3 | | | | | o | | 8 b844052e7b3b outside 2c |/ / / | | o 7 9db2d8fcc2a6 outside 4b | | | | | o 6 6418167787a6 inside 3 | | | +---o 5 77344f344d83 outside 2b | | | o 4 9cadde08dc9f outside 4a | | | o 3 019ef06f125b inside 3 | | | o 2 75e40c075a19 outside 2a |/ o 1 906d6c682641 initial outside | o 0 9f8e82b51004 initial inside Now narrow clone this and get a hopefully correct graph $ cd .. $ hg clone --narrow ssh://user@dummy/master narrow --include inside requesting all changes adding changesets adding manifests adding file changes added 14 changesets with 3 changes to 1 files new changesets *:* (glob) updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd narrow To make updating the tests easier, we print the emitted nodes sorted. This makes it easier to identify when the same node structure has been emitted, just in a different order. $ hg log -T '{if(ellipsis,"...")}{node|short} {p1node|short} {p2node|short} {desc}\n' | sort ...094aa62fc898 6418167787a6 bb96a08b062a merge a/b/c 7 ...2a20009de83e 019ef06f125b 3ac1f5779de3 outside 10 ...3ac1f5779de3 465567bdfb2d 094aa62fc898 merge a/b/c/d 9 ...75e40c075a19 9f8e82b51004 000000000000 outside 2a ...77344f344d83 9f8e82b51004 000000000000 outside 2b ...8d874d57adea 7ef88b4dd4fa 000000000000 outside 12 ...b844052e7b3b 9f8e82b51004 000000000000 outside 2c ...d1c61993ec83 9f8e82b51004 000000000000 outside 2d 019ef06f125b 75e40c075a19 000000000000 inside 3 465567bdfb2d d1c61993ec83 000000000000 inside 3 6418167787a6 77344f344d83 000000000000 inside 3 7ef88b4dd4fa 2a20009de83e 000000000000 inside 11 9f8e82b51004 000000000000 000000000000 initial inside bb96a08b062a b844052e7b3b 000000000000 inside 3 But seeing the graph is also nice: $ hg log -G -T '{if(ellipsis,"...")}{node|short} {desc}\n' @ ...8d874d57adea outside 12 | o 7ef88b4dd4fa inside 11 | o ...2a20009de83e outside 10 |\ | o ...3ac1f5779de3 merge a/b/c/d 9 | |\ | | o ...094aa62fc898 merge a/b/c 7 | | |\ | o | | 465567bdfb2d inside 3 | | | | | o | | ...d1c61993ec83 outside 2d | | | | | | | o bb96a08b062a inside 3 | | | | | +---o ...b844052e7b3b outside 2c | | | | | o 6418167787a6 inside 3 | | | | | o ...77344f344d83 outside 2b | |/ o | 019ef06f125b inside 3 | | o | ...75e40c075a19 outside 2a |/ o 9f8e82b51004 initial inside