This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8413

nodemap: access the mmap opener option using bytes
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0792ad55e533: nodemap: access the mmap opener option using bytes
Summary

The key is bytes and need to be accessed s such.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlogutils/nodemap.py (4 lines)

Diff 21076

mercurial/revlogutils/nodemap.py

docket = NodeMapDocket(pdata[offset : offset + uid_size]) docket = NodeMapDocket(pdata[offset : offset + uid_size])
offset += uid_size offset += uid_size
docket.tip_rev = tip_rev docket.tip_rev = tip_rev
docket.tip_node = pdata[offset : offset + tip_node_size] docket.tip_node = pdata[offset : offset + tip_node_size]
docket.data_length = data_length docket.data_length = data_length
docket.data_unused = data_unused docket.data_unused = data_unused
filename = _rawdata_filepath(revlog, docket) filename = _rawdata_filepath(revlog, docket)
use_mmap = revlog.opener.options.get("exp-persistent-nodemap.mmap") use_mmap = revlog.opener.options.get(b"exp-persistent-nodemap.mmap")
try: try:
with revlog.opener(filename) as fd: with revlog.opener(filename) as fd:
if use_mmap: if use_mmap:
data = util.buffer(util.mmapread(fd, data_length)) data = util.buffer(util.mmapread(fd, data_length))
else: else:
data = fd.read(data_length) data = fd.read(data_length)
except OSError as e: except OSError as e:
if e.errno != errno.ENOENT: if e.errno != errno.ENOENT:
) )
if revlog.nodemap_file is None: if revlog.nodemap_file is None:
msg = "calling persist nodemap on a revlog without the feature enableb" msg = "calling persist nodemap on a revlog without the feature enableb"
raise error.ProgrammingError(msg) raise error.ProgrammingError(msg)
can_incremental = util.safehasattr(revlog.index, "nodemap_data_incremental") can_incremental = util.safehasattr(revlog.index, "nodemap_data_incremental")
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("exp-persistent-nodemap.mmap") use_mmap = revlog.opener.options.get(b"exp-persistent-nodemap.mmap")
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,