This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4390

perf: use storage API for resolving manifest node
ClosedPublic

Authored by indygreg on Aug 27 2018, 12:00 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc03c5f528e9b: perf: use storage API for resolving manifest node
Summary

lookup() isn't part of the storage API. And this code shouldn't
be accessing manifestlog._revlog directly for the modern code base.
So let's port it to the modern API.

Note that the previous code was busted for cases where we needed
to call lookup() because lookup() isn't exposed by manifestrevlog
any more.

This change is strictly BC breaking because we no longer support
resolving partial nodes. But it is a perf* command and I don't
think we should flag the change as such.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Aug 27 2018, 12:00 PM
Closed by commit rHGc03c5f528e9b: perf: use storage API for resolving manifest node (authored by indygreg). · Explain WhyAug 29 2018, 1:23 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/perf.py (16 lines)
Mtests/test-contrib-perf.t (4 lines)

Diff 10631

contrib/perf.py

dict-like object dict-like object
Manifest caches are cleared before retrieval.""" Manifest caches are cleared before retrieval."""
timer, fm = gettimer(ui, opts) timer, fm = gettimer(ui, opts)
if not manifest_rev: if not manifest_rev:
ctx = scmutil.revsingle(repo, rev, rev) ctx = scmutil.revsingle(repo, rev, rev)
t = ctx.manifestnode() t = ctx.manifestnode()
else: else:
from mercurial.node import bin
if len(rev) == 40:
t = bin(rev)
else:
try:
rev = int(rev)
if util.safehasattr(repo.manifestlog, 'getstorage'):
t = repo.manifestlog.getstorage(b'').node(rev)
else:
t = repo.manifestlog._revlog.lookup(rev) t = repo.manifestlog._revlog.lookup(rev)
except ValueError:
raise error.Abort('manifest revision must be integer or full '
'node')
def d(): def d():
repo.manifestlog.clearcaches(clear_persisted_data=clear_disk) repo.manifestlog.clearcaches(clear_persisted_data=clear_disk)
repo.manifestlog[t].read() repo.manifestlog[t].read()
timer(d) timer(d)
fm.end() fm.end()
@command('perfchangeset', formatteropts) @command('perfchangeset', formatteropts)
def perfchangeset(ui, repo, rev, **opts): def perfchangeset(ui, repo, rev, **opts):

tests/test-contrib-perf.t

$ hg perfheads $ hg perfheads
$ hg perfindex $ hg perfindex
$ hg perflinelogedits -n 1 $ hg perflinelogedits -n 1
$ hg perfloadmarkers $ hg perfloadmarkers
$ hg perflog $ hg perflog
$ hg perflookup 2 $ hg perflookup 2
$ hg perflrucache $ hg perflrucache
$ hg perfmanifest 2 $ hg perfmanifest 2
$ hg perfmanifest -m 44fe2c8352bb3a478ffd7d8350bbc721920134d1
$ hg perfmanifest -m 44fe2c8352bb
abort: manifest revision must be integer or full node
[255]
$ hg perfmergecalculate -r 3 $ hg perfmergecalculate -r 3
$ hg perfmoonwalk $ hg perfmoonwalk
$ hg perfnodelookup 2 $ hg perfnodelookup 2
$ hg perfpathcopies 1 2 $ hg perfpathcopies 1 2
$ hg perfrawfiles 2 $ hg perfrawfiles 2
$ hg perfrevlogindex -c $ hg perfrevlogindex -c
#if reporevlogstore #if reporevlogstore
$ hg perfrevlogrevisions .hg/store/data/a.i $ hg perfrevlogrevisions .hg/store/data/a.i