##// END OF EJS Templates
compression: introduce a `storage.revlog.zstd.level` configuration...
compression: introduce a `storage.revlog.zstd.level` configuration This option control the zstd compression level used when compressing revlog chunk. The usage of zstd for revlog compression has not graduated from experimental yet, but we intend to fix that soon. The option name for the compression level is more straight forward to pick, so this changesets comes first. Having a dedicated option for each compression engine is useful because they don't support the same range of values. I ran the same measurement as for the zlib compression level (in the parent changesets). The variation in repository size is stay mostly in the same (small) range. The "read/write" performance see smallish variation, but are overall much better than zlib. Write performance show the same tend of having better write performance for when reaching high-end compression. Again, we don't intend to change the default zstd compression level (currently: 3) in this series. However this is worth investigating in the future. The Performance comparison of zlib vs zstd is quite impressive. The repository size stay in the same range, but the performance are much better in all situations. Comparison summary ================== We are looking at: - performance range for zlib - performance range for zstd - comparison of default zstd (level-3) to default zlib (level 6) - comparison of the slowest zstd time to the fastest zlib time Read performance: ----------------- | zlib | zstd | cmp | f2s mercurial | 0.170159 - 0.189219 | 0.144127 - 0.149624 | 80% | 88% pypy | 2.679217 - 2.768691 | 1.532317 - 1.705044 | 60% | 63% netbeans | 122.477027 - 141.620281 | 72.996346 - 89.731560 | 58% | 73% mozilla | 147.867662 - 170.572118 | 91.700995 - 105.853099 | 56% | 71% Write performance: ------------------ | zlib | zstd | cmp | f2s mercurial | 53.250304 - 56.2936129 | 40.877025 - 45.677286 | 75% | 86% pypy | 460.721984 - 476.589918 | 270.545409 - 301.002219 | 63% | 65% netbeans | 520.560316 - 715.930400 | 370.356311 - 428.329652 | 55% | 82% mozilla | 739.803002 - 987.056093 | 505.152906 - 591.930683 | 57% | 80% Raw data -------- repo alg lvl .hg/store size 00manifest.d read write mercurial zlib 1 49,402,813 5,963,475 0.170159 53.250304 mercurial zlib 6 47,197,397 5,875,730 0.182820 56.264320 mercurial zlib 9 47,121,596 5,849,781 0.189219 56.293612 mercurial zstd 1 49,737,084 5,966,355 0.144127 40.877025 mercurial zstd 3 48,961,867 5,895,208 0.146376 42.268142 mercurial zstd 5 48,200,592 5,938,676 0.149624 43.162875 mercurial zstd 10 47,833,520 5,913,353 0.145185 44.012489 mercurial zstd 15 47,314,604 5,728,679 0.147686 45.677286 mercurial zstd 20 47,330,502 5,830,539 0.145789 45.025407 mercurial zstd 22 47,330,076 5,830,539 0.143996 44.690460 pypy zlib 1 370,830,572 28,462,425 2.679217 460.721984 pypy zlib 6 340,112,317 27,648,747 2.768691 467.537158 pypy zlib 9 338,360,736 27,639,003 2.763495 476.589918 pypy zstd 1 362,377,479 27,916,214 1.532317 270.545409 pypy zstd 3 354,137,693 27,905,988 1.686718 294.951509 pypy zstd 5 342,640,043 27,655,774 1.705044 301.002219 pypy zstd 10 334,224,327 27,164,493 1.567287 285.186239 pypy zstd 15 329,000,363 26,645,965 1.637729 299.561332 pypy zstd 20 324,534,039 26,199,547 1.526813 302.149827 pypy zstd 22 324,530,595 26,198,932 1.525718 307.821218 netbeans zlib 1 1,281,847,810 165,495,457 122.477027 520.560316 netbeans zlib 6 1,205,284,353 159,161,207 139.876147 715.930400 netbeans zlib 9 1,197,135,671 155,034,586 141.620281 678.297064 netbeans zstd 1 1,259,581,737 160,840,613 72.996346 370.356311 netbeans zstd 3 1,232,978,122 157,691,551 81.622317 396.733087 netbeans zstd 5 1,208,034,075 160,246,880 83.080549 364.342626 netbeans zstd 10 1,188,624,176 156,083,417 79.323935 403.594602 netbeans zstd 15 1,176,973,589 153,859,477 89.731560 428.329652 netbeans zstd 20 1,162,958,258 151,147,535 82.842667 392.335349 netbeans zstd 22 1,162,707,029 151,150,220 82.565695 402.840655 mozilla zlib 1 2,775,497,186 298,527,987 147.867662 751.263721 mozilla zlib 6 2,596,856,420 286,597,671 170.572118 987.056093 mozilla zlib 9 2,587,542,494 287,018,264 163.622338 739.803002 mozilla zstd 1 2,723,159,348 286,617,532 91.700995 570.042751 mozilla zstd 3 2,665,055,001 286,152,013 95.240155 561.412805 mozilla zstd 5 2,607,819,817 288,060,030 101.978048 505.152906 mozilla zstd 10 2,558,761,085 283,967,648 104.113481 497.771202 mozilla zstd 15 2,526,216,060 275,581,300 105.853099 591.930683 mozilla zstd 20 2,485,114,806 266,478,859 95.268795 576.515389 mozilla zstd 22 2,484,869,080 266,456,505 94.429282 572.785537

File last commit:

r40329:c303d65d default
r42211:bb271ec2 default
Show More
relink.py
194 lines | 6.5 KiB | text/x-python | PythonLexer
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 # Mercurial extension to provide 'hg relink' command
#
# Copyright (C) 2007 Brendan Cully <brendan@kublai.com>
#
# This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729
"""recreates hardlinks between repository clones"""
timeless
relink: use absolute_import
r28380 from __future__ import absolute_import
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729
timeless
relink: use absolute_import
r28380 import os
import stat
Yuya Nishihara
py3: move up symbol imports to enforce import-checker rules...
r29205 from mercurial.i18n import _
timeless
relink: use absolute_import
r28380 from mercurial import (
error,
hg,
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 registrar,
timeless
relink: use absolute_import
r28380 util,
)
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 from mercurial.utils import (
stringutil,
)
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729
Gregory Szorc
relink: declare command using decorator
r21252 cmdtable = {}
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 command = registrar.command(cmdtable)
Augie Fackler
extensions: change magic "shipped with hg" string...
r29841 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
Augie Fackler
extensions: document that `testedwith = 'internal'` is special...
r25186 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified.
Augie Fackler
extensions: change magic "shipped with hg" string...
r29841 testedwith = 'ships-with-hg-core'
Augie Fackler
hgext: mark all first-party extensions as such
r16743
rdamazio@google.com
help: assigning categories to existing commands...
r40329 @command('relink', [], _('[ORIGIN]'), helpcategory=command.CATEGORY_MAINTENANCE)
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 def relink(ui, repo, origin=None, **opts):
"""recreate hardlinks between two repositories
Martin Geisler
relink: wrap long lines in docstring
r9886 When repositories are cloned locally, their data files will be
hardlinked so that they only use the space of a single repository.
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729
Martin Geisler
relink: wrap long lines in docstring
r9886 Unfortunately, subsequent pulls into either repository will break
hardlinks for any files touched by the new changesets, even if
both repositories end up pulling the same changes.
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729
Martin Geisler
relink: wrap long lines in docstring
r9886 Similarly, passing --rev to "hg clone" will fail to use any
hardlinks, falling back to a complete copy of the source
repository.
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729
Martin Geisler
relink: wrap long lines in docstring
r9886 This command lets you recreate those hardlinks and reclaim that
wasted space.
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729
Martin Geisler
relink: wrap long lines in docstring
r9886 This repository will be relinked to share space with ORIGIN, which
must be on the same local disk. If ORIGIN is omitted, looks for
"default-relink", then "default", in [paths].
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729
Martin Geisler
relink: wrap long lines in docstring
r9886 Do not attempt any read operations on this repository while the
command is running. (Both repositories will be locked against
writes.)
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 """
Augie Fackler
hgext: replace uses of hasattr with util.safehasattr
r14945 if (not util.safehasattr(util, 'samefile') or
not util.safehasattr(util, 'samedevice')):
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('hardlinks are not supported on this system'))
Simon Heimberg
repo: repo isolation, do not pass on repo.ui for creating new repos...
r18825 src = hg.repository(repo.baseui, ui.expandpath(origin or 'default-relink',
Matt Mackall
hg: change various repository() users to use peer() where appropriate...
r14556 origin or 'default'))
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 ui.status(_('relinking %s to %s\n') % (src.store.path, repo.store.path))
Martin Geisler
relink: avoid trying to lock the same repo twice
r13657 if repo.root == src.root:
ui.status(_('there is nothing to relink\n'))
return
Simon Heimberg
relink: abort earlier when on different devices (issue3916)...
r20083 if not util.samedevice(src.store.path, repo.store.path):
# No point in continuing
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('source and destination are on different devices'))
Simon Heimberg
relink: abort earlier when on different devices (issue3916)...
r20083
Matt Harbison
relink: use context manager for lock management
r38461 with repo.lock(), src.lock():
candidates = sorted(collect(src, ui))
targets = prune(candidates, src.store.path, repo.store.path, ui)
do_relink(src.store.path, repo.store.path, targets, ui)
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729
def collect(src, ui):
seplen = len(os.path.sep)
candidates = []
timeless
relink/progress: Adding progress for collecting stage
r11355 live = len(src['tip'].manifest())
# Your average repository has some files which were deleted before
# the tip revision. We account for that by assuming that there are
# 3 tracked files for every 2 live files as of the tip version of
# the repository.
#
# mozilla-central as of 2010-06-10 had a ratio of just over 7:5.
total = live * 3 // 2
src = src.store.path
Martin von Zweigbergk
relink: use progress helper...
r38423 progress = ui.makeprogress(_('collecting'), unit=_('files'), total=total)
timeless
relink/progress: Adding progress for collecting stage
r11355 pos = 0
timeless@mozdev.org
l10n: use %d instead of %s for numbers
r26778 ui.status(_("tip has %d files, estimated total number of files: %d\n")
timeless
relink/progress: Adding progress for collecting stage
r11355 % (live, total))
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 for dirpath, dirnames, filenames in os.walk(src):
Martin Geisler
relink: ensure deterministic directory walk in collect
r11357 dirnames.sort()
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 relpath = dirpath[len(src) + seplen:]
Martin Geisler
relink: ensure deterministic directory walk in collect
r11357 for filename in sorted(filenames):
Brodie Rao
cleanup: "not x in y" -> "x not in y"
r16686 if filename[-2:] not in ('.d', '.i'):
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 continue
st = os.stat(os.path.join(dirpath, filename))
if not stat.S_ISREG(st.st_mode):
continue
timeless
relink/progress: Adding progress for collecting stage
r11355 pos += 1
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 candidates.append((os.path.join(relpath, filename), st))
Martin von Zweigbergk
relink: use progress helper...
r38423 progress.update(pos, item=filename)
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729
Martin von Zweigbergk
relink: use progress helper...
r38423 progress.complete()
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 ui.status(_('collected %d candidate storage files\n') % len(candidates))
return candidates
Siddharth Agarwal
Add support for relinking on Windows....
r10218 def prune(candidates, src, dst, ui):
def linkfilter(src, dst, st):
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 try:
ts = os.stat(dst)
except OSError:
# Destination doesn't have this file?
return False
Siddharth Agarwal
Add support for relinking on Windows....
r10218 if util.samefile(src, dst):
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 return False
Siddharth Agarwal
Add support for relinking on Windows....
r10218 if not util.samedevice(src, dst):
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 # No point in continuing
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 _('source and destination are on different devices'))
if st.st_size != ts.st_size:
return False
return st
targets = []
Martin von Zweigbergk
relink: use progress helper...
r38423 progress = ui.makeprogress(_('pruning'), unit=_('files'),
total=len(candidates))
timeless
relink/progress: Adding progress for pruning stage
r11354 pos = 0
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 for fn, st in candidates:
timeless
relink/progress: Adding progress for pruning stage
r11354 pos += 1
Siddharth Agarwal
Add support for relinking on Windows....
r10218 srcpath = os.path.join(src, fn)
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 tgt = os.path.join(dst, fn)
Siddharth Agarwal
Add support for relinking on Windows....
r10218 ts = linkfilter(srcpath, tgt, st)
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 if not ts:
Matt Mackall
check-code: don't mark debug messages for translation
r14709 ui.debug('not linkable: %s\n' % fn)
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 continue
targets.append((fn, ts.st_size))
Martin von Zweigbergk
relink: use progress helper...
r38423 progress.update(pos, item=fn)
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729
Martin von Zweigbergk
relink: use progress helper...
r38423 progress.complete()
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 ui.status(_('pruned down to %d probably relinkable files\n') % len(targets))
return targets
def do_relink(src, dst, files, ui):
def relinkfile(src, dst):
bak = dst + '.bak'
os.rename(dst, bak)
try:
Adrian Buehlmann
rename util.os_link to oslink
r14235 util.oslink(src, dst)
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 except OSError:
os.rename(bak, dst)
raise
os.remove(bak)
CHUNKLEN = 65536
relinked = 0
savedbytes = 0
Martin von Zweigbergk
relink: use progress helper...
r38423 progress = ui.makeprogress(_('relinking'), unit=_('files'),
total=len(files))
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 pos = 0
for f, sz in files:
pos += 1
source = os.path.join(src, f)
tgt = os.path.join(dst, f)
Siddharth Agarwal
Add support for relinking on Windows....
r10218 # Binary mode, so that read() works correctly, especially on Windows
Pulkit Goyal
py3: replace file() with open()...
r36412 sfp = open(source, 'rb')
dfp = open(tgt, 'rb')
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 sin = sfp.read(CHUNKLEN)
while sin:
din = dfp.read(CHUNKLEN)
if sin != din:
break
sin = sfp.read(CHUNKLEN)
Siddharth Agarwal
Add support for relinking on Windows....
r10218 sfp.close()
dfp.close()
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 if sin:
Matt Mackall
check-code: don't mark debug messages for translation
r14709 ui.debug('not linkable: %s\n' % f)
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 continue
try:
relinkfile(source, tgt)
Martin von Zweigbergk
relink: use progress helper...
r38423 progress.update(pos, item=f)
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729 relinked += 1
savedbytes += sz
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except OSError as inst:
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 ui.warn('%s: %s\n' % (tgt, stringutil.forcebytestr(inst)))
Jesse Glick
Issue919: add a standard extension to recreate hardlinks between repositories....
r9729
Martin von Zweigbergk
relink: use progress helper...
r38423 progress.complete()
Augie Fackler
relink: properly use the progress API
r10424
Martin Geisler
relink: format reclaimed byte count nicely
r13656 ui.status(_('relinked %d files (%s reclaimed)\n') %
(relinked, util.bytecount(savedbytes)))