This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7660

rust-index: add a `experimental.rust.index` option to use the wrapper
ClosedPublic

Authored by marmoute on Dec 13 2019, 3:12 PM.

Details

Reviewers
indygreg
Alphare
Group Reviewers
hg-reviewers
Commits
rHG8042856c90b6: rust-index: add a `experimental.rust.index` option to use the wrapper
Summary

Now we can start putting this wrapper on the test and benchmark grill.

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.Dec 13 2019, 3:12 PM
Alphare accepted this revision.Dec 20 2019, 3:40 AM
marmoute updated this revision to Diff 18943.Dec 27 2019, 12:13 PM
gracinet added a commit: rHG8042856c90b6: rust-index: add a `experimental.rust.index` option to use the wrapper.Jan 8 2020, 1:11 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG8042856c90b6: rust-index: add a `experimental.rust.index` option to use the wrapper (authored by gracinet). · Explain Why
This revision was automatically updated to reflect the committed changes.
mharbison72 added a subscriber: mharbison72.Jan 8 2020, 8:30 PM
mharbison72 added inline comments.
mercurial/localrepo.py
930

This needs bytes if someone with write access wants to rewrite it before it gets too deep. Alternately, I submitted D7817.

Revision Contents
Changeset List

PathPackages
Mmercurial/configitems.py (3 lines)
Mmercurial/localrepo.py (3 lines)
Mmercurial/revlog.py (9 lines)

Diff 19084

mercurial/configitems.py

) )
coreconfigitem( coreconfigitem(
b'experimental', b'revlogv2', default=None, b'experimental', b'revlogv2', default=None,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'revisions.disambiguatewithin', default=None, b'experimental', b'revisions.disambiguatewithin', default=None,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'rust.index', default=False,
)
coreconfigitem(
b'experimental', b'server.filesdata.recommended-batch-size', default=50000, b'experimental', b'server.filesdata.recommended-batch-size', default=50000,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'server.manifestdata.recommended-batch-size', b'server.manifestdata.recommended-batch-size',
default=100000, default=100000,
) )
coreconfigitem( coreconfigitem(

mercurial/localrepo.py

if options[b'zstd.level'] is not None: if options[b'zstd.level'] is not None:
if not (0 <= options[b'zstd.level'] <= 22): if not (0 <= options[b'zstd.level'] <= 22):
msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d') msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d')
raise error.Abort(msg % options[b'zstd.level']) raise error.Abort(msg % options[b'zstd.level'])
if repository.NARROW_REQUIREMENT in requirements: if repository.NARROW_REQUIREMENT in requirements:
options[b'enableellipsis'] = True options[b'enableellipsis'] = True
if ui.configbool('experimental', 'rust.index'):
mharbison72Unsubmitted
Not Done

This needs bytes if someone with write access wants to rewrite it before it gets too deep. Alternately, I submitted D7817.

mharbison72: This needs bytes if someone with write access wants to rewrite it before it gets too deep.
options[b'rust.index'] = True
return options return options
def makemain(**kwargs): def makemain(**kwargs):
"""Produce a type conforming to ``ilocalrepositorymain``.""" """Produce a type conforming to ``ilocalrepositorymain``."""
return localrepository return localrepository

mercurial/revlog.py

REVIDX_EXTSTORED REVIDX_EXTSTORED
REVIDX_DEFAULT_FLAGS REVIDX_DEFAULT_FLAGS
REVIDX_FLAGS_ORDER REVIDX_FLAGS_ORDER
REVIDX_RAWTEXT_CHANGING_FLAGS REVIDX_RAWTEXT_CHANGING_FLAGS
parsers = policy.importmod('parsers') parsers = policy.importmod('parsers')
rustancestor = policy.importrust('ancestor') rustancestor = policy.importrust('ancestor')
rustdagop = policy.importrust('dagop') rustdagop = policy.importrust('dagop')
rustrevlog = policy.importrust('revlog')
# Aliased for performance. # Aliased for performance.
_zlibdecompress = zlib.decompress _zlibdecompress = zlib.decompress
# max size of revlog with inline data # max size of revlog with inline data
_maxinline = 131072 _maxinline = 131072
_chunksize = 1048576 _chunksize = 1048576
def packentry(self, entry, node, version, rev): def packentry(self, entry, node, version, rev):
p = indexformatng_pack(*entry) p = indexformatng_pack(*entry)
if rev == 0: if rev == 0:
p = versionformat_pack(version) + p[4:] p = versionformat_pack(version) + p[4:]
return p return p
class rustrevlogio(revlogio):
def parseindex(self, data, inline):
index, cache = super(rustrevlogio, self).parseindex(data, inline)
return rustrevlog.MixedIndex(index), cache
class revlog(object): class revlog(object):
""" """
the underlying revision storage object the underlying revision storage object
A revlog consists of two parts, an index and the revision data. A revlog consists of two parts, an index and the revision data.
The index is a file with a fixed record size containing The index is a file with a fixed record size containing
information on each revision, including its nodeid (hash), the information on each revision, including its nodeid (hash), the
) )
# sparse-revlog can't be on without general-delta (issue6056) # sparse-revlog can't be on without general-delta (issue6056)
if not self._generaldelta: if not self._generaldelta:
self._sparserevlog = False self._sparserevlog = False
self._storedeltachains = True self._storedeltachains = True
self._io = revlogio() self._io = revlogio()
if rustrevlog is not None and self.opener.options.get('rust.index'):
self._io = rustrevlogio()
if self.version == REVLOGV0: if self.version == REVLOGV0:
self._io = revlogoldio() self._io = revlogoldio()
try: try:
d = self._io.parseindex(indexdata, self._inline) d = self._io.parseindex(indexdata, self._inline)
except (ValueError, IndexError): except (ValueError, IndexError):
raise error.RevlogError( raise error.RevlogError(
_(b"index %s is corrupted") % self.indexfile _(b"index %s is corrupted") % self.indexfile
) )