Mercurial > hg
view tests/test-remotefilelog-linknodes.t @ 44118:f81c17ec303c
hgdemandimport: apply lazy module loading to sys.meta_path finders
Python's `sys.meta_path` finders are the primary objects whose job it
is to find a module at import time. When `import` is called, Python
iterates objects in this list and calls `o.find_spec(...)` to find
a `ModuleSpec` (or None if the module couldn't be found by that
finder). If no meta path finder can find a module, import fails.
One of the default meta path finders is `PathFinder`. Its job is to
import modules from the filesystem and is probably the most important
importer. This finder looks at `sys.path` and `sys.path_hooks` to do
its job.
The `ModuleSpec` returned by `MetaPathImporter.find_spec()` has a
`loader` attribute, which defines the concrete module loader to use.
`sys.path_hooks` is a hook point for teaching `PathFinder` to
instantiate custom loader types.
Previously, we injected a custom `sys.path_hook` that told `PathFinder`
to wrap the default loaders with a loader that creates a module object
that is lazy.
This approach worked. But its main limitation was that it only applied
to the `PathFinder` meta path importer. There are other meta path
importers that are registered. And in the case of PyOxidizer loading
modules from memory, `PathFinder` doesn't come into play since
PyOxidizer's own meta path importer was handling all imports.
This commit changes our approach to lazy module loading by proxying
all meta path importers. Specifically, we overload the `find_spec()`
method to swap in a wrapped loader on the `ModuleSpec` before it
is returned. The end result of this is all meta path importers should
be lazy.
As much as I would have loved to utilize .__class__ manipulation to
achieve this, some meta path importers are implemented in C/Rust
in such a way that they cannot be monkeypatched. This is why we
use __getattribute__ to define a proxy.
Also, this change could theoretically open us up to regressions in
meta path importers whose loader is creating module objects which
can't be monkeypatched. But I'm not aware of any of these in the
wild. So I think we'll be safe.
According to hyperfine, this change yields a decent startup time win of
5-6ms:
```
Benchmark #1: ~/.pyenv/versions/3.6.10/bin/python ./hg version
Time (mean ± σ): 86.8 ms ± 0.5 ms [User: 78.0 ms, System: 8.7 ms]
Range (min … max): 86.0 ms … 89.1 ms 50 runs
Time (mean ± σ): 81.1 ms ± 2.7 ms [User: 74.5 ms, System: 6.5 ms]
Range (min … max): 77.8 ms … 90.5 ms 50 runs
Benchmark #2: ~/.pyenv/versions/3.7.6/bin/python ./hg version
Time (mean ± σ): 78.9 ms ± 0.6 ms [User: 70.2 ms, System: 8.7 ms]
Range (min … max): 78.1 ms … 81.2 ms 50 runs
Time (mean ± σ): 73.4 ms ± 0.6 ms [User: 65.3 ms, System: 8.0 ms]
Range (min … max): 72.4 ms … 75.7 ms 50 runs
Benchmark #3: ~/.pyenv/versions/3.8.1/bin/python ./hg version
Time (mean ± σ): 78.1 ms ± 0.6 ms [User: 70.2 ms, System: 7.9 ms]
Range (min … max): 77.4 ms … 80.9 ms 50 runs
Time (mean ± σ): 72.1 ms ± 0.4 ms [User: 64.4 ms, System: 7.6 ms]
Range (min … max): 71.4 ms … 74.1 ms 50 runs
```
Differential Revision: https://phab.mercurial-scm.org/D7954
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Mon, 20 Jan 2020 23:51:25 -0800 |
parents | 4edd427f34c1 |
children | f90a5c211251 |
line wrap: on
line source
#require no-windows # Tests for the complicated linknode logic in remotefilelog.py::ancestormap() $ . "$TESTDIR/remotefilelog-library.sh" $ hg init master $ cd master $ cat >> .hg/hgrc <<EOF > [remotefilelog] > server=True > serverexpiration=-1 > EOF $ echo x > x $ hg commit -qAm x $ cd .. $ hgcloneshallow ssh://user@dummy/master shallow -q 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob) # Rebase produces correct log -f linknodes $ cd shallow $ echo y > y $ hg commit -qAm y $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo x >> x $ hg commit -qAm xx $ hg log -f x --template "{node|short}\n" 0632994590a8 b292c1e3311f $ hg rebase -d 1 rebasing 2:0632994590a8 "xx" (tip) saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/0632994590a8-0bc786d8-rebase.hg (glob) $ hg log -f x --template "{node|short}\n" 81deab2073bc b292c1e3311f # Rebase back, log -f still works $ hg rebase -d 0 -r 2 rebasing 2:81deab2073bc "xx" (tip) saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/81deab2073bc-80cb4fda-rebase.hg (glob) $ hg log -f x --template "{node|short}\n" b3fca10fb42d b292c1e3311f $ hg rebase -d 1 -r 2 rebasing 2:b3fca10fb42d "xx" (tip) saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/b3fca10fb42d-da73a0c7-rebase.hg (glob) $ cd .. # Reset repos $ clearcache $ rm -rf master $ rm -rf shallow $ hg init master $ cd master $ cat >> .hg/hgrc <<EOF > [remotefilelog] > server=True > serverexpiration=-1 > EOF $ echo x > x $ hg commit -qAm x $ cd .. $ hgcloneshallow ssh://user@dummy/master shallow -q 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob) # Rebase stack onto landed commit $ cd master $ echo x >> x $ hg commit -Aqm xx $ cd ../shallow $ echo x >> x $ hg commit -Aqm xx2 $ echo y >> x $ hg commit -Aqm xxy $ hg pull -q $ hg rebase -d tip rebasing 1:4549721d828f "xx2" note: not rebasing 1:4549721d828f "xx2", its destination already has all its changes rebasing 2:5ef6d97e851c "xxy" saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/4549721d828f-b084e33c-rebase.hg (glob) $ hg log -f x --template '{node|short}\n' 4ae8e31c85ef 0632994590a8 b292c1e3311f $ cd .. # system cache has invalid linknode, but .hg/store/data has valid $ cd shallow $ hg strip -r 1 -q $ rm -rf .hg/store/data/* $ echo x >> x $ hg commit -Aqm xx_local $ hg log -f x --template '{rev}:{node|short}\n' 1:21847713771d 0:b292c1e3311f $ cd .. $ rm -rf shallow /* Local linknode is invalid; remote linknode is valid (formerly slow case) */ $ hgcloneshallow ssh://user@dummy/master shallow -q 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob) $ cd shallow $ echo x >> x $ hg commit -Aqm xx2 $ cd ../master $ echo y >> y $ hg commit -Aqm yy2 $ echo x >> x $ hg commit -Aqm xx2-fake-rebased $ echo y >> y $ hg commit -Aqm yy3 $ cd ../shallow $ hg pull --config remotefilelog.debug=True pulling from ssh://user@dummy/master searching for changes adding changesets adding manifests adding file changes added 3 changesets with 0 changes to 0 files (+1 heads) new changesets 01979f9404f8:7200df4e0aca (run 'hg heads' to see heads, 'hg merge' to merge) $ hg update tip -q 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob) $ echo x > x $ hg commit -qAm xx3 # At this point, the linknode points to c1254e70bad1 instead of 32e6611f6149 $ hg log -G -T '{node|short} {desc} {phase} {files}\n' @ a5957b6bf0bd xx3 draft x | o 7200df4e0aca yy3 public y | o 32e6611f6149 xx2-fake-rebased public x | o 01979f9404f8 yy2 public y | | o c1254e70bad1 xx2 draft x |/ o 0632994590a8 xx public x | o b292c1e3311f x public x # Check the contents of the local blob for incorrect linknode $ hg debugremotefilelog .hg/store/data/11f6ad8ec52a2984abaafd7c3b516503785c2072/d4a3ed9310e5bd9887e3bf779da5077efab28216 size: 6 bytes path: .hg/store/data/11f6ad8ec52a2984abaafd7c3b516503785c2072/d4a3ed9310e5bd9887e3bf779da5077efab28216 key: d4a3ed9310e5 node => p1 p2 linknode copyfrom d4a3ed9310e5 => aee31534993a 000000000000 c1254e70bad1 aee31534993a => 1406e7411862 000000000000 0632994590a8 1406e7411862 => 000000000000 000000000000 b292c1e3311f # Verify that we do a fetch on the first log (remote blob fetch for linkrev fix) $ hg log -f x -T '{node|short} {desc} {phase} {files}\n' a5957b6bf0bd xx3 draft x 32e6611f6149 xx2-fake-rebased public x 0632994590a8 xx public x b292c1e3311f x public x 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob) # But not after that $ hg log -f x -T '{node|short} {desc} {phase} {files}\n' a5957b6bf0bd xx3 draft x 32e6611f6149 xx2-fake-rebased public x 0632994590a8 xx public x b292c1e3311f x public x # Check the contents of the remote blob for correct linknode $ hg debugremotefilelog $CACHEDIR/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/d4a3ed9310e5bd9887e3bf779da5077efab28216 size: 6 bytes path: $TESTTMP/hgcache/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/d4a3ed9310e5bd9887e3bf779da5077efab28216 key: d4a3ed9310e5 node => p1 p2 linknode copyfrom d4a3ed9310e5 => aee31534993a 000000000000 32e6611f6149 aee31534993a => 1406e7411862 000000000000 0632994590a8 1406e7411862 => 000000000000 000000000000 b292c1e3311f