This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7074

sidedatacopies: fast path data fetching if revision has no sidedata
ClosedPublic

Authored by marmoute on Oct 12 2019, 12:46 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG8a2925265402: sidedatacopies: fast path data fetching if revision has no sidedata

Summary

When using the side data mode, we know their won't be any copy information
sidedata. Skipping revision restoration give an important speed boost.

In the future, there will be other user of sidedata, reducing the efficiency of
this. We should consider adding a dedicated flag in revlog V2 to preserve this
optimisation. The current situation is good enough for now.

revision: large amount; added files: large amount; rename small amount; c3b14617fbd7 9ba6ab77fd29
before: ! wall 2.401569 comb 2.400000 user 2.390000 sys 0.010000 (median of 10)
after: ! wall 1.429294 comb 1.430000 user 1.410000 sys 0.020000 (median of 10)
revision: large amount; added files: small amount; rename small amount; c3b14617fbd7 f650a9b140d2
before: ! wall 3.519140 comb 3.520000 user 3.470000 sys 0.050000 (median of 10)
after: ! wall 1.963332 comb 1.960000 user 1.960000 sys 0.000000 (median of 10)
revision: large amount; added files: large amount; rename large amount; 08ea3258278e d9fa043f30c0
before: ! wall 0.593880 comb 0.600000 user 0.590000 sys 0.010000 (median of 15)
after: ! wall 0.251679 comb 0.250000 user 0.250000 sys 0.000000 (median of 38)
revision: small amount; added files: large amount; rename large amount; df6f7a526b60 a83dc6a2d56f
before: ! wall 0.013414 comb 0.020000 user 0.020000 sys 0.000000 (median of 220)
after: ! wall 0.013222 comb 0.020000 user 0.020000 sys 0.000000 (median of 223)
revision: small amount; added files: large amount; rename small amount; 4aa4e1f8e19a 169138063d63
before: ! wall 0.002711 comb 0.000000 user 0.000000 sys 0.000000 (median of 1000)
after: ! wall 0.001631 comb 0.000000 user 0.000000 sys 0.000000 (median of 1000)
revision: small amount; added files: small amount; rename small amount; 4bc173b045a6 964879152e2e
before: ! wall 0.000077 comb 0.000000 user 0.000000 sys 0.000000 (median of 12208)
after: ! wall 0.000078 comb 0.000000 user 0.000000 sys 0.000000 (median of 12012)
revision: medium amount; added files: large amount; rename medium amount; c95f1ced15f2 2c68e87c3efe
before: ! wall 0.410067 comb 0.410000 user 0.410000 sys 0.000000 (median of 23)
after: ! wall 0.207786 comb 0.200000 user 0.200000 sys 0.000000 (median of 46)
revision: medium amount; added files: medium amount; rename small amount; d343da0c55a8 d7746d32bf9d
before: ! wall 0.097004 comb 0.090000 user 0.090000 sys 0.000000 (median of 100)
after: ! wall 0.038495 comb 0.030000 user 0.030000 sys 0.000000 (median of 100)

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.Oct 12 2019, 12:46 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 12 2019, 12:46 PM

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

marmoute added a child revision: D7075: copies: add an explicit test using multiple roots.Oct 12 2019, 12:47 PM

marmoute edited the summary of this revision. (Show Details)Oct 16 2019, 6:55 PM

marmoute updated this revision to Diff 17276.

marmoute added a commit: rHG8a2925265402: sidedatacopies: fast path data fetching if revision has no sidedata.Oct 19 2019, 1:37 PM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHG8a2925265402: sidedatacopies: fast path data fetching if revision has no sidedata (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/copies.py (14 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	17114		Oct 12 2019, 12:46 PM	★	★
Diff 2	17276		Oct 16 2019, 6:55 PM	★	★
Diff 3	17358	rHG8a29252654021deed60a87ccebf4530b34583dc4	Oct 2 2019, 6:16 PM	★	★

Status	Author	Revision
Closed	marmoute	D7131 copies: simplify chain loop
Closed	marmoute	D7127 sidedatacopies: only fetch information once for merge
Closed	marmoute	D7124 copies: move from a copy on branchpoint to a copy on write approach
Closed	marmoute	D7076 copies: compute the exact set of revision to walk
Closed	marmoute	D7075 copies: add an explicit test using multiple roots
Closed	marmoute	D7074 sidedatacopies: fast path data fetching if revision has no sidedata
Abandoned	marmoute	D7073 revlog: introduce a `_uncheckedflags` shortcut
Closed	marmoute	D7072 sidedatacopies: directly fetch copies information from sidedata
Closed	marmoute	D7123 copies: use an unfiltered repository for the changeset centric algorithm
Abandoned	marmoute	D7071 copies: use unchecked parentrevs function to access parent
Closed	marmoute	D7070 copies: extract data extraction into a `revinfo` function
Closed	marmoute	D7122 copies: avoid instancing more changectx to access parent revisions
Closed	marmoute	D7121 copies: get copies information directly from _copies

Diff 17358

mercurial/copies.py

	* p2copies: mapping of copies from p2			* p2copies: mapping of copies from p2
	* removed: a list of removed files			* removed: a list of removed files
	"""			"""
	cl = repo.changelog			cl = repo.changelog
	parents = cl.parentrevs			parents = cl.parentrevs

	if repo.filecopiesmode == b'changeset-sidedata':			if repo.filecopiesmode == b'changeset-sidedata':
	changelogrevision = cl.changelogrevision			changelogrevision = cl.changelogrevision
				flags = cl.flags

	def revinfo(rev):			def revinfo(rev):
	p1, p2 = parents(rev)			p1, p2 = parents(rev)
				if flags(rev) & REVIDX_SIDEDATA:
	c = changelogrevision(rev)			c = changelogrevision(rev)
	p1copies = c.p1copies			p1copies = c.p1copies
	p2copies = c.p2copies			p2copies = c.p2copies
	removed = c.filesremoved			removed = c.filesremoved
				else:
				p1copies = {}
				p2copies = {}
				removed = ()
	return p1, p2, p1copies, p2copies, removed			return p1, p2, p1copies, p2copies, removed

	else:			else:

	def revinfo(rev):			def revinfo(rev):
	p1, p2 = parents(rev)			p1, p2 = parents(rev)
	ctx = repo[rev]			ctx = repo[rev]
	p1copies, p2copies = ctx._copies			p1copies, p2copies = ctx._copies