##// END OF EJS Templates
compression: introduce a `storage.revlog.zlib.level` configuration...
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

File last commit:

r40105:fd4d59cf default
r42210:1fac9b93 default
Show More
remotenames.py
403 lines | 13.5 KiB | text/x-python | PythonLexer
# remotenames.py - extension to display remotenames
#
# Copyright 2017 Augie Fackler <raf@durin42.com>
# Copyright 2017 Sean Farley <sean@farley.io>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
""" showing remotebookmarks and remotebranches in UI (EXPERIMENTAL)
By default both remotebookmarks and remotebranches are turned on. Config knob to
control the individually are as follows.
Config options to tweak the default behaviour:
remotenames.bookmarks
Boolean value to enable or disable showing of remotebookmarks (default: True)
remotenames.branches
Boolean value to enable or disable showing of remotebranches (default: True)
remotenames.hoistedpeer
Name of the peer whose remotebookmarks should be hoisted into the top-level
namespace (default: 'default')
"""
from __future__ import absolute_import
from mercurial.i18n import _
from mercurial.node import (
bin,
)
from mercurial import (
bookmarks,
error,
extensions,
logexchange,
namespaces,
pycompat,
registrar,
revsetlang,
smartset,
templateutil,
util,
)
from mercurial.utils import (
stringutil,
)
if pycompat.ispy3:
import collections.abc
mutablemapping = collections.abc.MutableMapping
else:
import collections
mutablemapping = collections.MutableMapping
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# 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.
testedwith = 'ships-with-hg-core'
configtable = {}
configitem = registrar.configitem(configtable)
templatekeyword = registrar.templatekeyword()
revsetpredicate = registrar.revsetpredicate()
configitem('remotenames', 'bookmarks',
default=True,
)
configitem('remotenames', 'branches',
default=True,
)
configitem('remotenames', 'hoistedpeer',
default='default',
)
class lazyremotenamedict(mutablemapping):
"""
Read-only dict-like Class to lazily resolve remotename entries
We are doing that because remotenames startup was slow.
We lazily read the remotenames file once to figure out the potential entries
and store them in self.potentialentries. Then when asked to resolve an
entry, if it is not in self.potentialentries, then it isn't there, if it
is in self.potentialentries we resolve it and store the result in
self.cache. We cannot be lazy is when asked all the entries (keys).
"""
def __init__(self, kind, repo):
self.cache = {}
self.potentialentries = {}
self._kind = kind # bookmarks or branches
self._repo = repo
self.loaded = False
def _load(self):
""" Read the remotenames file, store entries matching selected kind """
self.loaded = True
repo = self._repo
for node, rpath, rname in logexchange.readremotenamefile(repo,
self._kind):
name = rpath + '/' + rname
self.potentialentries[name] = (node, rpath, name)
def _resolvedata(self, potentialentry):
""" Check that the node for potentialentry exists and return it """
if not potentialentry in self.potentialentries:
return None
node, remote, name = self.potentialentries[potentialentry]
repo = self._repo
binnode = bin(node)
# if the node doesn't exist, skip it
try:
repo.changelog.rev(binnode)
except LookupError:
return None
# Skip closed branches
if (self._kind == 'branches' and repo[binnode].closesbranch()):
return None
return [binnode]
def __getitem__(self, key):
if not self.loaded:
self._load()
val = self._fetchandcache(key)
if val is not None:
return val
else:
raise KeyError()
def __iter__(self):
return iter(self.potentialentries)
def __len__(self):
return len(self.potentialentries)
def __setitem__(self):
raise NotImplementedError
def __delitem__(self):
raise NotImplementedError
def _fetchandcache(self, key):
if key in self.cache:
return self.cache[key]
val = self._resolvedata(key)
if val is not None:
self.cache[key] = val
return val
else:
return None
def keys(self):
""" Get a list of bookmark or branch names """
if not self.loaded:
self._load()
return self.potentialentries.keys()
def iteritems(self):
""" Iterate over (name, node) tuples """
if not self.loaded:
self._load()
for k, vtup in self.potentialentries.iteritems():
yield (k, [bin(vtup[0])])
class remotenames(object):
"""
This class encapsulates all the remotenames state. It also contains
methods to access that state in convenient ways. Remotenames are lazy
loaded. Whenever client code needs to ensure the freshest copy of
remotenames, use the `clearnames` method to force an eventual load.
"""
def __init__(self, repo, *args):
self._repo = repo
self.clearnames()
def clearnames(self):
""" Clear all remote names state """
self.bookmarks = lazyremotenamedict("bookmarks", self._repo)
self.branches = lazyremotenamedict("branches", self._repo)
self._invalidatecache()
def _invalidatecache(self):
self._nodetobmarks = None
self._nodetobranch = None
self._hoisttonodes = None
self._nodetohoists = None
def bmarktonodes(self):
return self.bookmarks
def nodetobmarks(self):
if not self._nodetobmarks:
bmarktonodes = self.bmarktonodes()
self._nodetobmarks = {}
for name, node in bmarktonodes.iteritems():
self._nodetobmarks.setdefault(node[0], []).append(name)
return self._nodetobmarks
def branchtonodes(self):
return self.branches
def nodetobranch(self):
if not self._nodetobranch:
branchtonodes = self.branchtonodes()
self._nodetobranch = {}
for name, nodes in branchtonodes.iteritems():
for node in nodes:
self._nodetobranch.setdefault(node, []).append(name)
return self._nodetobranch
def hoisttonodes(self, hoist):
if not self._hoisttonodes:
marktonodes = self.bmarktonodes()
self._hoisttonodes = {}
hoist += '/'
for name, node in marktonodes.iteritems():
if name.startswith(hoist):
name = name[len(hoist):]
self._hoisttonodes[name] = node
return self._hoisttonodes
def nodetohoists(self, hoist):
if not self._nodetohoists:
marktonodes = self.bmarktonodes()
self._nodetohoists = {}
hoist += '/'
for name, node in marktonodes.iteritems():
if name.startswith(hoist):
name = name[len(hoist):]
self._nodetohoists.setdefault(node[0], []).append(name)
return self._nodetohoists
def wrapprintbookmarks(orig, ui, repo, fm, bmarks):
if 'remotebookmarks' not in repo.names:
return
ns = repo.names['remotebookmarks']
for name in ns.listnames(repo):
nodes = ns.nodes(repo, name)
if not nodes:
continue
node = nodes[0]
bmarks[name] = (node, ' ', '')
return orig(ui, repo, fm, bmarks)
def extsetup(ui):
extensions.wrapfunction(bookmarks, '_printbookmarks', wrapprintbookmarks)
def reposetup(ui, repo):
# set the config option to store remotenames
repo.ui.setconfig('experimental', 'remotenames', True, 'remotenames-ext')
if not repo.local():
return
repo._remotenames = remotenames(repo)
ns = namespaces.namespace
if ui.configbool('remotenames', 'bookmarks'):
remotebookmarkns = ns(
'remotebookmarks',
templatename='remotebookmarks',
colorname='remotebookmark',
logfmt='remote bookmark: %s\n',
listnames=lambda repo: repo._remotenames.bmarktonodes().keys(),
namemap=lambda repo, name:
repo._remotenames.bmarktonodes().get(name, []),
nodemap=lambda repo, node:
repo._remotenames.nodetobmarks().get(node, []))
repo.names.addnamespace(remotebookmarkns)
# hoisting only works if there are remote bookmarks
hoist = ui.config('remotenames', 'hoistedpeer')
if hoist:
hoistednamens = ns(
'hoistednames',
templatename='hoistednames',
colorname='hoistedname',
logfmt='hoisted name: %s\n',
listnames = lambda repo:
repo._remotenames.hoisttonodes(hoist).keys(),
namemap = lambda repo, name:
repo._remotenames.hoisttonodes(hoist).get(name, []),
nodemap = lambda repo, node:
repo._remotenames.nodetohoists(hoist).get(node, []))
repo.names.addnamespace(hoistednamens)
if ui.configbool('remotenames', 'branches'):
remotebranchns = ns(
'remotebranches',
templatename='remotebranches',
colorname='remotebranch',
logfmt='remote branch: %s\n',
listnames = lambda repo: repo._remotenames.branchtonodes().keys(),
namemap = lambda repo, name:
repo._remotenames.branchtonodes().get(name, []),
nodemap = lambda repo, node:
repo._remotenames.nodetobranch().get(node, []))
repo.names.addnamespace(remotebranchns)
@templatekeyword('remotenames', requires={'repo', 'ctx'})
def remotenameskw(context, mapping):
"""List of strings. Remote names associated with the changeset."""
repo = context.resource(mapping, 'repo')
ctx = context.resource(mapping, 'ctx')
remotenames = []
if 'remotebookmarks' in repo.names:
remotenames = repo.names['remotebookmarks'].names(repo, ctx.node())
if 'remotebranches' in repo.names:
remotenames += repo.names['remotebranches'].names(repo, ctx.node())
return templateutil.compatlist(context, mapping, 'remotename', remotenames,
plural='remotenames')
@templatekeyword('remotebookmarks', requires={'repo', 'ctx'})
def remotebookmarkskw(context, mapping):
"""List of strings. Remote bookmarks associated with the changeset."""
repo = context.resource(mapping, 'repo')
ctx = context.resource(mapping, 'ctx')
remotebmarks = []
if 'remotebookmarks' in repo.names:
remotebmarks = repo.names['remotebookmarks'].names(repo, ctx.node())
return templateutil.compatlist(context, mapping, 'remotebookmark',
remotebmarks, plural='remotebookmarks')
@templatekeyword('remotebranches', requires={'repo', 'ctx'})
def remotebrancheskw(context, mapping):
"""List of strings. Remote branches associated with the changeset."""
repo = context.resource(mapping, 'repo')
ctx = context.resource(mapping, 'ctx')
remotebranches = []
if 'remotebranches' in repo.names:
remotebranches = repo.names['remotebranches'].names(repo, ctx.node())
return templateutil.compatlist(context, mapping, 'remotebranch',
remotebranches, plural='remotebranches')
def _revsetutil(repo, subset, x, rtypes):
"""utility function to return a set of revs based on the rtypes"""
args = revsetlang.getargs(x, 0, 1, _('only one argument accepted'))
if args:
kind, pattern, matcher = stringutil.stringmatcher(
revsetlang.getstring(args[0], _('argument must be a string')))
else:
kind = pattern = None
matcher = util.always
nodes = set()
cl = repo.changelog
for rtype in rtypes:
if rtype in repo.names:
ns = repo.names[rtype]
for name in ns.listnames(repo):
if not matcher(name):
continue
nodes.update(ns.nodes(repo, name))
if kind == 'literal' and not nodes:
raise error.RepoLookupError(_("remote name '%s' does not exist")
% pattern)
revs = (cl.rev(n) for n in nodes if cl.hasnode(n))
return subset & smartset.baseset(revs)
@revsetpredicate('remotenames([name])')
def remotenamesrevset(repo, subset, x):
"""All changesets which have a remotename on them. If `name` is
specified, only remotenames of matching remote paths are considered.
Pattern matching is supported for `name`. See :hg:`help revisions.patterns`.
"""
return _revsetutil(repo, subset, x, ('remotebookmarks', 'remotebranches'))
@revsetpredicate('remotebranches([name])')
def remotebranchesrevset(repo, subset, x):
"""All changesets which are branch heads on remotes. If `name` is
specified, only remotenames of matching remote paths are considered.
Pattern matching is supported for `name`. See :hg:`help revisions.patterns`.
"""
return _revsetutil(repo, subset, x, ('remotebranches',))
@revsetpredicate('remotebookmarks([name])')
def remotebmarksrevset(repo, subset, x):
"""All changesets which have bookmarks on remotes. If `name` is
specified, only remotenames of matching remote paths are considered.
Pattern matching is supported for `name`. See :hg:`help revisions.patterns`.
"""
return _revsetutil(repo, subset, x, ('remotebookmarks',))