Mercurial > hg
view tests/test-removeemptydirs.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 | 42e2c7c52e1b |
children | e9fbf8fd5f33 |
line wrap: on
line source
Tests for experimental.removeemptydirs $ NO_RM=--config=experimental.removeemptydirs=0 $ isdir() { if [ -d $1 ]; then echo yes; else echo no; fi } $ isfile() { if [ -f $1 ]; then echo yes; else echo no; fi } `hg rm` of the last file in a directory: $ hg init hgrm $ cd hgrm $ mkdir somedir $ echo hi > somedir/foo $ hg ci -qAm foo $ isdir somedir yes $ hg rm somedir/foo $ isdir somedir no $ hg revert -qa $ isdir somedir yes $ hg $NO_RM rm somedir/foo $ isdir somedir yes $ ls somedir $ cd $TESTTMP `hg mv` of the last file in a directory: $ hg init hgmv $ cd hgmv $ mkdir somedir $ mkdir destdir $ echo hi > somedir/foo $ hg ci -qAm foo $ isdir somedir yes $ hg mv somedir/foo destdir/foo $ isdir somedir no $ hg revert -qa (revert doesn't get rid of destdir/foo?) $ rm destdir/foo $ isdir somedir yes $ hg $NO_RM mv somedir/foo destdir/foo $ isdir somedir yes $ ls somedir $ cd $TESTTMP Updating to a commit that doesn't have the directory: $ hg init hgupdate $ cd hgupdate $ echo hi > r0 $ hg ci -qAm r0 $ mkdir somedir $ echo hi > somedir/foo $ hg ci -qAm r1 $ isdir somedir yes $ hg co -q -r ".^" $ isdir somedir no $ hg co -q tip $ isdir somedir yes $ hg $NO_RM co -q -r ".^" $ isdir somedir yes $ ls somedir $ cd $TESTTMP Rebasing across a commit that doesn't have the directory, from inside the directory: $ hg init hgrebase $ cd hgrebase $ echo hi > r0 $ hg ci -qAm r0 $ mkdir somedir $ echo hi > somedir/foo $ hg ci -qAm first_rebase_source $ hg $NO_RM co -q -r ".^" $ echo hi > somedir/bar $ hg ci -qAm first_rebase_dest $ hg $NO_RM co -q -r ".^" $ echo hi > somedir/baz $ hg ci -qAm second_rebase_dest $ hg co -qr 'desc(first_rebase_source)' $ cd $TESTTMP/hgrebase/somedir $ hg --config extensions.rebase= rebase -qr . -d 'desc(first_rebase_dest)' current directory was removed (rmcwd !) (consider changing to repo root: $TESTTMP/hgrebase) (rmcwd !) $ cd $TESTTMP/hgrebase/somedir (The current node is the rebased first_rebase_source on top of first_rebase_dest) This should not output anything about current directory being removed: $ hg $NO_RM --config extensions.rebase= rebase -qr . -d 'desc(second_rebase_dest)' $ cd $TESTTMP Histediting across a commit that doesn't have the directory, from inside the directory (reordering nodes): $ hg init hghistedit $ cd hghistedit $ echo hi > r0 $ hg ci -qAm r0 $ echo hi > r1 $ hg ci -qAm r1 $ echo hi > r2 $ hg ci -qAm r2 $ mkdir somedir $ echo hi > somedir/foo $ hg ci -qAm migrating_revision $ cat > histedit_commands <<EOF > pick 89079fab8aee 0 r0 > pick e6d271df3142 1 r1 > pick 89e25aa83f0f 3 migrating_revision > pick b550aa12d873 2 r2 > EOF $ cd $TESTTMP/hghistedit/somedir $ hg --config extensions.histedit= histedit -q --commands ../histedit_commands histedit doesn't output anything when the current diretory is removed. We rely on the tests being commonly run on machines where the current directory disappearing from underneath us actually has an observable effect, such as an error or no files listed #if linuxormacos $ isfile foo no #endif $ cd $TESTTMP/hghistedit/somedir $ isfile foo yes $ cd $TESTTMP/hghistedit $ cat > histedit_commands <<EOF > pick 89079fab8aee 0 r0 > pick 7c7a22c6009f 3 migrating_revision > pick e6d271df3142 1 r1 > pick 40a53c2d4276 2 r2 > EOF $ cd $TESTTMP/hghistedit/somedir $ hg $NO_RM --config extensions.histedit= histedit -q --commands ../histedit_commands Regardless of system, we should always get a 'yes' here. $ isfile foo yes $ cd $TESTTMP This is essentially the exact test from issue5826, just cleaned up a little: $ hg init issue5826_withrm $ cd issue5826_withrm Let's only turn this on for this repo so that we don't contaminate later tests. $ cat >> .hg/hgrc <<EOF > [extensions] > histedit = > EOF Commit three revisions that each create a directory: $ mkdir foo $ touch foo/bar $ hg commit -qAm "add foo" $ mkdir bar $ touch bar/bar $ hg commit -qAm "add bar" $ mkdir baz $ touch baz/bar $ hg commit -qAm "add baz" Enter the first directory: $ cd foo Histedit doing 'pick, pick, fold': #if rmcwd $ hg histedit --commands - <<EOF > pick 6274c77c93c3 1 add bar > pick ff70a87b588f 0 add foo > fold 9992bb0ac0db 2 add baz > EOF abort: $ENOENT$ [255] Go back to the repo root after losing it as part of that operation: $ cd $TESTTMP/issue5826_withrm Note the lack of a non-zero exit code from this function - it exits successfully, but doesn't really do anything. $ hg histedit --continue 9992bb0ac0db: cannot fold - working copy is not a descendant of previous commit 5c806432464a saved backup bundle to $TESTTMP/issue5826_withrm/.hg/strip-backup/ff70a87b588f-e94f9789-histedit.hg $ hg log -T '{rev}:{node|short} {desc}\n' 2:94e3f9fae1d6 fold-temp-revision 9992bb0ac0db 1:5c806432464a add foo 0:d17db4b0303a add bar #else $ cd $TESTTMP/issue5826_withrm $ hg histedit --commands - <<EOF > pick 6274c77c93c3 1 add bar > pick ff70a87b588f 0 add foo > fold 9992bb0ac0db 2 add baz > EOF saved backup bundle to $TESTTMP/issue5826_withrm/.hg/strip-backup/5c806432464a-cd4c8d86-histedit.hg $ hg log -T '{rev}:{node|short} {desc}\n' 1:b9eddaa97cbc add foo *** add baz 0:d17db4b0303a add bar #endif Now test that again with experimental.removeemptydirs=false: $ hg init issue5826_norm $ cd issue5826_norm Let's only turn this on for this repo so that we don't contaminate later tests. $ cat >> .hg/hgrc <<EOF > [extensions] > histedit = > [experimental] > removeemptydirs = false > EOF Commit three revisions that each create a directory: $ mkdir foo $ touch foo/bar $ hg commit -qAm "add foo" $ mkdir bar $ touch bar/bar $ hg commit -qAm "add bar" $ mkdir baz $ touch baz/bar $ hg commit -qAm "add baz" Enter the first directory: $ cd foo Histedit doing 'pick, pick, fold': $ hg histedit --commands - <<EOF > pick 6274c77c93c3 1 add bar > pick ff70a87b588f 0 add foo > fold 9992bb0ac0db 2 add baz > EOF saved backup bundle to $TESTTMP/issue5826_withrm/issue5826_norm/.hg/strip-backup/5c806432464a-cd4c8d86-histedit.hg Note the lack of a 'cd' being necessary here, and we don't need to 'histedit --continue' $ hg log -T '{rev}:{node|short} {desc}\n' 1:b9eddaa97cbc add foo *** add baz 0:d17db4b0303a add bar $ cd $TESTTMP