##// END OF EJS Templates
exchange: improve computation of relevant markers for large repos...
exchange: improve computation of relevant markers for large repos Compute the candidate nodes with relevant markers directly from keys of the predecessors/successors/children dictionaries of obsstore. This is faster than iterating over all nodes directly. This test could be further improved for repositories with relative few markers compared to the repository size, but this is no longer hot already. With the current loop structure, the obshashrange use works as well as before as it passes lists with a single node. Adjust the interface by allowing revision lists as well as node lists. This helps cases that computes ancestors as it reduces the materialisation cost. Use this in _pushdiscoveryobsmarker and _getbundleobsmarkerpart. Improve the latter further by directly using ancestors(). Performance benchmarks show notable and welcome improvement to no-op push and pull (that would also apply to other push/pull). This apply to push and pull done without evolve. ### push/pull Benchmark parameter # bin-env-vars.hg.flavor = default # benchmark.variants.explicit-rev = none # benchmark.variants.protocol = ssh # benchmark.variants.revs = none ## benchmark.name = hg.command.pull # data-env-vars.name = mercurial-devel-2024-03-22-zstd-sparse-revlog before: 5.968537 seconds after: 5.668507 seconds (-5.03%, -0.30) # data-env-vars.name = tryton-devel-2024-03-22-zstd-sparse-revlog before: 1.446232 seconds after: 0.835553 seconds (-42.23%, -0.61) # data-env-vars.name = netbsd-src-draft-2024-09-19-zstd-sparse-revlog before: 5.777412 seconds after: 2.523454 seconds (-56.32%, -3.25) ## benchmark.name = hg.command.push # data-env-vars.name = mercurial-devel-2024-03-22-zstd-sparse-revlog before: 6.155501 seconds after: 5.885072 seconds (-4.39%, -0.27) # data-env-vars.name = tryton-devel-2024-03-22-zstd-sparse-revlog before: 1.491054 seconds after: 0.934882 seconds (-37.30%, -0.56) # data-env-vars.name = netbsd-src-draft-2024-09-19-zstd-sparse-revlog before: 5.902494 seconds after: 2.957644 seconds (-49.89%, -2.94) There is not notable different in these result using the "rust" flavor instead of the "default". The performance impact on the same operation when using evolve were also tested and no impact was noted.

File last commit:

r52756:f4733654 default
r52789:8583d138 default
Show More
flagutil.py
199 lines | 7.5 KiB | text/x-python | PythonLexer
flagutil: create a `mercurial.revlogutils.flagutil` module...
r42954 # flagutils.py - code to deal with revlog flags and their processors
#
# Copyright 2016 Remi Chaintron <remi@fb.com>
# Copyright 2016-2019 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Matt Harbison
typing: add `from __future__ import annotations` to most files...
r52756 from __future__ import annotations
flagutil: create a `mercurial.revlogutils.flagutil` module...
r42954
flagutil: move insertflagprocessor to the new module (API)
r42957 from ..i18n import _
flagutil: create a `mercurial.revlogutils.flagutil` module...
r42954 from .constants import (
REVIDX_DEFAULT_FLAGS,
REVIDX_ELLIPSIS,
REVIDX_EXTSTORED,
REVIDX_FLAGS_ORDER,
copies: add a HASCOPIESINFO flag to highlight rev with useful data...
r46263 REVIDX_HASCOPIESINFO,
flagutil: create a `mercurial.revlogutils.flagutil` module...
r42954 REVIDX_ISCENSORED,
REVIDX_RAWTEXT_CHANGING_FLAGS,
)
Augie Fackler
formatting: blacken the codebase...
r43346 from .. import error, util
flagutil: move REVIDX_KNOWN_FLAGS source of truth in flagutil (API)...
r42956
flagutil: create a `mercurial.revlogutils.flagutil` module...
r42954 # blanked usage of all the name to prevent pyflakes constraints
# We need these name available in the module for extensions.
REVIDX_ISCENSORED
REVIDX_ELLIPSIS
REVIDX_EXTSTORED
copies: add a HASCOPIESINFO flag to highlight rev with useful data...
r46263 REVIDX_HASCOPIESINFO,
flagutil: create a `mercurial.revlogutils.flagutil` module...
r42954 REVIDX_DEFAULT_FLAGS
REVIDX_FLAGS_ORDER
REVIDX_RAWTEXT_CHANGING_FLAGS
Simon Sapin
rhg: desambiguate status without decompressing filelog if possible...
r49378 # Keep this in sync with REVIDX_KNOWN_FLAGS in rust/hg-core/src/revlog/revlog.rs
flagutil: move REVIDX_KNOWN_FLAGS source of truth in flagutil (API)...
r42956 REVIDX_KNOWN_FLAGS = util.bitsfrom(REVIDX_FLAGS_ORDER)
flagutil: move the `flagprocessors` mapping in the new module...
r42955 # Store flag processors (cf. 'addflagprocessor()' to register)
flagprocessors = {
REVIDX_ISCENSORED: None,
copies: add a HASCOPIESINFO flag to highlight rev with useful data...
r46263 REVIDX_HASCOPIESINFO: None,
flagutil: move the `flagprocessors` mapping in the new module...
r42955 }
flagutil: create a `mercurial.revlogutils.flagutil` module...
r42954
Augie Fackler
formatting: blacken the codebase...
r43346
flagutil: move addflagprocessor to the new module (API)
r42958 def addflagprocessor(flag, processor):
"""Register a flag processor on a revision data flag.
Invariant:
- Flags need to be defined in REVIDX_KNOWN_FLAGS and REVIDX_FLAGS_ORDER,
and REVIDX_RAWTEXT_CHANGING_FLAGS if they can alter rawtext.
- Only one flag processor can be registered on a specific flag.
- flagprocessors must be 3-tuples of functions (read, write, raw) with the
following signatures:
- (read) f(self, rawtext) -> text, bool
- (write) f(self, text) -> rawtext, bool
- (raw) f(self, rawtext) -> bool
"text" is presented to the user. "rawtext" is stored in revlog data, not
directly visible to the user.
The boolean returned by these transforms is used to determine whether
the returned text can be used for hash integrity checking. For example,
if "write" returns False, then "text" is used to generate hash. If
"write" returns True, that basically means "rawtext" returned by "write"
should be used to generate hash. Usually, "write" and "read" return
different booleans. And "raw" returns a same boolean as "write".
Note: The 'raw' transform is used for changegroup generation and in some
debug commands. In this case the transform only indicates whether the
contents can be used for hash integrity checks.
"""
insertflagprocessor(flag, processor, flagprocessors)
Augie Fackler
formatting: blacken the codebase...
r43346
flagutil: move insertflagprocessor to the new module (API)
r42957 def insertflagprocessor(flag, processor, flagprocessors):
if not flag & REVIDX_KNOWN_FLAGS:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 msg = _(b"cannot register processor on unknown flag '%#x'.") % flag
flagutil: move insertflagprocessor to the new module (API)
r42957 raise error.ProgrammingError(msg)
if flag not in REVIDX_FLAGS_ORDER:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 msg = _(b"flag '%#x' undefined in REVIDX_FLAGS_ORDER.") % flag
flagutil: move insertflagprocessor to the new module (API)
r42957 raise error.ProgrammingError(msg)
if flag in flagprocessors:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 msg = _(b"cannot register multiple processors on flag '%#x'.") % flag
flagutil: move insertflagprocessor to the new module (API)
r42957 raise error.Abort(msg)
flagprocessors[flag] = processor
flagutil: introduce a flagprocessorsmixin class...
r43140
Augie Fackler
formatting: blacken the codebase...
r43346
Raphaël Gomès
sidedata: move to new sidedata storage in revlogv2...
r47443 def processflagswrite(revlog, text, flags):
flagprocessors: make `processflagswrite` a module level function...
r43260 """Inspect revision data flags and applies write transformations defined
by registered flag processors.
``text`` - the revision data to process
``flags`` - the revision flags
This method processes the flags in the order (or reverse order if
``operation`` is 'write') defined by REVIDX_FLAGS_ORDER, applying the
flag processors registered for present flags. The order of flags defined
in REVIDX_FLAGS_ORDER needs to be stable to allow non-commutativity.
Returns a 2-tuple of ``(text, validatehash)`` where ``text`` is the
processed text and ``validatehash`` is a bool indicating whether the
returned text should be checked for hash integrity.
"""
Raphaël Gomès
sidedata: move to new sidedata storage in revlogv2...
r47443 return _processflagsfunc(
revlog,
text,
flags,
b'write',
)[:2]
Augie Fackler
formatting: blacken the codebase...
r43346
flagprocessors: make `processflagswrite` a module level function...
r43260
flagprocessors: make `processflagsread` a module level function...
r43261 def processflagsread(revlog, text, flags):
"""Inspect revision data flags and applies read transformations defined
by registered flag processors.
``text`` - the revision data to process
``flags`` - the revision flags
``raw`` - an optional argument describing if the raw transform should be
applied.
This method processes the flags in the order (or reverse order if
``operation`` is 'write') defined by REVIDX_FLAGS_ORDER, applying the
flag processors registered for present flags. The order of flags defined
in REVIDX_FLAGS_ORDER needs to be stable to allow non-commutativity.
Returns a 2-tuple of ``(text, validatehash)`` where ``text`` is the
processed text and ``validatehash`` is a bool indicating whether the
returned text should be checked for hash integrity.
"""
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return _processflagsfunc(revlog, text, flags, b'read')
flagprocessors: make `processflagsread` a module level function...
r43261
Augie Fackler
formatting: blacken the codebase...
r43346
flagprocessors: make `processflagsraw` a module level function...
r43262 def processflagsraw(revlog, text, flags):
"""Inspect revision data flags to check is the content hash should be
validated.
``text`` - the revision data to process
``flags`` - the revision flags
This method processes the flags in the order (or reverse order if
``operation`` is 'write') defined by REVIDX_FLAGS_ORDER, applying the
flag processors registered for present flags. The order of flags defined
in REVIDX_FLAGS_ORDER needs to be stable to allow non-commutativity.
Returns a 2-tuple of ``(text, validatehash)`` where ``text`` is the
processed text and ``validatehash`` is a bool indicating whether the
returned text should be checked for hash integrity.
"""
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return _processflagsfunc(revlog, text, flags, b'raw')[1]
flagprocessors: make `processflagsraw` a module level function...
r43262
Augie Fackler
formatting: blacken the codebase...
r43346
Raphaël Gomès
sidedata: move to new sidedata storage in revlogv2...
r47443 def _processflagsfunc(revlog, text, flags, operation):
flagprocessors: make `_processflagsfunc` a module level function...
r43259 """internal function to process flag on a revlog
flagprocessors: introduce specialized functions...
r43144
flagprocessors: make `_processflagsfunc` a module level function...
r43259 This function is private to this module, code should never needs to call it
directly."""
# fast path: no flag processors will run
if flags == 0:
Raphaël Gomès
sidedata: move to new sidedata storage in revlogv2...
r47443 return text, True
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if operation not in (b'read', b'write', b'raw'):
raise error.ProgrammingError(_(b"invalid '%s' operation") % operation)
flagprocessors: make `_processflagsfunc` a module level function...
r43259 # Check all flags are known.
if flags & ~REVIDX_KNOWN_FLAGS:
Augie Fackler
formatting: blacken the codebase...
r43346 raise revlog._flagserrorclass(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b"incompatible revision flag '%#x'")
Augie Fackler
formatting: blacken the codebase...
r43346 % (flags & ~REVIDX_KNOWN_FLAGS)
)
flagprocessors: make `_processflagsfunc` a module level function...
r43259 validatehash = True
# Depending on the operation (read or write), the order might be
# reversed due to non-commutative transforms.
orderedflags = REVIDX_FLAGS_ORDER
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if operation == b'write':
flagprocessors: make `_processflagsfunc` a module level function...
r43259 orderedflags = reversed(orderedflags)
flagutil: introduce a flagprocessorsmixin class...
r43140
flagprocessors: make `_processflagsfunc` a module level function...
r43259 for flag in orderedflags:
# If a flagprocessor has been registered for a known flag, apply the
# related operation transform and update result tuple.
if flag & flags:
vhash = True
flagutil: introduce a flagprocessorsmixin class...
r43140
flagprocessors: make `_processflagsfunc` a module level function...
r43259 if flag not in revlog._flagprocessors:
Matt Harbison
revlog: add an exception hint when processing LFS flags without the extension...
r51180 hint = None
if flag == REVIDX_EXTSTORED:
hint = _(b"the lfs extension must be enabled")
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 message = _(b"missing processor for flag '%#x'") % flag
Matt Harbison
revlog: add an exception hint when processing LFS flags without the extension...
r51180 raise revlog._flagserrorclass(message, hint=hint)
flagutil: introduce a flagprocessorsmixin class...
r43140
flagprocessors: make `_processflagsfunc` a module level function...
r43259 processor = revlog._flagprocessors[flag]
if processor is not None:
readtransform, writetransform, rawtransform = processor
flagutil: introduce a flagprocessorsmixin class...
r43140
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if operation == b'raw':
flagprocessors: make `_processflagsfunc` a module level function...
r43259 vhash = rawtransform(revlog, text)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 elif operation == b'read':
Raphaël Gomès
sidedata: move to new sidedata storage in revlogv2...
r47443 text, vhash = readtransform(revlog, text)
Augie Fackler
formatting: blacken the codebase...
r43346 else: # write operation
Raphaël Gomès
sidedata: move to new sidedata storage in revlogv2...
r47443 text, vhash = writetransform(revlog, text)
flagprocessors: make `_processflagsfunc` a module level function...
r43259 validatehash = validatehash and vhash
flagutil: introduce a flagprocessorsmixin class...
r43140
Raphaël Gomès
sidedata: move to new sidedata storage in revlogv2...
r47443 return text, validatehash