kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

odb: introduce parent pointers 

In subsequent commits we'll get rid of our use of `the_repository` in
"odb.c" in favor of explicitly passing in a `struct object_database` or
a `struct odb_source`. In some cases though we'll need access to the
repository, for example to read a config value from it, but we don't
have a way to access the repository owning a specific object database.

Introduce parent pointers for `struct object_database` to its owning
repository as well as for `struct odb_source` to its owning object
database, which will allow us to adapt those use cases.

Note that this change requires us to pass through the object database to
`link_alt_odb_entry()` so that we can set up the parent pointers for any
source there. The callchain is adapted to pass through the object
database accordingly.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Patrick Steinhardt 2025-07-01 14:22:16 +02:00 committed by Junio C Hamano
parent 8f49151763
commit 2f5181fce6
3 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
odb.c
View File

@ -135,11 +135,15 @@ static int alt_odb_usable(struct object_database *o,
* of the object ID, an extra slash for the first level indirection, and * of the object ID, an extra slash for the first level indirection, and
* the terminating NUL. * the terminating NUL.
*/ */
static void read_info_alternates(struct repository *r, static void read_info_alternates(struct object_database *odb,
const char *relative_base, const char *relative_base,
int depth); int depth);
static int link_alt_odb_entry(struct repository *r, const struct strbuf *entry,
const char *relative_base, int depth, const char *normalized_objdir) static int link_alt_odb_entry(struct object_database *odb,
const struct strbuf *entry,
const char *relative_base,
int depth,
const char *normalized_objdir)
{ {
struct odb_source *alternate; struct odb_source *alternate;
struct strbuf pathbuf = STRBUF_INIT; struct strbuf pathbuf = STRBUF_INIT;
@ -167,22 +171,23 @@ static int link_alt_odb_entry(struct repository *r, const struct strbuf *entry,
while (pathbuf.len && pathbuf.buf[pathbuf.len - 1] == '/') while (pathbuf.len && pathbuf.buf[pathbuf.len - 1] == '/')
strbuf_setlen(&pathbuf, pathbuf.len - 1); strbuf_setlen(&pathbuf, pathbuf.len - 1);


if (!alt_odb_usable(r->objects, &pathbuf, normalized_objdir, &pos)) if (!alt_odb_usable(odb, &pathbuf, normalized_objdir, &pos))
goto error; goto error;


CALLOC_ARRAY(alternate, 1); CALLOC_ARRAY(alternate, 1);
alternate->odb = odb;
/* pathbuf.buf is already in r->objects->source_by_path */ /* pathbuf.buf is already in r->objects->source_by_path */
alternate->path = strbuf_detach(&pathbuf, NULL); alternate->path = strbuf_detach(&pathbuf, NULL);


/* add the alternate entry */ /* add the alternate entry */
*r->objects->sources_tail = alternate; *odb->sources_tail = alternate;
r->objects->sources_tail = &(alternate->next); odb->sources_tail = &(alternate->next);
alternate->next = NULL; alternate->next = NULL;
assert(r->objects->source_by_path); assert(odb->source_by_path);
kh_value(r->objects->source_by_path, pos) = alternate; kh_value(odb->source_by_path, pos) = alternate;


/* recursively add alternates */ /* recursively add alternates */
read_info_alternates(r, alternate->path, depth + 1); read_info_alternates(odb, alternate->path, depth + 1);
ret = 0; ret = 0;
error: error:
strbuf_release(&tmp); strbuf_release(&tmp);
@ -219,7 +224,7 @@ static const char *parse_alt_odb_entry(const char *string,
return end; return end;
} }


static void link_alt_odb_entries(struct repository *r, const char *alt, static void link_alt_odb_entries(struct object_database *odb, const char *alt,
int sep, const char *relative_base, int depth) int sep, const char *relative_base, int depth)
{ {
struct strbuf objdirbuf = STRBUF_INIT; struct strbuf objdirbuf = STRBUF_INIT;
@ -234,20 +239,20 @@ static void link_alt_odb_entries(struct repository *r, const char *alt,
return; return;
} }


strbuf_realpath(&objdirbuf, r->objects->sources->path, 1); strbuf_realpath(&objdirbuf, odb->sources->path, 1);


while (*alt) { while (*alt) {
alt = parse_alt_odb_entry(alt, sep, &entry); alt = parse_alt_odb_entry(alt, sep, &entry);
if (!entry.len) if (!entry.len)
continue; continue;
link_alt_odb_entry(r, &entry, link_alt_odb_entry(odb, &entry,
relative_base, depth, objdirbuf.buf); relative_base, depth, objdirbuf.buf);
} }
strbuf_release(&entry); strbuf_release(&entry);
strbuf_release(&objdirbuf); strbuf_release(&objdirbuf);
} }


static void read_info_alternates(struct repository *r, static void read_info_alternates(struct object_database *odb,
const char *relative_base, const char *relative_base,
int depth) int depth)
{ {
@ -261,7 +266,7 @@ static void read_info_alternates(struct repository *r,
return; return;
} }


link_alt_odb_entries(r, buf.buf, '\n', relative_base, depth); link_alt_odb_entries(odb, buf.buf, '\n', relative_base, depth);
strbuf_release(&buf); strbuf_release(&buf);
free(path); free(path);
} }
@ -303,7 +308,7 @@ void add_to_alternates_file(const char *reference)
if (commit_lock_file(&lock)) if (commit_lock_file(&lock))
die_errno(_("unable to move new alternates file into place")); die_errno(_("unable to move new alternates file into place"));
if (the_repository->objects->loaded_alternates) if (the_repository->objects->loaded_alternates)
link_alt_odb_entries(the_repository, reference, link_alt_odb_entries(the_repository->objects, reference,
'\n', NULL, 0); '\n', NULL, 0);
} }
free(alts); free(alts);
@ -317,7 +322,7 @@ void add_to_alternates_memory(const char *reference)
*/ */
prepare_alt_odb(the_repository); prepare_alt_odb(the_repository);


link_alt_odb_entries(the_repository, reference, link_alt_odb_entries(the_repository->objects, reference,
'\n', NULL, 0); '\n', NULL, 0);
} }


@ -336,6 +341,7 @@ struct odb_source *set_temporary_primary_odb(const char *dir, int will_destroy)
* alternate * alternate
*/ */
source = xcalloc(1, sizeof(*source)); source = xcalloc(1, sizeof(*source));
source->odb = the_repository->objects;
source->path = xstrdup(dir); source->path = xstrdup(dir);


/* /*
@ -580,9 +586,9 @@ void prepare_alt_odb(struct repository *r)
if (r->objects->loaded_alternates) if (r->objects->loaded_alternates)
return; return;


link_alt_odb_entries(r, r->objects->alternate_db, PATH_SEP, NULL, 0); link_alt_odb_entries(r->objects, r->objects->alternate_db, PATH_SEP, NULL, 0);


read_info_alternates(r, r->objects->sources->path, 0); read_info_alternates(r->objects, r->objects->sources->path, 0);
r->objects->loaded_alternates = 1; r->objects->loaded_alternates = 1;
} }


@ -950,11 +956,12 @@ void assert_oid_type(const struct object_id *oid, enum object_type expect)
type_name(expect)); type_name(expect));
} }


struct object_database *odb_new(void) struct object_database *odb_new(struct repository *repo)
{ {
struct object_database *o = xmalloc(sizeof(*o)); struct object_database *o = xmalloc(sizeof(*o));


memset(o, 0, sizeof(*o)); memset(o, 0, sizeof(*o));
o->repo = repo;
INIT_LIST_HEAD(&o->packed_git_mru); INIT_LIST_HEAD(&o->packed_git_mru);
hashmap_init(&o->pack_map, pack_map_entry_cmp, NULL, 0); hashmap_init(&o->pack_map, pack_map_entry_cmp, NULL, 0);
pthread_mutex_init(&o->replace_mutex, NULL); pthread_mutex_init(&o->replace_mutex, NULL);

8
odb.h
View File

@ -28,6 +28,9 @@ struct repository;
struct odb_source { struct odb_source {
struct odb_source *next; struct odb_source *next;


/* Object database that owns this object source. */
struct object_database *odb;

/* /*
* Used to store the results of readdir(3) calls when we are OK * Used to store the results of readdir(3) calls when we are OK
* sacrificing accuracy due to races for speed. That includes * sacrificing accuracy due to races for speed. That includes
@ -105,6 +108,9 @@ struct cached_object_entry;
* configured via alternates. * configured via alternates.
*/ */
struct object_database { struct object_database {
/* Repository that owns this database. */
struct repository *repo;

/* /*
* Set of all object directories; the main directory is first (and * Set of all object directories; the main directory is first (and
* cannot be NULL after initialization). Subsequent directories are * cannot be NULL after initialization). Subsequent directories are
@ -186,7 +192,7 @@ struct object_database {
unsigned packed_git_initialized : 1; unsigned packed_git_initialized : 1;
}; };


struct object_database *odb_new(void); struct object_database *odb_new(struct repository *repo);
void odb_clear(struct object_database *o); void odb_clear(struct object_database *o);


/* /*

3
repository.c
View File

@ -52,7 +52,7 @@ static void set_default_hash_algo(struct repository *repo)


void initialize_repository(struct repository *repo) void initialize_repository(struct repository *repo)
{ {
repo->objects = odb_new(); repo->objects = odb_new(repo);
repo->remote_state = remote_state_new(); repo->remote_state = remote_state_new();
repo->parsed_objects = parsed_object_pool_new(repo); repo->parsed_objects = parsed_object_pool_new(repo);
ALLOC_ARRAY(repo->index, 1); ALLOC_ARRAY(repo->index, 1);
@ -167,6 +167,7 @@ void repo_set_gitdir(struct repository *repo,


if (!repo->objects->sources) { if (!repo->objects->sources) {
CALLOC_ARRAY(repo->objects->sources, 1); CALLOC_ARRAY(repo->objects->sources, 1);
repo->objects->sources->odb = repo->objects;
repo->objects->sources_tail = &repo->objects->sources->next; repo->objects->sources_tail = &repo->objects->sources->next;
} }
expand_base_dir(&repo->objects->sources->path, o->object_dir, expand_base_dir(&repo->objects->sources->path, o->object_dir,