raw_object_store: drop extra pointer to replace_map

We store the replacement data in an oidmap, which is itself a pointer in
the raw_object_store struct. But there's no need for an extra pointer
indirection here. It is always allocated and initialized along with the
containing struct, and we never check it for NULL-ness.

Let's embed the map directly in the struct, which is simpler and avoids
extra pointer chasing.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/commit-graph.c b/commit-graph.c
index 1a74e1e1baffbe3e99db3f34548ddfd3a7a9e63f..4a6e34f8a0a070a0f4731bf647362e15232f15f7 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -222,7 +222,7 @@ static int commit_graph_compatible(struct repository *r)
 
        if (replace_refs_enabled(r)) {
                prepare_replace_object(r);
-               if (oidmap_get_size(r->objects->replace_map))
+               if (oidmap_get_size(&r->objects->replace_map))
                        return 0;
        }
 

diff --git a/object-store.c b/object-store.c
index bc24e8082904d520cd23489f7e3968d04c0bfec9..911bc7ff5ffdf63390eb683ebefc67d12fa1c7b7 100644 (file)
--- a/object-store.c
+++ b/object-store.c
@@ -1017,8 +1017,7 @@ void raw_object_store_clear(struct raw_object_store *o)
 {
        FREE_AND_NULL(o->alternate_db);
 
-       oidmap_clear(o->replace_map, 1);
-       FREE_AND_NULL(o->replace_map);
+       oidmap_clear(&o->replace_map, 1);
        pthread_mutex_destroy(&o->replace_mutex);
 
        free_commit_graph(o->commit_graph);

diff --git a/object-store.h b/object-store.h
index 46961dc954257b5da5e883329d10b8f59e25e0f2..9f6f27c016a8ca2a80322a25915e70ea2bbf14dc 100644 (file)
--- a/object-store.h
+++ b/object-store.h
@@ -5,6 +5,7 @@
 #include "object.h"
 #include "list.h"
 #include "oidset.h"
+#include "oidmap.h"
 #include "thread-utils.h"
 
 struct oidmap;
@@ -176,7 +177,7 @@ struct raw_object_store {
         * Objects that should be substituted by other objects
         * (see git-replace(1)).
         */
-       struct oidmap *replace_map;
+       struct oidmap replace_map;
        unsigned replace_map_initialized : 1;
        pthread_mutex_t replace_mutex; /* protect object replace functions */
 

diff --git a/replace-object.c b/replace-object.c
index 7b8a09b5cb495995db2bd9ce467780fc9e56645e..f8c5f68837f12ec63d1744e92b6d663a9f0798cc 100644 (file)
--- a/replace-object.c
+++ b/replace-object.c
@@ -31,7 +31,7 @@ static int register_replace_ref(const char *refname,
        oidcpy(&repl_obj->replacement, oid);
 
        /* Register new object */
-       if (oidmap_put(r->objects->replace_map, repl_obj))
+       if (oidmap_put(&r->objects->replace_map, repl_obj))
                die(_("duplicate replace ref: %s"), refname);
 
        return 0;
@@ -48,9 +48,7 @@ void prepare_replace_object(struct repository *r)
                return;
        }
 
-       r->objects->replace_map =
-               xmalloc(sizeof(*r->objects->replace_map));
-       oidmap_init(r->objects->replace_map, 0);
+       oidmap_init(&r->objects->replace_map, 0);
 
        refs_for_each_replace_ref(get_main_ref_store(r),
                                  register_replace_ref, r);
@@ -80,7 +78,7 @@ const struct object_id *do_lookup_replace_object(struct repository *r,
        /* Try to recursively replace the object */
        while (depth-- > 0) {
                struct replace_object *repl_obj =
-                       oidmap_get(r->objects->replace_map, cur);
+                       oidmap_get(&r->objects->replace_map, cur);
                if (!repl_obj)
                        return cur;
                cur = &repl_obj->replacement;

diff --git a/replace-object.h b/replace-object.h
index 4226376534b22e7b0293063f2637f0dd3a401055..3052e96a6203fdaa7354be39a1d5f26408adc86e 100644 (file)
--- a/replace-object.h
+++ b/replace-object.h
@@ -47,7 +47,7 @@ static inline const struct object_id *lookup_replace_object(struct repository *r
 {
        if (!replace_refs_enabled(r) ||
            (r->objects->replace_map_initialized &&
-            oidmap_get_size(r->objects->replace_map) == 0))
+            oidmap_get_size(&r->objects->replace_map) == 0))
                return oid;
        return do_lookup_replace_object(r, oid);
 }