Mercurial > hg
view tests/test-bookflow.t @ 44363:f7459da77f23
nodemap: introduce an option to use mmap to read the nodemap mapping
The performance and memory benefit is much greater if we don't have to copy all
the data in memory for each information. So we introduce an option (on by
default) to read the data using mmap.
This changeset is the last one definition the API for index support nodemap
data. (they have to be able to use the mmaping).
Below are some benchmark comparing the best we currently have in 5.3 with the
final step of this series (using the persistent nodemap implementation in
Rust). The benchmark run `hg perfindex` with various revset and the following
variants:
Before:
* do not use the persistent nodemap
* use the CPython implementation of the index for nodemap
* use mmapping of the changelog index
After:
* use the MixedIndex Rust code, with the NodeTree object for nodemap access
(still in review)
* use the persistent nodemap data from disk
* access the persistent nodemap data through mmap
* use mmapping of the changelog index
The persistent nodemap greatly speed up most operation on very large
repositories. Some of the previously very fast lookup end up a bit slower because
the persistent nodemap has to be setup. However the absolute slowdown is very
small and won't matters in the big picture.
Here are some numbers (in seconds) for the reference copy of mozilla-try:
Revset Before After abs-change speedup
-10000: 0.004622 0.005532 0.000910 × 0.83
-10: 0.000050 0.000132 0.000082 × 0.37
tip 0.000052 0.000085 0.000033 × 0.61
0 + (-10000:) 0.028222 0.005337 -0.022885 × 5.29
0 0.023521 0.000084 -0.023437 × 280.01
(-10000:) + 0 0.235539 0.005308 -0.230231 × 44.37
(-10:) + :9 0.232883 0.000180 -0.232703 ×1293.79
(-10000:) + (:99) 0.238735 0.005358 -0.233377 × 44.55
:99 + (-10000:) 0.317942 0.005593 -0.312349 × 56.84
:9 + (-10:) 0.313372 0.000179 -0.313193 ×1750.68
:9 0.316450 0.000143 -0.316307 ×2212.93
On smaller repositories, the cost of nodemap related operation is not as big, so
the win is much more modest. Yet it helps shaving a handful of millisecond here
and there.
Here are some numbers (in seconds) for the reference copy of mercurial:
Revset Before After abs-change speedup
-10: 0.000065 0.000097 0.000032 × 0.67
tip 0.000063 0.000078 0.000015 × 0.80
0 0.000561 0.000079 -0.000482 × 7.10
-10000: 0.004609 0.003648 -0.000961 × 1.26
0 + (-10000:) 0.005023 0.003715 -0.001307 × 1.35
(-10:) + :9 0.002187 0.000108 -0.002079 ×20.25
(-10000:) + 0 0.006252 0.003716 -0.002536 × 1.68
(-10000:) + (:99) 0.006367 0.003707 -0.002660 × 1.71
:9 + (-10:) 0.003846 0.000110 -0.003736 ×34.96
:9 0.003854 0.000099 -0.003755 ×38.92
:99 + (-10000:) 0.007644 0.003778 -0.003866 × 2.02
Differential Revision: https://phab.mercurial-scm.org/D7894
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 11 Feb 2020 11:18:52 +0100 |
parents | d7304434390f |
children | 122f0b59f5f0 |
line wrap: on
line source
initialize $ make_changes() { > d=`pwd` > [ ! -z $1 ] && cd $1 > echo "test `basename \`pwd\``" >> test > hg commit -Am"${2:-test}" > r=$? > cd $d > return $r > } $ ls -1a . .. $ hg init a $ cd a $ echo 'test' > test; hg commit -Am'test' adding test clone to b $ mkdir ../b $ cd ../b $ hg clone ../a . updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo "[extensions]" >> .hg/hgrc $ echo "bookflow=" >> .hg/hgrc $ hg branch X abort: creating named branches is disabled and you should use bookmarks (see 'hg help bookflow') [255] $ hg bookmark X $ hg bookmarks * X 0:* (glob) $ hg bookmark X abort: bookmark X already exists, to move use the --rev option [255] $ make_changes $ hg push ../a -q $ hg bookmarks \* X 1:* (glob) change a $ cd ../a $ hg up 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo 'test' >> test; hg commit -Am'test' pull in b $ cd ../b $ hg pull -u pulling from $TESTTMP/a searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files new changesets * (glob) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark X) $ hg status $ hg bookmarks X 1:* (glob) check protection of @ bookmark $ hg bookmark @ $ hg bookmarks \* @ 2:* (glob) X 1:* (glob) $ make_changes abort: cannot commit, bookmark @ is protected [255] $ hg status M test $ hg bookmarks \* @ 2:* (glob) X 1:* (glob) $ hg --config bookflow.protect= commit -Am"Updated test" $ hg bookmarks \* @ 3:* (glob) X 1:* (glob) check requirement for an active bookmark $ hg bookmark -i $ hg bookmarks @ 3:* (glob) X 1:* (glob) $ make_changes abort: cannot commit without an active bookmark [255] $ hg revert test $ rm test.orig $ hg status make the bookmark move by updating it on a, and then pulling # add a commit to a $ cd ../a $ hg bookmark X $ hg bookmarks \* X 2:* (glob) $ make_changes $ hg bookmarks * X 3:81af7977fdb9 # go back to b, and check out X $ cd ../b $ hg up X 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (activating bookmark X) $ hg bookmarks @ 3:* (glob) \* X 1:* (glob) # pull, this should move the bookmark forward, because it was changed remotely $ hg pull -u | grep "updating to active bookmark X" updating to active bookmark X $ hg bookmarks @ 3:* (glob) * X 4:81af7977fdb9 the bookmark should not move if it diverged from remote $ hg -R ../a status $ hg -R ../b status $ make_changes ../a $ make_changes ../b $ hg -R ../a status $ hg -R ../b status $ hg -R ../a bookmarks * X 4:238292f60a57 $ hg -R ../b bookmarks @ 3:* (glob) * X 5:096f7e86892d $ cd ../b $ # make sure we cannot push after bookmarks diverged $ hg push -B X | grep abort abort: push creates new remote head * with bookmark 'X'! (glob) (pull and merge or see 'hg help push' for details about pushing new heads) [1] $ hg pull -u | grep divergent divergent bookmark X stored as X@default 1 other divergent bookmarks for "X" $ hg bookmarks @ 3:* (glob) * X 5:096f7e86892d X@default 6:238292f60a57 $ hg id -in 096f7e86892d 5 $ make_changes $ hg status $ hg bookmarks @ 3:* (glob) * X 7:227f941aeb07 X@default 6:238292f60a57 now merge with the remote bookmark $ hg merge X@default --tool :local -q $ hg status M test $ hg commit -m"Merged with X@default" $ hg bookmarks @ 3:* (glob) * X 8:26fed9bb3219 $ hg push -B X | grep bookmark pushing to $TESTTMP/a (?) updating bookmark X $ cd ../a $ hg up -q $ hg bookmarks * X 7:26fed9bb3219 test hg pull when there is more than one descendant $ cd ../a $ hg bookmark Z $ hg bookmark Y $ make_changes . YY $ hg up Z -q $ make_changes . ZZ created new head $ hg bookmarks X 7:26fed9bb3219 Y 8:131e663dbd2a * Z 9:b74a4149df25 $ hg log -r 'p1(Y)' -r 'p1(Z)' -T '{rev}\n' # prove that Y and Z share the same parent 7 $ hg log -r 'Y%Z' -T '{rev}\n' # revs in Y but not in Z 8 $ hg log -r 'Z%Y' -T '{rev}\n' # revs in Z but not in Y 9 $ cd ../b $ hg pull -uq $ hg id b74a4149df25 tip Z $ hg bookmarks | grep \* # no active bookmark [1] test shelving $ cd ../a $ echo anotherfile > anotherfile # this change should not conflict $ hg add anotherfile $ hg commit -m"Change in a" $ cd ../b $ hg up Z | grep Z (activating bookmark Z) $ hg book | grep \* # make sure active bookmark \* Z 10:* (glob) $ echo "test b" >> test $ hg diff --stat test | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) $ hg shelve shelved as Z 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg pull -uq $ hg unshelve unshelving change 'Z' rebasing shelved changes $ hg diff --stat test | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) make the bookmark move by updating it on a, and then pulling with a local change # add a commit to a $ cd ../a $ hg up -C X |fgrep "activating bookmark X" (activating bookmark X) # go back to b, and check out X $ cd ../b $ hg up -C X |fgrep "activating bookmark X" (activating bookmark X) # update and push from a $ make_changes ../a created new head $ echo "more" >> test $ hg pull -u 2>&1 | fgrep -v TESTTMP| fgrep -v "searching for changes" | fgrep -v adding pulling from $TESTTMP/a updating bookmark X added 1 changesets with 0 changes to 0 files (+1 heads) new changesets * (glob) updating to active bookmark X merging test warning: conflicts while merging test! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges $ hg update -Cq $ rm test.orig make sure that commits aren't possible if working directory is not pointing to active bookmark $ hg -R ../a status $ hg -R ../b status $ hg -R ../a id -i 36a6e592ec06 $ hg -R ../a book | grep X \* X \d+:36a6e592ec06 (re) $ hg -R ../b id -i 36a6e592ec06 $ hg -R ../b book | grep X \* X \d+:36a6e592ec06 (re) $ make_changes ../a $ hg -R ../a book | grep X \* X \d+:f73a71c992b8 (re) $ cd ../b $ hg pull 2>&1 | grep -v add | grep -v pulling | grep -v searching | grep -v changeset updating bookmark X (run 'hg update' to get a working copy) working directory out of sync with active bookmark, run 'hg up X' $ hg id -i # we're still on the old commit 36a6e592ec06 $ hg book | grep X # while the bookmark moved \* X \d+:f73a71c992b8 (re) $ make_changes abort: cannot commit, working directory out of sync with active bookmark (run 'hg up X') [255] $ hg up -Cq -r . # cleanup local changes $ hg status $ hg id -i # we're still on the old commit 36a6e592ec06 $ hg up X -q $ hg id -i # now we're on X f73a71c992b8 $ hg book | grep X \* X \d+:f73a71c992b8 (re)