This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7317

revlog: access the nodemap through the index
ClosedPublic

Authored by marmoute on Nov 8 2019, 4:29 AM.

Download Raw Diff

Details

Reviewers

indygreg

Group Reviewers

hg-reviewers

Commits

rHGbf176127033a: revlog: access the nodemap through the index
rHG0c3e9ddb9f54: revlog: access the nodemap through the index

Summary

The revlog.rev method now access the nodemap through self.index.nodemap,
instead of using the _nodecache attribute that we are trying to remove.

This work is part of a refactoring to unify the revlog index and the nodemap.
This unification prepare the use of a persistent nodemap.

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

marmoute created this revision.Nov 8 2019, 4:29 AM

Herald added a reviewer: indygreg. · View Herald TranscriptNov 8 2019, 4:29 AM

Herald added a reviewer: hg-reviewers. · View Herald Transcript

Herald added a subscriber: mercurial-devel. · View Herald Transcript

marmoute added a child revision: D7318: revlog: deprecate the _nodecache attribute (API).Nov 8 2019, 4:29 AM

Note that this adds an extra lookup to calls to rev(), which is often used in tight loops. But I think things may be fine. And we can always reintroduce the property if it shows up in perf tests.

This revision is now accepted and ready to land.Nov 8 2019, 2:34 PM

marmoute added a commit: rHG0c3e9ddb9f54: revlog: access the nodemap through the index.Nov 8 2019, 8:55 PM

Closed by commit rHG0c3e9ddb9f54: revlog: access the nodemap through the index (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

marmoute added a commit: rHGbf176127033a: revlog: access the nodemap through the index.Nov 10 2019, 10:37 AM

Revision Contents
Changeset List

			Path	Packages
M			mercurial/revlog.py (2 lines)

Status	Author	Revision
Closed	marmoute	D7362 revlog: deprecate direct `nodemap` access
Closed	marmoute	D7361 revlog: drop special hack in the `nodemap` property
Closed	marmoute	D7360 perf: make `perfrevlogindex` use the new `index.rev` api if available
Closed	marmoute	D7359 perf: make `perfphasesremote` use the new `index.has_node` api
Closed	marmoute	D7358 perf: make `perfnodemap` use the new `index.get_rev` api if available
Closed	marmoute	D7357 index: use `index.get_rev` in `remotefilelog`
Closed	marmoute	D7356 index: use `index.has_node` in `infinitypush`
Closed	marmoute	D7355 index: use `index.has_node` in `phabricator.getoldnodedrevmap`
Closed	marmoute	D7354 index: use `index.get_rev` in `histedit.processreplacement`
Closed	marmoute	D7353 index: use `index.get_rev` in `histedit.adjustreplacementsfrommarkers`
Closed	marmoute	D7352 index: use `index.has_node` in `histedit.cleanupnode`
Closed	marmoute	D7351 index: use `index.has_node` in `histedit._finishhistedit
Closed	marmoute	D7350 index: use `index.get_rev` in `rebase._computeobsoletenotrebased`
Closed	marmoute	D7349 index: use `index.get_rev` in `rebase.successorrevs`
Closed	marmoute	D7339 index: use `index.has_node` in `bundlerepo.bundlerevlog`
Closed	marmoute	D7338 index: use `index.get_rev` in `unionrepo.unionrevlog`
Closed	marmoute	D7340 index: use `index.rev` in `bundlerepo.bundlerevlog`
Closed	marmoute	D7348 index: use `index.has_node` in `exchangev2._pullchangesetdiscovery`
Closed	marmoute	D7347 index: use `index.get_rev` in `exchange._pullapplyphases`
Closed	marmoute	D7346 index: use `index.has_node` in `exchange._pulldiscoverychangegroup`
Closed	marmoute	D7345 index: use `index.rev` in `exchange.fallbackheads`
Closed	marmoute	D7344 index: use `index.has_node` in `bookmarks.bmstore`
Closed	marmoute	D7343 index: use `index.get_rev` in `revset._mapbynodefunc`
Closed	marmoute	D7342 index: use `index.has_node` in `tags.findglobaltags`
Closed	marmoute	D7341 index: use `index.get_rev` in `discovery._postprocessobsolete`
Closed	marmoute	D7337 index: use `index.get_rev` in `repoview.pinnedrevs`
Closed	marmoute	D7336 index: use `index.get_rev` in `obsolete._computephasedivergentset`
Closed	marmoute	D7335 index: use `index.get_rev` in `obsutil.getobsoleted`
Closed	marmoute	D7331 index: use `index.has_node` in `phases.filterunknown`
Closed	marmoute	D7330 index: use `index.has_node` in `analyzeremotephases`
Closed	marmoute	D7329 index: use `index.has_node` in `repo._rollback`
Closed	marmoute	D7328 index: use `index.has_node` in `revlog.addgroup`
Closed	marmoute	D7334 index: use `index.has_node` in `obsutil.foreground`
Closed	marmoute	D7333 index: use `index.has_node` in `obsutil.exclusivemarkers`
Closed	marmoute	D7332 index: use `index.get_rev` in `phases.newheads`
Closed	marmoute	D7327 index: use `index.get_rev` in `localrepo.known`
Closed	marmoute	D7326 index: add a `get_rev` method (API)
Closed	marmoute	D7325 index: use `index.rev` in `revlog.rev`
Closed	marmoute	D7324 index: add a `rev` method (API)
Closed	marmoute	D7323 index: use `index.has_node` in `revlog.addrevision`
Closed	marmoute	D7322 index: add a `has_node` method (API)
Closed	marmoute	D7321 revlog: deal with nodemap deletion within the index
Closed	marmoute	D7320 revlog: clean up the node of all revision stripped in the C code
Closed	marmoute	D7319 revlog: move nodemap update within the index code
Closed	marmoute	D7318 revlog: deprecate the _nodecache attribute (API)
Closed	marmoute	D7317 revlog: access the nodemap through the index
Closed	marmoute	D7316 revlog: return the nodemap as the nodecache
Closed	marmoute	D7315 revlog: clarify which version use the older API in perf
Closed	marmoute	D7314 revlog: no longer return the nodemap after parsing
Closed	marmoute	D7313 revlog: move the nodemap into the index object (for pure)
Closed	marmoute	D7312 revlog: introduce an explicit NodeMap class for pure code
Closed	marmoute	D7311 utils: move the `dirs` definition in pathutil (API)

Diff 17830

mercurial/revlog.py

	self._revisioncache = None			self._revisioncache = None
	self._chainbasecache.clear()			self._chainbasecache.clear()
	self._chunkcache = (0, b'')			self._chunkcache = (0, b'')
	self._pcache = {}			self._pcache = {}
	self.index.clearcaches()			self.index.clearcaches()

	def rev(self, node):			def rev(self, node):
	try:			try:
	return self._nodecache[node]			return self.index.nodemap[node]
	except TypeError:			except TypeError:
	raise			raise
	except error.RevlogError:			except error.RevlogError:
	# parsers.c radix tree lookup failed			# parsers.c radix tree lookup failed
	if node == wdirid or node in wdirfilenodeids:			if node == wdirid or node in wdirfilenodeids:
	raise error.WdirUnsupported			raise error.WdirUnsupported
	raise error.LookupError(node, self.indexfile, _(b'no node'))			raise error.LookupError(node, self.indexfile, _(b'no node'))

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	17733		Nov 8 2019, 4:29 AM	★	★
Diff 2	17830	rHG0c3e9ddb9f54d6923246340cad9cbd8a33ab2000	Nov 2 2019, 10:25 AM	★	★