upstream/mercurial-mirror Files · mercurial/revlogutils/constants.py

discovery: fix embarrassing typo in slice definition...

discovery: fix embarrassing typo in slice definition The code introduced in ended up having a silly bug. The indexing selected a single item slice picking only p1. The discovery result was still correct, but the sampling was hampered, sometime leading to much more round trips being performed. Fixing this issue restore the previous sampling behavior. This fix has a negative performance impact on the pathological case the previous test has been built. # parent of this changesets ! wall 5.313884 comb 5.310000 user 5.260000 sys 0.050000 (best of 5) ! wall 6.711860 comb 6.710000 user 6.670000 sys 0.040000 (max of 5) ! wall 5.844016 comb 5.842000 user 5.784000 sys 0.058000 (avg of 5) ! wall 5.778635 comb 5.780000 user 5.740000 sys 0.040000 (median of 5) # With this changesets. ! wall 6.350879 comb 6.350000 user 6.300000 sys 0.050000 (best of 5) ! wall 6.653647 comb 6.660000 user 6.480000 sys 0.180000 (max of 5) ! wall 6.492762 comb 6.494000 user 6.414000 sys 0.080000 (avg of 5) ! wall 6.547577 comb 6.550000 user 6.490000 sys 0.060000 (median of 5) Changeset raised the question of using the "_uncheckedparentrevs" instead of the current code. So I ran comparative timing: # old code: (e514799e4e07 parent) ! wall 64.078708 comb 64.080000 user 63.160000 sys 0.920000 (best of 5) ! wall 68.296300 comb 68.290000 user 67.410000 sys 0.880000 (max of 5) ! wall 65.899075 comb 65.894000 user 65.082000 sys 0.812000 (avg of 5) ! wall 66.140286 comb 66.130000 user 65.330000 sys 0.800000 (median of 5) # buggy code: ! wall 46.605362 comb 46.610000 user 45.880000 sys 0.730000 (best of 5) ! wall 48.619659 comb 48.620000 user 47.890000 sys 0.730000 (max of 5) ! wall 47.350247 comb 47.350000 user 46.672000 sys 0.678000 (avg of 5) ! wall 46.983224 comb 46.980000 user 46.350000 sys 0.630000 (median of 5) # fixed code: with this fix ! wall 55.858460 comb 55.850000 user 55.090000 sys 0.760000 (best of 5) ! wall 59.048805 comb 59.060000 user 58.110000 sys 0.950000 (max of 5) ! wall 57.192639 comb 57.192000 user 56.350000 sys 0.842000 (avg of 5) ! wall 57.056373 comb 57.060000 user 56.160000 sys 0.900000 (median of 5) # version using uncheckedparents ! wall 56.471916 comb 56.470000 user 55.630000 sys 0.840000 (best of 5) ! wall 58.228793 comb 58.230000 user 57.600000 sys 0.630000 (max of 5) ! wall 57.377583 comb 57.378000 user 56.674000 sys 0.704000 (avg of 5) ! wall 57.008843 comb 57.010000 user 56.330000 sys 0.680000 (median of 5) So it looks like the overhead from `_uncheckedparentrevs` is not that impactful. I'll investigate this shortly. I'm almost done updating our benchmark suite with more meaningful discovery cases.

Gregory Szorc - - Load All Authors

File last commit:

r41238:e7a2cc84 default


                r42145:0d467e4d

default

Download file

             constants.py
        
                    56 lines
            
             | 1.8 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / revlogutils / constants.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Boris Feld
    
revlog: split constants into a new `revlogutils.constants` module...

              r39365
            
      # revlogdeltas.py - constant used for revlog logic

      #

      # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>

      # Copyright 2018 Octobus <contact@octobus.net>

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      """Helper class to compute deltas stored inside revlogs"""

      from __future__ import absolute_import

      from .. import (

        Gregory Szorc
    
repository: define and use revision flag constants...

              r40083
            
          repository,

        Boris Feld
    
revlog: split constants into a new `revlogutils.constants` module...

              r39365
            
          util,

      )

      # revlog header flags

      REVLOGV0 = 0

      REVLOGV1 = 1

      # Dummy value until file format is finalized.

      # Reminder: change the bounds check in revlog.__init__ when this is changed.

      REVLOGV2 = 0xDEAD

        Gregory Szorc
    
revlog: always enable generaldelta on version 2 revlogs...

              r41238
            
      # Shared across v1 and v2.

        Boris Feld
    
revlog: split constants into a new `revlogutils.constants` module...

              r39365
            
      FLAG_INLINE_DATA = (1 << 16)

        Gregory Szorc
    
revlog: always enable generaldelta on version 2 revlogs...

              r41238
            
      # Only used by v1, implied by v2.

        Boris Feld
    
revlog: split constants into a new `revlogutils.constants` module...

              r39365
            
      FLAG_GENERALDELTA = (1 << 17)

      REVLOG_DEFAULT_FLAGS = FLAG_INLINE_DATA

      REVLOG_DEFAULT_FORMAT = REVLOGV1

      REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT | REVLOG_DEFAULT_FLAGS

      REVLOGV1_FLAGS = FLAG_INLINE_DATA | FLAG_GENERALDELTA

        Gregory Szorc
    
revlog: always enable generaldelta on version 2 revlogs...

              r41238
            
      REVLOGV2_FLAGS = FLAG_INLINE_DATA

        Boris Feld
    
revlog: split constants into a new `revlogutils.constants` module...

              r39365
            
      # revlog index flags

        Gregory Szorc
    
repository: define and use revision flag constants...

              r40083
            
      # For historical reasons, revlog's internal flags were exposed via the

      # wire protocol and are even exposed in parts of the storage APIs.

      # revision has censor metadata, must be verified

      REVIDX_ISCENSORED = repository.REVISION_FLAG_CENSORED

      # revision hash does not match data (narrowhg)

      REVIDX_ELLIPSIS = repository.REVISION_FLAG_ELLIPSIS

      # revision data is stored externally

      REVIDX_EXTSTORED = repository.REVISION_FLAG_EXTSTORED

        Boris Feld
    
revlog: split constants into a new `revlogutils.constants` module...

              r39365
            
      REVIDX_DEFAULT_FLAGS = 0

      # stable order in which flags need to be processed and their processors applied

      REVIDX_FLAGS_ORDER = [

          REVIDX_ISCENSORED,

          REVIDX_ELLIPSIS,

          REVIDX_EXTSTORED,

      ]

      REVIDX_KNOWN_FLAGS = util.bitsfrom(REVIDX_FLAGS_ORDER)

      # bitmark for flags that could cause rawdata content change

      REVIDX_RAWTEXT_CHANGING_FLAGS = REVIDX_ISCENSORED | REVIDX_EXTSTORED

        Boris Feld
    
sparse-revlog: set max delta chain length to on thousand...

              r39542
            
      SPARSE_REVLOG_MAX_CHAIN_LENGTH = 1000

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Boris Feld revlog: split constants into a new `revlogutils.constants` module...	r39365	# revlogdeltas.py - constant used for revlog logic
		#
		# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
		# Copyright 2018 Octobus <contact@octobus.net>
		#
		# This software may be used and distributed according to the terms of the
		# GNU General Public License version 2 or any later version.
		"""Helper class to compute deltas stored inside revlogs"""

		from __future__ import absolute_import

		from .. import (
Gregory Szorc repository: define and use revision flag constants...	r40083	repository,
Boris Feld revlog: split constants into a new `revlogutils.constants` module...	r39365	util,
		)

		# revlog header flags
		REVLOGV0 = 0
		REVLOGV1 = 1
		# Dummy value until file format is finalized.
		# Reminder: change the bounds check in revlog.__init__ when this is changed.
		REVLOGV2 = 0xDEAD
Gregory Szorc revlog: always enable generaldelta on version 2 revlogs...	r41238	# Shared across v1 and v2.
Boris Feld revlog: split constants into a new `revlogutils.constants` module...	r39365	FLAG_INLINE_DATA = (1 << 16)
Gregory Szorc revlog: always enable generaldelta on version 2 revlogs...	r41238	# Only used by v1, implied by v2.
Boris Feld revlog: split constants into a new `revlogutils.constants` module...	r39365	FLAG_GENERALDELTA = (1 << 17)
		REVLOG_DEFAULT_FLAGS = FLAG_INLINE_DATA
		REVLOG_DEFAULT_FORMAT = REVLOGV1
		REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT \| REVLOG_DEFAULT_FLAGS
		REVLOGV1_FLAGS = FLAG_INLINE_DATA \| FLAG_GENERALDELTA
Gregory Szorc revlog: always enable generaldelta on version 2 revlogs...	r41238	REVLOGV2_FLAGS = FLAG_INLINE_DATA
Boris Feld revlog: split constants into a new `revlogutils.constants` module...	r39365
		# revlog index flags
Gregory Szorc repository: define and use revision flag constants...	r40083
		# For historical reasons, revlog's internal flags were exposed via the
		# wire protocol and are even exposed in parts of the storage APIs.

		# revision has censor metadata, must be verified
		REVIDX_ISCENSORED = repository.REVISION_FLAG_CENSORED
		# revision hash does not match data (narrowhg)
		REVIDX_ELLIPSIS = repository.REVISION_FLAG_ELLIPSIS
		# revision data is stored externally
		REVIDX_EXTSTORED = repository.REVISION_FLAG_EXTSTORED
Boris Feld revlog: split constants into a new `revlogutils.constants` module...	r39365	REVIDX_DEFAULT_FLAGS = 0
		# stable order in which flags need to be processed and their processors applied
		REVIDX_FLAGS_ORDER = [
		REVIDX_ISCENSORED,
		REVIDX_ELLIPSIS,
		REVIDX_EXTSTORED,
		]
		REVIDX_KNOWN_FLAGS = util.bitsfrom(REVIDX_FLAGS_ORDER)
		# bitmark for flags that could cause rawdata content change
		REVIDX_RAWTEXT_CHANGING_FLAGS = REVIDX_ISCENSORED \| REVIDX_EXTSTORED
Boris Feld sparse-revlog: set max delta chain length to on thousand...	r39542
		SPARSE_REVLOG_MAX_CHAIN_LENGTH = 1000