comparison mercurial/revlog.py @ 42043:1fac9b931d46

compression: introduce a `storage.revlog.zlib.level` configuration This option control the zlib compression level used when compression revlog chunk. This is also a good excuse to pave the way for a similar configuration option for the zstd compression engine. Having a dedicated option for each compression algorithm is useful because they don't support the same range of values. Using a higher zlib compression impact CPU consumption at compression time, but does not directly affected decompression time. However dealing with small compressed chunk can directly help decompression and indirectly help other revlog logic. I ran some basic test on repositories using different level. I am using the mercurial, pypy, netbeans and mozilla-central clone from our benchmark suite. All tested repository use sparse-revlog and got all their delta recomputed. The different compression level has a small effect on the repository size (about 10% variation in the total range). My quick analysis is that revlog mostly store small delta, that are not affected by the compression level much. So the variation probably mostly comes from better compression of the snapshots revisions, and snapshot revision only represent a small portion of the repository content. I also made some basic timings measurements. The "read" timings are gathered using simple run of `hg perfrevlogrevisions`, the "write" timings using `hg perfrevlogwrite` (restricted to the last 5000 revisions for netbeans and mozilla central). The timings are gathered on a generic machine, (not one of our performance locked machine), so small variation might not be meaningful. However large trend remains relevant. Keep in mind that these numbers are not pure compression/decompression time. They also involve the full revlog logic. In particular the difference in chunk size has an impact on the delta chain structure, affecting performance when writing or reading them. On read/write performance, the compression level has a bigger impact. Counter-intuitively, the higher compression levels improve "write" performance for the large repositories in our tested setting. Maybe because the last 5000 delta chain end up having a very different shape in this specific spot? Or maybe because of a more general trend of better delta chains thanks to the smaller chunk and snapshot. This series does not intend to change the default compression level. However, these result call for a deeper analysis of this performance difference in the future. Full data ========= repo level .hg/store size 00manifest.d read write ---------------------------------------------------------------- mercurial 1 49,402,813 5,963,475 0.170159 53.250304 mercurial 6 47,197,397 5,875,730 0.182820 56.264320 mercurial 9 47,121,596 5,849,781 0.189219 56.293612 pypy 1 370,830,572 28,462,425 2.679217 460.721984 pypy 6 340,112,317 27,648,747 2.768691 467.537158 pypy 9 338,360,736 27,639,003 2.763495 476.589918 netbeans 1 1,281,847,810 165,495,457 122.477027 520.560316 netbeans 6 1,205,284,353 159,161,207 139.876147 715.930400 netbeans 9 1,197,135,671 155,034,586 141.620281 678.297064 mozilla 1 2,775,497,186 298,527,987 147.867662 751.263721 mozilla 6 2,596,856,420 286,597,671 170.572118 987.056093 mozilla 9 2,587,542,494 287,018,264 163.622338 739.803002
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 27 Mar 2019 18:35:27 +0100
parents 3f3f962457b2
children bb271ec2fbfb
comparison
equal deleted inserted replaced
42042:aaececb4b066 42043:1fac9b931d46
369 self._pcache = {} 369 self._pcache = {}
370 # Mapping of revision integer to full node. 370 # Mapping of revision integer to full node.
371 self._nodecache = {nullid: nullrev} 371 self._nodecache = {nullid: nullrev}
372 self._nodepos = None 372 self._nodepos = None
373 self._compengine = 'zlib' 373 self._compengine = 'zlib'
374 self._compengineopts = {}
374 self._maxdeltachainspan = -1 375 self._maxdeltachainspan = -1
375 self._withsparseread = False 376 self._withsparseread = False
376 self._sparserevlog = False 377 self._sparserevlog = False
377 self._srdensitythreshold = 0.50 378 self._srdensitythreshold = 0.50
378 self._srmingapsize = 262144 379 self._srmingapsize = 262144
414 self._lazydeltabase = False 415 self._lazydeltabase = False
415 if self._lazydelta: 416 if self._lazydelta:
416 self._lazydeltabase = bool(opts.get('lazydeltabase', False)) 417 self._lazydeltabase = bool(opts.get('lazydeltabase', False))
417 if 'compengine' in opts: 418 if 'compengine' in opts:
418 self._compengine = opts['compengine'] 419 self._compengine = opts['compengine']
420 if 'zlib.level' in opts:
421 self._compengineopts['zlib.level'] = opts['zlib.level']
419 if 'maxdeltachainspan' in opts: 422 if 'maxdeltachainspan' in opts:
420 self._maxdeltachainspan = opts['maxdeltachainspan'] 423 self._maxdeltachainspan = opts['maxdeltachainspan']
421 if self._mmaplargeindex and 'mmapindexthreshold' in opts: 424 if self._mmaplargeindex and 'mmapindexthreshold' in opts:
422 mmapindexthreshold = opts['mmapindexthreshold'] 425 mmapindexthreshold = opts['mmapindexthreshold']
423 self._sparserevlog = bool(opts.get('sparse-revlog', False)) 426 self._sparserevlog = bool(opts.get('sparse-revlog', False))
524 # revlog header -> revlog compressor 527 # revlog header -> revlog compressor
525 self._decompressors = {} 528 self._decompressors = {}
526 529
527 @util.propertycache 530 @util.propertycache
528 def _compressor(self): 531 def _compressor(self):
529 return util.compengines[self._compengine].revlogcompressor() 532 engine = util.compengines[self._compengine]
533 return engine.revlogcompressor(self._compengineopts)
530 534
531 def _indexfp(self, mode='r'): 535 def _indexfp(self, mode='r'):
532 """file object for the revlog's index file""" 536 """file object for the revlog's index file"""
533 args = {r'mode': mode} 537 args = {r'mode': mode}
534 if mode != 'r': 538 if mode != 'r':
1979 try: 1983 try:
1980 compressor = self._decompressors[t] 1984 compressor = self._decompressors[t]
1981 except KeyError: 1985 except KeyError:
1982 try: 1986 try:
1983 engine = util.compengines.forrevlogheader(t) 1987 engine = util.compengines.forrevlogheader(t)
1984 compressor = engine.revlogcompressor() 1988 compressor = engine.revlogcompressor(self._compengineopts)
1985 self._decompressors[t] = compressor 1989 self._decompressors[t] = compressor
1986 except KeyError: 1990 except KeyError:
1987 raise error.RevlogError(_('unknown compression type %r') % t) 1991 raise error.RevlogError(_('unknown compression type %r') % t)
1988 1992
1989 return compressor.decompress(data) 1993 return compressor.decompress(data)