This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1450

perftweaks: also wrap branchmap.updatecache
AbandonedPublic

Authored by quark on Nov 18 2017, 12:56 AM.
Tags
None
Subscribers
durham

Details

Reviewers
durham
Group Reviewers
Restricted Project
Summary

branchmap.branchcache.update is not the only code path triggering branchmap
update. branchmap.updatecache also matters. Let's also change it too.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Nov 18 2017, 12:56 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 18 2017, 12:56 AM
durham requested changes to this revision.Nov 21 2017, 10:15 AM
durham added a subscriber: durham.

Can you provide a more detailed description of why this is safe and correct? The branch cache is a funky bit of logic. I know we only use it for heads these days, but I want to be sure we aren't breaking that functionality.

What kind of testing did we do here?

This revision now requires changes to proceed.Nov 21 2017, 10:15 AM
quark abandoned this revision.Nov 21 2017, 10:18 PM

I thought this is similar to _branchmapupdate but that might be wrong. With D1473, this might be unnecessary.

Revision Contents
Changeset List

Diff 3625

hgext3rd/perftweaks.py

import os import os
testedwith = 'ships-with-fb-hgext' testedwith = 'ships-with-fb-hgext'
def extsetup(ui): def extsetup(ui):
wrapfunction(tags, '_readtagcache', _readtagcache) wrapfunction(tags, '_readtagcache', _readtagcache)
wrapfunction(merge, '_checkcollision', _checkcollision) wrapfunction(merge, '_checkcollision', _checkcollision)
wrapfunction(branchmap.branchcache, 'update', _branchmapupdate) wrapfunction(branchmap.branchcache, 'update', _branchmapupdate)
wrapfunction(branchmap, 'updatecache', _branchmapupdatecache)
if ui.configbool('perftweaks', 'preferdeltas'): if ui.configbool('perftweaks', 'preferdeltas'):
wrapfunction(revlog.revlog, '_isgooddelta', _isgooddelta) wrapfunction(revlog.revlog, '_isgooddelta', _isgooddelta)
wrapfunction(dispatch, 'runcommand', _trackdirstatesizes) wrapfunction(dispatch, 'runcommand', _trackdirstatesizes)
wrapfunction(dispatch, 'runcommand', _tracksparseprofiles) wrapfunction(dispatch, 'runcommand', _tracksparseprofiles)
wrapfunction(merge, 'update', _trackupdatesize) wrapfunction(merge, 'update', _trackupdatesize)
try: try:
tiprev = max(cl.rev(node) for node in heads) tiprev = max(cl.rev(node) for node in heads)
if tiprev > self.tiprev: if tiprev > self.tiprev:
self.tipnode = cl.node(tiprev) self.tipnode = cl.node(tiprev)
self.tiprev = tiprev self.tiprev = tiprev
self.filteredhash = scmutil.filteredhash(repo, self.tiprev) self.filteredhash = scmutil.filteredhash(repo, self.tiprev)
repo.ui.log('branchcache', 'perftweaks updated %s branch cache\n', repo.ui.log('branchcache', 'perftweaks updated %s branch cache\n',
repo.filtername) repo.filtername)
def _branchmapupdatecache(orig, repo):
if not repo.ui.configbool('perftweaks', 'disablebranchcache'):
return orig(repo)
filtername = repo.filtername
if filtername not in repo._branchcaches:
cache = branchmap.branchcache()
_branchmapupdate(None, cache, repo, None)
repo._branchcaches[filtername] = cache
def _branchmapwrite(orig, self, repo): def _branchmapwrite(orig, self, repo):
result = orig(self, repo) result = orig(self, repo)
if repo.ui.configbool('perftweaks', 'cachenoderevs', True): if repo.ui.configbool('perftweaks', 'cachenoderevs', True):
revs = set() revs = set()
nodemap = repo.changelog.nodemap nodemap = repo.changelog.nodemap
for branch, heads in self.iteritems(): for branch, heads in self.iteritems():
revs.update(nodemap[n] for n in heads) revs.update(nodemap[n] for n in heads)
name = 'branchheads-%s' % repo.filtername name = 'branchheads-%s' % repo.filtername