diff options
| author |  Jeff King <peff@peff.net> | 2015-06-09 13:24:37 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-06-09 12:26:35 -0700 |
| commit | 0eeb077be7d526635995e17808927c94c70be665 (patch) | |
| tree | aa0c85228872134e3497235bc1a86009a6f20dcc /builtin | |
| parent | Merge branch 'maint-1.9' into maint-2.0 (diff) | |
| download | tgif-0eeb077be7d526635995e17808927c94c70be665.tar.xz | |
index-pack: avoid excessive re-reading of pack directory
Since 45e8a74 (has_sha1_file: re-check pack directory before
giving up, 2013-08-30), we spend extra effort for
has_sha1_file to give the right answer when somebody else is
repacking. Usually this effort does not matter, because
after finding that the object does not exist, the next step
is usually to die().
However, some code paths make a large number of
has_sha1_file checks which are _not_ expected to return 1.
The collision test in index-pack.c is such a case. On a
local system, this can cause a performance slowdown of
around 5%. But on a system with high-latency system calls
(like NFS), it can be much worse.
This patch introduces a "quick" flag to has_sha1_file which
callers can use when they would prefer high performance at
the cost of false negatives during repacks. There may be
other code paths that can use this, but the index-pack one
is the most obviously critical, so we'll start with
switching that one.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/index-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 9ca0203922..96b110445d 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -721,7 +721,7 @@ static void sha1_object(const void *data, struct object_entry *obj_entry, assert(data || obj_entry); read_lock(); - collision_test_needed = has_sha1_file(sha1); + collision_test_needed = has_sha1_file_with_flags(sha1, HAS_SHA1_QUICK); read_unlock(); if (collision_test_needed && !data) { |