odb/source-loose: store pointer to "files" instead of generic source

The `struct odb_source_loose` 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 "loose" source doesn't have any owning parent source at all
so that it can be used 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 "loose" 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 <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/object-file.c b/object-file.c
index 641bd9c..7a1908b 100644 (file)
--- a/object-file.c
+++ b/object-file.c
@@ -178,7 +178,7 @@ static int open_loose_object(struct odb_source_loose *loose,
        static struct strbuf buf = STRBUF_INIT;
        int fd;
 
-       *path = odb_loose_path(loose->source, &buf, oid);
+       *path = odb_loose_path(&loose->files->base, &buf, oid);
        fd = git_open(*path);
        if (fd >= 0)
                return fd;
@@ -189,7 +189,7 @@ static int open_loose_object(struct odb_source_loose *loose,
 static int quick_has_loose(struct odb_source_loose *loose,
                           const struct object_id *oid)
 {
-       return !!oidtree_contains(odb_source_loose_cache(loose->source, oid), oid);
+       return !!oidtree_contains(odb_source_loose_cache(&loose->files->base, oid), oid);
 }
 
 /*

diff --git a/odb/source-files.c b/odb/source-files.c
index b5abd20..185cc69 100644 (file)
--- a/odb/source-files.c
+++ b/odb/source-files.c
@@ -264,7 +264,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(&files->base);
+       files->loose = odb_source_loose_new(files);
        files->packed = packfile_store_new(&files->base);
 
        files->base.free = odb_source_files_free;

diff --git a/odb/source-loose.c b/odb/source-loose.c
index b944d21..c9e7414 100644 (file)
--- a/odb/source-loose.c
+++ b/odb/source-loose.c
@@ -1,10 +1,10 @@
 #include "git-compat-util.h"
 #include "odb/source-loose.h"
 
-struct odb_source_loose *odb_source_loose_new(struct odb_source *source)
+struct odb_source_loose *odb_source_loose_new(struct odb_source_files *files)
 {
        struct odb_source_loose *loose;
        CALLOC_ARRAY(loose, 1);
-       loose->source = source;
+       loose->files = files;
        return loose;
 }

diff --git a/odb/source-loose.h b/odb/source-loose.h
index 8b4bac7..bf61e76 100644 (file)
--- a/odb/source-loose.h
+++ b/odb/source-loose.h
@@ -3,6 +3,7 @@
 
 #include "odb/source.h"
 
+struct odb_source_files;
 struct object_database;
 struct oidtree;
 
@@ -11,7 +12,7 @@ struct oidtree;
  * file per object. This source is part of the files source.
  */
 struct odb_source_loose {
-       struct odb_source *source;
+       struct odb_source_files *files;
 
        /*
         * Used to store the results of readdir(3) calls when we are OK
@@ -29,6 +30,6 @@ struct odb_source_loose {
        struct loose_object_map *map;
 };
 
-struct odb_source_loose *odb_source_loose_new(struct odb_source *source);
+struct odb_source_loose *odb_source_loose_new(struct odb_source_files *files);
 
 #endif