Patchwork ["] discovery: fix embarrassing typo in slice definition

login
register
mail settings
Submitter Pierre-Yves David
Date March 18, 2019, 1:22 p.m.
Message ID <315e85cba7516da756cd.1552915320@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/39317/
State Accepted
Headers show

Comments

Pierre-Yves David - March 18, 2019, 1:22 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1552590825 0
#      Thu Mar 14 19:13:45 2019 +0000
# Node ID 315e85cba7516da756cd86d9a1fd4a4edb1ffb4d
# Parent  2b21c7fbb3a109dab329df8f6e79987cebbcb4de
# EXP-Topic disco-regression
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 315e85cba751
discovery: fix embarrassing typo in slice definition

The code introduced in e514799e4e07 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 e514799e4e07 raised the question of using the "_uncheckedparentrevs"
instead of the current code. So I ran comparative timing:

# old code: 55919b96c02a (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: e514799e4e07
! 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: e514799e4e07 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.
Yuya Nishihara - March 18, 2019, 10:48 p.m.
On Mon, 18 Mar 2019 13:22:00 +0000, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@octobus.net>
> # Date 1552590825 0
> #      Thu Mar 14 19:13:45 2019 +0000
> # Node ID 315e85cba7516da756cd86d9a1fd4a4edb1ffb4d
> # Parent  2b21c7fbb3a109dab329df8f6e79987cebbcb4de
> # EXP-Topic disco-regression
> # Available At https://bitbucket.org/octobus/mercurial-devel/
> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 315e85cba751
> discovery: fix embarrassing typo in slice definition

Queued, thanks.

> diff --git a/mercurial/setdiscovery.py b/mercurial/setdiscovery.py
> --- a/mercurial/setdiscovery.py
> +++ b/mercurial/setdiscovery.py
> @@ -169,7 +169,7 @@ class partialdiscovery(object):
>      def _parentsgetter(self):
>          getrev = self._repo.changelog.index.__getitem__
>          def getparents(r):
> -            return getrev(r)[5:6]
> +            return getrev(r)[5:7]
>          return getparents

Can we somehow add test coverage on this bug?

Patch

diff --git a/mercurial/setdiscovery.py b/mercurial/setdiscovery.py
--- a/mercurial/setdiscovery.py
+++ b/mercurial/setdiscovery.py
@@ -169,7 +169,7 @@  class partialdiscovery(object):
     def _parentsgetter(self):
         getrev = self._repo.changelog.index.__getitem__
         def getparents(r):
-            return getrev(r)[5:6]
+            return getrev(r)[5:7]
         return getparents
 
     def _childrengetter(self):