Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Patrick Steinhardt <ps@pks.im>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 01/12] commit-graph: simplify linking commit graph chains
Date: Mon, 16 Nov 2026 12:53:56 -0800	[thread overview]
Message-ID: <xmqqqzgkjy57.fsf@gitster.g> (raw)
In-Reply-To: <20261116-pks-odb-pluggable-commit-graphs-v1-1-a83fc1ff0808@pks.im> (Patrick Steinhardt's message of "Mon, 16 Nov 2026 14:07:37 +0100")

Patrick Steinhardt <ps@pks.im> writes:

> 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.

>  {
> -	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.

>  	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?

>  	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?

> @@ -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 {

> +
> +/*
> + * 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);

  reply	other threads:[~2026-11-16 20:53 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-16 13:07 [PATCH 00/12] Introduce pluggable commit graphs Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 01/12] commit-graph: simplify linking commit graph chains Patrick Steinhardt
2026-11-16 20:53   ` Junio C Hamano [this message]
2026-11-16 13:07 ` [PATCH 02/12] commit-graph: simplify reading a single commit graph Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 03/12] commit-graph: expose function to validate a commit graph chain Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 04/12] commit-graph: decide mergeable and chainable layers by depth Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 05/12] commit-graph: introduce common exit for `write_commit_graph_file()` Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 06/12] commit-graph: derive layer infos from the passed-in chain Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 07/12] commit-graph: split out check whether writing commit graphs is allowed Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 08/12] commit-graph: split out logic to write a new commit graph layer Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 09/12] commit-graph: mark incomplete commit graph chains Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 10/12] odb/source: make commit graphs pluggable Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 11/12] odb/source-files: move logic to derive commit graph paths Patrick Steinhardt
2026-11-16 13:07 ` [PATCH 12/12] odb/source-files: internalize " Patrick Steinhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqqzgkjy57.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=ps@pks.im \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox