Mercurial > hg
view tests/test-rebase-mq.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 | 4edd427f34c1 |
children | dc5e5577af39 |
line wrap: on
line source
$ cat >> $HGRCPATH <<EOF > [extensions] > rebase= > mq= > > [mq] > plain=true > > [alias] > tglog = log -G --template "{rev}: {node|short} '{desc}' tags: {tags}\n" > EOF $ hg init a $ cd a $ hg qinit -c $ echo c1 > f $ hg add f $ hg ci -m C1 $ echo r1 > f $ hg ci -m R1 $ hg up -q 0 $ hg qnew f.patch -d '1 0' $ echo mq1 > f $ hg qref -m P0 $ hg qnew f2.patch $ echo mq2 > f $ hg qref -m P1 -d '2 0' $ hg tglog @ 3: 929394423cd3 'P1' tags: f2.patch qtip tip | o 2: 3504f44bffc0 'P0' tags: f.patch qbase | | o 1: bac9ed9960d8 'R1' tags: |/ o 0: 36f36ddbca61 'C1' tags: qparent Rebase - try to rebase on an applied mq patch: $ hg rebase -s 1 -d 3 abort: cannot rebase onto an applied mq patch [255] Rebase - same thing, but mq patch is default dest: $ hg up -q 1 $ hg rebase abort: cannot rebase onto an applied mq patch [255] $ hg up -q qtip Rebase - generate a conflict: $ hg rebase -s 2 -d 1 rebasing 2:3504f44bffc0 "P0" (f.patch qbase) merging f warning: conflicts while merging f! (edit, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) [1] Fix the 1st conflict: $ echo mq1r1 > f $ hg resolve -m f (no more unresolved files) continue: hg rebase --continue $ hg rebase -c rebasing 2:3504f44bffc0 "P0" (f.patch qbase) rebasing 3:929394423cd3 "P1" (f2.patch qtip tip) merging f warning: conflicts while merging f! (edit, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) [1] Fix the 2nd conflict: $ echo mq1r1mq2 > f $ hg resolve -m f (no more unresolved files) continue: hg rebase --continue $ hg rebase -c already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c rebasing 3:929394423cd3 "P1" (f2.patch qtip) saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-rebase.hg $ hg tglog @ 3: 462012cf340c 'P1' tags: f2.patch qtip tip | o 2: ebe9914c0d1c 'P0' tags: f.patch qbase | o 1: bac9ed9960d8 'R1' tags: qparent | o 0: 36f36ddbca61 'C1' tags: $ hg up -q qbase $ cat f mq1r1 $ cat .hg/patches/f.patch # HG changeset patch # User test # Date 1 0 # Thu Jan 01 00:00:01 1970 +0000 # Node ID ebe9914c0d1c3f60096e952fa4dbb3d377dea3ab # Parent bac9ed9960d8992bcad75864a879fa76cadaf1b0 P0 diff -r bac9ed9960d8 -r ebe9914c0d1c f --- a/f Thu Jan 01 00:00:00 1970 +0000 +++ b/f Thu Jan 01 00:00:01 1970 +0000 @@ -1,1 +1,1 @@ -r1 +mq1r1 Update to qtip: $ hg up -q qtip $ cat f mq1r1mq2 $ cat .hg/patches/f2.patch # HG changeset patch # User test # Date 2 0 # Thu Jan 01 00:00:02 1970 +0000 # Node ID 462012cf340c97d44d62377c985a423f6bb82f07 # Parent ebe9914c0d1c3f60096e952fa4dbb3d377dea3ab P1 diff -r ebe9914c0d1c -r 462012cf340c f --- a/f Thu Jan 01 00:00:01 1970 +0000 +++ b/f Thu Jan 01 00:00:02 1970 +0000 @@ -1,1 +1,1 @@ -mq1r1 +mq1r1mq2 Adding one git-style patch and one normal: $ hg qpop -a popping f2.patch popping f.patch patch queue now empty $ rm -fr .hg/patches $ hg qinit -c $ hg up -q 0 $ hg qnew --git f_git.patch -d '3 0' $ echo mq1 > p $ hg add p $ hg qref --git -m 'P0 (git)' $ hg qnew f.patch -d '4 0' $ echo mq2 > p $ hg qref -m P1 $ hg qci -m 'save patch state' $ hg qseries -s f_git.patch: P0 (git) f.patch: P1 $ hg -R .hg/patches manifest .hgignore f.patch f_git.patch series $ cat .hg/patches/f_git.patch Date: 3 0 P0 (git) diff --git a/p b/p new file mode 100644 --- /dev/null +++ b/p @@ -0,0 +1,1 @@ +mq1 $ cat .hg/patches/f.patch Date: 4 0 P1 diff -r ???????????? p (glob) --- a/p ??? ??? ?? ??:??:?? ???? ????? (glob) +++ b/p ??? ??? ?? ??:??:?? ???? ????? (glob) @@ -1,1 +1,1 @@ -mq1 +mq2 Rebase the applied mq patches: $ hg rebase -s 2 -d 1 rebasing 2:0c587ffcb480 "P0 (git)" (f_git.patch qbase) rebasing 3:c7f18665e4bc "P1" (f.patch qtip tip) saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-0ea5695f-rebase.hg $ hg qci -m 'save patch state' $ hg qseries -s f_git.patch: P0 (git) f.patch: P1 $ hg -R .hg/patches manifest .hgignore f.patch f_git.patch series $ cat .hg/patches/f_git.patch # HG changeset patch # User test # Date 3 0 # Thu Jan 01 00:00:03 1970 +0000 # Node ID 12d9f6a3bbe560dee50c7c454d434add7fb8e837 # Parent bac9ed9960d8992bcad75864a879fa76cadaf1b0 P0 (git) diff --git a/p b/p new file mode 100644 --- /dev/null +++ b/p @@ -0,0 +1,1 @@ +mq1 $ cat .hg/patches/f.patch # HG changeset patch # User test # Date 4 0 # Thu Jan 01 00:00:04 1970 +0000 # Node ID c77a2661c64c60d82f63c4f7aefd95b3a948a557 # Parent 12d9f6a3bbe560dee50c7c454d434add7fb8e837 P1 diff -r 12d9f6a3bbe5 -r c77a2661c64c p --- a/p Thu Jan 01 00:00:03 1970 +0000 +++ b/p Thu Jan 01 00:00:04 1970 +0000 @@ -1,1 +1,1 @@ -mq1 +mq2 $ cd .. Rebase with guards $ hg init foo $ cd foo $ echo a > a $ hg ci -Am a adding a Create mq repo with guarded patches foo and bar and empty patch: $ hg qinit $ echo guarded > guarded $ hg add guarded $ hg qnew guarded $ hg qnew empty-important -m 'important commit message' -d '1 0' $ echo bar > bar $ hg add bar $ hg qnew bar -d '2 0' $ echo foo > foo $ hg add foo $ hg qnew foo $ hg qpop -a popping foo popping bar popping empty-important popping guarded patch queue now empty $ hg qguard guarded +guarded $ hg qguard bar +baz $ hg qguard foo +baz $ hg qselect baz number of unguarded, unapplied patches has changed from 1 to 3 $ hg qpush bar applying empty-important patch empty-important is empty applying bar now at: bar $ hg qguard -l guarded: +guarded empty-important: unguarded bar: +baz foo: +baz $ hg tglog @ 2: 4f44b861d38c 'imported patch bar' tags: bar qtip tip | o 1: 0aaf4c3af7eb 'important commit message' tags: empty-important qbase | o 0: cb9a9f314b8b 'a' tags: qparent Create new head to rebase bar onto: $ hg up -C 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo b > b $ hg add b $ hg ci -m b created new head $ hg up -C 2 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo a >> a $ hg qref $ hg tglog @ 3: d526d4536ed6 '[mq]: bar' tags: bar qtip tip | | o 2: d2ae7f538514 'b' tags: | | o | 1: 0aaf4c3af7eb 'important commit message' tags: empty-important qbase |/ o 0: cb9a9f314b8b 'a' tags: qparent Rebase bar (make sure series order is preserved and empty-important also is removed from the series): $ hg qseries guarded empty-important bar foo $ [ -f .hg/patches/empty-important ] $ hg -q rebase -d 2 note: not rebasing 1:0aaf4c3af7eb "important commit message" (empty-important qbase), its destination already has all its changes $ hg qseries guarded bar foo $ [ -f .hg/patches/empty-important ] [1] $ hg qguard -l guarded: +guarded bar: +baz foo: +baz $ hg tglog @ 2: 477d948bb2af '[mq]: bar' tags: bar qbase qtip tip | o 1: d2ae7f538514 'b' tags: qparent | o 0: cb9a9f314b8b 'a' tags: $ cd ..