odb: introduce "files" source

Introduce a new "files" object database source. This source encapsulates
access to both loose object files and the packfile store, similar to how
the "files" backend for refs encapsulates access to loose refs and the
packed-refs file.

Note that for now the "files" source is still a direct member of a
`struct odb_source`. This architecture will be reversed in the next
commit so that the files source contains a `struct odb_source`.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index 116358e484cf8f936b1895432b31ca16216151e7..c05285399c86af0d81e84e79eff82f91fdaa59d4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1215,6 +1215,7 @@ LIB_OBJS += object-name.o
 LIB_OBJS += object.o
 LIB_OBJS += odb.o
 LIB_OBJS += odb/source.o
+LIB_OBJS += odb/source-files.o
 LIB_OBJS += odb/streaming.o
 LIB_OBJS += oid-array.o
 LIB_OBJS += oidmap.o

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 53ffe80c79eeac9f7354fb8a2ef6e66f610df5c3..01a53f3f294b126d7686ebaf84a903e04b614e0a 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -882,7 +882,7 @@ static void batch_each_object(struct batch_options *opt,
                struct object_info oi = { 0 };
 
                for (source = the_repository->objects->sources; source; source = source->next) {
-                       int ret = packfile_store_for_each_object(source->packfiles, &oi,
+                       int ret = packfile_store_for_each_object(source->files->packed, &oi,
                                                                 batch_one_object_oi, &payload, flags);
                        if (ret)
                                break;

diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index b8a7757cfda943484bf42169850a32a616709d14..627dcbf4f3e61a590c2eec9ce8c7636cbddc8e7e 100644 (file)
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -900,7 +900,7 @@ static void end_packfile(void)
                idx_name = keep_pack(create_index());
 
                /* Register the packfile with core git's machinery. */
-               new_p = packfile_store_load_pack(pack_data->repo->objects->sources->packfiles,
+               new_p = packfile_store_load_pack(pack_data->repo->objects->sources->files->packed,
                                                 idx_name, 1);
                if (!new_p)
                        die(_("core Git rejected index %s"), idx_name);
@@ -982,7 +982,7 @@ static int store_object(
        }
 
        for (source = the_repository->objects->sources; source; source = source->next) {
-               if (!packfile_list_find_oid(packfile_store_get_packs(source->packfiles), &oid))
+               if (!packfile_list_find_oid(packfile_store_get_packs(source->files->packed), &oid))
                        continue;
                e->type = type;
                e->pack_id = MAX_PACK_ID;
@@ -1187,7 +1187,7 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark)
        }
 
        for (source = the_repository->objects->sources; source; source = source->next) {
-               if (!packfile_list_find_oid(packfile_store_get_packs(source->packfiles), &oid))
+               if (!packfile_list_find_oid(packfile_store_get_packs(source->files->packed), &oid))
                        continue;
                e->type = OBJ_BLOB;
                e->pack_id = MAX_PACK_ID;

diff --git a/builtin/grep.c b/builtin/grep.c
index 5b8b87b1ac4d7aca7534e37fb4c3bee045e3cdd1..c8d0e51415336e9557ecd452f85b19f84da7b4bc 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -1219,7 +1219,7 @@ int cmd_grep(int argc,
 
                        odb_prepare_alternates(the_repository->objects);
                        for (source = the_repository->objects->sources; source; source = source->next)
-                               packfile_store_prepare(source->packfiles);
+                               packfile_store_prepare(source->files->packed);
                }
 
                start_threads(&opt);

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index b67fb0256cc8318cc98ffc08afedd3faa83f1834..f0cce534b2623d10ff0b1a38cfc3bb3a284fa193 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1638,7 +1638,7 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
                            hash, "idx", 1);
 
        if (do_fsck_object && startup_info->have_repository)
-               packfile_store_load_pack(the_repository->objects->sources->packfiles,
+               packfile_store_load_pack(the_repository->objects->sources->files->packed,
                                         final_index_name, 0);
 
        if (!from_stdin) {

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 242d1c68f004e8738df650c5e59ba715a3f14168..0c3c01cdc95c079bea63041b3c5c1b8ac05fe014 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1531,7 +1531,7 @@ static int want_cruft_object_mtime(struct repository *r,
        struct odb_source *source;
 
        for (source = r->objects->sources; source; source = source->next) {
-               struct packed_git **cache = packfile_store_get_kept_pack_cache(source->packfiles, flags);
+               struct packed_git **cache = packfile_store_get_kept_pack_cache(source->files->packed, flags);
 
                for (; *cache; cache++) {
                        struct packed_git *p = *cache;
@@ -1753,11 +1753,11 @@ static int want_object_in_pack_mtime(const struct object_id *oid,
        }
 
        for (source = the_repository->objects->sources; source; source = source->next) {
-               for (e = source->packfiles->packs.head; e; e = e->next) {
+               for (e = source->files->packed->packs.head; e; e = e->next) {
                        struct packed_git *p = e->pack;
                        want = want_object_in_pack_one(p, oid, exclude, found_pack, found_offset, found_mtime);
                        if (!exclude && want > 0)
-                               packfile_list_prepend(&source->packfiles->packs, p);
+                               packfile_list_prepend(&source->files->packed->packs, p);
                        if (want != -1)
                                return want;
                }
@@ -4340,7 +4340,7 @@ static void add_objects_in_unpacked_packs(void)
                if (!source->local)
                        continue;
 
-               if (packfile_store_for_each_object(source->packfiles, &oi,
+               if (packfile_store_for_each_object(source->files->packed, &oi,
                                                   add_object_in_unpacked_pack, NULL,
                                                   ODB_FOR_EACH_OBJECT_PACK_ORDER |
                                                   ODB_FOR_EACH_OBJECT_LOCAL_ONLY |

diff --git a/commit-graph.c b/commit-graph.c
index d250a729b1a09997736e8ea15e1405812fbf67c1..967eb77047910a86dc94d163b5868ef9610bce5b 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -1981,7 +1981,7 @@ static void fill_oids_from_all_packs(struct write_commit_graph_context *ctx)
 
        odb_prepare_alternates(ctx->r->objects);
        for (source = ctx->r->objects->sources; source; source = source->next)
-               packfile_store_for_each_object(source->packfiles, &oi, add_packed_commits_oi,
+               packfile_store_for_each_object(source->files->packed, &oi, add_packed_commits_oi,
                                               ctx, ODB_FOR_EACH_OBJECT_PACK_ORDER);
 
        if (ctx->progress_done < ctx->approx_nr_objects)

diff --git a/http.c b/http.c
index 7815f144de3d69ae4c5f7aa76c8a627d1ec90bfb..b44f493919c40bc6f97f424866299c5eb316c913 100644 (file)
--- a/http.c
+++ b/http.c
@@ -2544,7 +2544,7 @@ void http_install_packfile(struct packed_git *p,
                           struct packfile_list *list_to_remove_from)
 {
        packfile_list_remove(list_to_remove_from, p);
-       packfile_store_add_pack(the_repository->objects->sources->packfiles, p);
+       packfile_store_add_pack(the_repository->objects->sources->files->packed, p);
 }
 
 struct http_pack_request *new_http_pack_request(

diff --git a/loose.c b/loose.c
index 56cf64b648bf80c3d7d8e0649f87687138018743..c921d46b94ee052d813550459dba03a497554c99 100644 (file)
--- a/loose.c
+++ b/loose.c
@@ -49,13 +49,13 @@ static int insert_loose_map(struct odb_source *source,
                            const struct object_id *oid,
                            const struct object_id *compat_oid)
 {
-       struct loose_object_map *map = source->loose->map;
+       struct loose_object_map *map = source->files->loose->map;
        int inserted = 0;
 
        inserted |= insert_oid_pair(map->to_compat, oid, compat_oid);
        inserted |= insert_oid_pair(map->to_storage, compat_oid, oid);
        if (inserted)
-               oidtree_insert(source->loose->cache, compat_oid);
+               oidtree_insert(source->files->loose->cache, compat_oid);
 
        return inserted;
 }
@@ -65,11 +65,11 @@ static int load_one_loose_object_map(struct repository *repo, struct odb_source
        struct strbuf buf = STRBUF_INIT, path = STRBUF_INIT;
        FILE *fp;
 
-       if (!source->loose->map)
-               loose_object_map_init(&source->loose->map);
-       if (!source->loose->cache) {
-               ALLOC_ARRAY(source->loose->cache, 1);
-               oidtree_init(source->loose->cache);
+       if (!source->files->loose->map)
+               loose_object_map_init(&source->files->loose->map);
+       if (!source->files->loose->cache) {
+               ALLOC_ARRAY(source->files->loose->cache, 1);
+               oidtree_init(source->files->loose->cache);
        }
 
        insert_loose_map(source, repo->hash_algo->empty_tree, repo->compat_hash_algo->empty_tree);
@@ -125,7 +125,7 @@ int repo_read_loose_object_map(struct repository *repo)
 
 int repo_write_loose_object_map(struct repository *repo)
 {
-       kh_oid_map_t *map = repo->objects->sources->loose->map->to_compat;
+       kh_oid_map_t *map = repo->objects->sources->files->loose->map->to_compat;
        struct lock_file lock;
        int fd;
        khiter_t iter;
@@ -231,7 +231,7 @@ int repo_loose_object_map_oid(struct repository *repo,
        khiter_t pos;
 
        for (source = repo->objects->sources; source; source = source->next) {
-               struct loose_object_map *loose_map = source->loose->map;
+               struct loose_object_map *loose_map = source->files->loose->map;
                if (!loose_map)
                        continue;
                map = (to == repo->compat_hash_algo) ?

diff --git a/meson.build b/meson.build
index 1018af17c3a81ebbdc2a878279b7e45afaad200e..8e1125a5855600b352264e109fb11a06760abd29 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -398,6 +398,7 @@ libgit_sources = [
   'object.c',
   'odb.c',
   'odb/source.c',
+  'odb/source-files.c',
   'odb/streaming.c',
   'oid-array.c',
   'oidmap.c',

diff --git a/midx.c b/midx.c
index a75ea99a0d4bb052076c27f9c420ccecf3d053e0..698d10a1c68c76fe26463834050d9ff36ca44a83 100644 (file)
--- a/midx.c
+++ b/midx.c
@@ -95,8 +95,8 @@ static int midx_read_object_offsets(const unsigned char *chunk_start,
 
 struct multi_pack_index *get_multi_pack_index(struct odb_source *source)
 {
-       packfile_store_prepare(source->packfiles);
-       return source->packfiles->midx;
+       packfile_store_prepare(source->files->packed);
+       return source->files->packed->midx;
 }
 
 static struct multi_pack_index *load_multi_pack_index_one(struct odb_source *source,
@@ -459,7 +459,7 @@ int prepare_midx_pack(struct multi_pack_index *m,
 
        strbuf_addf(&pack_name, "%s/pack/%s", m->source->path,
                    m->pack_names[pack_int_id]);
-       p = packfile_store_load_pack(m->source->packfiles,
+       p = packfile_store_load_pack(m->source->files->packed,
                                     pack_name.buf, m->source->local);
        strbuf_release(&pack_name);
 
@@ -709,12 +709,12 @@ int prepare_multi_pack_index_one(struct odb_source *source)
        if (!r->settings.core_multi_pack_index)
                return 0;
 
-       if (source->packfiles->midx)
+       if (source->files->packed->midx)
                return 1;
 
-       source->packfiles->midx = load_multi_pack_index(source);
+       source->files->packed->midx = load_multi_pack_index(source);
 
-       return !!source->packfiles->midx;
+       return !!source->files->packed->midx;
 }
 
 int midx_checksum_valid(struct multi_pack_index *m)
@@ -803,9 +803,9 @@ void clear_midx_file(struct repository *r)
                struct odb_source *source;
 
                for (source = r->objects->sources; source; source = source->next) {
-                       if (source->packfiles->midx)
-                               close_midx(source->packfiles->midx);
-                       source->packfiles->midx = NULL;
+                       if (source->files->packed->midx)
+                               close_midx(source->files->packed->midx);
+                       source->files->packed->midx = NULL;
                }
        }
 

diff --git a/object-file.c b/object-file.c
index 098b0541abf6865956961bce91456e23b7687c00..db66ae5ebe56b8a42ff99628dcd6253f4020e7b5 100644 (file)
--- a/object-file.c
+++ b/object-file.c
@@ -220,7 +220,7 @@ static void *odb_source_loose_map_object(struct odb_source *source,
                                         unsigned long *size)
 {
        const char *p;
-       int fd = open_loose_object(source->loose, oid, &p);
+       int fd = open_loose_object(source->files->loose, oid, &p);
 
        if (fd < 0)
                return NULL;
@@ -423,7 +423,7 @@ static int read_object_info_from_path(struct odb_source *source,
                struct stat st;
 
                if ((!oi || (!oi->disk_sizep && !oi->mtimep)) && (flags & OBJECT_INFO_QUICK)) {
-                       ret = quick_has_loose(source->loose, oid) ? 0 : -1;
+                       ret = quick_has_loose(source->files->loose, oid) ? 0 : -1;
                        goto out;
                }
 
@@ -1868,31 +1868,31 @@ struct oidtree *odb_source_loose_cache(struct odb_source *source,
 {
        int subdir_nr = oid->hash[0];
        struct strbuf buf = STRBUF_INIT;
-       size_t word_bits = bitsizeof(source->loose->subdir_seen[0]);
+       size_t word_bits = bitsizeof(source->files->loose->subdir_seen[0]);
        size_t word_index = subdir_nr / word_bits;
        size_t mask = (size_t)1u << (subdir_nr % word_bits);
        uint32_t *bitmap;
 
        if (subdir_nr < 0 ||
-           (size_t) subdir_nr >= bitsizeof(source->loose->subdir_seen))
+           (size_t) subdir_nr >= bitsizeof(source->files->loose->subdir_seen))
                BUG("subdir_nr out of range");
 
-       bitmap = &source->loose->subdir_seen[word_index];
+       bitmap = &source->files->loose->subdir_seen[word_index];
        if (*bitmap & mask)
-               return source->loose->cache;
-       if (!source->loose->cache) {
-               ALLOC_ARRAY(source->loose->cache, 1);
-               oidtree_init(source->loose->cache);
+               return source->files->loose->cache;
+       if (!source->files->loose->cache) {
+               ALLOC_ARRAY(source->files->loose->cache, 1);
+               oidtree_init(source->files->loose->cache);
        }
        strbuf_addstr(&buf, source->path);
        for_each_file_in_obj_subdir(subdir_nr, &buf,
                                    source->odb->repo->hash_algo,
                                    append_loose_object,
                                    NULL, NULL,
-                                   source->loose->cache);
+                                   source->files->loose->cache);
        *bitmap |= mask;
        strbuf_release(&buf);
-       return source->loose->cache;
+       return source->files->loose->cache;
 }
 
 static void odb_source_loose_clear_cache(struct odb_source_loose *loose)
@@ -1905,7 +1905,7 @@ static void odb_source_loose_clear_cache(struct odb_source_loose *loose)
 
 void odb_source_loose_reprepare(struct odb_source *source)
 {
-       odb_source_loose_clear_cache(source->loose);
+       odb_source_loose_clear_cache(source->files->loose);
 }
 
 static int check_stream_oid(git_zstream *stream,

diff --git a/odb.c b/odb.c
index d318482d476ba71411527eac560c0e653dfc0619..c9ebc7e741956ae90f46e66773368955dc7a1186 100644 (file)
--- a/odb.c
+++ b/odb.c
@@ -691,7 +691,7 @@ static int do_oid_object_info_extended(struct object_database *odb,
 
                /* Most likely it's a loose object. */
                for (source = odb->sources; source; source = source->next) {
-                       if (!packfile_store_read_object_info(source->packfiles, real, oi, flags) ||
+                       if (!packfile_store_read_object_info(source->files->packed, real, oi, flags) ||
                            !odb_source_loose_read_object_info(source, real, oi, flags))
                                return 0;
                }
@@ -700,7 +700,7 @@ static int do_oid_object_info_extended(struct object_database *odb,
                if (!(flags & OBJECT_INFO_QUICK)) {
                        odb_reprepare(odb->repo->objects);
                        for (source = odb->sources; source; source = source->next)
-                               if (!packfile_store_read_object_info(source->packfiles, real, oi, flags))
+                               if (!packfile_store_read_object_info(source->files->packed, real, oi, flags))
                                        return 0;
                }
 
@@ -962,7 +962,7 @@ int odb_freshen_object(struct object_database *odb,
 
        odb_prepare_alternates(odb);
        for (source = odb->sources; source; source = source->next) {
-               if (packfile_store_freshen_object(source->packfiles, oid))
+               if (packfile_store_freshen_object(source->files->packed, oid))
                        return 1;
 
                if (odb_source_loose_freshen_object(source, oid))
@@ -992,7 +992,7 @@ int odb_for_each_object(struct object_database *odb,
                                return ret;
                }
 
-               ret = packfile_store_for_each_object(source->packfiles, request,
+               ret = packfile_store_for_each_object(source->files->packed, request,
                                                     cb, cb_data, flags);
                if (ret)
                        return ret;
@@ -1091,7 +1091,7 @@ void odb_close(struct object_database *o)
 {
        struct odb_source *source;
        for (source = o->sources; source; source = source->next)
-               packfile_store_close(source->packfiles);
+               packfile_store_close(source->files->packed);
        close_commit_graph(o);
 }
 
@@ -1149,7 +1149,7 @@ void odb_reprepare(struct object_database *o)
 
        for (source = o->sources; source; source = source->next) {
                odb_source_loose_reprepare(source);
-               packfile_store_reprepare(source->packfiles);
+               packfile_store_reprepare(source->files->packed);
        }
 
        o->approximate_object_count_valid = 0;

diff --git a/odb/source-files.c b/odb/source-files.c
new file mode 100644 (file)
index 0000000..cbdaa68
--- /dev/null
+++ b/odb/source-files.c
@@ -0,0 +1,23 @@
+#include "git-compat-util.h"
+#include "object-file.h"
+#include "odb/source-files.h"
+#include "packfile.h"
+
+void odb_source_files_free(struct odb_source_files *files)
+{
+       if (!files)
+               return;
+       odb_source_loose_free(files->loose);
+       packfile_store_free(files->packed);
+       free(files);
+}
+
+struct odb_source_files *odb_source_files_new(struct odb_source *source)
+{
+       struct odb_source_files *files;
+       CALLOC_ARRAY(files, 1);
+       files->source = source;
+       files->loose = odb_source_loose_new(source);
+       files->packed = packfile_store_new(source);
+       return files;
+}

diff --git a/odb/source-files.h b/odb/source-files.h
new file mode 100644 (file)
index 0000000..0b8bf77
--- /dev/null
+++ b/odb/source-files.h
@@ -0,0 +1,24 @@
+#ifndef ODB_SOURCE_FILES_H
+#define ODB_SOURCE_FILES_H
+
+struct odb_source_loose;
+struct odb_source;
+struct packfile_store;
+
+/*
+ * The files object database source uses a combination of loose objects and
+ * packfiles. It is the default backend used by Git to store objects.
+ */
+struct odb_source_files {
+       struct odb_source *source;
+       struct odb_source_loose *loose;
+       struct packfile_store *packed;
+};
+
+/* Allocate and initialize a new object source. */
+struct odb_source_files *odb_source_files_new(struct odb_source *source);
+
+/* Free the object source and release all associated resources. */
+void odb_source_files_free(struct odb_source_files *files);
+
+#endif

diff --git a/odb/source.c b/odb/source.c
index 7fc89806f9c784baf52ea904b6398dc0818cb7ba..9d7fd19f4545087326fa3093a525e4573827ba17 100644 (file)
--- a/odb/source.c
+++ b/odb/source.c
@@ -13,8 +13,7 @@ struct odb_source *odb_source_new(struct object_database *odb,
        source->odb = odb;
        source->local = local;
        source->path = xstrdup(path);
-       source->loose = odb_source_loose_new(source);
-       source->packfiles = packfile_store_new(source);
+       source->files = odb_source_files_new(source);
 
        return source;
 }
@@ -22,7 +21,6 @@ struct odb_source *odb_source_new(struct object_database *odb,
 void odb_source_free(struct odb_source *source)
 {
        free(source->path);
-       odb_source_loose_free(source->loose);
-       packfile_store_free(source->packfiles);
+       odb_source_files_free(source->files);
        free(source);
 }

diff --git a/odb/source.h b/odb/source.h
index 391d6d1e383f51020a46eb6cb12c79976a2cc928..1c34265189d8f3877013679e8ca69a0d4560c0e3 100644 (file)
--- a/odb/source.h
+++ b/odb/source.h
@@ -1,6 +1,8 @@
 #ifndef ODB_SOURCE_H
 #define ODB_SOURCE_H
 
+#include "odb/source-files.h"
+
 /*
  * The source is the part of the object database that stores the actual
  * objects. It thus encapsulates the logic to read and write the specific
@@ -19,11 +21,8 @@ struct odb_source {
        /* Object database that owns this object source. */
        struct object_database *odb;
 
-       /* Private state for loose objects. */
-       struct odb_source_loose *loose;
-
-       /* Should only be accessed directly by packfile.c and midx.c. */
-       struct packfile_store *packfiles;
+       /* The backend used to store objects. */
+       struct odb_source_files *files;
 
        /*
         * Figure out whether this is the local source of the owning

diff --git a/odb/streaming.c b/odb/streaming.c
index 4a4474f891a07f719d2503874ed45e4474739a91..26b0a1a0f5ad05ec78368c25eef07d43198d90c3 100644 (file)
--- a/odb/streaming.c
+++ b/odb/streaming.c
@@ -187,7 +187,7 @@ static int istream_source(struct odb_read_stream **out,
 
        odb_prepare_alternates(odb);
        for (source = odb->sources; source; source = source->next) {
-               if (!packfile_store_read_object_stream(out, source->packfiles, oid) ||
+               if (!packfile_store_read_object_stream(out, source->files->packed, oid) ||
                    !odb_source_loose_read_object_stream(out, source, oid))
                        return 0;
        }

diff --git a/packfile.c b/packfile.c
index ce837f852ad1f6bd84b478d2e8bd92e35643ce2d..4e1f6087eda1f37b63f112661d6c1389c4f19ae9 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -363,7 +363,7 @@ static int unuse_one_window(struct object_database *odb)
        struct pack_window *lru_w = NULL, *lru_l = NULL;
 
        for (source = odb->sources; source; source = source->next)
-               for (e = source->packfiles->packs.head; e; e = e->next)
+               for (e = source->files->packed->packs.head; e; e = e->next)
                        scan_windows(e->pack, &lru_p, &lru_w, &lru_l);
 
        if (lru_p) {
@@ -537,7 +537,7 @@ static int close_one_pack(struct repository *r)
        int accept_windows_inuse = 1;
 
        for (source = r->objects->sources; source; source = source->next) {
-               for (e = source->packfiles->packs.head; e; e = e->next) {
+               for (e = source->files->packed->packs.head; e; e = e->next) {
                        if (e->pack->pack_fd == -1)
                                continue;
                        find_lru_pack(e->pack, &lru_p, &mru_w, &accept_windows_inuse);
@@ -990,10 +990,10 @@ static void prepare_pack(const char *full_name, size_t full_name_len,
        size_t base_len = full_name_len;
 
        if (strip_suffix_mem(full_name, &base_len, ".idx") &&
-           !(data->source->packfiles->midx &&
-             midx_contains_pack(data->source->packfiles->midx, file_name))) {
+           !(data->source->files->packed->midx &&
+             midx_contains_pack(data->source->files->packed->midx, file_name))) {
                char *trimmed_path = xstrndup(full_name, full_name_len);
-               packfile_store_load_pack(data->source->packfiles,
+               packfile_store_load_pack(data->source->files->packed,
                                         trimmed_path, data->source->local);
                free(trimmed_path);
        }
@@ -1248,7 +1248,7 @@ const struct packed_git *has_packed_and_bad(struct repository *r,
 
        for (source = r->objects->sources; source; source = source->next) {
                struct packfile_list_entry *e;
-               for (e = source->packfiles->packs.head; e; e = e->next)
+               for (e = source->files->packed->packs.head; e; e = e->next)
                        if (oidset_contains(&e->pack->bad_objects, oid))
                                return e->pack;
        }
@@ -2254,7 +2254,7 @@ int has_object_pack(struct repository *r, const struct object_id *oid)
 
        odb_prepare_alternates(r->objects);
        for (source = r->objects->sources; source; source = source->next) {
-               int ret = find_pack_entry(source->packfiles, oid, &e);
+               int ret = find_pack_entry(source->files->packed, oid, &e);
                if (ret)
                        return ret;
        }
@@ -2271,7 +2271,7 @@ int has_object_kept_pack(struct repository *r, const struct object_id *oid,
        for (source = r->objects->sources; source; source = source->next) {
                struct packed_git **cache;
 
-               cache = packfile_store_get_kept_pack_cache(source->packfiles, flags);
+               cache = packfile_store_get_kept_pack_cache(source->files->packed, flags);
 
                for (; *cache; cache++) {
                        struct packed_git *p = *cache;

diff --git a/packfile.h b/packfile.h
index 224142fd346715a45c1dc502d1a9d6ababc669fc..e8de06ee86cdae57b0f354b2472a047501a1be44 100644 (file)
--- a/packfile.h
+++ b/packfile.h
@@ -192,7 +192,7 @@ static inline struct repo_for_each_pack_data repo_for_eack_pack_data_init(struct
        odb_prepare_alternates(repo->objects);
 
        for (struct odb_source *source = repo->objects->sources; source; source = source->next) {
-               struct packfile_list_entry *entry = packfile_store_get_packs(source->packfiles);
+               struct packfile_list_entry *entry = packfile_store_get_packs(source->files->packed);
                if (!entry)
                        continue;
                data.source = source;
@@ -212,7 +212,7 @@ static inline void repo_for_each_pack_data_next(struct repo_for_each_pack_data *
                return;
 
        for (source = data->source->next; source; source = source->next) {
-               struct packfile_list_entry *entry = packfile_store_get_packs(source->packfiles);
+               struct packfile_list_entry *entry = packfile_store_get_packs(source->files->packed);
                if (!entry)
                        continue;
                data->source = source;