Mercurial > hg
changeset 41109:3e1960e23e6b
delta: reuse _findsnapshot call from previous stage
Two different stage of the sparse-revlog logic needs the _findsnapshot data.
To avoid recomputing it twice, make it possible to reuse the first computation
in the second step.
example affected manifest write
before: 0.067141s
after: 0.064252s (-5%)
(total gain since start of series: 95%)
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 20 Dec 2018 10:16:24 +0100 |
| parents | 38e88450138c |
| children | 71b0db4fa027 |
| files | mercurial/revlogutils/deltas.py |
| diffstat | 1 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/revlogutils/deltas.py Thu Dec 20 10:15:20 2018 +0100 +++ b/mercurial/revlogutils/deltas.py Thu Dec 20 10:16:24 2018 +0100 @@ -713,7 +713,8 @@ if good is not None: yield None return - for candidates in _rawgroups(revlog, p1, p2, cachedelta): + snapshots = collections.defaultdict(list) + for candidates in _rawgroups(revlog, p1, p2, cachedelta, snapshots): good = yield candidates if good is not None: break @@ -734,12 +735,8 @@ break good = yield (base,) # refine snapshot up - # - # XXX the _findsnapshots call can be expensive and is "duplicated" with - # the one done in `_rawgroups`. Once we start working on performance, - # we should make the two logics share this computation. - snapshots = collections.defaultdict(list) - _findsnapshots(revlog, snapshots, good + 1) + if not snapshots: + _findsnapshots(revlog, snapshots, good + 1) previous = None while good != previous: previous = good @@ -749,7 +746,7 @@ # we have found nothing yield None -def _rawgroups(revlog, p1, p2, cachedelta): +def _rawgroups(revlog, p1, p2, cachedelta, snapshots=None): """Provides group of revision to be tested as delta base This lower level function focus on emitting delta theorically interresting @@ -779,7 +776,9 @@ yield parents if sparse and parents: - snapshots = collections.defaultdict(list) # map: base-rev: snapshot-rev + if snapshots is None: + # map: base-rev: snapshot-rev + snapshots = collections.defaultdict(list) # See if we can use an existing snapshot in the parent chains to use as # a base for a new intermediate-snapshot #