Re: [PATCH 01/12] commit-graph: simplify linking commit graph chains
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 16, 2026, 20:53 UTC
- Message-ID
- <xmqqqzgkjy57.fsf@gitster.g>
- In-Reply-To
- <20261116-pks-odb-pluggable-commit-graphs-v1-1-a83fc1ff0808@pks.im>
Patrick Steinhardt <ps@pks.im> writes:
Show 37 quoted lines
> When we load a commit graph chain we verify for every layer that the > hash of the base commit graph matches what the current tip has in its > base graphs chunk. To do so we pass both the chain itself as well as the > array of object IDs that we have read from the commit-graph chain file > to `add_graph_to_chain()`. > > But the array of object IDs is redundant information: we have already > loaded and linked the base layers, and as part of that we have stored > their respective hashes in the structure itself. Consequently, we can > already derive the hashes by walking the chain of base layers. > > Refactor the function to only take the new tip and base layers as input > and derive all the other information ad-hoc and make the function > public. This prepares for a subsequent commit, where we are about to > move the logic that creates commit graph chains into the object database > backend. > > Signed-off-by: Patrick Steinhardt <ps@pks.im> > --- > commit-graph.c | 52 ++++++++++++++++++++++++---------------------------- > commit-graph.h | 8 ++++++++ > 2 files changed, 32 insertions(+), 28 deletions(-) > > diff --git a/commit-graph.c b/commit-graph.c > index da65cd3deb9..94c761907a0 100644 > --- a/commit-graph.c > +++ b/commit-graph.c > @@ -575,50 +575,48 @@ static void validate_mixed_bloom_settings(struct commit_graph *g) > } > } > > -static int add_graph_to_chain(struct commit_graph *g, > - struct commit_graph *chain, > - struct object_id *oids, > - int n) > +int commit_graph_link_base(struct commit_graph *g, > + struct commit_graph *base)
Nice simplification, I guess.
Show 7 quoted lines
> {
> - struct commit_graph *cur_g = chain;
> + struct commit_graph *layer;
> + size_t n = 0;
> +
> + for (layer = base; layer; layer = layer->base_graph)
> + n++;We chase the pointers to count the number of layers. We no longer count in signed int, which is probably a big plus in the sanitation department.
Show 5 quoted lines
> if (n && !g->chunk_base_graphs) {
> warning(_("commit-graph has no base graphs chunk"));
> - return 0;
> + return -1;
> }It might be obvious when reading (and writing) this patch, but it is a welcome change to standardize on "0 means happy" convention. Should the fact that we now use more common error reporting convention be mentioned in the log message?
Show 16 quoted lines
> if (g->chunk_base_graphs_size / g->hash_algo->rawsz < n) {
> warning(_("commit-graph base graphs chunk is too small"));
> - return 0;
> + return -1;
> }
>
> - while (n) {
> + for (layer = base; layer; layer = layer->base_graph) {
> n--;
> -
> - if (!cur_g ||
> - !oideq(&oids[n], &cur_g->oid) ||
> - !hasheq(oids[n].hash, g->chunk_base_graphs + st_mult(g->hash_algo->rawsz, n),
> + if (!hasheq(layer->oid.hash,
> + g->chunk_base_graphs + st_mult(g->hash_algo->rawsz, n),
> g->hash_algo)) {We no longer check cur_g->oid is what we expect, because we lost the array that holds the value to compare. Would this make cur_g->oid a write-only member that is only computed and written but never used other than reporting purposes? In commit-graph.c before this step, I think this is the only place that reads ->oid for purposes other than passing it to diagnostics like die/warn.
We seem to still be making sure in load_commit_graph_chain_fd_st() that the line we read into local oid there is a hash, so perhaps it is possible to validate g->oid against this oid after we load g?
Show 9 quoted lines
> @@ -682,7 +679,7 @@ struct commit_graph *load_commit_graph_chain_fd_st(struct object_database *odb,
> free(graph_name);
>
> if (g) {
> - if (add_graph_to_chain(g, graph_chain, oids, i)) {
> + if (!commit_graph_link_base(g, graph_chain)) {
> graph_chain = g;
> valid = 1;
> } else {Show 10 quoted lines
> + > +/* > + * Link the commit graph layer `g` on top of the chain `base`. `base` may be > + * NULL if `g` is the root of a new chain. Returns 0 on success, a negative > + * error code otherwise. > + */ > +int commit_graph_link_base(struct commit_graph *g, > + struct commit_graph *base); > struct commit_graph *read_commit_graph_one(struct repository *repo, > const char *dir);