mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

object-store: retire odb_load_loose_cache()

Browse Source 
Inline odb_load_loose_cache() into its only remaining caller,
odb_loose_cache().  The latter offers a nicer interface for loading the
cache, as it doesn't require callers to deal with fanout directory
numbers directly.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2019-01-07 18:29:16 +01:00
committed by Junio C Hamano
parent 4cea1ce0f6
commit 8be88dbcb1
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
object-store.h
View File

@ -47,13 +47,6 @@ void add_to_alternates_file(const char *dir);
*/ */
void add_to_alternates_memory(const char *dir); void add_to_alternates_memory(const char *dir);
/*
* Populate an odb's loose object cache for one particular subdirectory (i.e.,
* the one that corresponds to the first byte of objects you're interested in,
* from 0 to 255 inclusive).
*/
void odb_load_loose_cache(struct object_directory *odb, int subdir_nr);
/* /*
* Populate and return the loose object cache array corresponding to the * Populate and return the loose object cache array corresponding to the
* given object ID. * given object ID.

9
sha1-file.c
View File

@ -2154,12 +2154,6 @@ struct oid_array *odb_loose_cache(struct object_directory *odb,
const struct object_id *oid) const struct object_id *oid)
{ {
int subdir_nr = oid->hash[0]; int subdir_nr = oid->hash[0];
odb_load_loose_cache(odb, subdir_nr);
return &odb->loose_objects_cache[subdir_nr];
}
void odb_load_loose_cache(struct object_directory *odb, int subdir_nr)
{
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
if (subdir_nr < 0 || if (subdir_nr < 0 ||
@ -2167,7 +2161,7 @@ void odb_load_loose_cache(struct object_directory *odb, int subdir_nr)
BUG("subdir_nr out of range"); BUG("subdir_nr out of range");
if (odb->loose_objects_subdir_seen[subdir_nr]) if (odb->loose_objects_subdir_seen[subdir_nr])
return; return &odb->loose_objects_cache[subdir_nr];
strbuf_addstr(&buf, odb->path); strbuf_addstr(&buf, odb->path);
for_each_file_in_obj_subdir(subdir_nr, &buf, for_each_file_in_obj_subdir(subdir_nr, &buf,
@ -2176,6 +2170,7 @@ void odb_load_loose_cache(struct object_directory *odb, int subdir_nr)
&odb->loose_objects_cache[subdir_nr]); &odb->loose_objects_cache[subdir_nr]);
odb->loose_objects_subdir_seen[subdir_nr] = 1; odb->loose_objects_subdir_seen[subdir_nr] = 1;
strbuf_release(&buf); strbuf_release(&buf);
return &odb->loose_objects_cache[subdir_nr];
} }
void odb_clear_loose_cache(struct object_directory *odb) void odb_clear_loose_cache(struct object_directory *odb)