This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7892

nodemap: never read more than the expected data amount
ClosedPublic

Authored by marmoute on Jan 15 2020, 9:56 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc7eebdb15139: nodemap: never read more than the expected data amount
Summary

Since we are tracking this number we can use it to detect corrupted rawdata file
and to only read the correct amount of data when possible.

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.Jan 15 2020, 9:56 AM
marmoute updated this revision to Diff 19773.Jan 31 2020, 10:30 AM
marmoute updated this revision to Diff 19800.Jan 31 2020, 6:01 PM
marmoute updated this revision to Diff 19844.Feb 2 2020, 3:19 AM

small doc update on .#s[1]

marmoute updated this revision to Diff 19904.Feb 4 2020, 7:25 PM

rebase to latest default

marmoute added a commit: rHGc7eebdb15139: nodemap: never read more than the expected data amount.Feb 10 2020, 8:28 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc7eebdb15139: nodemap: never read more than the expected data amount (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 20125

mercurial/revlogutils/nodemap.py

uid_size, tip_rev, data_length, data_unused = headers uid_size, tip_rev, data_length, data_unused = headers
offset += S_HEADER.size offset += S_HEADER.size
docket = NodeMapDocket(pdata[offset : offset + uid_size]) docket = NodeMapDocket(pdata[offset : offset + uid_size])
docket.tip_rev = tip_rev docket.tip_rev = tip_rev
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)
return docket, revlog.opener.tryread(filename) data = revlog.opener.tryread(filename)
if len(data) < data_length:
return None
elif len(data) > data_length:
data = data[:data_length]
return docket, data
def setup_persistent_nodemap(tr, revlog): def setup_persistent_nodemap(tr, revlog):
"""Install whatever is needed transaction side to persist a nodemap on disk """Install whatever is needed transaction side to persist a nodemap on disk
(only actually persist the nodemap if this is relevant for this revlog) (only actually persist the nodemap if this is relevant for this revlog)
""" """
if revlog._inline: if revlog._inline: