@matheusbsbs / matheus-bagliano / commits / f8bdf3127a

odb: refactor `odb_clear()` to `odb_free()`

The function `odb_clear()` releases all resources allocated to an object database and ensures that all fields become zero'd out. Despite its naming though it doesn't really clear the object database so that it becomes ready for reuse afterwards again -- the caller would first have to reinitialize it, and that contradicts the terminology of "clearing" as we have defined it in our coding guidelines. There isn't really only a reason to have "clearing" semantics, either. There's only a single caller of `odb_clear()`, and that caller also ends up freeing the object database structure itself. Refactor the function to have "freeing" semantics instead, so that the structure itself is also freed, which allows us to drop some useless boilerplate to zero out the structure's members. This refactoring reveals that we're trying to close the commit graph multiple times: once directly via `free_commit_graph()`, and once via `odb_close()`. Drop the former call. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Patrick Steinhardt committed Nov 19, 2025 at 08:50 UTC f8bdf3127ab7df8a8f3039f41889b35eefe029a3
3 files changed +13 -14
odb.c
+8 -11
@@ -1073,30 +1073,27 @@ static void odb_free_sources(struct object_database *o)
1073 o->source_by_path = NULL;
1074 }
1075
1076 -void odb_clear(struct object_database *o)
1076 +void odb_free(struct object_database *o)
1077 {
1078 - FREE_AND_NULL(o->alternate_db);
1078 + if (!o)
1079 + return;
1080 +
1081 + free(o->alternate_db);
1082
1083 oidmap_clear(&o->replace_map, 1);
1084 pthread_mutex_destroy(&o->replace_mutex);
1085
1083 - free_commit_graph(o->commit_graph);
1084 - o->commit_graph = NULL;
1085 - o->commit_graph_attempted = 0;
1086 -
1086 odb_free_sources(o);
1088 - o->sources_tail = NULL;
1089 - o->loaded_alternates = 0;
1087
1088 for (size_t i = 0; i < o->cached_object_nr; i++)
1089 free((char *) o->cached_objects[i].value.buf);
1093 - FREE_AND_NULL(o->cached_objects);
1090 + free(o->cached_objects);
1091
1092 odb_close(o);
1093 packfile_store_free(o->packfiles);
1097 - o->packfiles = NULL;
1098 -
1094 string_list_clear(&o->submodule_source_paths, 0);
1095 +
1096 + free(o);
1097 }
1098
1099 void odb_reprepare(struct object_database *o)
odb.h
+3 -1
@@ -167,7 +167,9 @@ struct object_database {
167 };
168
169 struct object_database *odb_new(struct repository *repo);
170 -void odb_clear(struct object_database *o);
170 +
171 +/* Free the object database and release all resources. */
172 +void odb_free(struct object_database *o);
173
174 /*
175 * Close the object database and all of its sources so that any held resources
repository.c
+2 -2
@@ -382,8 +382,8 @@ void repo_clear(struct repository *repo)
382 FREE_AND_NULL(repo->worktree);
383 FREE_AND_NULL(repo->submodule_prefix);
384
385 - odb_clear(repo->objects);
386 - FREE_AND_NULL(repo->objects);
385 + odb_free(repo->objects);
386 + repo->objects = NULL;
387
388 parsed_object_pool_clear(repo->parsed_objects);
389 FREE_AND_NULL(repo->parsed_objects);