Skip to content
Snippets Groups Projects
  1. Nov 20, 2020
  2. Nov 12, 2020
    • Pierre-Yves David's avatar
      copies-rust: parse the changed-file sidedata directly in rust · e0313b0a6f7e
      Pierre-Yves David authored
      It does not make much sense to parse the data into python object using slow
      python code to later turn them into rust object. We directly pass the binary
      blob and use it directly in Rust.
      
      Ideally we could directly read the sidedata in Rust, using a revlog in Rust.
      However we do not have this ready to use yet.
      
      This more direct approach provides a nice speedup over the board. Especially five
      cases that we previously too slow to return in the previous changeset are not
      able to finish.
      
      Notably, we are now significantly faster than the Python version of this code in
      all the meaningful cases.
      
      I looked at the various cases that remains significantly slower then the filelog
      version and they are currently 3 main source of slowness:
      
      * The isancestor computation: even if we cache them, if the revs spawn over a
        large amount of history the ancestry checking is still quite expensive. Using
        a different approach more centered on the graph we are currently considering
        might yield significant speed.
      
      * Merging of the map from the two parents: in some case, this climb up to ⅔ of
        the time spent in copy tracing. See inline comment for idea to handle this
        better.
      
      * Extracting data from the filelog. I would like to think this mostly comes from
        the fact my test repositories pre-date Valentin Gatien-Baron improvement of
        the `files` field (99ebde4fec99) and that more recent revisions will be faster
        to fetch. Further testing on this aspect is needed.
      
      This revision compared to the previous one:
      ===========================================
      
      Repo            Case                                  Source-Rev   Dest-Rev      # of revisions  old time    new time      Difference    Factor    time per rev
      --------------------------------------------------------------------------------------------------------------------------------------------------------------
      mercurial       x_revs_x_added_0_copies               ad6b123de1c7 39cfcef4f463 :      1 revs,   0.000047 s,   0.000049 s,  +0.000002 s, × 1.0426,    49 µs/rev
      mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :      6 revs,   0.000181 s,   0.000114 s,  -0.000067 s, × 0.6298,    19 µs/rev
      mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :   1032 revs,   0.005852 s,   0.004223 s,  -0.001629 s, × 0.7216,     4 µs/rev
      pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :      9 revs,   0.000229 s,   0.000305 s,  +0.000076 s, × 1.3319,    33 µs/rev
      pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :      1 revs,   0.000058 s,   0.000060 s,  +0.000002 s, × 1.0345,    60 µs/rev
      pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :      7 revs,   0.000146 s,   0.000173 s,  +0.000027 s, × 1.1849,    24 µs/rev
      pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :      1 revs,   0.001206 s,   0.000446 s,  -0.000760 s, × 0.3698,   446 µs/rev
      pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :      6 revs,   0.025275 s,   0.010360 s,  -0.014915 s, × 0.4099,  1726 µs/rev
      pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :   4785 revs,   0.080303 s,   0.048002 s,  -0.032301 s, × 0.5978,    10 µs/rev
      pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :   6780 revs,   0.152641 s,   0.075705 s,  -0.076936 s, × 0.4960,    11 µs/rev
      pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :   5441 revs,   0.099107 s,   0.056705 s,  -0.042402 s, × 0.5722,    10 µs/rev
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  43646 revs,   2.137894 s,   0.794685 s,  -1.343209 s, × 0.3717,    18 µs/rev
      pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :  26389 revs,   0.022202 s,   0.020209 s,  -0.001993 s, × 0.9102,     0 µs/rev
      pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :  11316 revs,   0.228946 s,   0.122475 s,  -0.106471 s, × 0.5350,    10 µs/rev
      netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :      2 revs,   0.000186 s,   0.000142 s,  -0.000044 s, × 0.7634,    71 µs/rev
      netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :      2 revs,   0.000133 s,   0.000113 s,  -0.000020 s, × 0.8496,    56 µs/rev
      netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :      3 revs,   0.000320 s,   0.000241 s,  -0.000079 s, × 0.7531,    80 µs/rev
      netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :      9 revs,   0.001339 s,   0.000729 s,  -0.000610 s, × 0.5444,    81 µs/rev
      netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :   1421 revs,   0.015694 s,   0.010198 s,  -0.005496 s, × 0.6498,     7 µs/rev
      netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :   1533 revs,   0.018457 s,   0.015312 s,  -0.003145 s, × 0.8296,     9 µs/rev
      netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :   5750 revs,   0.111691 s,   0.060517 s,  -0.051174 s, × 0.5418,    10 µs/rev
      netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd :  67005 revs,   1.166017 s,   0.611102 s,  -0.554915 s, × 0.5241,     9 µs/rev
      mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :      2 revs,   0.000197 s,   0.000164 s,  -0.000033 s, × 0.8325,    82 µs/rev
      mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :      8 revs,   0.000626 s,   0.000334 s,  -0.000292 s, × 0.5335,    41 µs/rev
      mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :      9 revs,   0.000303 s,   0.000463 s,  +0.000160 s, × 1.5281,    51 µs/rev
      mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :      7 revs,   0.001679 s,   0.000730 s,  -0.000949 s, × 0.4348,   104 µs/rev
      mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :      3 revs,   0.006947 s,   0.003522 s,  -0.003425 s, × 0.5070,  1174 µs/rev
      mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   0.133070 s,   0.072518 s,  -0.060552 s, × 0.5450, 12086 µs/rev
      mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.008705 s,   0.005760 s,  -0.002945 s, × 0.6617,     3 µs/rev
      mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   8315 revs,   0.005913 s,   0.005720 s,  -0.000193 s, × 0.9674,     0 µs/rev
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   7839 revs,   0.101373 s,   0.063310 s,  -0.038063 s, × 0.6245,     8 µs/rev
      mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :  45299 revs,   0.046526 s,   0.043608 s,  -0.002918 s, × 0.9373,     0 µs/rev
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :  30263 revs,   0.313954 s,   0.204831 s,  -0.109123 s, × 0.6524,     6 µs/rev
      mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 : 153721 revs,   3.367395 s,   2.161906 s,  -1.205489 s, × 0.6420,    14 µs/rev
      mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 : 210546 revs,   4.691820 s,   3.291831 s,  -1.399989 s, × 0.7016,    15 µs/rev
      mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a :      2 revs,   0.001199 s,   0.001213 s,  +0.000014 s, × 1.0117,   606 µs/rev
      mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 :      2 revs,   0.001216 s,   0.001225 s,  +0.000009 s, × 1.0074,   612 µs/rev
      mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a :      4 revs,   0.000613 s,   0.000564 s,  -0.000049 s, × 0.9201,   141 µs/rev
      mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec :      2 revs,   0.001906 s,   0.001549 s,  -0.000357 s, × 0.8127,   774 µs/rev
      mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad :      1 revs,   0.092766 s,   0.035918 s,  -0.056848 s, × 0.3872, 35918 µs/rev
      mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   0.136074 s,   0.073788 s,  -0.062286 s, × 0.5423, 12298 µs/rev
      mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.009067 s,   0.006151 s,  -0.002916 s, × 0.6784,     3 µs/rev
      mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   8315 revs,   0.006243 s,   0.006165 s,  -0.000078 s, × 0.9875,     0 µs/rev
      mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f :   6657 revs,   0.114463 s,   0.065421 s,  -0.049042 s, × 0.5715,     9 µs/rev
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :  40314 revs,   0.433683 s,   0.313749 s,  -0.119934 s, × 0.7235,     7 µs/rev
      mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 :  38690 revs,   0.411278 s,   0.297867 s,  -0.113411 s, × 0.7242,     7 µs/rev
      mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 :  54487 revs,   0.155133 s,   0.111300 s,  -0.043833 s, × 0.7174,     2 µs/rev
      mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :  45299 revs,   0.048933 s,   0.046202 s,  -0.002731 s, × 0.9442,     1 µs/rev
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :  97052 revs,   8.100385 s,   1.999640 s,  -6.100745 s, × 0.2469,    20 µs/rev
      mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :  52031 revs,   1.446720 s,   0.809134 s,  -0.637586 s, × 0.5593,    15 µs/rev
      mozilla-try     x00000_revs_x_added_0_copies          6a320851d377 1ebb79acd503 : 363753 revs, killed      ,  47.406785 s,             ,         ,   130 µs/rev
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c : 444327 revs,   1.369537 s,   0.996219 s,  -0.373318 s, × 0.7274,     2 µs/rev
      mozilla-try     x00000_revs_x_added_x_copies          5173c4b6f97c 95d83ee7242d : 362229 revs, killed      ,  47.273399 s,             ,         ,   130 µs/rev
      mozilla-try     x00000_revs_x000_added_x_copies       9126823d0e9c ca82787bb23c : 359344 revs, killed      ,  47.419099 s,             ,         ,   131 µs/rev
      mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 : 192665 revs,   5.186079 s,   3.512653 s,  -1.673426 s, × 0.6773,    18 µs/rev
      mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 237259 revs, killed      ,  44.459049 s,             ,         ,   187 µs/rev
      mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 391148 revs, killed      ,  52.837926 s,             ,         ,   135 µs/rev
      
      This revision compared to the python code:
      ==========================================
      
      Repo            Case                                  Source-Rev   Dest-Rev      # of revisions  Python-Time  Rust-Time    Difference    Factor    time per rev
      --------------------------------------------------------------------------------------------------------------------------------------------------------------
      mercurial       x_revs_x_added_0_copies               ad6b123de1c7 39cfcef4f463 :      1 revs,   0.000044 s,   0.000049 s,  +0.000005 s, × 1.1136,    49 µs/rev
      mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :      6 revs,   0.000138 s,   0.000114 s,  -0.000024 s, × 0.8261,    19 µs/rev
      mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :   1032 revs,   0.005052 s,   0.004223 s,  -0.000829 s, × 0.8359,     4 µs/rev
      pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :      9 revs,   0.000219 s,   0.000305 s,  +0.000086 s, × 1.3927,    33 µs/rev
      pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :      1 revs,   0.000055 s,   0.000060 s,  +0.000005 s, × 1.0909,    60 µs/rev
      pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :      7 revs,   0.000128 s,   0.000173 s,  +0.000045 s, × 1.3516,    24 µs/rev
      pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :      1 revs,   0.001089 s,   0.000446 s,  -0.000643 s, × 0.4096,   446 µs/rev
      pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :      6 revs,   0.017407 s,   0.010360 s,  -0.007047 s, × 0.5952,  1726 µs/rev
      pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :   4785 revs,   0.094175 s,   0.048002 s,  -0.046173 s, × 0.5097,    10 µs/rev
      pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :   6780 revs,   0.238009 s,   0.075705 s,  -0.162304 s, × 0.3181,    11 µs/rev
      pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :   5441 revs,   0.125876 s,   0.056705 s,  -0.069171 s, × 0.4505,    10 µs/rev
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  43646 revs,   3.581556 s,   0.794685 s,  -2.786871 s, × 0.2219,    18 µs/rev
      pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :  26389 revs,   0.016721 s,   0.020209 s,  +0.003488 s, × 1.2086,     0 µs/rev
      pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :  11316 revs,   0.242367 s,   0.122475 s,  -0.119892 s, × 0.5053,    10 µs/rev
      netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :      2 revs,   0.000165 s,   0.000142 s,  -0.000023 s, × 0.8606,    71 µs/rev
      netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :      2 revs,   0.000114 s,   0.000113 s,  -0.000001 s, × 0.9912,    56 µs/rev
      netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :      3 revs,   0.000296 s,   0.000241 s,  -0.000055 s, × 0.8142,    80 µs/rev
      netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :      9 revs,   0.001124 s,   0.000729 s,  -0.000395 s, × 0.6486,    81 µs/rev
      netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :   1421 revs,   0.013060 s,   0.010198 s,  -0.002862 s, × 0.7809,     7 µs/rev
      netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :   1533 revs,   0.017112 s,   0.015312 s,  -0.001800 s, × 0.8948,     9 µs/rev
      netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :   5750 revs,   0.660350 s,   0.060517 s,  -0.599833 s, × 0.0916,    10 µs/rev
      netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd :  67005 revs,  10.032499 s,   0.611102 s,  -9.421397 s, × 0.0609,     9 µs/rev
      mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :      2 revs,   0.000189 s,   0.000164 s,  -0.000025 s, × 0.8677,    82 µs/rev
      mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :      8 revs,   0.000462 s,   0.000334 s,  -0.000128 s, × 0.7229,    41 µs/rev
      mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :      9 revs,   0.000270 s,   0.000463 s,  +0.000193 s, × 1.7148,    51 µs/rev
      mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :      7 revs,   0.001474 s,   0.000730 s,  -0.000744 s, × 0.4953,   104 µs/rev
      mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :      3 revs,   0.004806 s,   0.003522 s,  -0.001284 s, × 0.7328,  1174 µs/rev
      mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   0.085150 s,   0.072518 s,  -0.012632 s, × 0.8517, 12086 µs/rev
      mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.007064 s,   0.005760 s,  -0.001304 s, × 0.8154,     3 µs/rev
      mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   8315 revs,   0.004741 s,   0.005720 s,  +0.000979 s, × 1.2065,     0 µs/rev
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   7839 revs,   0.190133 s,   0.063310 s,  -0.126823 s, × 0.3330,     8 µs/rev
      mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :  45299 revs,   0.035651 s,   0.043608 s,  +0.007957 s, × 1.2232,     0 µs/rev
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :  30263 revs,   0.440694 s,   0.204831 s,  -0.235863 s, × 0.4648,     6 µs/rev
      mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 : 153721 revs,  18.454163 s,   2.161906 s, -16.292257 s, × 0.1172,    14 µs/rev
      mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 : 210546 revs,  31.562719 s,   3.291831 s, -28.270888 s, × 0.1043,    15 µs/rev
      mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a :      2 revs,   0.001189 s,   0.001213 s,  +0.000024 s, × 1.0202,   606 µs/rev
      mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 :      2 revs,   0.001204 s,   0.001225 s,  +0.000021 s, × 1.0174,   612 µs/rev
      mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a :      4 revs,   0.000586 s,   0.000564 s,  -0.000022 s, × 0.9625,   141 µs/rev
      mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec :      2 revs,   0.001845 s,   0.001549 s,  -0.000296 s, × 0.8396,   774 µs/rev
      mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad :      1 revs,   0.063822 s,   0.035918 s,  -0.027904 s, × 0.5628, 35918 µs/rev
      mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   0.088038 s,   0.073788 s,  -0.014250 s, × 0.8381, 12298 µs/rev
      mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.007389 s,   0.006151 s,  -0.001238 s, × 0.8325,     3 µs/rev
      mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   8315 revs,   0.004868 s,   0.006165 s,  +0.001297 s, × 1.2664,     0 µs/rev
      mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f :   6657 revs,   0.222450 s,   0.065421 s,  -0.157029 s, × 0.2941,     9 µs/rev
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :  40314 revs,   0.370675 s,   0.313749 s,  -0.056926 s, × 0.8464,     7 µs/rev
      mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 :  38690 revs,   0.358020 s,   0.297867 s,  -0.060153 s, × 0.8320,     7 µs/rev
      mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 :  54487 revs,   0.145235 s,   0.111300 s,  -0.033935 s, × 0.7663,     2 µs/rev
      mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :  45299 revs,   0.037606 s,   0.046202 s,  +0.008596 s, × 1.2286,     1 µs/rev
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :  97052 revs,   7.382439 s,   1.999640 s,  -5.382799 s, × 0.2709,    20 µs/rev
      mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :  52031 revs,   7.273506 s,   0.809134 s,  -6.464372 s, × 0.1112,    15 µs/rev
      mozilla-try     x00000_revs_x_added_0_copies          6a320851d377 1ebb79acd503 : 363753 revs, killed      ,  47.406785 s,             ,         ,   130 µs/rev
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c : 444327 revs,   1.074593 s,   0.996219 s,  -0.078374 s, × 0.9271,     2 µs/rev
      mozilla-try     x00000_revs_x_added_x_copies          5173c4b6f97c 95d83ee7242d : 362229 revs, killed      ,  47.273399 s,             ,         ,   130 µs/rev
      mozilla-try     x00000_revs_x000_added_x_copies       9126823d0e9c ca82787bb23c : 359344 revs, killed      ,  47.419099 s,             ,         ,   131 µs/rev
      mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 : 192665 revs,  27.746195 s,   3.512653 s, -24.233542 s, × 0.1266,    18 µs/rev
      mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 237259 revs, killed      ,  44.459049 s,             ,         ,   187 µs/rev
      mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 391148 revs, killed      ,  52.837926 s,             ,         ,   135 µs/rev
      
      
      This revision compared to the filelog algorithm:
      ================================================
      
      Repo            Case                                  Source-Rev   Dest-Rev      # of revisions  filelog     sidedata      Difference    Factor    time per rev
      --------------------------------------------------------------------------------------------------------------------------------------------------------------
      mercurial       x_revs_x_added_0_copies               ad6b123de1c7 39cfcef4f463 :      1 revs,   0.000906 s,   0.000049 s,  -0.000857 s, × 0.0540,     48 µs/rev
      mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :      6 revs,   0.001844 s,   0.000114 s,  -0.001730 s, × 0.0618,     18 µs/rev
      mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :   1032 revs,   0.018577 s,   0.004223 s,  -0.014354 s, × 0.2273,      4 µs/rev
      pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :      9 revs,   0.005009 s,   0.000305 s,  -0.004704 s, × 0.0608,     33 µs/rev
      pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :      1 revs,   0.209606 s,   0.000060 s,  -0.209546 s, × 0.0002,     59 µs/rev
      pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :      7 revs,   0.017008 s,   0.000173 s,  -0.016835 s, × 0.0101,     24 µs/rev
      pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :      1 revs,   0.019227 s,   0.000446 s,  -0.018781 s, × 0.0231,    445 µs/rev
      pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :      6 revs,   0.765782 s,   0.010360 s,  -0.755422 s, × 0.0135,   1726 µs/rev
      pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :   4785 revs,   1.186068 s,   0.048002 s,  -1.138066 s, × 0.0404,     10 µs/rev
      pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :   6780 revs,   1.266745 s,   0.075705 s,  -1.191040 s, × 0.0597,     11 µs/rev
      pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :   5441 revs,   1.666389 s,   0.056705 s,  -1.609684 s, × 0.0340,     10 µs/rev
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  43646 revs,   0.001070 s,   0.794685 s,  +0.793615 s, × 742.69,     18 µs/rev
      pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :  26389 revs,   1.076269 s,   0.020209 s,  -1.056060 s, × 0.0187,      0 µs/rev
      pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :  11316 revs,   1.355085 s,   0.122475 s,  -1.232610 s, × 0.0903,     10 µs/rev
      netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :      2 revs,   0.028551 s,   0.000142 s,  -0.028409 s, × 0.0049,     70 µs/rev
      netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :      2 revs,   0.157319 s,   0.000113 s,  -0.157206 s, × 0.0007,     56 µs/rev
      netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :      3 revs,   0.025722 s,   0.000241 s,  -0.025481 s, × 0.0093,     80 µs/rev
      netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :      9 revs,   0.053374 s,   0.000729 s,  -0.052645 s, × 0.0136,     80 µs/rev
      netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :   1421 revs,   0.038146 s,   0.010198 s,  -0.027948 s, × 0.2673,      7 µs/rev
      netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :   1533 revs,   0.229215 s,   0.015312 s,  -0.213903 s, × 0.0668,      9 µs/rev
      netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :   5750 revs,   0.974484 s,   0.060517 s,  -0.913967 s, × 0.0621,     10 µs/rev
      netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd :  67005 revs,   3.924308 s,   0.611102 s,  -3.313206 s, × 0.1557,      9 µs/rev
      mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :      2 revs,   0.035563 s,   0.000164 s,  -0.035399 s, × 0.0046,     81 µs/rev
      mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :      8 revs,   0.145766 s,   0.000334 s,  -0.145432 s, × 0.0022,     41 µs/rev
      mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :      9 revs,   0.026283 s,   0.000463 s,  -0.025820 s, × 0.0176,     51 µs/rev
      mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :      7 revs,   0.087403 s,   0.000730 s,  -0.086673 s, × 0.0083,    104 µs/rev
      mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :      3 revs,   0.209484 s,   0.003522 s,  -0.205962 s, × 0.0168,   1173 µs/rev
      mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   2.197867 s,   0.072518 s,  -2.125349 s, × 0.0329,  12084 µs/rev
      mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.090142 s,   0.005760 s,  -0.084382 s, × 0.0638,      3 µs/rev
      mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   8315 revs,   0.742658 s,   0.005720 s,  -0.736938 s, × 0.0077,      0 µs/rev
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   7839 revs,   1.166159 s,   0.063310 s,  -1.102849 s, × 0.0542,      8 µs/rev
      mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :  45299 revs,   6.721719 s,   0.043608 s,  -6.678111 s, × 0.0064,      0 µs/rev
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :  30263 revs,   3.356523 s,   0.204831 s,  -3.151692 s, × 0.0610,      6 µs/rev
      mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 : 153721 revs,  15.880822 s,   2.161906 s, -13.718916 s, × 0.1361,     14 µs/rev
      mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 : 210546 revs,  20.781275 s,   3.291831 s, -17.489444 s, × 0.1584,     15 µs/rev
      mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a :      2 revs,   0.084165 s,   0.001213 s,  -0.082952 s, × 0.0144,    606 µs/rev
      mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 :      2 revs,   0.503744 s,   0.001225 s,  -0.502519 s, × 0.0024,    612 µs/rev
      mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a :      4 revs,   0.021545 s,   0.000564 s,  -0.020981 s, × 0.0261,    140 µs/rev
      mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec :      2 revs,   0.240699 s,   0.001549 s,  -0.239150 s, × 0.0064,    774 µs/rev
      mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad :      1 revs,   1.100682 s,   0.035918 s,  -1.064764 s, × 0.0326,  35882 µs/rev
      mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :      6 revs,   2.234809 s,   0.073788 s,  -2.161021 s, × 0.0330,  12295 µs/rev
      mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   1593 revs,   0.091222 s,   0.006151 s,  -0.085071 s, × 0.0674,      3 µs/rev
      mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   8315 revs,   0.764722 s,   0.006165 s,  -0.758557 s, × 0.0080,      0 µs/rev
      mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f :   6657 revs,   1.185655 s,   0.065421 s,  -1.120234 s, × 0.0551,      9 µs/rev
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :  40314 revs,   0.089736 s,   0.313749 s,  +0.224013 s, × 3.4963,      7 µs/rev
      mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 :  38690 revs,   0.084132 s,   0.297867 s,  +0.213735 s, × 3.5404,      7 µs/rev
      mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 :  54487 revs,   7.581932 s,   0.111300 s,  -7.470632 s, × 0.0146,      2 µs/rev
      mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :  45299 revs,   6.671144 s,   0.046202 s,  -6.624942 s, × 0.0069,      1 µs/rev
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :  97052 revs,   7.674771 s,   1.999640 s,  -5.675131 s, × 0.2605,     20 µs/rev
      mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :  52031 revs,   9.870343 s,   0.809134 s,  -9.061209 s, × 0.0819,     15 µs/rev
      mozilla-try     x00000_revs_x_added_0_copies          6a320851d377 1ebb79acd503 : 363753 revs,   0.094781 s,  47.406785 s, +47.312004 s, × 500.17,    130 µs/rev
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c : 444327 revs,  26.690029 s,   0.996219 s, -25.693810 s, × 0.0373,      2 µs/rev
      mozilla-try     x00000_revs_x_added_x_copies          5173c4b6f97c 95d83ee7242d : 362229 revs,   0.094941 s,  47.273399 s, +47.178458 s, × 497.92,    130 µs/rev
      mozilla-try     x00000_revs_x000_added_x_copies       9126823d0e9c ca82787bb23c : 359344 revs,   0.233811 s,  47.419099 s, +47.185288 s, × 202.80,    131 µs/rev
      mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 : 192665 revs,  19.321750 s,   3.512653 s, -15.809097 s, × 0.1817,     18 µs/rev
      mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 237259 revs,  21.358350 s,  44.459049 s, +23.100699 s, × 2.0815,    187 µs/rev
      mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 391148 revs,  25.328737 s,  52.837926 s, +27.509189 s, × 2.0860,    135 µs/rev
      
      Differential Revision: https://phab.mercurial-scm.org/D9307
      e0313b0a6f7e
  3. Nov 30, 2020
  4. Dec 02, 2020
  5. Nov 30, 2020
  6. Dec 03, 2020
  7. Nov 26, 2020
  8. Nov 30, 2020
  9. Nov 26, 2020
  10. Oct 04, 2020
  11. Oct 30, 2020
  12. Oct 04, 2020
  13. Oct 02, 2020
    • Pierre-Yves David's avatar
      copies-rust: move is_ancestor caching within the rust code · 8b99c473aae2
      Pierre-Yves David authored
      Now that the OrdMap merging is fast, smaller things start to matters.
      
      We move the caching of `is_ancestor` call within the Rust code. This avoid
      round-trip to Python and help us to shave more time on our slower case:
      
      Repo            Cases                                 Source-Rev   Dest-Rev         Old-Time      New-Time     Difference   Factor
      ------------------------------------------------------------------------------------------------------------------------------------
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :   2.780174 s,   2.137894 s,  -0.642280 s, × 0.7690
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :   9.843481 s,   8.100385 s,  -1.743096 s, × 0.8229
      
      
      Note: I would happily have used native code for ancestors computation, however
      I failed (did not tried hard) to created a rust version that goes as fast as
      the current C version.
      
      Below are full tables for:
      - this change compared to the previous change
      - this change compared to filelog performance
      
      Repo            Cases                                 Source-Rev   Dest-Rev         Old-Time      New-Time     Difference   Factor
      ------------------------------------------------------------------------------------------------------------------------------------
      mercurial       x_revs_x_added_0_copies               ad6b123de1c7 39cfcef4f463 :   0.000049 s,   0.000047 s,  -0.000002 s, × 0.9592
      mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :   0.000182 s,   0.000181 s,  -0.000001 s, × 0.9945
      mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :   0.005872 s,   0.005852 s,  -0.000020 s, × 0.9966
      pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :   0.000229 s,   0.000229 s,  +0.000000 s, × 1.0000
      pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :   0.000058 s,   0.000058 s,  +0.000000 s, × 1.0000
      pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :   0.000148 s,   0.000146 s,  -0.000002 s, × 0.9865
      pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :   0.001205 s,   0.001206 s,  +0.000001 s, × 1.0008
      pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :   0.025662 s,   0.025275 s,  -0.000387 s, × 0.9849
      pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :   0.080113 s,   0.080303 s,  +0.000190 s, × 1.0024
      pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :   0.153030 s,   0.152641 s,  -0.000389 s, × 0.9975
      pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :   0.098774 s,   0.099107 s,  +0.000333 s, × 1.0034
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :   2.780174 s,   2.137894 s,  -0.642280 s, × 0.7690
      pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :   0.022218 s,   0.022202 s,  -0.000016 s, × 0.9993
      pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :   0.252125 s,   0.228946 s,  -0.023179 s, × 0.9081
      netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :   0.000186 s,   0.000186 s,  +0.000000 s, × 1.0000
      netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :   0.000133 s,   0.000133 s,  +0.000000 s, × 1.0000
      netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :   0.000320 s,   0.000320 s,  +0.000000 s, × 1.0000
      netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :   0.001336 s,   0.001339 s,  +0.000003 s, × 1.0022
      netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :   0.015573 s,   0.015694 s,  +0.000121 s, × 1.0078
      netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :   0.018667 s,   0.018457 s,  -0.000210 s, × 0.9888
      netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :   0.112534 s,   0.111691 s,  -0.000843 s, × 0.9925
      netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd :   1.231869 s,   1.166017 s,  -0.065852 s, × 0.9465
      mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :   0.000197 s,   0.000197 s,  +0.000000 s, × 1.0000
      mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :   0.000637 s,   0.000626 s,  -0.000011 s, × 0.9827
      mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :   0.000303 s,   0.000303 s,  +0.000000 s, × 1.0000
      mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :   0.001663 s,   0.001679 s,  +0.000016 s, × 1.0096
      mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :   0.007008 s,   0.006947 s,  -0.000061 s, × 0.9913
      mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :   0.127385 s,   0.133070 s,  +0.005685 s, × 1.0446
      mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   0.008740 s,   0.008705 s,  -0.000035 s, × 0.9960
      mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   0.005783 s,   0.005913 s,  +0.000130 s, × 1.0225
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   0.102184 s,   0.101373 s,  -0.000811 s, × 0.9921
      mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :   0.046220 s,   0.046526 s,  +0.000306 s, × 1.0066
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :   0.315271 s,   0.313954 s,  -0.001317 s, × 0.9958
      mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 :   3.478747 s,   3.367395 s,  -0.111352 s, × 0.9680
      mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 :   4.766435 s,   4.691820 s,  -0.074615 s, × 0.9843
      mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a :   0.001214 s,   0.001199 s,  -0.000015 s, × 0.9876
      mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 :   0.001221 s,   0.001216 s,  -0.000005 s, × 0.9959
      mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a :   0.000613 s,   0.000613 s,  +0.000000 s, × 1.0000
      mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec :   0.001904 s,   0.001906 s,  +0.000002 s, × 1.0011
      mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad :   0.093000 s,   0.092766 s,  -0.000234 s, × 0.9975
      mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :   0.132194 s,   0.136074 s,  +0.003880 s, × 1.0294
      mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   0.009069 s,   0.009067 s,  -0.000002 s, × 0.9998
      mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   0.006169 s,   0.006243 s,  +0.000074 s, × 1.0120
      mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f :   0.115540 s,   0.114463 s,  -0.001077 s, × 0.9907
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :   0.435381 s,   0.433683 s,  -0.001698 s, × 0.9961
      mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 :   0.415461 s,   0.411278 s,  -0.004183 s, × 0.9899
      mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 :   0.155946 s,   0.155133 s,  -0.000813 s, × 0.9948
      mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :   0.048521 s,   0.048933 s,  +0.000412 s, × 1.0085
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :   9.843481 s,   8.100385 s,  -1.743096 s, × 0.8229
      mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :   1.465128 s,   1.446720 s,  -0.018408 s, × 0.9874
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c :   1.374283 s,   1.369537 s,  -0.004746 s, × 0.9965
      mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 :   5.255158 s,   5.186079 s,  -0.069079 s, × 0.9869
      
      Repo            Case                                  Source-Rev   Dest-Rev        filelog     sidedata     Difference    Factor
      --------------------------------------------------------------------------------------------------------------------------------------
      mercurial       x_revs_x_added_0_copies               ad6b123de1c7 39cfcef4f463 :  0.000892 s, 0.000047 s,  -0.000845 s,    × 0.052691
      mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :  0.001823 s, 0.000181 s,  -0.001642 s,    × 0.099287
      mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :  0.018063 s, 0.005852 s,  -0.012211 s,    × 0.323977
      pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :  0.001505 s, 0.000229 s,  -0.001276 s,    × 0.152159
      pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :  0.205895 s, 0.000058 s,  -0.205837 s,    × 0.000282
      pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :  0.017021 s, 0.000146 s,  -0.016875 s,    × 0.008578
      pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :  0.019422 s, 0.001206 s,  -0.018216 s,    × 0.062095
      pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :  0.767740 s, 0.025275 s,  -0.742465 s,    × 0.032921
      pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :  1.188515 s, 0.080303 s,  -1.108212 s,    × 0.067566
      pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :  1.251968 s, 0.152641 s,  -1.099327 s,    × 0.121921
      pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :  1.616799 s, 0.099107 s,  -1.517692 s,    × 0.061298
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  0.001057 s, 2.137894 s,  +2.136837 s, × 2022.605487
      pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :  1.069485 s, 0.022202 s,  -1.047283 s,    × 0.020760
      pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :  1.350162 s, 0.228946 s,  -1.121216 s,    × 0.169569
      netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :  0.028008 s, 0.000186 s,  -0.027822 s,    × 0.006641
      netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :  0.132281 s, 0.000133 s,  -0.132148 s,    × 0.001005
      netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :  0.025311 s, 0.000320 s,  -0.024991 s,    × 0.012643
      netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :  0.052957 s, 0.001339 s,  -0.051618 s,    × 0.025285
      netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :  0.038011 s, 0.015694 s,  -0.022317 s,    × 0.412880
      netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :  0.198639 s, 0.018457 s,  -0.180182 s,    × 0.092917
      netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :  0.955713 s, 0.111691 s,  -0.844022 s,    × 0.116867
      netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd :  3.838886 s, 1.166017 s,  -2.672869 s,    × 0.303738
      mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :  0.024548 s, 0.000197 s,  -0.024351 s,    × 0.008025
      mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :  0.143394 s, 0.000626 s,  -0.142768 s,    × 0.004366
      mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :  0.026046 s, 0.000303 s,  -0.025743 s,    × 0.011633
      mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :  0.085440 s, 0.001679 s,  -0.083761 s,    × 0.019651
      mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :  0.195656 s, 0.006947 s,  -0.188709 s,    × 0.035506
      mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :  2.190874 s, 0.133070 s,  -2.057804 s,    × 0.060738
      mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :  0.090208 s, 0.008705 s,  -0.081503 s,    × 0.096499
      mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :  0.747367 s, 0.005913 s,  -0.741454 s,    × 0.007912
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :  1.152863 s, 0.101373 s,  -1.051490 s,    × 0.087932
      mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :  6.598336 s, 0.046526 s,  -6.551810 s,    × 0.007051
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :  3.255015 s, 0.313954 s,  -2.941061 s,    × 0.096452
      mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 : 15.668041 s, 3.367395 s, -12.300646 s,    × 0.214921
      mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 : 20.439638 s, 4.691820 s, -15.747818 s,    × 0.229545
      mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a :  0.080923 s, 0.001199 s,  -0.079724 s,    × 0.014817
      mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 :  0.498456 s, 0.001216 s,  -0.497240 s,    × 0.002440
      mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a :  0.020798 s, 0.000613 s,  -0.020185 s,    × 0.029474
      mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec :  0.226930 s, 0.001906 s,  -0.225024 s,    × 0.008399
      mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad :  1.113005 s, 0.092766 s,  -1.020239 s,    × 0.083347
      mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :  2.230671 s, 0.136074 s,  -2.094597 s,    × 0.061001
      mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :  0.089672 s, 0.009067 s,  -0.080605 s,    × 0.101113
      mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :  0.740221 s, 0.006243 s,  -0.733978 s,    × 0.008434
      mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f :  1.185881 s, 0.114463 s,  -1.071418 s,    × 0.096521
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :  0.086072 s, 0.433683 s,  +0.347611 s,    × 5.038607
      mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 :  0.081321 s, 0.411278 s,  +0.329957 s,    × 5.057464
      mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 :  7.528370 s, 0.155133 s,  -7.373237 s,    × 0.020606
      mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :  6.757368 s, 0.048933 s,  -6.708435 s,    × 0.007241
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :  7.643752 s, 8.100385 s,  +0.456633 s,    × 1.059739
      mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :  9.704242 s, 1.446720 s,  -8.257522 s,    × 0.149081
      mozilla-try     x00000_revs_x_added_0_copies          6a320851d377 1ebb79acd503 :  0.092845 s, killed
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c : 26.626870 s, 1.369537 s, -25.257333 s,    × 0.051434
      mozilla-try     x00000_revs_x_added_x_copies          5173c4b6f97c 95d83ee7242d :  0.092953 s, killed
      mozilla-try     x00000_revs_x000_added_x_copies       9126823d0e9c ca82787bb23c :  0.227131 s, killed
      mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 : 18.884666 s, 5.186079 s, -13.698587 s,    × 0.274619
      mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 21.451622 s, killed
      mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 25.152558 s, killed
      
      Differential Revision: https://phab.mercurial-scm.org/D9303
      8b99c473aae2
  14. Apr 21, 2020
    • Pierre-Yves David's avatar
      copies-rust: leverage the immutability for efficient update · cc759d3db1e8
      Pierre-Yves David authored
      The immutable OrdMap has a diff function. That function yield items for each
      difference (missing in minor; missing in major; present in both, but
      different). We reorganise the manifest merging code to use this new function.
      We gather the data we would need to inject into the `minor` or `major` dict and
      eventually update one of them. The semantic of the merge itself is kept as is.
      
      Why are we doing this? Last year we contributed a patch making that diff
      function quickly detect some of the identical subsection when comparing two
      OrdMap cloned from a common ancestors (because they point to the very same node
      in memory).
      
      As a result:
      
      - That diff function is very fast in most of our cases,
      - It is important to maximize the "common" part by  minimising the amount of
        unnecessary changes we do in theses Map. This is why we gather update for both
        and update the one with the smaller update.
      
      In practice, this yield a massive speed up on all our slow cases. Some examples
      below.:
      
      
      Repo            Cases                                 Source-Rev   Dest-Rev         Old-Time      New-Time     Difference   Factor
      ------------------------------------------------------------------------------------------------------------------------------------
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  33.527067 s,   2.780174 s, -30.746893 s, × 0.0829
      netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd : killed(>120),   1.231869 s
      mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 : killed(>120),   3.478747 s
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :  83.508590 s,   9.843481 s, -73.665109 s, × 0.1179
      mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :  55.079813 s,   1.465128 s, -53.614685 s, × 0.0266
      
      The performance compared to the Python code are now comparable (worst case are a
      score percent slower)" You an check the full table below for details.
      
      The big new is that, with this change, we are now faster filelog in most case, .
      Below is an highlight of some pretty nice win:
      
      Repo            Case                                  Source-Rev   Dest-Rev         filelog     sidedata      Difference       Factor
      ---------------------------------------------------------------------------------------------------------------------------------------
      pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :  1.354211 s, 0.252125 s, -1.102086 s, × 0.186179
      netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :  0.939593 s, 0.112534 s, -0.827059 s, × 0.119769
      netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd :  3.824967 s, 1.231869 s, -2.593098 s, × 0.322060
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :  1.142414 s, 0.102184 s, -1.040230 s, × 0.089446
      mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :  6.667504 s, 0.046220 s, -6.621284 s, × 0.006932
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :  3.267274 s, 0.315271 s, -2.952003 s, × 0.096494
      mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 : 16.038104 s, 3.478747 s, -12.559357 s, × 0.216905
      mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 : 20.639928 s, 4.766435 s, -15.873493 s, × 0.230933
      
      They they are a handful of slower case where we perform less well. A good Share
      of them are really pathological "service" merge in mozilla-try, but not all of
      them.
      
      Repo            Case                                  Source-Rev   Dest-Rev         filelog     sidedata      Difference       Factor
      ---------------------------------------------------------------------------------------------------------------------------------------
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  0.001055 s, 2.780174 s, +2.779119 s, × 2635.236019
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 : 0.088715 s, 0.435381 s, +0.346666 s, × 4.907637
      mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 : 0.080765 s, 0.415461 s, +0.334696 s, × 5.144072
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 : 7.598509 s, 9.843481 s, +2.244972 s, × 1.295449
      mozilla-try     x00000_revs_x_added_0_copies          6a320851d377 1ebb79acd503 : 0.092232 s, killed
      mozilla-try     x00000_revs_x_added_x_copies          5173c4b6f97c 95d83ee7242d : 0.093892 s, killed
      mozilla-try     x00000_revs_x000_added_x_copies       9126823d0e9c ca82787bb23c : 0.227503 s, killed
      mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 21.145391 s, killed
      mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 25.304164 s, killed
      
      
      Below are two different tables for full performance comparison
      - this changeset against the previous one (spoiler: it is much better)
      - this changeset against the python code  (spoiler: still slower, but it gets more comparable)
      - this changeset against the filelog code (spoiler: better in many case, but not all)
      
      Repo            Cases                                 Source-Rev   Dest-Rev         Old-Time      New-Time     Difference   Factor
      ------------------------------------------------------------------------------------------------------------------------------------
      mercurial       x_revs_x_added_0_copies               ad6b123de1c7 39cfcef4f463 :   0.000049 s,   0.000049 s,  +0.000000 s, × 1.0000
      mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :   0.000179 s,   0.000182 s,  +0.000003 s, × 1.0168
      mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :   0.006494 s,   0.005872 s,  -0.000622 s, × 0.9042
      pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :   0.000339 s,   0.000229 s,  -0.000110 s, × 0.6755
      pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :   0.000057 s,   0.000058 s,  +0.000001 s, × 1.0175
      pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :   0.000299 s,   0.000148 s,  -0.000151 s, × 0.4950
      pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :   0.001200 s,   0.001205 s,  +0.000005 s, × 1.0042
      pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :   0.025120 s,   0.025662 s,  +0.000542 s, × 1.0216
      pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :   0.506921 s,   0.080113 s,  -0.426808 s, × 0.1580
      pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :   1.272060 s,   0.153030 s,  -1.119030 s, × 0.1203
      pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :   0.690941 s,   0.098774 s,  -0.592167 s, × 0.1430
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  33.527067 s,   2.780174 s, -30.746893 s, × 0.0829
      pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :   0.021970 s,   0.022218 s,  +0.000248 s, × 1.0113
      pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :   1.772094 s,   0.252125 s,  -1.519969 s, × 0.1423
      netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :   0.000185 s,   0.000186 s,  +0.000001 s, × 1.0054
      netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :   0.000135 s,   0.000133 s,  -0.000002 s, × 0.9852
      netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :   0.000329 s,   0.000320 s,  -0.000009 s, × 0.9726
      netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :   0.001343 s,   0.001336 s,  -0.000007 s, × 0.9948
      netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :   0.029396 s,   0.015573 s,  -0.013823 s, × 0.5298
      netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :   0.040210 s,   0.018667 s,  -0.021543 s, × 0.4642
      netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :   4.556794 s,   0.112534 s,  -4.444260 s, × 0.0247
      netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd : killed      ,   1.231869 s
      mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :   0.000199 s,   0.000197 s,  -0.000002 s, × 0.9899
      mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :   0.000639 s,   0.000637 s,  -0.000002 s, × 0.9969
      mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :   0.000542 s,   0.000303 s,  -0.000239 s, × 0.5590
      mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :   0.001685 s,   0.001663 s,  -0.000022 s, × 0.9869
      mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :   0.006954 s,   0.007008 s,  +0.000054 s, × 1.0078
      mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :   0.132938 s,   0.127385 s,  -0.005553 s, × 0.9582
      mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   0.008683 s,   0.008740 s,  +0.000057 s, × 1.0066
      mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   0.005956 s,   0.005783 s,  -0.000173 s, × 0.9710
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   0.963905 s,   0.102184 s,  -0.861721 s, × 0.1060
      mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :   0.049239 s,   0.046220 s,  -0.003019 s, × 0.9387
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :   4.217003 s,   0.315271 s,  -3.901732 s, × 0.0748
      mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 : killed      ,   3.478747 s
      mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 : killed      ,   4.766435 s
      mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a :   0.001197 s,   0.001214 s,  +0.000017 s, × 1.0142
      mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 :   0.001213 s,   0.001221 s,  +0.000008 s, × 1.0066
      mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a :   0.000762 s,   0.000613 s,  -0.000149 s, × 0.8045
      mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec :   0.001909 s,   0.001904 s,  -0.000005 s, × 0.9974
      mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad :   0.093021 s,   0.093000 s,  -0.000021 s, × 0.9998
      mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :   0.134536 s,   0.132194 s,  -0.002342 s, × 0.9826
      mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   0.009071 s,   0.009069 s,  -0.000002 s, × 0.9998
      mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   0.006206 s,   0.006169 s,  -0.000037 s, × 0.9940
      mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f :   1.150502 s,   0.115540 s,  -1.034962 s, × 0.1004
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :   1.114864 s,   0.435381 s,  -0.679483 s, × 0.3905
      mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 :   1.042658 s,   0.415461 s,  -0.627197 s, × 0.3985
      mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 :   0.447402 s,   0.155946 s,  -0.291456 s, × 0.3486
      mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :   0.051132 s,   0.048521 s,  -0.002611 s, × 0.9489
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :  83.508590 s,   9.843481 s, -73.665109 s, × 0.1179
      mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :  55.079813 s,   1.465128 s, -53.614685 s, × 0.0266
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c :   1.442793 s,   1.374283 s,  -0.068510 s, × 0.9525
      mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 : killed      ,   5.255158 s
      
      Repo            Cases                                 Source-Rev   Dest-Rev         Py-time       Rust-time    Difference   Factor
      ------------------------------------------------------------------------------------------------------------------------------------
      mercurial       x_revs_x_added_0_copies               ad6b123de1c7 39cfcef4f463 :   0.000044 s,   0.000049 s,  +0.000005 s, × 1.1136
      mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :   0.000138 s,   0.000182 s,  +0.000044 s, × 1.3188
      mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :   0.005052 s,   0.005872 s,  +0.000820 s, × 1.1623
      pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :   0.000219 s,   0.000229 s,  +0.000010 s, × 1.0457
      pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :   0.000055 s,   0.000058 s,  +0.000003 s, × 1.0545
      pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :   0.000128 s,   0.000148 s,  +0.000020 s, × 1.1562
      pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :   0.001089 s,   0.001205 s,  +0.000116 s, × 1.1065
      pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :   0.017407 s,   0.025662 s,  +0.008255 s, × 1.4742
      pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :   0.094175 s,   0.080113 s,  -0.014062 s, × 0.8507
      pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :   0.238009 s,   0.153030 s,  -0.084979 s, × 0.6430
      pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :   0.125876 s,   0.098774 s,  -0.027102 s, × 0.7847
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :   3.581556 s,   2.780174 s,  -0.801382 s, × 0.7762
      pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :   0.016721 s,   0.022218 s,  +0.005497 s, × 1.3287
      pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :   0.242367 s,   0.252125 s,  +0.009758 s, × 1.0403
      netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :   0.000165 s,   0.000186 s,  +0.000021 s, × 1.1273
      netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :   0.000114 s,   0.000133 s,  +0.000019 s, × 1.1667
      netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :   0.000296 s,   0.000320 s,  +0.000024 s, × 1.0811
      netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :   0.001124 s,   0.001336 s,  +0.000212 s, × 1.1886
      netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :   0.013060 s,   0.015573 s,  +0.002513 s, × 1.1924
      netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :   0.017112 s,   0.018667 s,  +0.001555 s, × 1.0909
      netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :   0.660350 s,   0.112534 s,  -0.547816 s, × 0.1704
      netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd :  10.032499 s,   1.231869 s,  -8.800630 s, × 0.1228
      mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :   0.000189 s,   0.000197 s,  +0.000008 s, × 1.0423
      mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :   0.000462 s,   0.000637 s,  +0.000175 s, × 1.3788
      mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :   0.000270 s,   0.000303 s,  +0.000033 s, × 1.1222
      mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :   0.001474 s,   0.001663 s,  +0.000189 s, × 1.1282
      mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :   0.004806 s,   0.007008 s,  +0.002202 s, × 1.4582
      mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :   0.085150 s,   0.127385 s,  +0.042235 s, × 1.4960
      mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   0.007064 s,   0.008740 s,  +0.001676 s, × 1.2373
      mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   0.004741 s,   0.005783 s,  +0.001042 s, × 1.2198
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   0.190133 s,   0.102184 s,  -0.087949 s, × 0.5374
      mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :   0.035651 s,   0.046220 s,  +0.010569 s, × 1.2965
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :   0.440694 s,   0.315271 s,  -0.125423 s, × 0.7154
      mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 :  18.454163 s,   3.478747 s, -14.975416 s, × 0.1885
      mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 :  31.562719 s,   4.766435 s, -26.796284 s, × 0.1510
      mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a :   0.001189 s,   0.001214 s,  +0.000025 s, × 1.0210
      mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 :   0.001204 s,   0.001221 s,  +0.000017 s, × 1.0141
      mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a :   0.000586 s,   0.000613 s,  +0.000027 s, × 1.0461
      mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec :   0.001845 s,   0.001904 s,  +0.000059 s, × 1.0320
      mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad :   0.063822 s,   0.093000 s,  +0.029178 s, × 1.4572
      mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :   0.088038 s,   0.132194 s,  +0.044156 s, × 1.5016
      mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   0.007389 s,   0.009069 s,  +0.001680 s, × 1.2274
      mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   0.004868 s,   0.006169 s,  +0.001301 s, × 1.2673
      mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f :   0.222450 s,   0.115540 s,  -0.106910 s, × 0.5194
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :   0.370675 s,   0.435381 s,  +0.064706 s, × 1.1746
      mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 :   0.358020 s,   0.415461 s,  +0.057441 s, × 1.1604
      mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 :   0.145235 s,   0.155946 s,  +0.010711 s, × 1.0737
      mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :   0.037606 s,   0.048521 s,  +0.010915 s, × 1.2902
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :   7.382439 s,   9.843481 s,  +2.461042 s, × 1.3334
      mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :   7.273506 s,   1.465128 s,  -5.808378 s, × 0.2014
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c :   1.074593 s,   1.374283 s,  +0.299690 s, × 1.2789
      mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 :  27.746195 s,   5.255158 s, -22.491037 s, × 0.1894
      
      Repo            Case                                  Source-Rev   Dest-Rev         filelog     sidedata      Difference       Factor
      ---------------------------------------------------------------------------------------------------------------------------------------
      mercurial       x_revs_x_added_0_copies               ad6b123de1c7 39cfcef4f463 :  0.000906 s, 0.000049 s, -0.000857 s, × 0.054084
      mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :  0.001832 s, 0.000182 s, -0.001650 s, × 0.099345
      mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :  0.018101 s, 0.005872 s, -0.012229 s, × 0.324402
      pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :  0.001508 s, 0.000229 s, -0.001279 s, × 0.151857
      pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :  0.207438 s, 0.000058 s, -0.207380 s, × 0.000280
      pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :  0.016956 s, 0.000148 s, -0.016808 s, × 0.008728
      pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :  0.019129 s, 0.001205 s, -0.017924 s, × 0.062993
      pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :  0.772050 s, 0.025662 s, -0.746388 s, × 0.033239
      pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :  1.181775 s, 0.080113 s, -1.101662 s, × 0.067790
      pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :  1.255717 s, 0.153030 s, -1.102687 s, × 0.121867
      pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :  1.628132 s, 0.098774 s, -1.529358 s, × 0.060667
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  0.001055 s, 2.780174 s, +2.779119 s, × 2635.236019
      pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :  1.056756 s, 0.022218 s, -1.034538 s, × 0.021025
      pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :  1.354211 s, 0.252125 s, -1.102086 s, × 0.186179
      netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :  0.027759 s, 0.000186 s, -0.027573 s, × 0.006701
      netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :  0.133382 s, 0.000133 s, -0.133249 s, × 0.000997
      netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :  0.025353 s, 0.000320 s, -0.025033 s, × 0.012622
      netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :  0.052939 s, 0.001336 s, -0.051603 s, × 0.025237
      netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :  0.037532 s, 0.015573 s, -0.021959 s, × 0.414926
      netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :  0.195401 s, 0.018667 s, -0.176734 s, × 0.095532
      netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :  0.939593 s, 0.112534 s, -0.827059 s, × 0.119769
      netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd :  3.824967 s, 1.231869 s, -2.593098 s, × 0.322060
      mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :  0.024626 s, 0.000197 s, -0.024429 s, × 0.008000
      mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :  0.141098 s, 0.000637 s, -0.140461 s, × 0.004515
      mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :  0.025973 s, 0.000303 s, -0.025670 s, × 0.011666
      mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :  0.085098 s, 0.001663 s, -0.083435 s, × 0.019542
      mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :  0.196623 s, 0.007008 s, -0.189615 s, × 0.035642
      mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :  2.182911 s, 0.127385 s, -2.055526 s, × 0.058356
      mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :  0.088865 s, 0.008740 s, -0.080125 s, × 0.098351
      mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :  0.731211 s, 0.005783 s, -0.725428 s, × 0.007909
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :  1.142414 s, 0.102184 s, -1.040230 s, × 0.089446
      mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :  6.667504 s, 0.046220 s, -6.621284 s, × 0.006932
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :  3.267274 s, 0.315271 s, -2.952003 s, × 0.096494
      mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 : 16.038104 s, 3.478747 s, -12.559357 s, × 0.216905
      mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 : 20.639928 s, 4.766435 s, -15.873493 s, × 0.230933
      mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a : 0.080513 s, 0.001214 s, -0.079299 s, × 0.015078
      mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 : 0.502965 s, 0.001221 s, -0.501744 s, × 0.002428
      mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a : 0.021408 s, 0.000613 s, -0.020795 s, × 0.028634
      mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec : 0.228498 s, 0.001904 s, -0.226594 s, × 0.008333
      mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad : 1.118490 s, 0.093000 s, -1.025490 s, × 0.083148
      mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 : 2.188390 s, 0.132194 s, -2.056196 s, × 0.060407
      mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e : 0.089755 s, 0.009069 s, -0.080686 s, × 0.101042
      mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed : 0.750223 s, 0.006169 s, -0.744054 s, × 0.008223
      mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f : 1.189708 s, 0.115540 s, -1.074168 s, × 0.097116
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 : 0.088715 s, 0.435381 s, +0.346666 s, × 4.907637
      mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 : 0.080765 s, 0.415461 s, +0.334696 s, × 5.144072
      mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 : 7.487310 s, 0.155946 s, -7.331364 s, × 0.020828
      mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad : 6.676682 s, 0.048521 s, -6.628161 s, × 0.007267
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 : 7.598509 s, 9.843481 s, +2.244972 s, × 1.295449
      mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a : 9.871850 s, 1.465128 s, -8.406722 s, × 0.148415
      mozilla-try     x00000_revs_x_added_0_copies          6a320851d377 1ebb79acd503 : 0.092232 s, killed
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c : 26.471560 s, 1.374283 s, -25.097277 s, × 0.051915
      mozilla-try     x00000_revs_x_added_x_copies          5173c4b6f97c 95d83ee7242d : 0.093892 s, killed
      mozilla-try     x00000_revs_x000_added_x_copies       9126823d0e9c ca82787bb23c : 0.227503 s, killed
      mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 : 19.064699 s, 5.255158 s, -13.809541 s, × 0.275649
      mozilla-try     x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 21.145391 s, killed
      mozilla-try     x00000_revs_x00000_added_x000_copies  9b2a99adc05e 8e29777b48e6 : 25.304164 s, killed
      
      Differential Revision: https://phab.mercurial-scm.org/D9302
      cc759d3db1e8
  15. Nov 02, 2020
  16. Apr 21, 2020
    • Pierre-Yves David's avatar
      copies-rust: use immutable "OrdMap" to store copies information · 0d99778af68a
      Pierre-Yves David authored
      The large majority of time is currently spent coping and merging directories.
      the `IM` crate offer "immutable" Map, that use "copy on write" internally.  The
      new object use the same API as the standard HashMap.  So switching to it is
      trivial and it reduce copying cost significantly. More importantly, using
      immutable structure will unlock new possibility for a massive speed up of the
      "merging" part. This will came in a later changesets.
      
      Performance wise, we get very significant boost in the worst case. Below is some
      highlight of how we fare compared to the previous changeset.
      
      Repo            Cases                                 Source-Rev   Dest-Rev         Old-Time      New-Time     Difference   Factor
      ------------------------------------------------------------------------------------------------------------------------------------
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  62.468362 s,  33.527067 s, -28.941295 s, × 0.5367
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   3.619850 s,   0.963905 s,  -2.655945 s, × 0.2663
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :  11.926587 s,   4.217003 s,  -7.709584 s, × 0.3536
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :  10.674920 s,   1.114864 s,  -9.560056 s, × 0.1044
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c :  19.647038 s,   1.442793 s, -18.204245 s, × 0.0734
      
      
      And we sometimes catch up with the performance of the python code as highlighted
      below:
      
      Repo            Cases                                 Source-Rev   Dest-Rev         Py-time       Rust-time    Difference   Factor
      ------------------------------------------------------------------------------------------------------------------------------------
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c :   1.074593 s,   1.442793 s,  +0.368200 s, × 1.3426
      
      However, multiple case remains significantly slower, as highlighted below
      
      Repo            Cases                                 Source-Rev   Dest-Rev         Py-time       Rust-time    Difference   Factor
      ------------------------------------------------------------------------------------------------------------------------------------
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   0.190133 s,   0.963905 s,  +0.773772 s, × 5.0696
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :   0.440694 s,   4.217003 s,  +3.776309 s, × 9.5690
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :   0.370675 s,   1.114864 s,  +0.744189 s, × 3.0077
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :   3.581556 s,  33.527067 s, +29.945511 s, × 9.3610
      
      Below are two different tables for full performance comparison
      - this changeset against the previous one (spoiler: it is much better)
      - this changeset against the python code  (spoiler: still slower, but it gets more comparable)
      
      This changeset compared to the previous one
      ===========================================
      
      Repo            Cases                                 Source-Rev   Dest-Rev         Old-Time      New-Time     Difference   Factor
      ------------------------------------------------------------------------------------------------------------------------------------
      mercurial       x_revs_x_added_0_copies               ad6b123de1c7 39cfcef4f463 :   0.000046 s,   0.000049 s,  +0.000003 s, × 1.0652
      mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :   0.000173 s,   0.000179 s,  +0.000006 s, × 1.0347
      mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :   0.006303 s,   0.006494 s,  +0.000191 s, × 1.0303
      pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :   0.000229 s,   0.000339 s,  +0.000110 s, × 1.4803
      pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :   0.000056 s,   0.000057 s,  +0.000001 s, × 1.0179
      pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :   0.000143 s,   0.000299 s,  +0.000156 s, × 2.0909
      pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :   0.001166 s,   0.001200 s,  +0.000034 s, × 1.0292
      pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :   0.022931 s,   0.025120 s,  +0.002189 s, × 1.0955
      pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :   0.852446 s,   0.506921 s,  -0.345525 s, × 0.5947
      pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :   2.221824 s,   1.272060 s,  -0.949764 s, × 0.5725
      pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :   1.194162 s,   0.690941 s,  -0.503221 s, × 0.5786
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :  62.468362 s,  33.527067 s, -28.941295 s, × 0.5367
      pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :   0.022116 s,   0.021970 s,  -0.000146 s, × 0.9934
      pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :   2.972788 s,   1.772094 s,  -1.200694 s, × 0.5961
      netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :   0.000180 s,   0.000185 s,  +0.000005 s, × 1.0278
      netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :   0.000123 s,   0.000135 s,  +0.000012 s, × 1.0976
      netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :   0.000315 s,   0.000329 s,  +0.000014 s, × 1.0444
      netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :   0.001297 s,   0.001343 s,  +0.000046 s, × 1.0355
      netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :   0.024884 s,   0.029396 s,  +0.004512 s, × 1.1813
      netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :   0.032653 s,   0.040210 s,  +0.007557 s, × 1.2314
      netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :   4.230118 s,   4.556794 s,  +0.326676 s, × 1.0772
      mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :   0.000197 s,   0.000199 s,  +0.000002 s, × 1.0102
      mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :   0.000622 s,   0.000639 s,  +0.000017 s, × 1.0273
      mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :   0.000296 s,   0.000542 s,  +0.000246 s, × 1.8311
      mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :   0.001626 s,   0.001685 s,  +0.000059 s, × 1.0363
      mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :   0.006218 s,   0.006954 s,  +0.000736 s, × 1.1184
      mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :   0.132760 s,   0.132938 s,  +0.000178 s, × 1.0013
      mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   0.029001 s,   0.008683 s,  -0.020318 s, × 0.2994
      mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   0.005886 s,   0.005956 s,  +0.000070 s, × 1.0119
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   3.619850 s,   0.963905 s,  -2.655945 s, × 0.2663
      mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :   0.058678 s,   0.049239 s,  -0.009439 s, × 0.8391
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :  11.926587 s,   4.217003 s,  -7.709584 s, × 0.3536
      mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a :   0.001204 s,   0.001197 s,  -0.000007 s, × 0.9942
      mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 :   0.001217 s,   0.001213 s,  -0.000004 s, × 0.9967
      mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a :   0.000605 s,   0.000762 s,  +0.000157 s, × 1.2595
      mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec :   0.001876 s,   0.001909 s,  +0.000033 s, × 1.0176
      mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad :   0.078190 s,   0.093021 s,  +0.014831 s, × 1.1897
      mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :   0.135428 s,   0.134536 s,  -0.000892 s, × 0.9934
      mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   0.029123 s,   0.009071 s,  -0.020052 s, × 0.3115
      mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   0.006141 s,   0.006206 s,  +0.000065 s, × 1.0106
      mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f :   4.857827 s,   1.150502 s,  -3.707325 s, × 0.2368
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :  10.674920 s,   1.114864 s,  -9.560056 s, × 0.1044
      mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 :   9.789462 s,   1.042658 s,  -8.746804 s, × 0.1065
      mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 :   1.087890 s,   0.447402 s,  -0.640488 s, × 0.4113
      mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :   0.060556 s,   0.051132 s,  -0.009424 s, × 0.8444
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 : killed         ,  83.508590 s
      mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a : killed         ,  55.079813 s
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c :  19.647038 s,   1.442793 s, -18.204245 s, × 0.0734
      
      
      This changeset compared to the Python Code
      ==========================================
      
      
      Repo            Cases                                 Source-Rev   Dest-Rev         Py-time       Rust-time    Difference   Factor
      ------------------------------------------------------------------------------------------------------------------------------------
      mercurial       x_revs_x_added_0_copies               ad6b123de1c7 39cfcef4f463 :   0.000044 s,   0.000049 s,  +0.000005 s, × 1.1136
      mercurial       x_revs_x_added_x_copies               2b1c78674230 0c1d10351869 :   0.000138 s,   0.000179 s,  +0.000041 s, × 1.2971
      mercurial       x000_revs_x000_added_x_copies         81f8ff2a9bf2 dd3267698d84 :   0.005052 s,   0.006494 s,  +0.001442 s, × 1.2854
      pypy            x_revs_x_added_0_copies               aed021ee8ae8 099ed31b181b :   0.000219 s,   0.000339 s,  +0.000120 s, × 1.5479
      pypy            x_revs_x000_added_0_copies            4aa4e1f8e19a 359343b9ac0e :   0.000055 s,   0.000057 s,  +0.000002 s, × 1.0364
      pypy            x_revs_x_added_x_copies               ac52eb7bbbb0 72e022663155 :   0.000128 s,   0.000299 s,  +0.000171 s, × 2.3359
      pypy            x_revs_x00_added_x_copies             c3b14617fbd7 ace7255d9a26 :   0.001089 s,   0.001200 s,  +0.000111 s, × 1.1019
      pypy            x_revs_x000_added_x000_copies         df6f7a526b60 a83dc6a2d56f :   0.017407 s,   0.025120 s,  +0.007713 s, × 1.4431
      pypy            x000_revs_xx00_added_0_copies         89a76aede314 2f22446ff07e :   0.094175 s,   0.506921 s,  +0.412746 s, × 5.3828
      pypy            x000_revs_x000_added_x_copies         8a3b5bfd266e 2c68e87c3efe :   0.238009 s,   1.272060 s,  +1.034051 s, × 5.3446
      pypy            x000_revs_x000_added_x000_copies      89a76aede314 7b3dda341c84 :   0.125876 s,   0.690941 s,  +0.565065 s, × 5.4891
      pypy            x0000_revs_x_added_0_copies           d1defd0dc478 c9cb1334cc78 :   3.581556 s,  33.527067 s, +29.945511 s, × 9.3610
      pypy            x0000_revs_xx000_added_0_copies       bf2c629d0071 4ffed77c095c :   0.016721 s,   0.021970 s,  +0.005249 s, × 1.3139
      pypy            x0000_revs_xx000_added_x000_copies    08ea3258278e d9fa043f30c0 :   0.242367 s,   1.772094 s,  +1.529727 s, × 7.3116
      netbeans        x_revs_x_added_0_copies               fb0955ffcbcd a01e9239f9e7 :   0.000165 s,   0.000185 s,  +0.000020 s, × 1.1212
      netbeans        x_revs_x000_added_0_copies            6f360122949f 20eb231cc7d0 :   0.000114 s,   0.000135 s,  +0.000021 s, × 1.1842
      netbeans        x_revs_x_added_x_copies               1ada3faf6fb6 5a39d12eecf4 :   0.000296 s,   0.000329 s,  +0.000033 s, × 1.1115
      netbeans        x_revs_x00_added_x_copies             35be93ba1e2c 9eec5e90c05f :   0.001124 s,   0.001343 s,  +0.000219 s, × 1.1948
      netbeans        x000_revs_xx00_added_0_copies         eac3045b4fdd 51d4ae7f1290 :   0.013060 s,   0.029396 s,  +0.016336 s, × 2.2508
      netbeans        x000_revs_x000_added_x_copies         e2063d266acd 6081d72689dc :   0.017112 s,   0.040210 s,  +0.023098 s, × 2.3498
      netbeans        x000_revs_x000_added_x000_copies      ff453e9fee32 411350406ec2 :   0.660350 s,   4.556794 s,  +3.896444 s, × 6.9006
      netbeans        x0000_revs_xx000_added_x000_copies    588c2d1ced70 1aad62e59ddd :  10.032499 s, killed
      mozilla-central x_revs_x_added_0_copies               3697f962bb7b 7015fcdd43a2 :   0.000189 s,   0.000199 s,  +0.000010 s, × 1.0529
      mozilla-central x_revs_x000_added_0_copies            dd390860c6c9 40d0c5bed75d :   0.000462 s,   0.000639 s,  +0.000177 s, × 1.3831
      mozilla-central x_revs_x_added_x_copies               8d198483ae3b 14207ffc2b2f :   0.000270 s,   0.000542 s,  +0.000272 s, × 2.0074
      mozilla-central x_revs_x00_added_x_copies             98cbc58cc6bc 446a150332c3 :   0.001474 s,   0.001685 s,  +0.000211 s, × 1.1431
      mozilla-central x_revs_x000_added_x000_copies         3c684b4b8f68 0a5e72d1b479 :   0.004806 s,   0.006954 s,  +0.002148 s, × 1.4469
      mozilla-central x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :   0.085150 s,   0.132938 s,  +0.047788 s, × 1.5612
      mozilla-central x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   0.007064 s,   0.008683 s,  +0.001619 s, × 1.2292
      mozilla-central x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   0.004741 s,   0.005956 s,  +0.001215 s, × 1.2563
      mozilla-central x000_revs_x000_added_x000_copies      7c97034feb78 4407bd0c6330 :   0.190133 s,   0.963905 s,  +0.773772 s, × 5.0696
      mozilla-central x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :   0.035651 s,   0.049239 s,  +0.013588 s, × 1.3811
      mozilla-central x0000_revs_xx000_added_x000_copies    f78c615a656c 96a38b690156 :   0.440694 s,   4.217003 s,  +3.776309 s, × 9.5690
      mozilla-central x00000_revs_x0000_added_x0000_copies  6832ae71433c 4c222a1d9a00 :  18.454163 s, killed
      mozilla-central x00000_revs_x00000_added_x000_copies  76caed42cf7c 1daa622bbe42 :  31.562719 s, killed
      mozilla-try     x_revs_x_added_0_copies               aaf6dde0deb8 9790f499805a :   0.001189 s,   0.001197 s,  +0.000008 s, × 1.0067
      mozilla-try     x_revs_x000_added_0_copies            d8d0222927b4 5bb8ce8c7450 :   0.001204 s,   0.001213 s,  +0.000009 s, × 1.0075
      mozilla-try     x_revs_x_added_x_copies               092fcca11bdb 936255a0384a :   0.000586 s,   0.000762 s,  +0.000176 s, × 1.3003
      mozilla-try     x_revs_x00_added_x_copies             b53d2fadbdb5 017afae788ec :   0.001845 s,   0.001909 s,  +0.000064 s, × 1.0347
      mozilla-try     x_revs_x000_added_x000_copies         20408ad61ce5 6f0ee96e21ad :   0.063822 s,   0.093021 s,  +0.029199 s, × 1.4575
      mozilla-try     x_revs_x0000_added_x0000_copies       effb563bb7e5 c07a39dc4e80 :   0.088038 s,   0.134536 s,  +0.046498 s, × 1.5282
      mozilla-try     x000_revs_xx00_added_0_copies         6100d773079a 04a55431795e :   0.007389 s,   0.009071 s,  +0.001682 s, × 1.2276
      mozilla-try     x000_revs_x000_added_x_copies         9f17a6fc04f9 2d37b966abed :   0.004868 s,   0.006206 s,  +0.001338 s, × 1.2749
      mozilla-try     x000_revs_x000_added_x000_copies      1346fd0130e4 4c65cbdabc1f :   0.222450 s,   1.150502 s,  +0.928052 s, × 5.1720
      mozilla-try     x0000_revs_x_added_0_copies           63519bfd42ee a36a2a865d92 :   0.370675 s,   1.114864 s,  +0.744189 s, × 3.0077
      mozilla-try     x0000_revs_x_added_x_copies           9fe69ff0762d bcabf2a78927 :   0.358020 s,   1.042658 s,  +0.684638 s, × 2.9123
      mozilla-try     x0000_revs_xx000_added_x_copies       156f6e2674f2 4d0f2c178e66 :   0.145235 s,   0.447402 s,  +0.302167 s, × 3.0805
      mozilla-try     x0000_revs_xx000_added_0_copies       9eec5917337d 67118cc6dcad :   0.037606 s,   0.051132 s,  +0.013526 s, × 1.3597
      mozilla-try     x0000_revs_xx000_added_x000_copies    89294cd501d9 7ccb2fc7ccb5 :   7.382439 s,  83.508590 s, +76.126151 s, × 11.3118
      mozilla-try     x0000_revs_x0000_added_x0000_copies   e928c65095ed e951f4ad123a :   7.273506 s,  55.079813 s, +47.806307 s, × 7.5727
      mozilla-try     x00000_revs_x00000_added_0_copies     dc8a3ca7010e d16fde900c9c :   1.074593 s,   1.442793 s,  +0.368200 s, × 1.3426
      mozilla-try     x00000_revs_x0000_added_x0000_copies  8d3fafa80d4b eb884023b810 :  27.746195 s, killed
      
      Differential Revision: https://phab.mercurial-scm.org/D9300
      0d99778af68a
  17. Nov 28, 2020
    • Pierre-Yves David's avatar
      rust: fix non-utf8 char in requirements.rs · 40f79997e81f
      Pierre-Yves David authored
      Apparently Phabricator detect `rust/hg-core/src/requirements.rs` file as non
      utf8 ‽, and mark it as binary.  During application it ended up being non-utf8
      and this made Rust (and as a result heptapod) very angry::
      
          error: couldn't read hg-core/src/requirements.rs: stream did not contain valid UTF-8
            --> hg-core/src/lib.rs:11:9
             |
          11 | pub mod requirements;
             |         ^^^^^^^^^^^^
      
          error: aborting due to previous error
      
          error: could not compile `hg-core`.
      
      The after "fixing", the file content has no character matching the following
      regexp:
      
        [^0-9-a-zA-Z /(|).,{}!\[\]:"&=>?_*-;<`'#]
      
      So we should be fine, unless Phabricator does something funny again.
      
      Differential Revision: https://phab.mercurial-scm.org/D9444
      40f79997e81f
  18. Oct 01, 2020
    • Pierre-Yves David's avatar
      copies: introduce the hg-cpython wrapper for `combine_changeset_copies` · 50c5ee3bdf9a
      Pierre-Yves David authored
      This patch focus on the `hg-cpython` part of this work. Bridging the python code
      with the new rust code in `hg-core`. The next patch will actually plug this in
      the python code.
      
      The rust code use multiple Python callback, python related error within this
      callback are not expected unless they are a programming error or a data
      corruption. In addition, these callback will slowly be replaced by native Rust
      code. For these reasons, we use will deal with unexpected error within this
      callback using rust Panic and let the `rust-cpython` layer deal with raising a
      Python exception.
      
      The code dealing with the ChangedFile instance is repeating itself a lot. I did
      not factor these duplication out because that whole code will get replaced by
      entirely different one in a handful of changesets.
      
      Differential Revision: https://phab.mercurial-scm.org/D9298
      50c5ee3bdf9a
    • Pierre-Yves David's avatar
      copies: introduce a basic Rust function for `combine_changeset_copies` · 595979dc924e
      Pierre-Yves David authored
      This new function mirror the python code.  This first implementation does a lot
      of data copies and is therefore quite slow. However my goal here is to create a
      simple "frame" from where to start adding optimization.
      
      This patch focus on the `hg-core` part of this work. Coming patches will do the
      necessary `hg-cpython` work  to be able to use this from Python.
      
      Differential Revision: https://phab.mercurial-scm.org/D9297
      595979dc924e
  19. Nov 25, 2020
  20. Nov 24, 2020
  21. Nov 26, 2020
  22. Nov 24, 2020
  23. Nov 19, 2020
  24. Nov 16, 2020
  25. Nov 10, 2020
  26. Nov 03, 2020
  27. Oct 20, 2020
  28. Sep 28, 2020
  29. Oct 29, 2020
  30. Oct 09, 2020
  31. Oct 22, 2020
    • Gregory Szorc's avatar
      contrib: split Windows requirements into multiple files · d270b9b797a7
      Gregory Szorc authored
      Package support for Python 2 has diverged significantly. It is no
      longer trivial to maintain a single requirements file that supports
      both Python 2 and 3 because the set of packages and versions varies
      wildly.
      
      This commit split up the Windows requirements files so we have
      variants for Python 2 and 3. As part of this, I also renamed the
      files to have what I believe to be more reasonable naming ("win32"
      felt like a weird identifier to me).
      
      We can see that some package versions decreated on 2.7. This is
      because the old pinned versions weren't compatible with Python 2.
      d270b9b797a7
  32. Oct 19, 2020
  33. Oct 09, 2020
  34. Oct 08, 2020
  35. Oct 05, 2020
    • Gregory Szorc's avatar
      pyoxidizer: produce working Python 3 Windows installers (issue6366) · 57b5452a55d5
      Gregory Szorc authored
      While we've had code to produce Python 3 Windows installers with
      PyOxidizer, we haven't been advertising them on the web site due to
      a bug in making TLS connections and issues around resource handling.
      
      This commit upgrades our PyOxidizer install and configuration to
      use a recent Git commit of PyOxidizer. This new version of PyOxidizer
      contains a *ton* of changes, improvements, and bug fixes. Notably,
      Windows shared distributions now mostly "just work" and the TLS bug
      and random problems with Python extension modules in the standard
      library go away. And Python has been upgraded from 3.7 to 3.8.6.
      
      The price we pay for this upgrade is a ton of backwards incompatible
      changes to Starlark.
      
      I applied this commit (the overall series actually) on stable to
      produce Windows installers for Mercurial 5.5.2, which I published
      shortly before submitting this commit for review.
      
      In order to get the stable branch working, I decided to take a
      less aggressive approach to Python resource management. Previously,
      we were attempting to load all Python modules from memory and were
      performing some hacks to copy Mercurial's non-module resources
      into additional directories in Starlark. This commit implements
      a resource callback function in Starlark (a new feature since
      PyOxidizer 0.7) to dynamically assign standard library resources
      to in-memory loading and all other resources to filesystem loading.
      This means that Mercurial's files and all the other packages we ship
      in the Windows installers (e.g. certifi and pygments) are loaded
      from the filesystem instead of from memory. This avoids issues
      due to lack of __file__ and enables us to ship a working Python
      3 installer on Windows.
      
      The end state of the install layout after this patch is not
      ideal for @: we still copy resource files like templates and
      help text to directories next to the hg.exe executable. There
      is code in @ to use importlib.resources to load these files and
      we could likely remove these copies once this lands on @. But for
      now, the install layout mimics what we've shipped for seemingly
      forever and is backwards compatible. It allows us to achieve the
      milestone of working Python 3 Windows installers and gets us a
      giant step closer to deleting Python 2.
      
      Differential Revision: https://phab.mercurial-scm.org/D9148
      57b5452a55d5
  36. Oct 01, 2020
Loading