This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7847

nodemap: provide the on disk data to indexes who support it
ClosedPublic

Authored by marmoute on Jan 13 2020, 10:07 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG671f9479af0e: nodemap: provide the on disk data to indexes who support it
Summary

Time to start defining the API and prepare the rust index support. We provide
a method to do so. We use a distinct method instead of passing them in the
constructor because we will need this method anyway later (to refresh the mmap
once we update the data on disk).

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 13 2020, 10:07 AM
marmoute retitled this revision from nodemap: provide the on disk data to the index who support it to nodemap: provide the on disk data to indexes who support it.Jan 13 2020, 10:36 AM
marmoute updated this revision to Diff 19430.Jan 17 2020, 1:06 PM
marmoute updated this revision to Diff 19763.Jan 31 2020, 10:29 AM
marmoute added a commit: rHG671f9479af0e: nodemap: provide the on disk data to indexes who support it.Feb 10 2020, 8:25 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG671f9479af0e: nodemap: provide the on disk data to indexes who support it (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/pure/parsers.py (8 lines)
Mmercurial/revlog.py (10 lines)

Diff 20115

mercurial/pure/parsers.py

def nodemap_data_all(self): def nodemap_data_all(self):
"""Return bytes containing a full serialization of a nodemap """Return bytes containing a full serialization of a nodemap
The nodemap should be valid for the full set of revisions in the The nodemap should be valid for the full set of revisions in the
index.""" index."""
return nodemaputil.persistent_data(self) return nodemaputil.persistent_data(self)
def update_nodemap_data(self, nm_data):
"""provide full blokc of persisted binary data for a nodemap
The data are expected to come from disk. See `nodemap_data_all` for a
produceur of such data."""
if nm_data is not None:
nodemaputil.parse_data(nm_data)
class InlinedIndexObject(BaseIndexObject): class InlinedIndexObject(BaseIndexObject):
def __init__(self, data, inline=0): def __init__(self, data, inline=0):
self._data = data self._data = data
self._lgt = self._inline_scan(None) self._lgt = self._inline_scan(None)
self._inline_scan(self._lgt) self._inline_scan(self._lgt)
self._extra = [] self._extra = []

mercurial/revlog.py

if self.version == REVLOGV0: if self.version == REVLOGV0:
self._io = revlogoldio() self._io = revlogoldio()
elif devel_nodemap: elif devel_nodemap:
self._io = NodemapRevlogIO() self._io = NodemapRevlogIO()
elif rustrevlog is not None and self.opener.options.get(b'rust.index'): elif rustrevlog is not None and self.opener.options.get(b'rust.index'):
self._io = rustrevlogio() self._io = rustrevlogio()
try: try:
d = self._io.parseindex(indexdata, self._inline) d = self._io.parseindex(indexdata, self._inline)
index, _chunkcache = d
use_nodemap = (
not self._inline
and self.nodemap_file is not None
and util.safehasattr(index, 'update_nodemap_data')
)
if use_nodemap:
nodemap_data = nodemaputil.persisted_data(self)
if nodemap_data is not None:
index.update_nodemap_data(nodemap_data)
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
) )
self.index, self._chunkcache = d self.index, self._chunkcache = d
if not self._chunkcache: if not self._chunkcache:
self._chunkclear() self._chunkclear()
# revnum -> (chain-length, sum-delta-length) # revnum -> (chain-length, sum-delta-length)