This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5563

revlog: inline opener options logic into _loadindex()
ClosedPublic

Authored by indygreg on Jan 10 2019, 7:32 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe3cfe0702eac: revlog: inline opener options logic into _loadindex()
Summary

We always call _loadindex() during init. But we also call
_loadindex() as part of censorrevision(). Before, when reloading
the index during censorrevision(), we would lose the configured
mmapindexthreshold setting from the opener. By inlining the
logic in _loadindex(), we ensure that opener options are always
respected when loading the index.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Jan 10 2019, 7:32 PM
Closed by commit rHGe3cfe0702eac: revlog: inline opener options logic into _loadindex() (authored by indygreg). · Explain WhyJan 12 2019, 10:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (10 lines)

Diff 13159

mercurial/revlog.py

# Make copy of flag processors so each revlog instance can support # Make copy of flag processors so each revlog instance can support
# custom flags. # custom flags.
self._flagprocessors = dict(_flagprocessors) self._flagprocessors = dict(_flagprocessors)
# 2-tuple of file handles being used for active writing. # 2-tuple of file handles being used for active writing.
self._writinghandles = None self._writinghandles = None
self._loadindex()
def _loadindex(self):
mmapindexthreshold = None mmapindexthreshold = None
opts = getattr(opener, 'options', {}) or {} opts = getattr(self.opener, 'options', {}) or {}
if 'revlogv2' in opts: if 'revlogv2' in opts:
versionflags = REVLOGV2 | FLAG_INLINE_DATA versionflags = REVLOGV2 | FLAG_INLINE_DATA
elif 'revlogv1' in opts: elif 'revlogv1' in opts:
versionflags = REVLOGV1 | FLAG_INLINE_DATA versionflags = REVLOGV1 | FLAG_INLINE_DATA
if 'generaldelta' in opts: if 'generaldelta' in opts:
versionflags |= FLAG_GENERALDELTA versionflags |= FLAG_GENERALDELTA
else: else:
if self._chunkcachesize <= 0: if self._chunkcachesize <= 0:
raise error.RevlogError(_('revlog chunk cache size %r is not ' raise error.RevlogError(_('revlog chunk cache size %r is not '
'greater than 0') % self._chunkcachesize) 'greater than 0') % self._chunkcachesize)
elif self._chunkcachesize & (self._chunkcachesize - 1): elif self._chunkcachesize & (self._chunkcachesize - 1):
raise error.RevlogError(_('revlog chunk cache size %r is not a ' raise error.RevlogError(_('revlog chunk cache size %r is not a '
'power of 2') % self._chunkcachesize) 'power of 2') % self._chunkcachesize)
self._loadindex(versionflags, mmapindexthreshold)
def _loadindex(self, versionflags, mmapindexthreshold):
indexdata = '' indexdata = ''
self._initempty = True self._initempty = True
try: try:
with self._indexfp() as f: with self._indexfp() as f:
if (mmapindexthreshold is not None and if (mmapindexthreshold is not None and
self.opener.fstat(f).st_size >= mmapindexthreshold): self.opener.fstat(f).st_size >= mmapindexthreshold):
indexdata = util.buffer(util.mmapread(f)) indexdata = util.buffer(util.mmapread(f))
else: else:
if not self._inline: if not self._inline:
tr.addbackup(self.datafile, location='store') tr.addbackup(self.datafile, location='store')
self.opener.rename(newrl.indexfile, self.indexfile) self.opener.rename(newrl.indexfile, self.indexfile)
if not self._inline: if not self._inline:
self.opener.rename(newrl.datafile, self.datafile) self.opener.rename(newrl.datafile, self.datafile)
self.clearcaches() self.clearcaches()
self._loadindex(self.version, None) self._loadindex()
def verifyintegrity(self, state): def verifyintegrity(self, state):
"""Verifies the integrity of the revlog. """Verifies the integrity of the revlog.
Yields ``revlogproblem`` instances describing problems that are Yields ``revlogproblem`` instances describing problems that are
found. found.
""" """
dd, di = self.checksize() dd, di = self.checksize()