diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-13 13:20:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-20 18:38:50 -0700 |
| commit | 5266d369b21f8c260fa60d94fb29c3998c521e4a (patch) | |
| tree | 62e71bbd0ebdeae16f6ea2e7bdc0214db5e46aad /sha1_file.c | |
| parent | 9a4905902230c080f0f6a64ed7f0aaa5777d2f5b (diff) | |
| download | git-5266d369b21f8c260fa60d94fb29c3998c521e4a.tar.gz git-5266d369b21f8c260fa60d94fb29c3998c521e4a.tar.xz | |
sha1_object_info_extended(): hint about objects in delta-base cache
An object found in the delta-base cache is not guaranteed to
stay there, but we know it came from a pack and it is likely
to give us a quick access if we read_sha1_file() it right now,
which is a piece of useful information.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sha1_file.c b/sha1_file.c index 7eed31667..1d6f93d5d 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1697,6 +1697,13 @@ static unsigned long pack_entry_hash(struct packed_git *p, off_t base_offset) return hash % MAX_DELTA_CACHE; } +static int in_delta_base_cache(struct packed_git *p, off_t base_offset) +{ + unsigned long hash = pack_entry_hash(p, base_offset); + struct delta_base_cache_entry *ent = delta_base_cache + hash; + return (ent->data && ent->p == p && ent->base_offset == base_offset); +} + static void *cache_or_unpack_entry(struct packed_git *p, off_t base_offset, unsigned long *base_size, enum object_type *type, int keep_cache) { @@ -2128,6 +2135,8 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi) if (status < 0) { mark_bad_packed_object(e.p, sha1); status = sha1_object_info_extended(sha1, oi); + } else if (in_delta_base_cache(e.p, e.offset)) { + oi->whence = OI_DBCACHED; } else { oi->whence = OI_PACKED; oi->u.packed.offset = e.offset; |