##// END OF EJS Templates
revlog: implement a "default compression" mode...
revlog: implement a "default compression" mode The revlog docker is now storing a default compression engine. When a chunk use that compression, a dedicated mode is used in the revlog entry and we can directly route it to the right decompressor. We should probably make PLAIN and DEFAULT mode the only available mode for revlogv2, but this is something for later. Differential Revision: https://phab.mercurial-scm.org/D10652

File last commit:

r48023:130c9f7e default
r48029:ff9fd710 default
Show More
test-parseindex2.py
314 lines | 10.3 KiB | text/x-python | PythonLexer
/ tests / test-parseindex2.py
Chris Jerdonek
parsers: fail fast if Python has wrong minor version (issue4110)...
r20742 """This unit test primarily tests parsers.parse_index2().
It also checks certain aspects of the parsers module as a whole.
"""
Chris Jerdonek
parsers: clarify documentation of test-parseindex2.py...
r20166
Robert Stanca
py3: use print_function in test-parseindex2.py
r28754 from __future__ import absolute_import, print_function
Yuya Nishihara
tests: move stdlib imports before mercurial modules in test-parseindex2
r28841
Martin von Zweigbergk
tests: use python from environment in test-parseindex2.py...
r46433 import os
Yuya Nishihara
tests: move stdlib imports before mercurial modules in test-parseindex2
r28841 import struct
import subprocess
import sys
Augie Fackler
tests: start moving test-parseindex2.py to a unittest...
r39025 import unittest
Yuya Nishihara
tests: move stdlib imports before mercurial modules in test-parseindex2
r28841
Robert Stanca
py3: use absolute_import in test-parseindex2.py
r28753 from mercurial.node import (
Joerg Sonnenberger
node: import symbols explicitly...
r46729 bin,
hex,
Robert Stanca
py3: use absolute_import in test-parseindex2.py
r28753 nullrev,
Joerg Sonnenberger
node: replace nullid and friends with nodeconstants class...
r47771 sha1nodeconstants,
Robert Stanca
py3: use absolute_import in test-parseindex2.py
r28753 )
Yuya Nishihara
py3: move up symbol imports to enforce import-checker rules...
r29205 from mercurial import (
Yuya Nishihara
parsers: switch to policy importer...
r32372 policy,
Augie Fackler
tests: fix test-parseindex2 on Python 3...
r38106 pycompat,
Yuya Nishihara
py3: move up symbol imports to enforce import-checker rules...
r29205 )
revlog: add a "data compression mode" entry in the index tuple...
r48023 from mercurial.revlogutils import (
constants,
)
Bernhard Leiner
Add parseindex2.py test case...
r7110
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 parsers = policy.importmod('parsers')
Yuya Nishihara
parsers: switch to policy importer...
r32372
Bernhard Leiner
Add parseindex2.py test case...
r7110 # original python implementation
def gettype(q):
return int(q & 0xFFFF)
Augie Fackler
formatting: blacken the codebase...
r43346
Bernhard Leiner
Add parseindex2.py test case...
r7110 def offset_type(offset, type):
Augie Fackler
tests: port test-parseindex2.py to Python 3...
r37911 return int(int(offset) << 16 | type)
Bernhard Leiner
Add parseindex2.py test case...
r7110
Augie Fackler
formatting: blacken the codebase...
r43346
Bernhard Leiner
Add parseindex2.py test case...
r7110 indexformatng = ">Qiiiiii20s12x"
Augie Fackler
formatting: blacken the codebase...
r43346
def py_parseindex(data, inline):
Bernhard Leiner
Add parseindex2.py test case...
r7110 s = 64
cache = None
index = []
Joerg Sonnenberger
node: replace nullid and friends with nodeconstants class...
r47771 nodemap = {sha1nodeconstants.nullid: nullrev}
Bernhard Leiner
Add parseindex2.py test case...
r7110 n = off = 0
Matt Mackall
revlog: remove lazy index
r13253
Bernhard Leiner
Add parseindex2.py test case...
r7110 l = len(data) - s
append = index.append
if inline:
cache = (0, data)
while off <= l:
Augie Fackler
formatting: blacken the codebase...
r43346 e = struct.unpack(indexformatng, data[off : off + s])
revlog: add a "data compression mode" entry in the index tuple...
r48023 e = e + (0, 0, constants.COMP_MODE_INLINE)
Bernhard Leiner
Add parseindex2.py test case...
r7110 nodemap[e[7]] = n
append(e)
n += 1
if e[1] < 0:
break
off += e[1] + s
else:
while off <= l:
Augie Fackler
formatting: blacken the codebase...
r43346 e = struct.unpack(indexformatng, data[off : off + s])
revlog: add a "data compression mode" entry in the index tuple...
r48023 e = e + (0, 0, constants.COMP_MODE_INLINE)
Bernhard Leiner
Add parseindex2.py test case...
r7110 nodemap[e[7]] = n
append(e)
n += 1
off += s
e = list(index[0])
type = gettype(e[0])
e[0] = offset_type(0, type)
index[0] = tuple(e)
Matt Mackall
revlog: only build the nodemap on demand
r13254 return index, cache
Bernhard Leiner
Add parseindex2.py test case...
r7110
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
tests: prefer string concatenation with () instead of \ in parseindex2 tests...
r37910 data_inlined = (
Augie Fackler
tests: port test-parseindex2.py to Python 3...
r37911 b'\x00\x01\x00\x01\x00\x00\x00\x00\x00\x00\x01\x8c'
b'\x00\x00\x04\x07\x00\x00\x00\x00\x00\x00\x15\x15\xff\xff\xff'
b'\xff\xff\xff\xff\xff\xebG\x97\xb7\x1fB\x04\xcf\x13V\x81\tw\x1b'
b'w\xdduR\xda\xc6\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
b'x\x9c\x9d\x93?O\xc30\x10\xc5\xf7|\x8a\xdb\x9a\xa8m\x06\xd8*\x95'
b'\x81B\xa1\xa2\xa2R\xcb\x86Pd\x9a\x0b5$vd_\x04\xfd\xf6\x9c\xff@'
b'\x11!\x0b\xd9\xec\xf7\xbbw\xe7gG6\xad6\x04\xdaN\xc0\x92\xa0$)'
b'\xb1\x82\xa2\xd1%\x16\xa4\x8b7\xa9\xca\xd4-\xb2Y\x02\xfc\xc9'
b'\xcaS\xf9\xaeX\xed\xb6\xd77Q\x02\x83\xd4\x19\xf5--Y\xea\xe1W'
b'\xab\xed\x10\xceR\x0f_\xdf\xdf\r\xe1,\xf5\xf0\xcb\xf5 \xceR\x0f'
b'_\xdc\x0e\x0e\xc3R\x0f_\xae\x96\x9b!\x9e\xa5\x1e\xbf\xdb,\x06'
b'\xc7q\x9a/\x88\x82\xc3B\xea\xb5\xb4TJ\x93\xb6\x82\x0e\xe16\xe6'
b'KQ\xdb\xaf\xecG\xa3\xd1 \x01\xd3\x0b_^\xe8\xaa\xa0\xae\xad\xd1'
b'&\xbef\x1bz\x08\xb0|\xc9Xz\x06\xf6Z\x91\x90J\xaa\x17\x90\xaa'
b'\xd2\xa6\x11$5C\xcf\xba#\xa0\x03\x02*2\x92-\xfc\xb1\x94\xdf\xe2'
b'\xae\xb8\'m\x8ey0^\x85\xd3\x82\xb4\xf0`:\x9c\x00\x8a\xfd\x01'
b'\xb0\xc6\x86\x8b\xdd\xae\x80\xf3\xa9\x9fd\x16\n\x00R%\x1a\x06'
b'\xe9\xd8b\x98\x1d\xf4\xf3+\x9bf\x01\xd8p\x1b\xf3.\xed\x9f^g\xc3'
b'^\xd9W81T\xdb\xd5\x04sx|\xf2\xeb\xd6`%?x\xed"\x831\xbf\xf3\xdc'
b'b\xeb%gaY\xe1\xad\x9f\xb9f\'1w\xa9\xa5a\x83s\x82J\xb98\xbc4\x8b'
b'\x83\x00\x9f$z\xb8#\xa5\xb1\xdf\x98\xd9\xec\x1b\x89O\xe3Ts\x9a4'
b'\x17m\x8b\xfc\x8f\xa5\x95\x9a\xfc\xfa\xed,\xe5|\xa1\xfe\x15\xb9'
b'\xbc\xb2\x93\x1f\xf2\x95\xff\xdf,\x1a\xc5\xe7\x17*\x93Oz:>\x0e'
Augie Fackler
formatting: blacken the codebase...
r43346 )
Bernhard Leiner
Add parseindex2.py test case...
r7110
Augie Fackler
tests: prefer string concatenation with () instead of \ in parseindex2 tests...
r37910 data_non_inlined = (
Augie Fackler
tests: port test-parseindex2.py to Python 3...
r37911 b'\x00\x00\x00\x01\x00\x00\x00\x00\x00\x01D\x19'
b'\x00\x07e\x12\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff'
b'\xff\xff\xff\xff\xd1\xf4\xbb\xb0\xbe\xfc\x13\xbd\x8c\xd3\x9d'
b'\x0f\xcd\xd9;\x8c\x07\x8cJ/\x00\x00\x00\x00\x00\x00\x00\x00\x00'
b'\x00\x00\x00\x00\x00\x00\x01D\x19\x00\x00\x00\x00\x00\xdf\x00'
b'\x00\x01q\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\xff'
b'\xff\xff\xff\xc1\x12\xb9\x04\x96\xa4Z1t\x91\xdfsJ\x90\xf0\x9bh'
b'\x07l&\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
b'\x00\x01D\xf8\x00\x00\x00\x00\x01\x1b\x00\x00\x01\xb8\x00\x00'
b'\x00\x01\x00\x00\x00\x02\x00\x00\x00\x01\xff\xff\xff\xff\x02\n'
b'\x0e\xc6&\xa1\x92\xae6\x0b\x02i\xfe-\xe5\xbao\x05\xd1\xe7\x00'
b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01F'
b'\x13\x00\x00\x00\x00\x01\xec\x00\x00\x03\x06\x00\x00\x00\x01'
b'\x00\x00\x00\x03\x00\x00\x00\x02\xff\xff\xff\xff\x12\xcb\xeby1'
b'\xb6\r\x98B\xcb\x07\xbd`\x8f\x92\xd9\xc4\x84\xbdK\x00\x00\x00'
b'\x00\x00\x00\x00\x00\x00\x00\x00\x00'
Augie Fackler
formatting: blacken the codebase...
r43346 )
Bernhard Leiner
Add parseindex2.py test case...
r7110
Raphaël Gomès
revlog: introduce v2 format...
r47438 def parse_index2(data, inline, revlogv2=False):
index, chunkcache = parsers.parse_index2(data, inline, revlogv2=revlogv2)
Bryan O'Sullivan
parsers: incrementally parse the revlog index in C...
r16363 return list(index), chunkcache
Bernhard Leiner
Add parseindex2.py test case...
r7110
Augie Fackler
formatting: blacken the codebase...
r43346
Chris Jerdonek
parsers: fail fast if Python has wrong minor version (issue4110)...
r20742 def importparsers(hexversion):
"""Import mercurial.parsers with the given sys.hexversion."""
# The file parsers.c inspects sys.hexversion to determine the version
# of the currently-running Python interpreter, so we monkey-patch
# sys.hexversion to simulate using different versions.
Augie Fackler
formatting: blacken the codebase...
r43346 code = (
"import sys; sys.hexversion=%s; "
"import mercurial.cext.parsers" % hexversion
)
Martin von Zweigbergk
tests: use python from environment in test-parseindex2.py...
r46433 cmd = "\"%s\" -c \"%s\"" % (os.environ['PYTHON'], code)
Chris Jerdonek
parsers: fail fast if Python has wrong minor version (issue4110)...
r20742 # We need to do these tests inside a subprocess because parser.c's
# version-checking code happens inside the module init function, and
# when using reload() to reimport an extension module, "The init function
# of extension modules is not called a second time"
# (from http://docs.python.org/2/library/functions.html?#reload).
Augie Fackler
formatting: blacken the codebase...
r43346 p = subprocess.Popen(
cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT
)
Chris Jerdonek
parsers: fail fast if Python has wrong minor version (issue4110)...
r20742 return p.communicate() # returns stdout, stderr
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
tests: port remaining bits of test-parseindex2 to unittest asserts...
r39080 def hexfailmsg(testnumber, hexversion, stdout, expected):
Chris Jerdonek
parsers: fail fast if Python has wrong minor version (issue4110)...
r20742 try:
hexstring = hex(hexversion)
except TypeError:
hexstring = None
Augie Fackler
formatting: blacken the codebase...
r43346 return (
"FAILED: version test #%s with Python %s and patched "
"sys.hexversion %r (%r):\n Expected %s but got:\n-->'%s'\n"
% (
testnumber,
sys.version_info,
hexversion,
hexstring,
expected,
stdout,
)
)
Chris Jerdonek
parsers: fail fast if Python has wrong minor version (issue4110)...
r20742
def makehex(major, minor, micro):
return int("%x%02x%02x00" % (major, minor, micro), 16)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
tests: start moving test-parseindex2.py to a unittest...
r39025 class parseindex2tests(unittest.TestCase):
Augie Fackler
tests: port remaining bits of test-parseindex2 to unittest asserts...
r39080 def assertversionokay(self, testnumber, hexversion):
stdout, stderr = importparsers(hexversion)
self.assertFalse(
Augie Fackler
formatting: blacken the codebase...
r43346 stdout, hexfailmsg(testnumber, hexversion, stdout, 'no stdout')
)
Augie Fackler
tests: port remaining bits of test-parseindex2 to unittest asserts...
r39080
def assertversionfail(self, testnumber, hexversion):
stdout, stderr = importparsers(hexversion)
# We include versionerrortext to distinguish from other ImportErrors.
errtext = b"ImportError: %s" % pycompat.sysbytes(
Augie Fackler
formatting: blacken the codebase...
r43346 parsers.versionerrortext
)
self.assertIn(
errtext,
stdout,
hexfailmsg(
testnumber,
hexversion,
stdout,
expected="stdout to contain %r" % errtext,
),
)
Augie Fackler
tests: port remaining bits of test-parseindex2 to unittest asserts...
r39080
Augie Fackler
tests: fix up indent width in test-parseindex2.py...
r39026 def testversiondetection(self):
"""Check the version-detection logic when importing parsers."""
# Only test the version-detection logic if it is present.
try:
parsers.versionerrortext
except AttributeError:
return
info = sys.version_info
major, minor, micro = info[0], info[1], info[2]
# Test same major-minor versions.
Augie Fackler
tests: port remaining bits of test-parseindex2 to unittest asserts...
r39080 self.assertversionokay(1, makehex(major, minor, micro))
self.assertversionokay(2, makehex(major, minor, micro + 1))
Augie Fackler
tests: fix up indent width in test-parseindex2.py...
r39026 # Test different major-minor versions.
Augie Fackler
tests: port remaining bits of test-parseindex2 to unittest asserts...
r39080 self.assertversionfail(3, makehex(major + 1, minor, micro))
self.assertversionfail(4, makehex(major, minor + 1, micro))
self.assertversionfail(5, "'foo'")
Chris Jerdonek
parsers: fail fast if Python has wrong minor version (issue4110)...
r20742
Augie Fackler
tests: fix up indent width in test-parseindex2.py...
r39026 def testbadargs(self):
# Check that parse_index2() raises TypeError on bad arguments.
Augie Fackler
tests: move chunks of test-parseindex2.py to use unittest properly...
r39027 with self.assertRaises(TypeError):
Augie Fackler
tests: fix up indent width in test-parseindex2.py...
r39026 parse_index2(0, True)
Chris Jerdonek
parse_index2: fix crash on bad argument type (issue4110)...
r20109
Augie Fackler
tests: fix up indent width in test-parseindex2.py...
r39026 def testparseindexfile(self):
# Check parsers.parse_index2() on an index file against the
# original Python implementation of parseindex, both with and
# without inlined data.
Chris Jerdonek
parsers: clarify documentation of test-parseindex2.py...
r20166
Augie Fackler
tests: rename variables in revlog index parse test for clarity...
r39029 want = py_parseindex(data_inlined, True)
got = parse_index2(data_inlined, True)
Augie Fackler
formatting: blacken the codebase...
r43346 self.assertEqual(want, got) # inline data
Bernhard Leiner
Add parseindex2.py test case...
r7110
Augie Fackler
tests: rename variables in revlog index parse test for clarity...
r39029 want = py_parseindex(data_non_inlined, False)
got = parse_index2(data_non_inlined, False)
Augie Fackler
formatting: blacken the codebase...
r43346 self.assertEqual(want, got) # no inline data
Bernhard Leiner
Add parseindex2.py test case...
r7110
Augie Fackler
tests: fix up indent width in test-parseindex2.py...
r39026 ix = parsers.parse_index2(data_inlined, True)[0]
for i, r in enumerate(ix):
Joerg Sonnenberger
node: replace nullid and friends with nodeconstants class...
r47771 if r[7] == sha1nodeconstants.nullid:
Augie Fackler
tests: fix up indent width in test-parseindex2.py...
r39026 i = -1
try:
Augie Fackler
tests: move chunks of test-parseindex2.py to use unittest properly...
r39027 self.assertEqual(
Augie Fackler
formatting: blacken the codebase...
r43346 ix[r[7]],
i,
Joerg Sonnenberger
node: import symbols explicitly...
r46729 'Reverse lookup inconsistent for %r' % hex(r[7]),
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
tests: fix up indent width in test-parseindex2.py...
r39026 except TypeError:
# pure version doesn't support this
break
Bryan O'Sullivan
parsers: use base-16 trie for faster node->rev mapping...
r16414
Augie Fackler
tests: add test coverage for revlogindex[-1] which was previously missing...
r39102 def testminusone(self):
revlog: add a "data compression mode" entry in the index tuple...
r48023 want = (
0,
0,
0,
-1,
-1,
-1,
-1,
sha1nodeconstants.nullid,
0,
0,
constants.COMP_MODE_INLINE,
)
Augie Fackler
tests: add test coverage for revlogindex[-1] which was previously missing...
r39102 index, junk = parsers.parse_index2(data_inlined, True)
got = index[-1]
Augie Fackler
formatting: blacken the codebase...
r43346 self.assertEqual(want, got) # inline data
Augie Fackler
tests: add test coverage for revlogindex[-1] which was previously missing...
r39102
index, junk = parsers.parse_index2(data_non_inlined, False)
got = index[-1]
Augie Fackler
formatting: blacken the codebase...
r43346 self.assertEqual(want, got) # no inline data
Georges Racinet
cext-revlog: fixed __delitem__ for uninitialized nodetree...
r44306 def testdelitemwithoutnodetree(self):
index, _junk = parsers.parse_index2(data_non_inlined, False)
def hexrev(rev):
if rev == nullrev:
return b'\xff\xff\xff\xff'
else:
Joerg Sonnenberger
node: import symbols explicitly...
r46729 return bin('%08x' % rev)
Georges Racinet
cext-revlog: fixed __delitem__ for uninitialized nodetree...
r44306
def appendrev(p1, p2=nullrev):
# node won't matter for this test, let's just make sure
# they don't collide. Other data don't matter either.
node = hexrev(p1) + hexrev(p2) + b'.' * 12
revlog: add a "data compression mode" entry in the index tuple...
r48023 e = (
0,
0,
12,
1,
34,
p1,
p2,
node,
0,
0,
constants.COMP_MODE_INLINE,
)
index.append(e)
Georges Racinet
cext-revlog: fixed __delitem__ for uninitialized nodetree...
r44306
appendrev(4)
appendrev(5)
appendrev(6)
self.assertEqual(len(index), 7)
Georges Racinet
tests-pure: fixing test-parseindex2...
r44399 del index[1:-1]
Georges Racinet
cext-revlog: fixed __delitem__ for uninitialized nodetree...
r44306
# assertions that failed before correction
self.assertEqual(len(index), 1) # was 4
Georges Racinet
tests-pure: fixing test-parseindex2...
r44399 headrevs = getattr(index, 'headrevs', None)
if headrevs is not None: # not implemented in pure
self.assertEqual(index.headrevs(), [0]) # gave ValueError
Georges Racinet
cext-revlog: fixed __delitem__ for uninitialized nodetree...
r44306
Augie Fackler
tests: add test coverage for revlogindex[-1] which was previously missing...
r39102
Augie Fackler
tests: start moving test-parseindex2.py to a unittest...
r39025 if __name__ == '__main__':
import silenttestrunner
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
tests: start moving test-parseindex2.py to a unittest...
r39025 silenttestrunner.main(__name__)