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>
Jeff King committed
May 12, 2025 at 14:52 UTC
4b63963f5d729cb9eb997c8912b7d500ffc53297
5 files changed
+8
-10
commit-graph.c
+1
-1
@@ -222,7 +222,7 @@ static int commit_graph_compatible(struct repository *r)
222
223
if (replace_refs_enabled(r)) {
224
prepare_replace_object(r);
225
- if (oidmap_get_size(r->objects->replace_map))
225
+ if (oidmap_get_size(&r->objects->replace_map))
226
return 0;
227
}
228
object-store.c
+1
-2
@@ -1017,8 +1017,7 @@ void raw_object_store_clear(struct raw_object_store *o)
1017
{
1018
FREE_AND_NULL(o->alternate_db);
1019
1020
- oidmap_clear(o->replace_map, 1);
1021
- FREE_AND_NULL(o->replace_map);
1020
+ oidmap_clear(&o->replace_map, 1);
1021
pthread_mutex_destroy(&o->replace_mutex);
1022
1023
free_commit_graph(o->commit_graph);
object-store.h
+2
-1
@@ -5,6 +5,7 @@
5
#include "object.h"
6
#include "list.h"
7
#include "oidset.h"
8
+#include "oidmap.h"
9
#include "thread-utils.h"
10
11
struct oidmap;
@@ -176,7 +177,7 @@ struct raw_object_store {
177
* Objects that should be substituted by other objects
178
* (see git-replace(1)).
179
*/
179
- struct oidmap *replace_map;
180
+ struct oidmap replace_map;
181
unsigned replace_map_initialized : 1;
182
pthread_mutex_t replace_mutex; /* protect object replace functions */
183
replace-object.c
+3
-5
@@ -31,7 +31,7 @@ static int register_replace_ref(const char *refname,
31
oidcpy(&repl_obj->replacement, oid);
32
33
/* Register new object */
34
- if (oidmap_put(r->objects->replace_map, repl_obj))
34
+ if (oidmap_put(&r->objects->replace_map, repl_obj))
35
die(_("duplicate replace ref: %s"), refname);
36
37
return 0;
@@ -48,9 +48,7 @@ void prepare_replace_object(struct repository *r)
48
return;
49
}
50
51
- r->objects->replace_map =
52
- xmalloc(sizeof(*r->objects->replace_map));
53
- oidmap_init(r->objects->replace_map, 0);
51
+ oidmap_init(&r->objects->replace_map, 0);
52
53
refs_for_each_replace_ref(get_main_ref_store(r),
54
register_replace_ref, r);
@@ -80,7 +78,7 @@ const struct object_id *do_lookup_replace_object(struct repository *r,
78
/* Try to recursively replace the object */
79
while (depth-- > 0) {
80
struct replace_object *repl_obj =
83
- oidmap_get(r->objects->replace_map, cur);
81
+ oidmap_get(&r->objects->replace_map, cur);
82
if (!repl_obj)
83
return cur;
84
cur = &repl_obj->replacement;
replace-object.h
+1
-1
@@ -47,7 +47,7 @@ static inline const struct object_id *lookup_replace_object(struct repository *r
47
{
48
if (!replace_refs_enabled(r) ||
49
(r->objects->replace_map_initialized &&
50
- oidmap_get_size(r->objects->replace_map) == 0))
50
+ oidmap_get_size(&r->objects->replace_map) == 0))
51
return oid;
52
return do_lookup_replace_object(r, oid);
53
}