From: Derrick Stolee <derrickstolee@github.com>
To: Victoria Dye via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: gitster@pobox.com, newren@gmail.com, Victoria Dye <vdye@github.com>
Subject: Re: [PATCH v2 0/3] Fix use of 'cache_bottom' in sparse index
Date: Mon, 21 Mar 2022 15:12:07 -0400 [thread overview]
Message-ID: <b4803b58-018b-fb02-717f-95e48d6f844a@github.com> (raw)
In-Reply-To: <pull.1179.v2.git.1647532536.gitgitgadget@gmail.com>
On 3/17/2022 11:55 AM, Victoria Dye via GitGitGadget wrote:
> To fix this, the 'cache_bottom' advancement is reinstated in
> 'mark_ce_used(...)', and instead it is disabled in 'unpack_callback(...)' if
> the tree in question is a sparse directory. This corrects both the
> non-"cache diff" cases and the 'unpack_index_entry(...)' cases while
> preventing the double-advancement 17a1bb570b originally intended to avoid
> (patch [2/3]).
Thank you for digging deep and finding the root cause here _and_ the
correct fix.
> Finally, now that the cache bottom is advanced properly, we can revert the
> "performance improvement" introduced in f2a454e0a5 (unpack-trees: improve
> performance of next_cache_entry, 2021-11-29) that mitigated performance
> issues arising in 'next_cache_entry(...)' from the non-advancing
> 'cache_bottom' (patch [3/3]). The performance results in
> 'p2000-sparse-operations.sh' showed expected variability around 0% change in
> execution time (+/= 0.04s, depending on the command), with example results
> for potentially-affected commands below.
>
> 'git reset' master this_series
> ------------------------------------------------------------------------
> full-v3 0.51(0.21+0.27) 0.50(0.21+0.25) -2.0%
> full-v4 0.51(0.22+0.27) 0.50(0.21+0.24) -2.0%
> sparse-v3 0.30(0.04+0.55) 0.28(0.04+0.50) -6.7%
> sparse-v4 0.31(0.04+0.51) 0.29(0.04+0.51) -6.5%
>
> 'git reset -- does-not-exist' master this_series
> ------------------------------------------------------------------------
> full-v3 0.54(0.23+0.27) 0.55(0.22+0.28) +1.9%
> full-v4 0.56(0.25+0.26) 0.54(0.24+0.26) -3.6%
> sparse-v3 0.31(0.04+0.54) 0.31(0.04+0.50) +0.0%
> sparse-v4 0.31(0.04+0.52) 0.31(0.04+0.50) +0.0%
>
> 'git diff --cached' master this_series
> -------------------------------------------------------------------------
> full-v3 0.09(0.04+0.04) 0.09(0.04+0.04) +0.0%
> full-v4 0.09(0.04+0.04) 0.09(0.04+0.04) +0.0%
> sparse-v3 0.05(0.01+0.02) 0.05(0.01+0.03) +0.0%
> sparse-v4 0.04(0.01+0.02) 0.04(0.01+0.02) +0.0%
I'm glad this also makes things simpler here. It's interesting that
it previously manifested only as a performance issue and not a
correctness issue.
I carefully read these patches and think they are ready to go.
Thanks,
-Stolee
prev parent reply other threads:[~2022-03-21 19:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-16 20:11 [PATCH 0/3] Fix use of 'cache_bottom' in sparse index Victoria Dye via GitGitGadget
2022-03-16 20:12 ` [PATCH 1/3] t1092: add sparse directory before cone in test repo Victoria Dye via GitGitGadget
2022-03-16 20:12 ` [PATCH 2/3] unpack-trees: increment cache_bottom for sparse directories Victoria Dye via GitGitGadget
2022-03-16 20:12 ` [PATCH 3/3] Revert "unpack-trees: improve performance of next_cache_entry" Victoria Dye via GitGitGadget
2022-03-16 20:21 ` [PATCH 0/3] Fix use of 'cache_bottom' in sparse index Junio C Hamano
2022-03-17 15:55 ` [PATCH v2 " Victoria Dye via GitGitGadget
2022-03-17 15:55 ` [PATCH v2 1/3] t1092: add sparse directory before cone in test repo Victoria Dye via GitGitGadget
2022-03-17 15:55 ` [PATCH v2 2/3] unpack-trees: increment cache_bottom for sparse directories Victoria Dye via GitGitGadget
2022-03-21 19:03 ` Derrick Stolee
2022-03-21 20:52 ` Junio C Hamano
2022-03-17 15:55 ` [PATCH v2 3/3] Revert "unpack-trees: improve performance of next_cache_entry" Victoria Dye via GitGitGadget
2022-03-21 19:12 ` Derrick Stolee [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b4803b58-018b-fb02-717f-95e48d6f844a@github.com \
--to=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=vdye@github.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).