From: Shuqi Liang <cheskaqiqi@gmail.com>
To: git@vger.kernel.org
Cc: Shuqi Liang <cheskaqiqi@gmail.com>,
vdye@github.com, gitster@pobox.com, derrickstolee@github.com
Subject: [PATCH v4] write-tree: integrate with sparse index
Date: Thu, 20 Apr 2023 20:41:08 -0400 [thread overview]
Message-ID: <20230421004108.32554-1-cheskaqiqi@gmail.com> (raw)
In-Reply-To: <20230419072148.4297-1-cheskaqiqi@gmail.com>
Update 'git write-tree' to allow using the sparse-index in memory
without expanding to a full one.
The recursive algorithm for update_one() was already updated in 2de37c5
(cache-tree: integrate with sparse directory entries, 2021-03-03) to
handle sparse directory entries in the index. Hence we can just set the
requires-full-index to false for "write-tree".
The `p2000` tests demonstrate a ~96% execution time reduction for 'git
write-tree' using a sparse index:
Test before after
-----------------------------------------------------------------
2000.78: git write-tree (full-v3) 0.34 0.33 -2.9%
2000.79: git write-tree (full-v4) 0.32 0.30 -6.3%
2000.80: git write-tree (sparse-v3) 0.47 0.02 -95.8%
2000.81: git write-tree (sparse-v4) 0.45 0.02 -95.6%
Signed-off-by: Shuqi Liang <cheskaqiqi@gmail.com>
---
* Modified the code to ensure prepare_repo_settings() is called only
when inside a repository.
* Change 'write-tree on all' to just 'write-tree'.
* Have a baseline 'test_all_match git write-tree' before making any
changes to the index.
* Add 'git status --porcelain=v2'.
* Ensuring that SKIP_WORKTREE files weren't materialized on disk by
using "test_path_is_missing".
* Use 'test_all_match' on the 'git update-index'.
builtin/write-tree.c | 9 ++++++---
t/t1092-sparse-checkout-compatibility.sh | 20 +++++++++++++++-----
2 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/builtin/write-tree.c b/builtin/write-tree.c
index 32e302a813..a9d5c20cde 100644
--- a/builtin/write-tree.c
+++ b/builtin/write-tree.c
@@ -38,12 +38,15 @@ int cmd_write_tree(int argc, const char **argv, const char *cmd_prefix)
};
git_config(git_default_config, NULL);
+
+ if (the_repository->gitdir) {
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+ }
+
argc = parse_options(argc, argv, cmd_prefix, write_tree_options,
write_tree_usage, 0);
- prepare_repo_settings(the_repository);
- the_repository->settings.command_requires_full_index = 0;
-
ret = write_index_as_tree(&oid, &the_index, get_index_file(), flags,
tree_prefix);
switch (ret) {
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
index 9bbc0d646b..d3eb31326b 100755
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -2055,22 +2055,32 @@ test_expect_success 'grep sparse directory within submodules' '
test_cmp actual expect
'
-test_expect_success 'write-tree on all' '
+test_expect_success 'write-tree' '
init_repos &&
+ test_all_match git write-tree &&
+
write_script edit-contents <<-\EOF &&
echo text >>"$1"
EOF
+ # make a change inside the sparse cone
run_on_all ../edit-contents deep/a &&
- run_on_all git update-index deep/a &&
+ test_all_match git update-index deep/a &&
test_all_match git write-tree &&
+ test_all_match git status --porcelain=v2 &&
+ # make a change outside the sparse cone
run_on_all mkdir -p folder1 &&
run_on_all cp a folder1/a &&
run_on_all ../edit-contents folder1/a &&
- run_on_all git update-index folder1/a &&
- test_all_match git write-tree
+ test_all_match git update-index folder1/a &&
+ test_all_match git write-tree &&
+ test_all_match git status --porcelain=v2 &&
+
+ # check that SKIP_WORKTREE files are not materialized
+ test_path_is_missing sparse-checkout/folder2/a &&
+ test_path_is_missing sparse-index/folder2/a
'
test_expect_success 'sparse-index is not expanded: write-tree' '
@@ -2080,7 +2090,7 @@ test_expect_success 'sparse-index is not expanded: write-tree' '
echo "test1" >>sparse-index/a &&
git -C sparse-index update-index a &&
- ensure_not_expanded write-tree
+ ensure_not_expanded write-tree
'
test_done
--
2.39.0
next prev parent reply other threads:[~2023-04-21 0:41 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-02 0:01 [RFC][PATCH v1] write-tree: integrate with sparse index Shuqi Liang
2023-04-03 20:58 ` Junio C Hamano
2023-04-03 22:16 ` Shuqi Liang
2023-04-03 22:54 ` Junio C Hamano
2023-04-04 0:35 ` [PATCH v2] " Shuqi Liang
2023-04-05 17:31 ` Victoria Dye
2023-04-05 19:48 ` Junio C Hamano
2023-04-19 7:21 ` [PATCH v3] " Shuqi Liang
2023-04-19 15:47 ` Junio C Hamano
2023-04-20 5:24 ` Shuqi Liang
2023-04-20 15:55 ` Junio C Hamano
2023-04-21 0:41 ` Shuqi Liang [this message]
2023-04-21 21:42 ` [PATCH v4] " Victoria Dye
2023-04-24 15:14 ` Junio C Hamano
2023-04-23 7:12 ` [PATCH v5] write-tree: optimize sparse integration Shuqi Liang
2023-04-24 16:00 ` Junio C Hamano
2023-05-08 20:05 ` [PATCH v6] " Shuqi Liang
2023-05-08 20:21 ` Shuqi Liang
2023-05-08 21:09 ` Junio C Hamano
2023-05-08 21:27 ` Shuqi Liang
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=20230421004108.32554-1-cheskaqiqi@gmail.com \
--to=cheskaqiqi@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).