From: Patrick Steinhardt Date: Thu, 04 Jun 2026 11:25:30 GMT Subject: [PATCH 03/16] odb/source-packed: store pointer to "files" instead of generic source Message-ID: <20260604-pks-odb-source-packed-v1-3-2e7ab31b4b5c@pks.im> In-Reply-To: <20260604-pks-odb-source-packed-v1-0-2e7ab31b4b5c@pks.im> The `struct odb_source_packed` holds a pointer to its owning parent source. The way that Git is currently structured, this parent is always the "files" source. In subsequent commits we're going to detangle that so that the "packed" source doesn't have any owning parent source at all, which makes it usable as a completely standalone source. Detangling this mess is somewhat intricate though, and is made even more intricate because it's not always clear which kind of source one is holding at a specific point in time -- either the parent "files" source, or the child "packed" source. Make this relationship more explicit by storing a pointer to the "files" source instead of storing a pointer to a generic `struct odb_source`. This will help make subsequent steps a bit clearer. Note that this is a temporary step, only. At the end of this series we will have dropped the parent pointer completely. Signed-off-by: Patrick Steinhardt --- odb/source-files.c | 2 +- odb/source-packed.c | 4 ++-- odb/source-packed.h | 4 ++-- packfile.c | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/odb/source-files.c b/odb/source-files.c index 191562f316..e04525fb08 100644 --- a/odb/source-files.c +++ b/odb/source-files.c @@ -269,7 +269,7 @@ struct odb_source_files *odb_source_files_new(struct object_database *odb, CALLOC_ARRAY(files, 1); odb_source_init(&files->base, odb, ODB_SOURCE_FILES, path, local); files->loose = odb_source_loose_new(odb, path, local); - files->packed = odb_source_packed_new(&files->base); + files->packed = odb_source_packed_new(files); files->base.free = odb_source_files_free; files->base.close = odb_source_files_close; diff --git a/odb/source-packed.c b/odb/source-packed.c index 1e94b47ea0..12e785be48 100644 --- a/odb/source-packed.c +++ b/odb/source-packed.c @@ -1,11 +1,11 @@ #include "git-compat-util.h" #include "odb/source-packed.h" -struct odb_source_packed *odb_source_packed_new(struct odb_source *source) +struct odb_source_packed *odb_source_packed_new(struct odb_source_files *parent) { struct odb_source_packed *store; CALLOC_ARRAY(store, 1); - store->source = source; + store->files = parent; strmap_init(&store->packs_by_path); return store; } diff --git a/odb/source-packed.h b/odb/source-packed.h index c17068a4f1..6e5c79a77a 100644 --- a/odb/source-packed.h +++ b/odb/source-packed.h @@ -17,7 +17,7 @@ struct packfile_list_entry { * A store that manages packfiles for a given object database. */ struct odb_source_packed { - struct odb_source *source; + struct odb_source_files *files; /* * The list of packfiles in the order in which they have been most @@ -75,6 +75,6 @@ struct odb_source_packed { * Allocate and initialize a new empty packfile store for the given object * database source. */ -struct odb_source_packed *odb_source_packed_new(struct odb_source *source); +struct odb_source_packed *odb_source_packed_new(struct odb_source_files *parent); #endif diff --git a/packfile.c b/packfile.c index f2b27df66e..2af07f5e1a 100644 --- a/packfile.c +++ b/packfile.c @@ -885,7 +885,7 @@ struct packed_git *packfile_store_load_pack(struct odb_source_packed *store, p = strmap_get(&store->packs_by_path, key.buf); if (!p) { - p = add_packed_git(store->source->odb->repo, idx_path, + p = add_packed_git(store->files->base.odb->repo, idx_path, strlen(idx_path), local); if (p) packfile_store_add_pack(store, p); @@ -1073,8 +1073,8 @@ void packfile_store_prepare(struct odb_source_packed *store) if (store->initialized) return; - prepare_multi_pack_index_one(store->source); - prepare_packed_git_one(store->source); + prepare_multi_pack_index_one(&store->files->base); + prepare_packed_git_one(&store->files->base); sort_packs(&store->packs.head, sort_pack); for (struct packfile_list_entry *e = store->packs.head; e; e = e->next) @@ -1112,7 +1112,7 @@ int packfile_store_count_objects(struct odb_source_packed *store, unsigned long count = 0; int ret; - m = get_multi_pack_index(store->source); + m = get_multi_pack_index(&store->files->base); if (m) count += m->num_objects + m->num_objects_in_base; @@ -2533,7 +2533,7 @@ static int packfile_store_for_each_prefixed_object( store->skip_mru_updates = true; - m = get_multi_pack_index(store->source); + m = get_multi_pack_index(&store->files->base); if (m) { ret = for_each_prefixed_object_in_midx(store, m, opts, data); if (ret) @@ -2715,7 +2715,7 @@ int packfile_store_find_abbrev_len(struct odb_source_packed *store, struct packfile_list_entry *e; struct multi_pack_index *m; - m = get_multi_pack_index(store->source); + m = get_multi_pack_index(&store->files->base); if (m) find_abbrev_len_for_midx(m, oid, min_len, &min_len); -- 2.54.0.1064.gd145956f57.dirty