On 8/3/2018 11:58 AM, Duy Nguyen wrote:
On Thu, Aug 02, 2018 at 02:02:00PM -0400, Ben Peart wrote:
But if you still want to push it further, this is something I have in
mind. It probably has bugs, but at least preliminary test shows me
that it could skip 99% work inside unpack_trees() and not need to
write the index.
The main check to determine "checkout -b" is basically the new
oidcmp() in merge_working_tree(). Not sure if I miss any condition in
that check, I didn't look very closely at checkout code.
Thanks Duy. I think this is an interesting idea to pursue but... when I
tried running this patch on a virtualized repo it started triggering
many object downloads. After taking a quick look, it appears that
CE_UPDATE is set on every cache entry so check_updates() ends up calling
checkout_entry() which writes out every file to the working tree - even
those supposedly skipped by the skip-wortree bit. Oops.
Not too surprising (you did say it probably has bugs :)) but it means I
can't trivially get performance data on how much this will help. It
also fails a lot of tests (see below).
It experience does highlight the additional risk of this model of
changing the underlying functions (vs the high level optimization of my
original patch). In addition, the new special cases in those
lower-level functions do add additional complexity and fragility to the
codebase. So, like most things, to me it isn't a clear better/worse
decision - it's just different. While I like the idea of general
optimizations that could apply more broadly to other commands; I do
worry about the additional complexity, amount of code churn, and
associated risk with the change.
When I have cycles, I'll take a look at how to fix this bug and get some
performance data. I just wanted to give you a heads up that I'm not
ignoring your patch, just that it is going to take additional time and
effort before I can properly evaluate how much impact it will have.
Test Summary Report
-------------------
./t1011-read-tree-sparse-checkout.sh (Wstat: 256 Tests: 21
Failed: 1)
Failed test: 20
Non-zero exit status: 1
./t1400-update-ref.sh (Wstat: 256 Tests:
170 Failed: 73)
Failed tests: 40, 42-45, 55-59, 70, 72, 82, 85, 87-88
90-100, 103-110, 113-119, 127, 129-130
132-133, 136-137, 140-147, 150-157, 160-166
170
Non-zero exit status: 1
./t2011-checkout-invalid-head.sh (Wstat: 256 Tests: 10
Failed: 5)
Failed tests: 3, 6-7, 9-10
Non-zero exit status: 1
./t2015-checkout-unborn.sh (Wstat: 256 Tests: 6
Failed: 3)
Failed tests: 2-4
Non-zero exit status: 1
./t2017-checkout-orphan.sh (Wstat: 256 Tests: 13
Failed: 7)
Failed tests: 7-13
Non-zero exit status: 1
./t3033-merge-toplevel.sh (Wstat: 256 Tests: 13
Failed: 11)
Failed tests: 3-13
Non-zero exit status: 1
./t3200-branch.sh (Wstat: 256 Tests:
139 Failed: 2)
Failed tests: 137-138
Non-zero exit status: 1
./t5616-partial-clone.sh (Wstat: 256 Tests: 13
Failed: 1)
Failed test: 4
Non-zero exit status: 1
./t5516-fetch-push.sh (Wstat: 256 Tests: 90
Failed: 1)
Failed test: 34
Non-zero exit status: 1
./t6300-for-each-ref.sh (Wstat: 256 Tests:
205 Failed: 9)
Failed tests: 189-196, 199
Non-zero exit status: 1
./t7114-reset-sparse-checkout.sh (Wstat: 256 Tests: 3
Failed: 2)
Failed tests: 2-3
Non-zero exit status: 1
./t7063-status-untracked-cache.sh (Wstat: 256 Tests: 50
Failed: 1)
Failed test: 23
Non-zero exit status: 1
./t7201-co.sh (Wstat: 256 Tests: 38
Failed: 33)
Failed tests: 4, 6-27, 29-38
Non-zero exit status: 1
./t7409-submodule-detached-work-tree.sh (Wstat: 256 Tests: 2
Failed: 1)
Failed test: 1
Non-zero exit status: 1
./t9350-fast-export.sh (Wstat: 256 Tests: 37
Failed: 1)
Failed test: 12
Non-zero exit status: 1
./t9903-bash-prompt.sh (Wstat: 256 Tests: 65
Failed: 52)
Failed tests: 4, 6-10, 14-34, 36, 39-51, 53-62, 65
Non-zero exit status: 1
Files=834, Tests=19658, 2081 wallclock secs (10.42 usr 15.09 sys +
1082.56 cusr 3530.46 csys = 4638.53 CPU)
Result: FAIL
-- 8< --
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 28627650cd..912e565acc 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -478,6 +478,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
{
int ret;
struct lock_file lock_file = LOCK_INIT;
+ int skip_cache_tree_update = 0;
hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
if (read_cache_preload(NULL) < 0)
@@ -493,6 +494,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
struct tree_desc trees[2];
struct tree *tree;
struct unpack_trees_options topts;
+ int nr_trees;
memset(&topts, 0, sizeof(topts));
topts.head_idx = -1;
@@ -514,20 +516,45 @@ static int merge_working_tree(const struct checkout_opts *opts,
topts.merge = 1;
topts.gently = opts->merge && old_branch_info->commit;
topts.verbose_update = opts->show_progress;
- topts.fn = twoway_merge;
+ /*
+ * We repair cache-tree explicitly in this function,
+ * no point in doing it again inside unpack_trees()
+ */
+ topts.skip_cache_tree_update = 1;
if (opts->overwrite_ignore) {
topts.dir = xcalloc(1, sizeof(*topts.dir));
topts.dir->flags |= DIR_SHOW_IGNORED;
setup_standard_excludes(topts.dir);
}
- tree = parse_tree_indirect(old_branch_info->commit ?
- &old_branch_info->commit->object.oid :
- the_hash_algo->empty_tree);
- init_tree_desc(&trees[0], tree->buffer, tree->size);
- tree = parse_tree_indirect(&new_branch_info->commit->object.oid);
- init_tree_desc(&trees[1], tree->buffer, tree->size);
-
- ret = unpack_trees(2, trees, &topts);
+ if (!oidcmp(&old_branch_info->commit->object.oid,
+ &new_branch_info->commit->object.oid)) {
+ /*
+ * Skip 2-way merge because we know the end
+ * result would be the same anyway (to double
+ * check).
+ */
+ topts.fn = noop_merge;
+ nr_trees = 0;
+ /*
+ * Repairing cache-tree is an optional optimization
+ * and could be safely skipped. Maybe have some
+ * heuristics based on the_index->cache_nr to
+ * determine if updating cache-tree could be too
+ * costly (including index writing cost) and skip it
+ * instead.
+ */
+ skip_cache_tree_update = 1;
+ } else {
+ topts.fn = twoway_merge;
+ tree = parse_tree_indirect(old_branch_info->commit ?
+ &old_branch_info->commit->object.oid :
+ the_hash_algo->empty_tree);
+ init_tree_desc(&trees[0], tree->buffer, tree->size);
+ tree = parse_tree_indirect(&new_branch_info->commit->object.oid);
+ init_tree_desc(&trees[1], tree->buffer, tree->size);
+ nr_trees = 2;
+ }
+ ret = unpack_trees(nr_trees, trees, &topts);
clear_unpack_trees_porcelain(&topts);
if (ret == -1) {
/*
@@ -597,13 +624,15 @@ static int merge_working_tree(const struct checkout_opts *opts,
}
}
- if (!active_cache_tree)
- active_cache_tree = cache_tree();
+ if (!skip_cache_tree_update) {
+ if (!active_cache_tree)
+ active_cache_tree = cache_tree();
- if (!cache_tree_fully_valid(active_cache_tree))
- cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR);
+ if (!cache_tree_fully_valid(active_cache_tree))
+ cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR);
+ }
- if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
+ if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK | SKIP_IF_UNCHANGED))
die(_("unable to write new index file"));
if (!opts->force && !opts->quiet)
diff --git a/unpack-trees.c b/unpack-trees.c
index cd0680f11e..007d6662f2 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1275,6 +1275,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
int i, ret;
static struct cache_entry *dfc;
struct exclude_list el;
+ int result_is_actually_src = 0;
if (len > MAX_UNPACK_TREES)
die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
@@ -1353,6 +1354,10 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
if (traverse_trees(len, t, &info) < 0)
goto return_failed;
+ } else if (o->fn == noop_merge) {
+ o->result = *o->src_index;
+ o->cache_bottom = o->src_index->cache_nr;
+ result_is_actually_src = 1;
}
/* Any left-over entries in the index? */
@@ -1426,7 +1431,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
ret = check_updates(o) ? (-2) : 0;
if (o->dst_index) {
- if (!ret) {
+ if (!ret &&!o->skip_cache_tree_update) {
if (!o->result.cache_tree)
o->result.cache_tree = cache_tree();
if (!cache_tree_fully_valid(o->result.cache_tree))
@@ -1435,7 +1440,10 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
WRITE_TREE_REPAIR);
}
move_index_extensions(&o->result, o->src_index);
- discard_index(o->dst_index);
+ if (result_is_actually_src && o->dst_index == o->src_index)
+ ; /* no discarding */
+ else
+ discard_index(o->dst_index);
*o->dst_index = o->result;
} else {
discard_index(&o->result);
@@ -2193,3 +2201,9 @@ int oneway_merge(const struct cache_entry * const *src,
}
return merged_entry(a, old, o);
}
+
+int noop_merge(const struct cache_entry * const *src,
+ struct unpack_trees_options *o)
+{
+ BUG("This is basically a flag and not supposed to be called");
+}
diff --git a/unpack-trees.h b/unpack-trees.h
index c2b434c606..3e5bce19a1 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -52,6 +52,7 @@ struct unpack_trees_options {
diff_index_cached,
debug_unpack,
skip_sparse_checkout,
+ skip_cache_tree_update,
gently,
exiting_early,
show_all_errors,
@@ -96,5 +97,7 @@ int bind_merge(const struct cache_entry * const *src,
struct unpack_trees_options *o);
int oneway_merge(const struct cache_entry * const *src,
struct unpack_trees_options *o);
+int noop_merge(const struct cache_entry * const *src,
+ struct unpack_trees_options *o);
#endif
-- 8< --
--
Duy
