From: Steven Grimm Date: Tue, 5 Aug 2008 20:08:41 +0000 (-0700) Subject: Optimize sha1_object_info for loose objects, not concurrent repacks X-Git-Tag: v1.6.0-rc2~6 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ddd63e64e4ac7e455dff3e807bf6a6977bb61456;p=git.git Optimize sha1_object_info for loose objects, not concurrent repacks When dealing with a repository with lots of loose objects, sha1_object_info would rescan the packs directory every time an unpacked object was referenced before finally giving up and looking for the loose object. This caused a lot of extra unnecessary system calls during git pack-objects; the code was rereading the entire pack directory once for each loose object file. This patch looks for a loose object before falling back to rescanning the pack directory, rather than the other way around. Signed-off-by: Steven Grimm Acked-by: Shawn O. Pearce Signed-off-by: Junio C Hamano --- diff --git a/sha1_file.c b/sha1_file.c index e281c14f0..32e4664b1 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1929,11 +1929,18 @@ static int sha1_loose_object_info(const unsigned char *sha1, unsigned long *size int sha1_object_info(const unsigned char *sha1, unsigned long *sizep) { struct pack_entry e; + int status; if (!find_pack_entry(sha1, &e, NULL)) { + /* Most likely it's a loose object. */ + status = sha1_loose_object_info(sha1, sizep); + if (status >= 0) + return status; + + /* Not a loose object; someone else may have just packed it. */ reprepare_packed_git(); if (!find_pack_entry(sha1, &e, NULL)) - return sha1_loose_object_info(sha1, sizep); + return status; } return packed_object_info(e.p, e.offset, sizep); }