From: Victoria Dye <vdye@github.com>
To: Junio C Hamano <gitster@pobox.com>,
Victoria Dye via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, stolee@gmail.com
Subject: Re: [PATCH v2 2/3] sparse-index: add ensure_correct_sparsity function
Date: Wed, 27 Oct 2021 13:21:12 -0400 [thread overview]
Message-ID: <a9ce8fa1-287e-56ef-4096-1492cceff3fc@github.com> (raw)
In-Reply-To: <xmqqy26mhvel.fsf@gitster.g>
Junio C Hamano wrote:
> "Victoria Dye via GitGitGadget" <gitgitgadget@gmail.com> writes:
> >> @@ -313,6 +336,19 @@ void ensure_full_index(struct index_state *istate)
>> trace2_region_leave("index", "ensure_full_index", istate->repo);
>> }
>>
>> +void ensure_correct_sparsity(struct index_state *istate)
>> +{
>> + /*
>> + * First check whether the index can be converted to sparse by attempting
>> + * to convert it with the SPARSE_INDEX_VERIFY_ALLOWED flag. If the
>> + * SPARSE_INDEX_VERIFY_ALLOWED checks indicate that the index cannot
>> + * be converted because repository settings and/or index properties
>> + * do not allow it, expand the index to full.
>> + */
>
> The logic may be OK, but the need to give this long description is a
> sign that the meaning of the value returned from the function is not
> clear from the name of the function.
>
>> + if (convert_to_sparse(istate, SPARSE_INDEX_VERIFY_ALLOWED))
>> + ensure_full_index(istate);
>
> It might make it more straight-forward to
>
> (1) drop the "if (verify)" part in convert_to_sparse(), which would
> mean that for all callers convert_to_sparse() will retain the
> same behaviour as before;
>
> (2) make a call to can_convert_to_sparse() here, and if that
> returns true, make a call to ensure_full_index(); this would
> behave identically to what this patch does when can_convert is
> false; and
>
> (3) correct the can_convert_to_sparse() function to not blow away
> the cache_tree unconditionally and recompute, so that calling
> it twice in a row will not be costly.
>
Agreed, this approach is a lot easier to follow. I went a bit overboard
trying to handle *all* possible cases where `convert_to_sparse` returns
before converting, but the primary goal of this series is updating the
behavior when config settings change. I'll include the suggested
restructuring in my next re-roll. Thanks!
next prev parent reply other threads:[~2021-10-27 17:21 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-15 19:54 [PATCH 0/2] sparse-index: expand/collapse based on 'index.sparse' Victoria Dye via GitGitGadget
2021-10-15 19:54 ` [PATCH 1/2] test-read-cache.c: prepare_repo_settings after config init Victoria Dye via GitGitGadget
2021-10-15 19:54 ` [PATCH 2/2] sparse-index: update index read to consider index.sparse config Victoria Dye via GitGitGadget
2021-10-15 21:53 ` Junio C Hamano
2021-10-17 1:21 ` Derrick Stolee
2021-10-17 5:58 ` Junio C Hamano
2021-10-17 19:33 ` Derrick Stolee
2021-10-18 1:15 ` Junio C Hamano
2021-10-18 13:25 ` Derrick Stolee
2021-10-18 14:14 ` Victoria Dye
2021-10-21 13:26 ` Derrick Stolee
2021-10-18 16:09 ` Junio C Hamano
2021-10-21 20:48 ` [PATCH v2 0/3] sparse-index: expand/collapse based on 'index.sparse' Victoria Dye via GitGitGadget
2021-10-21 20:48 ` [PATCH v2 1/3] test-read-cache.c: prepare_repo_settings after config init Victoria Dye via GitGitGadget
2021-10-21 20:48 ` [PATCH v2 2/3] sparse-index: add ensure_correct_sparsity function Victoria Dye via GitGitGadget
2021-10-21 22:20 ` Junio C Hamano
2021-10-27 17:21 ` Victoria Dye [this message]
2021-10-21 20:48 ` [PATCH v2 3/3] sparse-index: update do_read_index to ensure correct sparsity Victoria Dye via GitGitGadget
2021-10-27 18:20 ` [PATCH v3 0/3] sparse-index: expand/collapse based on 'index.sparse' Victoria Dye via GitGitGadget
2021-10-27 18:20 ` [PATCH v3 1/3] test-read-cache.c: prepare_repo_settings after config init Victoria Dye via GitGitGadget
2021-10-27 18:20 ` [PATCH v3 2/3] sparse-index: add ensure_correct_sparsity function Victoria Dye via GitGitGadget
2021-10-27 20:07 ` Derrick Stolee
2021-10-27 21:32 ` Junio C Hamano
2021-10-28 1:24 ` Derrick Stolee
2021-10-29 13:43 ` Victoria Dye
2021-10-27 18:20 ` [PATCH v3 3/3] sparse-index: update do_read_index to ensure correct sparsity Victoria Dye via GitGitGadget
2021-10-27 20:08 ` [PATCH v3 0/3] sparse-index: expand/collapse based on 'index.sparse' Derrick Stolee
2021-10-29 13:51 ` [PATCH v4 0/4] " Victoria Dye via GitGitGadget
2021-10-29 13:51 ` [PATCH v4 1/4] test-read-cache.c: prepare_repo_settings after config init Victoria Dye via GitGitGadget
2021-10-29 13:51 ` [PATCH v4 2/4] sparse-index: avoid unnecessary cache tree clearing Victoria Dye via GitGitGadget
2021-10-29 18:45 ` Junio C Hamano
2021-10-29 19:00 ` Derrick Stolee
2021-10-29 20:01 ` Junio C Hamano
2021-10-29 13:51 ` [PATCH v4 3/4] sparse-index: add ensure_correct_sparsity function Victoria Dye via GitGitGadget
2021-10-29 13:51 ` [PATCH v4 4/4] sparse-index: update do_read_index to ensure correct sparsity Victoria Dye via GitGitGadget
2021-11-22 17:36 ` Elijah Newren
2021-11-22 18:59 ` Victoria Dye
2021-11-22 17:40 ` [PATCH v4 0/4] sparse-index: expand/collapse based on 'index.sparse' Elijah Newren
2021-11-23 0:20 ` [PATCH v5 " Victoria Dye via GitGitGadget
2021-11-23 0:20 ` [PATCH v5 1/4] test-read-cache.c: prepare_repo_settings after config init Victoria Dye via GitGitGadget
2021-11-23 0:20 ` [PATCH v5 2/4] sparse-index: avoid unnecessary cache tree clearing Victoria Dye via GitGitGadget
2021-11-23 0:20 ` [PATCH v5 3/4] sparse-index: add ensure_correct_sparsity function Victoria Dye via GitGitGadget
2021-11-23 0:20 ` [PATCH v5 4/4] sparse-index: update do_read_index to ensure correct sparsity Victoria Dye via GitGitGadget
2021-11-23 17:21 ` [PATCH v5 0/4] sparse-index: expand/collapse based on 'index.sparse' Elijah Newren
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a9ce8fa1-287e-56ef-4096-1492cceff3fc@github.com \
--to=vdye@github.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=stolee@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).