This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8415

nodemap: add a new mode value, "strict"
ClosedPublic

Authored by marmoute on Apr 14 2020, 11:48 AM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHG6b01799e9db0: nodemap: add a new mode value, "strict"

Summary

When "strict" is set, operation will refuse to use the slow path and abort if
they would. This is useful for testing, benchmarking and server operation.

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.Apr 14 2020, 11:48 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptApr 14 2020, 11:48 AM

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

marmoute added a child revision: D8416: nodemap: move on disk file to version 1.Apr 14 2020, 11:48 AM

marmoute updated this revision to Diff 21093.Apr 15 2020, 7:59 AM

Herald added a subscriber: mercurial-patches. · View Herald TranscriptApr 27 2020, 1:12 PM

Alphare accepted this revision.May 7 2020, 9:03 AM

marmoute added a commit: rHG6b01799e9db0: nodemap: add a new mode value, "strict".May 7 2020, 11:33 AM

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

Closed by commit rHG6b01799e9db0: nodemap: add a new mode value, "strict" (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/revlogutils/nodemap.py (2 lines)
M			tests/test-persistent-nodemap.t (11 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	21063		Apr 14 2020, 11:48 AM	★	★
Diff 2	21093		Apr 15 2020, 7:59 AM	★	★
Diff 3	21291	rHG6b01799e9db0311c0b0bd7d8e95549293c2974f1	Apr 13 2020, 9:01 PM	★	★

Status	Author	Revision
Closed	marmoute	D8431 upgrade: support upgrade and downgrade from persistent nodemap
Closed	marmoute	D8430 nodemap: teach `hg debugformat` about the persistent nodemap option
Closed	marmoute	D8429 upgrade: support the --quiet flag
Closed	marmoute	D8428 upgrade: clearly list optimisation
Closed	marmoute	D8422 nodemap: move the mode option to storage.revlog.nodemap.mode
Closed	marmoute	D8421 nodemap: move the option for mmap usage to storage.revlog.nodemap.mmap
Closed	marmoute	D8420 nodemap: move and update the commend about persistence being experimental
Closed	marmoute	D8419 nodemap: move the main switch to the `format` section
Closed	marmoute	D8418 nodemap: drop the 'exp-' prefix for internal opener option
Closed	marmoute	D8417 nodemap: gate the feature behind a new requirement
Closed	marmoute	D8416 nodemap: move on disk file to version 1
Closed	marmoute	D8415 nodemap: add a new mode value, "strict"
Closed	marmoute	D8414 nodemap: add a new mode option, with an optional "warn" value
Closed	marmoute	D8413 nodemap: access the mmap opener option using bytes
Closed	marmoute	D8412 nodemap: rename a variable to prevent shawoding "_"
Closed	marmoute	D8411 nodemap: also warm manifest nodemap with other caches
Closed	marmoute	D8410 nodemap: also use persistent nodemap for manifest
Closed	marmoute	D8409 nodemap: create files in the repository used in the test
Closed	marmoute	D8427 upgrade: properly filter action depending on planned work
Closed	marmoute	D8408 nodemap: skip persistent nodemap warming for revlog not using it
Closed	marmoute	D8453 wait-on-file: adjust the timer counter

Diff 21291

mercurial/revlogutils/nodemap.py

	ondisk_docket = revlog._nodemap_docket			ondisk_docket = revlog._nodemap_docket
	feed_data = util.safehasattr(revlog.index, "update_nodemap_data")			feed_data = util.safehasattr(revlog.index, "update_nodemap_data")
	use_mmap = revlog.opener.options.get(b"exp-persistent-nodemap.mmap")			use_mmap = revlog.opener.options.get(b"exp-persistent-nodemap.mmap")
	mode = revlog.opener.options.get(b"exp-persistent-nodemap.mode")			mode = revlog.opener.options.get(b"exp-persistent-nodemap.mode")
	if not can_incremental:			if not can_incremental:
	msg = _(b"persistent nodemap in strict mode without efficient method")			msg = _(b"persistent nodemap in strict mode without efficient method")
	if mode == b'warn':			if mode == b'warn':
	tr._report(b"%s\n" % msg)			tr._report(b"%s\n" % msg)
				elif mode == b'strict':
				raise error.Abort(msg)

	data = None			data = None
	# first attemp an incremental update of the data			# first attemp an incremental update of the data
	if can_incremental and ondisk_docket is not None:			if can_incremental and ondisk_docket is not None:
	target_docket = revlog._nodemap_docket.copy()			target_docket = revlog._nodemap_docket.copy()
	(			(
	src_docket,			src_docket,
	data_changed_count,			data_changed_count,

tests/test-persistent-nodemap.t

	revision in nodemap: 5001			revision in nodemap: 5001

	add a new commit			add a new commit

	$ hg up			$ hg up
	5001 files updated, 0 files merged, 0 files removed, 0 files unresolved			5001 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ echo foo > foo			$ echo foo > foo
	$ hg add foo			$ hg add foo

				#if no-pure no-rust

				$ hg ci -m 'foo' --config "experimental.exp-persistent-nodemap.mode=strict"
				transaction abort!
				rollback completed
				abort: persistent nodemap in strict mode without efficient method
				[255]

				#endif

	$ hg ci -m 'foo'			$ hg ci -m 'foo'

	#if no-pure no-rust			#if no-pure no-rust
	$ hg debugnodemap --metadata			$ hg debugnodemap --metadata
	uid: ???????????????? (glob)			uid: ???????????????? (glob)
	tip-rev: 5001			tip-rev: 5001
	tip-node: 16395c3cf7e231394735e6b1717823ada303fb0c			tip-node: 16395c3cf7e231394735e6b1717823ada303fb0c
	data-length: 121088			data-length: 121088