This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10593

revlog: simplify a conditionnal in _enforceinlinesize
ClosedPublic

Authored by marmoute on May 3 2021, 7:50 AM.

Details

Reviewers
indygreg
Alphare
Group Reviewers
hg-reviewers
Commits
rHG88bd08a6830f: revlog: simplify a conditionnal in _enforceinlinesize
Summary

This is a gratuitous change to make things a bit easier to read.

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.May 3 2021, 7:50 AM
joerg.sonnenberger added a subscriber: joerg.sonnenberger.May 3 2021, 9:20 AM

This adds a penalty for the non-inline case?

marmoute added a comment.May 3 2021, 9:27 AM

Since the index is already in memory, I don't expect the computation to come at noticeable cost.

baymax updated this revision to Diff 27508.May 3 2021, 9:44 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.May 11 2021, 10:03 AM
Alphare added a subscriber: Alphare.

I agree with @marmoute on this one, this should be negligible.

This revision is now accepted and ready to land.May 11 2021, 10:03 AM
marmoute added a commit: rHG88bd08a6830f: revlog: simplify a conditionnal in _enforceinlinesize.May 11 2021, 1:08 PM
Closed by commit rHG88bd08a6830f: revlog: simplify a conditionnal in _enforceinlinesize (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (6 lines)

Diff 27839

mercurial/revlog.py

def _enforceinlinesize(self, tr, fp=None): def _enforceinlinesize(self, tr, fp=None):
"""Check if the revlog is too big for inline and convert if so. """Check if the revlog is too big for inline and convert if so.
This should be called after revisions are added to the revlog. If the This should be called after revisions are added to the revlog. If the
revlog has grown too large to be an inline revlog, it will convert it revlog has grown too large to be an inline revlog, it will convert it
to use multiple index and data files. to use multiple index and data files.
""" """
tiprev = len(self) - 1 tiprev = len(self) - 1
if ( total_size = self.start(tiprev) + self.length(tiprev)
not self._inline if not self._inline or total_size < _maxinline:
or (self.start(tiprev) + self.length(tiprev)) < _maxinline
):
return return
troffset = tr.findoffset(self._indexfile) troffset = tr.findoffset(self._indexfile)
if troffset is None: if troffset is None:
raise error.RevlogError( raise error.RevlogError(
_(b"%s not found in the transaction") % self._indexfile _(b"%s not found in the transaction") % self._indexfile
) )
trindex = 0 trindex = 0