This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5566

revlog: rename revlog I/O classes to reflect version (API)
Needs RevisionPublic

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

Details

Reviewers
baymax
Group Reviewers
hg-reviewers
Summary

I never liked these names. They imply the existence of exactly
2 revlog versions. We're hacking on version 2. So let's
introduce better names.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Jan 10 2019, 7:32 PM
baymax requested changes to this revision.Jan 24 2020, 12:32 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jan 24 2020, 12:32 PM

Revision Contents
Changeset List

PathPackages
Mcontrib/perf.py (6 lines)
Mmercurial/revlog.py (8 lines)

Diff 13162

contrib/perf.py

opener = getattr(rl, 'opener') # trick linter opener = getattr(rl, 'opener') # trick linter
indexfile = rl.indexfile indexfile = rl.indexfile
data = opener.read(indexfile) data = opener.read(indexfile)
header = struct.unpack(b'>I', data[0:4])[0] header = struct.unpack(b'>I', data[0:4])[0]
version = header & 0xFFFF version = header & 0xFFFF
if version == 1: if version == 1:
# Renamed to revlogv1io in Mercurial 4.9.
try:
revlogio = revlog.revlogv1io()
except AttributeError:
revlogio = revlog.revlogio() revlogio = revlog.revlogio()
inline = header & (1 << 16) inline = header & (1 << 16)
else: else:
raise error.Abort((b'unsupported revlog version: %d') % version) raise error.Abort((b'unsupported revlog version: %d') % version)
rllen = len(rl) rllen = len(rl)
node0 = rl.node(0) node0 = rl.node(0)
node25 = rl.node(rllen // 4) node25 = rl.node(rllen // 4)

mercurial/revlog.py

indexformatv0_unpack = indexformatv0.unpack indexformatv0_unpack = indexformatv0.unpack
class revlogoldindex(list): class revlogoldindex(list):
def __getitem__(self, i): def __getitem__(self, i):
if i == -1: if i == -1:
return (0, 0, 0, -1, -1, -1, -1, nullid) return (0, 0, 0, -1, -1, -1, -1, nullid)
return list.__getitem__(self, i) return list.__getitem__(self, i)
class revlogoldio(object): class revlogv0io(object):
def __init__(self): def __init__(self):
self.size = indexformatv0.size self.size = indexformatv0.size
def parseindex(self, data, inline): def parseindex(self, data, inline):
s = self.size s = self.size
index = [] index = []
nodemap = {nullid: nullrev} nodemap = {nullid: nullrev}
n = off = 0 n = off = 0
versionformat = struct.Struct(">I") versionformat = struct.Struct(">I")
versionformat_pack = versionformat.pack versionformat_pack = versionformat.pack
versionformat_unpack = versionformat.unpack versionformat_unpack = versionformat.unpack
# corresponds to uncompressed length of indexformatng (2 gigs, 4-byte # corresponds to uncompressed length of indexformatng (2 gigs, 4-byte
# signed integer) # signed integer)
_maxentrysize = 0x7fffffff _maxentrysize = 0x7fffffff
class revlogio(object): class revlogv1io(object):
def __init__(self): def __init__(self):
self.size = indexformatng.size self.size = indexformatng.size
def parseindex(self, data, inline): def parseindex(self, data, inline):
# call the C implementation to parse the index data # call the C implementation to parse the index data
index, cache = parsers.parse_index2(data, inline) index, cache = parsers.parse_index2(data, inline)
return index, getattr(index, 'nodemap', None), cache return index, getattr(index, 'nodemap', None), cache
self._withsparseread = versionflags & FLAG_SPARSE_DELTA_CHAINS self._withsparseread = versionflags & FLAG_SPARSE_DELTA_CHAINS
else: else:
raise error.RevlogError(_('unknown version (%d) in revlog %s') % raise error.RevlogError(_('unknown version (%d) in revlog %s') %
(fmt, self.indexfile)) (fmt, self.indexfile))
self._storedeltachains = True self._storedeltachains = True
self._io = revlogio() self._io = revlogv1io()
if self.version == REVLOGV0: if self.version == REVLOGV0:
self._io = revlogoldio() self._io = revlogv0io()
try: try:
d = self._io.parseindex(indexdata, self._inline) d = self._io.parseindex(indexdata, self._inline)
except (ValueError, IndexError): except (ValueError, IndexError):
raise error.RevlogError(_("index %s is corrupted") % raise error.RevlogError(_("index %s is corrupted") %
self.indexfile) self.indexfile)
self.index, nodemap, self._chunkcache = d self.index, nodemap, self._chunkcache = d
if nodemap is not None: if nodemap is not None:
self.nodemap = self._nodecache = nodemap self.nodemap = self._nodecache = nodemap