diff options
author | Jeff King <peff@peff.net> | 2012-01-06 14:18:01 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-01-06 13:28:57 -0800 |
commit | 90108a2441fb57f69c3f25d072d1952b306b77ab (patch) | |
tree | f508601fdb59b6e01071a01996f61a56a34fc63a /upload-pack.c | |
parent | 926f1dd95486b596de1f6b8e108053a870da0e18 (diff) | |
download | git-90108a2441fb57f69c3f25d072d1952b306b77ab.tar.gz |
upload-pack: avoid parsing tag destinationsjk/parse-object-cached
When upload-pack advertises refs, it dereferences any tags
it sees, and shows the resulting sha1 to the client. It does
this by calling deref_tag. That function must load and parse
each tag object to find the sha1 of the tagged object.
However, it also ends up parsing the tagged object itself,
which is not strictly necessary for upload-pack's use.
Each tag produces two object loads (assuming it is not a
recursive tag), when it could get away with only a single
one. Dropping the second load halves the effort we spend.
The downside is that we are no longer verifying the
resulting object by loading it. In particular:
1. We never cross-check the "type" field given in the tag
object with the type of the pointed-to object. If the
tag says it points to a tag but doesn't, then we will
keep peeling and realize the error. If the tag says it
points to a non-tag but actually points to a tag, we
will stop peeling and just advertise the pointed-to
tag.
2. If we are missing the pointed-to object, we will not
realize (because we never even look it up in the object
db).
However, both of these are errors in the object database,
and both will be detected if a client actually requests the
broken objects in question. So we are simply pushing the
verification away from the advertising stage, and down to
the actual fetching stage.
On my test repo with 120K refs, this drops the time to
advertise the refs from ~3.2s to ~2.0s.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'upload-pack.c')
-rw-r--r-- | upload-pack.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/upload-pack.c b/upload-pack.c index 65cb0ff0fb..c01e161a9d 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -741,8 +741,7 @@ static int send_ref(const char *refname, const unsigned char *sha1, int flag, vo nr_our_refs++; } if (o->type == OBJ_TAG) { - o = parse_object(o->sha1); - o = deref_tag(o, refname, 0); + o = deref_tag_noverify(o); if (o) packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname_nons); } |