From: "Victoria Dye via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: stolee@gmail.com, gitster@pobox.com,
Victoria Dye <vdye@github.com>, Victoria Dye <vdye@github.com>
Subject: [PATCH v2 2/3] sparse-index: add ensure_correct_sparsity function
Date: Thu, 21 Oct 2021 20:48:25 +0000 [thread overview]
Message-ID: <0b6e6633bb2b9f21a79625ace6db9509c48bd819.1634849307.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1059.v2.git.1634849307.gitgitgadget@gmail.com>
From: Victoria Dye <vdye@github.com>
The purpose of the `ensure_correct_sparsity` function is to provide a means
of aligning the in-core index with the sparsity required by the repository
settings and other properties of the index. The function will first attempt
to convert the index to sparse, now with a "SPARSE_INDEX_VERIFY_ALLOWED"
flag that forces the function to return a nonzero value if repository
settings do not allow use of a sparse index. If a nonzero value is returned,
the index is expanded to full with `ensure_full_index`.
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Victoria Dye <vdye@github.com>
---
sparse-index.c | 42 +++++++++++++++++++++++++++++++++++++++---
sparse-index.h | 2 ++
2 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/sparse-index.c b/sparse-index.c
index 7b7ff79e044..4273453e078 100644
--- a/sparse-index.c
+++ b/sparse-index.c
@@ -122,11 +122,10 @@ static int index_has_unmerged_entries(struct index_state *istate)
return 0;
}
-int convert_to_sparse(struct index_state *istate, int flags)
+static int can_convert_to_sparse(struct index_state *istate, int flags)
{
int test_env;
- if (istate->sparse_index || !istate->cache_nr ||
- !core_apply_sparse_checkout || !core_sparse_checkout_cone)
+ if (!core_apply_sparse_checkout || !core_sparse_checkout_cone)
return 0;
if (!istate->repo)
@@ -187,6 +186,30 @@ int convert_to_sparse(struct index_state *istate, int flags)
if (cache_tree_update(istate, WRITE_TREE_MISSING_OK))
return 0;
+ return 1;
+}
+
+int convert_to_sparse(struct index_state *istate, int flags)
+{
+ int verify = flags & SPARSE_INDEX_VERIFY_ALLOWED;
+
+ /*
+ * If validating with strict checks against whether the sparse index is
+ * allowed, we want to check `can_convert_to_sparse` *before* exiting
+ * early due to an already sparse or empty index.
+ *
+ * If not performing strict validation, the order is reversed to avoid
+ * the more expensive checks in `can_convert_to_sparse` whenver possible.
+ */
+ if (verify) {
+ if (!can_convert_to_sparse(istate, flags))
+ return -1;
+ else if (istate->sparse_index || !istate->cache_nr)
+ return 0;
+ } else if (istate->sparse_index || !istate->cache_nr ||
+ !can_convert_to_sparse(istate, flags))
+ return 0;
+
remove_fsmonitor(istate);
trace2_region_enter("index", "convert_to_sparse", istate->repo);
@@ -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.
+ */
+ if (convert_to_sparse(istate, SPARSE_INDEX_VERIFY_ALLOWED))
+ ensure_full_index(istate);
+}
+
/*
* This static global helps avoid infinite recursion between
* expand_to_path() and index_file_exists().
diff --git a/sparse-index.h b/sparse-index.h
index 9f3d7bc7faf..b61754f1f76 100644
--- a/sparse-index.h
+++ b/sparse-index.h
@@ -3,7 +3,9 @@
struct index_state;
#define SPARSE_INDEX_MEMORY_ONLY (1 << 0)
+#define SPARSE_INDEX_VERIFY_ALLOWED (1 << 1)
int convert_to_sparse(struct index_state *istate, int flags);
+void ensure_correct_sparsity(struct index_state *istate);
/*
* Some places in the codebase expect to search for a specific path.
--
gitgitgadget
next prev parent reply other threads:[~2021-10-21 20:48 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 ` Victoria Dye via GitGitGadget [this message]
2021-10-21 22:20 ` [PATCH v2 2/3] sparse-index: add ensure_correct_sparsity function Junio C Hamano
2021-10-27 17:21 ` Victoria Dye
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=0b6e6633bb2b9f21a79625ace6db9509c48bd819.1634849307.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=stolee@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.
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).