mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit-graph: drop unnecessary graph_read_bloom_data_context

Browse Source 
The `graph_read_bloom_data_context` struct was introduced in an earlier
commit in order to pass pointers to the commit-graph and changed-path
Bloom filter version when reading the BDAT chunk.

The previous commit no longer writes through the changed_paths_version
pointer, making the surrounding context structure unnecessary. Drop it
and pass a pointer to the commit-graph directly when reading the BDAT
chunk.

Noticed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Taylor Blau
2023-10-18 14:33:14 -04:00
committed by Junio C Hamano
parent aea7c95e05
commit 8440b13657
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
commit-graph.c
View File

@ -314,16 +314,10 @@ static int graph_read_oid_lookup(const unsigned char *chunk_start,
return 0; return 0;
} }
struct graph_read_bloom_data_context {
struct commit_graph *g;
int *commit_graph_changed_paths_version;
};
static int graph_read_bloom_data(const unsigned char *chunk_start, static int graph_read_bloom_data(const unsigned char *chunk_start,
size_t chunk_size, void *data) size_t chunk_size, void *data)
{ {
struct graph_read_bloom_data_context *c = data; struct commit_graph *g = data;
struct commit_graph *g = c->g;
uint32_t hash_version; uint32_t hash_version;
hash_version = get_be32(chunk_start); hash_version = get_be32(chunk_start);
@ -415,14 +409,10 @@ struct commit_graph *parse_commit_graph(struct repo_settings *s,
} }
if (s->commit_graph_changed_paths_version) { if (s->commit_graph_changed_paths_version) {
struct graph_read_bloom_data_context context = {
.g = graph,
.commit_graph_changed_paths_version = &s->commit_graph_changed_paths_version
};
pair_chunk(cf, GRAPH_CHUNKID_BLOOMINDEXES, pair_chunk(cf, GRAPH_CHUNKID_BLOOMINDEXES,
&graph->chunk_bloom_indexes); &graph->chunk_bloom_indexes);
read_chunk(cf, GRAPH_CHUNKID_BLOOMDATA, read_chunk(cf, GRAPH_CHUNKID_BLOOMDATA,
graph_read_bloom_data, &context); graph_read_bloom_data, graph);
} }
if (graph->chunk_bloom_indexes && graph->chunk_bloom_data) { if (graph->chunk_bloom_indexes && graph->chunk_bloom_data) {