| Message ID | pull.852.git.1611851095.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Speed up remove_redundant() | expand |
"Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com> writes: > Michael Haggerty pointed out that git merge-base --independent is quite slow > when many commits are provided in the input. This boils down to some > quadratic behavior in remove_redundant() because it calls > paint_down_to_common() in a loop. > > This series avoids that by using a single commit walk, pushing a flag that > means "this commit is reachable from a parent of a commit in the list." At > the end of the walk, the input commits without that flag are independent. Yay. I've been quite unhappy with the loop ever since I wrote it back in 2012. Thanks for cleaning it up.
Michael Haggerty pointed out that git merge-base --independent is quite slow when many commits are provided in the input. This boils down to some quadratic behavior in remove_redundant() because it calls paint_down_to_common() in a loop. This series avoids that by using a single commit walk, pushing a flag that means "this commit is reachable from a parent of a commit in the list." At the end of the walk, the input commits without that flag are independent. There is an extra performance enhancement using the first-parent history as a heuristic. This helps only when there is a single independent result, as we can short circuit the walk when all other inputs are found to be reachable from the top one. My tests were on the Linux kernel repository, testing this command: git merge-base --independent $(git for-each-ref refs/tags --format="%(refname)") Before: 16.4s After Patch 1: 1.1s After Patch 2: 0.1s This does not change the correctness of the function. It is tested carefully in t6600-test-reach.c, among existing merge-base tests. Thanks, -Stolee Derrick Stolee (3): commit-reach: use one walk in remove_redundant() commit-reach: move compare_commits_by_gen commit-reach: use heuristic in remove_redundant() commit-reach.c | 178 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 120 insertions(+), 58 deletions(-) base-commit: 5a3b130cad0d5c770f766e3af6d32b41766374c0 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-852%2Fderrickstolee%2Fmerge-independent-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-852/derrickstolee/merge-independent-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/852