@matheusbsbs / matheus-bagliano / commits / 1a65b41b38

write-tree: integrate with sparse index

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> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Shuqi Liang committed Apr 3, 2023 at 20:35 UTC 1a65b41b38a669f3d6e54edec38e6b8506ef6ee1

3 files changed +32

builtin/write-tree.c

@@ -38,6 +38,9 @@ int cmd_write_tree(int argc, const char **argv, const char *cmd_prefix)

38 argc = parse_options(argc, argv, cmd_prefix, write_tree_options,

39 write_tree_usage, 0);

41 + prepare_repo_settings(the_repository);

42 + the_repository->settings.command_requires_full_index = 0;

43 +

44 ret = write_cache_as_tree(&oid, flags, tree_prefix);

45 switch (ret) {

46 case 0:

t/perf/p2000-sparse-operations.sh

@@ -125,5 +125,6 @@ test_perf_on_all git checkout-index -f --all

125 test_perf_on_all git update-index --add --remove $SPARSE_CONE/a

126 test_perf_on_all "git rm -f $SPARSE_CONE/a && git checkout HEAD -- $SPARSE_CONE/a"

127 test_perf_on_all git grep --cached --sparse bogus -- "f2/f1/f1/*"

128 +test_perf_on_all git write-tree

129

130 test_done

t/t1092-sparse-checkout-compatibility.sh

+28

@@ -2055,4 +2055,32 @@ test_expect_success 'grep sparse directory within submodules' '

2055 test_cmp actual expect

2056 '

2057

2058 +test_expect_success 'write-tree on all' '

2059 + init_repos &&

2060 +

2061 + write_script edit-contents <<-\EOF &&

2062 + echo text >>"$1"

2063 + EOF

2064 +

2065 + run_on_all ../edit-contents deep/a &&

2066 + run_on_all git update-index deep/a &&

2067 + test_all_match git write-tree &&

2068 +

2069 + run_on_all mkdir -p folder1 &&

2070 + run_on_all cp a folder1/a &&

2071 + run_on_all ../edit-contents folder1/a &&

2072 + run_on_all git update-index folder1/a &&

2073 + test_all_match git write-tree

2074 +'

2075 +

2076 +test_expect_success 'sparse-index is not expanded: write-tree' '

2077 + init_repos &&

2078 +

2079 + ensure_not_expanded write-tree &&

2080 +

2081 + echo "test1" >>sparse-index/a &&

2082 + git -C sparse-index update-index a &&

2083 + ensure_not_expanded write-tree

2084 +'

2085 +

2086 test_done