Patchwork [1,of,8,"STABLE] test: update test-sparse-revlog.t output

login
register
mail settings
Submitter Pierre-Yves David
Date Feb. 24, 2019, 7:42 p.m.
Message ID <6422b5fbdf46904f125a.1551037360@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/38912/
State Accepted
Headers show

Comments

Pierre-Yves David - Feb. 24, 2019, 7:42 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1551034617 -3600
#      Sun Feb 24 19:56:57 2019 +0100
# Branch stable
# Node ID 6422b5fbdf46904f125aa5dd8309be5c117cfc91
# Parent  f2f538725d07ffffb0b58c64ff6415ce424cb0a7
# EXP-Topic test-sparse-revlog
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 6422b5fbdf46
test: update test-sparse-revlog.t output

This test is skipped unless a large artefact is pre-build. It seems like nobody
ran it in a while. Changeset 3764330f76a6 changed the expected output but
nobody noticed.

This changeset focus on the first and simpler step: putting the expected output
back to what one would get by running this test.

However this test changes highlight a couple of deeper issues:

1) Even if the revision content did not changed, a change in the delta
contained in the bundle affected the delta stored in the final revlog, changing
the test result. Since we are testing the delta computation strategy with
sparse, we should not blindly reuse the delta-base from the bundled delta.

2) A change in the format of the repository used to generate the bundle changed
the delta stored in the bundle. We should get a more stable output to avoid
future instabilities of this test.

3) The test is it not run by CI or developer.

We'll try to address all this issues in the coming changesets.
Gregory Szorc - Feb. 26, 2019, 2:54 a.m.
I queued parts 1-3 for stable. Then I merged stable into @ and queued 4-8
on default (because I don't think 4-8 are appropriate for stable since they
change test runner functionality).

FWIW I greatly appreciate the change to generate the file if it is missing.

On Sun, Feb 24, 2019 at 3:07 PM Pierre-Yves David <
pierre-yves.david@ens-lyon.org> wrote:

> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@octobus.net>
> # Date 1551034617 -3600
> #      Sun Feb 24 19:56:57 2019 +0100
> # Branch stable
> # Node ID 6422b5fbdf46904f125aa5dd8309be5c117cfc91
> # Parent  f2f538725d07ffffb0b58c64ff6415ce424cb0a7
> # EXP-Topic test-sparse-revlog
> # Available At https://bitbucket.org/octobus/mercurial-devel/
> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r
> 6422b5fbdf46
> test: update test-sparse-revlog.t output
>
> This test is skipped unless a large artefact is pre-build. It seems like
> nobody
> ran it in a while. Changeset 3764330f76a6 changed the expected output but
> nobody noticed.
>
> This changeset focus on the first and simpler step: putting the expected
> output
> back to what one would get by running this test.
>
> However this test changes highlight a couple of deeper issues:
>
> 1) Even if the revision content did not changed, a change in the delta
> contained in the bundle affected the delta stored in the final revlog,
> changing
> the test result. Since we are testing the delta computation strategy with
> sparse, we should not blindly reuse the delta-base from the bundled delta.
>
> 2) A change in the format of the repository used to generate the bundle
> changed
> the delta stored in the bundle. We should get a more stable output to avoid
> future instabilities of this test.
>
> 3) The test is it not run by CI or developer.
>
> We'll try to address all this issues in the coming changesets.
>
> diff --git a/tests/artifacts/cache/big-file-churn.hg.md5
> b/tests/artifacts/cache/big-file-churn.hg.md5
> --- a/tests/artifacts/cache/big-file-churn.hg.md5
> +++ b/tests/artifacts/cache/big-file-churn.hg.md5
> @@ -1,1 +1,1 @@
> -fe0d0bb5979de50f4fed71bb9437764d
> +403f5c247ad7cf58d3fad247a6b5e731
> diff --git a/tests/test-sparse-revlog.t b/tests/test-sparse-revlog.t
> --- a/tests/test-sparse-revlog.t
> +++ b/tests/test-sparse-revlog.t
> @@ -78,7 +78,7 @@ repeatedly while some of it changes rare
>
>
>    $ f -s .hg/store/data/*.d
> -  .hg/store/data/_s_p_a_r_s_e-_r_e_v_l_o_g-_t_e_s_t-_f_i_l_e.d:
> size=63002924
> +  .hg/store/data/_s_p_a_r_s_e-_r_e_v_l_o_g-_t_e_s_t-_f_i_l_e.d:
> size=65281524
>    $ hg debugrevlog *
>    format : 1
>    flags  : generaldelta
> @@ -90,45 +90,45 @@ repeatedly while some of it changes rare
>        empty     :        0 ( 0.00%)
>                       text  :        0 (100.00%)
>                       delta :        0 (100.00%)
> -      snapshot  :      374 ( 7.48%)
> +      snapshot  :      372 ( 7.44%)
>          lvl-0   :              4 ( 0.08%)
> -        lvl-1   :             23 ( 0.46%)
> -        lvl-2   :             63 ( 1.26%)
> -        lvl-3   :            118 ( 2.36%)
> -        lvl-4   :            166 ( 3.32%)
> -      deltas    :     4627 (92.52%)
> -  revision size : 63002924
> -      snapshot  :  9888099 (15.69%)
> -        lvl-0   :         804262 ( 1.28%)
> -        lvl-1   :        1561380 ( 2.48%)
> -        lvl-2   :        2096696 ( 3.33%)
> -        lvl-3   :        2749539 ( 4.36%)
> -        lvl-4   :        2676222 ( 4.25%)
> -      deltas    : 53114825 (84.31%)
> +        lvl-1   :             25 ( 0.50%)
> +        lvl-2   :             74 ( 1.48%)
> +        lvl-3   :            117 ( 2.34%)
> +        lvl-4   :            152 ( 3.04%)
> +      deltas    :     4629 (92.56%)
> +  revision size : 65281524
> +      snapshot  :  9910992 (15.18%)
> +        lvl-0   :         804162 ( 1.23%)
> +        lvl-1   :        1816378 ( 2.78%)
> +        lvl-2   :        2355855 ( 3.61%)
> +        lvl-3   :        2557680 ( 3.92%)
> +        lvl-4   :        2376917 ( 3.64%)
> +      deltas    : 55370532 (84.82%)
>
>    chunks        :     5001
>        0x78 (x)  :     5001 (100.00%)
> -  chunks size   : 63002924
> -      0x78 (x)  : 63002924 (100.00%)
> +  chunks size   : 65281524
> +      0x78 (x)  : 65281524 (100.00%)
>
>    avg chain length  :        9
>    max chain length  :       15
> -  max chain reach   : 28907121
> -  compression ratio :       27
> +  max chain reach   : 27873839
> +  compression ratio :       26
>
>    uncompressed data size (min/max/avg) : 346468 / 346472 / 346471
> -  full revision size (min/max/avg)     : 201008 / 201141 / 201065
> -  inter-snapshot size (min/max/avg)    : 11601 / 157413 / 24550
> -      level-1   (min/max/avg)          : 13061 / 157413 / 67886
> -      level-2   (min/max/avg)          : 11674 / 85631 / 33280
> -      level-3   (min/max/avg)          : 11602 / 42957 / 23301
> -      level-4   (min/max/avg)          : 11601 / 21475 / 16121
> -  delta size (min/max/avg)             : 10649 / 105465 / 11479
> +  full revision size (min/max/avg)     : 200973 / 201094 / 201040
> +  inter-snapshot size (min/max/avg)    : 11586 / 170448 / 24746
> +      level-1   (min/max/avg)          : 14021 / 170448 / 72655
> +      level-2   (min/max/avg)          : 11616 / 81152 / 31835
> +      level-3   (min/max/avg)          : 11607 / 42813 / 21860
> +      level-4   (min/max/avg)          : 11586 / 21590 / 15637
> +  delta size (min/max/avg)             : 10649 / 166014 / 11961
>
> -  deltas against prev  : 3966 (85.71%)
> -      where prev = p1  : 3922     (98.89%)
> +  deltas against prev  : 3839 (82.93%)
> +      where prev = p1  : 3839     (100.00%)
>        where prev = p2  :    0     ( 0.00%)
> -      other            :   44     ( 1.11%)
> -  deltas against p1    :  611 (13.21%)
> -  deltas against p2    :   50 ( 1.08%)
> -  deltas against other :    0 ( 0.00%)
> +      other            :    0     ( 0.00%)
> +  deltas against p1    :  634 (13.70%)
> +  deltas against p2    :   62 ( 1.34%)
> +  deltas against other :   94 ( 2.03%)
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>

Patch

diff --git a/tests/artifacts/cache/big-file-churn.hg.md5 b/tests/artifacts/cache/big-file-churn.hg.md5
--- a/tests/artifacts/cache/big-file-churn.hg.md5
+++ b/tests/artifacts/cache/big-file-churn.hg.md5
@@ -1,1 +1,1 @@ 
-fe0d0bb5979de50f4fed71bb9437764d
+403f5c247ad7cf58d3fad247a6b5e731
diff --git a/tests/test-sparse-revlog.t b/tests/test-sparse-revlog.t
--- a/tests/test-sparse-revlog.t
+++ b/tests/test-sparse-revlog.t
@@ -78,7 +78,7 @@  repeatedly while some of it changes rare
   
 
   $ f -s .hg/store/data/*.d
-  .hg/store/data/_s_p_a_r_s_e-_r_e_v_l_o_g-_t_e_s_t-_f_i_l_e.d: size=63002924
+  .hg/store/data/_s_p_a_r_s_e-_r_e_v_l_o_g-_t_e_s_t-_f_i_l_e.d: size=65281524
   $ hg debugrevlog *
   format : 1
   flags  : generaldelta
@@ -90,45 +90,45 @@  repeatedly while some of it changes rare
       empty     :        0 ( 0.00%)
                      text  :        0 (100.00%)
                      delta :        0 (100.00%)
-      snapshot  :      374 ( 7.48%)
+      snapshot  :      372 ( 7.44%)
         lvl-0   :              4 ( 0.08%)
-        lvl-1   :             23 ( 0.46%)
-        lvl-2   :             63 ( 1.26%)
-        lvl-3   :            118 ( 2.36%)
-        lvl-4   :            166 ( 3.32%)
-      deltas    :     4627 (92.52%)
-  revision size : 63002924
-      snapshot  :  9888099 (15.69%)
-        lvl-0   :         804262 ( 1.28%)
-        lvl-1   :        1561380 ( 2.48%)
-        lvl-2   :        2096696 ( 3.33%)
-        lvl-3   :        2749539 ( 4.36%)
-        lvl-4   :        2676222 ( 4.25%)
-      deltas    : 53114825 (84.31%)
+        lvl-1   :             25 ( 0.50%)
+        lvl-2   :             74 ( 1.48%)
+        lvl-3   :            117 ( 2.34%)
+        lvl-4   :            152 ( 3.04%)
+      deltas    :     4629 (92.56%)
+  revision size : 65281524
+      snapshot  :  9910992 (15.18%)
+        lvl-0   :         804162 ( 1.23%)
+        lvl-1   :        1816378 ( 2.78%)
+        lvl-2   :        2355855 ( 3.61%)
+        lvl-3   :        2557680 ( 3.92%)
+        lvl-4   :        2376917 ( 3.64%)
+      deltas    : 55370532 (84.82%)
   
   chunks        :     5001
       0x78 (x)  :     5001 (100.00%)
-  chunks size   : 63002924
-      0x78 (x)  : 63002924 (100.00%)
+  chunks size   : 65281524
+      0x78 (x)  : 65281524 (100.00%)
   
   avg chain length  :        9
   max chain length  :       15
-  max chain reach   : 28907121
-  compression ratio :       27
+  max chain reach   : 27873839
+  compression ratio :       26
   
   uncompressed data size (min/max/avg) : 346468 / 346472 / 346471
-  full revision size (min/max/avg)     : 201008 / 201141 / 201065
-  inter-snapshot size (min/max/avg)    : 11601 / 157413 / 24550
-      level-1   (min/max/avg)          : 13061 / 157413 / 67886
-      level-2   (min/max/avg)          : 11674 / 85631 / 33280
-      level-3   (min/max/avg)          : 11602 / 42957 / 23301
-      level-4   (min/max/avg)          : 11601 / 21475 / 16121
-  delta size (min/max/avg)             : 10649 / 105465 / 11479
+  full revision size (min/max/avg)     : 200973 / 201094 / 201040
+  inter-snapshot size (min/max/avg)    : 11586 / 170448 / 24746
+      level-1   (min/max/avg)          : 14021 / 170448 / 72655
+      level-2   (min/max/avg)          : 11616 / 81152 / 31835
+      level-3   (min/max/avg)          : 11607 / 42813 / 21860
+      level-4   (min/max/avg)          : 11586 / 21590 / 15637
+  delta size (min/max/avg)             : 10649 / 166014 / 11961
   
-  deltas against prev  : 3966 (85.71%)
-      where prev = p1  : 3922     (98.89%)
+  deltas against prev  : 3839 (82.93%)
+      where prev = p1  : 3839     (100.00%)
       where prev = p2  :    0     ( 0.00%)
-      other            :   44     ( 1.11%)
-  deltas against p1    :  611 (13.21%)
-  deltas against p2    :   50 ( 1.08%)
-  deltas against other :    0 ( 0.00%)
+      other            :    0     ( 0.00%)
+  deltas against p1    :  634 (13.70%)
+  deltas against p2    :   62 ( 1.34%)
+  deltas against other :   94 ( 2.03%)