bloom: rename function operates on bloom_key

git code style requires that functions operating on a struct S
should be named in the form S_verb. However, the functions operating
on struct bloom_key do not follow this convention. Therefore,
fill_bloom_key() and clear_bloom_key() are renamed to bloom_key_fill()
and bloom_key_clear(), respectively.

Signed-off-by: Lidong Yan <502024330056@smail.nju.edu.cn>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Lidong Yan 2025-07-12 17:35:14 +08:00 committed by Junio C Hamano
parent 4ca7017902
commit b187353ed2
6 changed files with 16 additions and 19 deletions

View File

@ -1310,7 +1310,7 @@ static void add_bloom_key(struct blame_bloom_data *bd,
}

bd->keys[bd->nr] = xmalloc(sizeof(struct bloom_key));
fill_bloom_key(path, strlen(path), bd->keys[bd->nr], bd->settings);
bloom_key_fill(bd->keys[bd->nr], path, strlen(path), bd->settings);
bd->nr++;
}


10
bloom.c
View File

@ -221,9 +221,7 @@ static uint32_t murmur3_seeded_v1(uint32_t seed, const char *data, size_t len)
return seed;
}

void fill_bloom_key(const char *data,
size_t len,
struct bloom_key *key,
void bloom_key_fill(struct bloom_key *key, const char *data, size_t len,
const struct bloom_filter_settings *settings)
{
int i;
@ -243,7 +241,7 @@ void fill_bloom_key(const char *data,
key->hashes[i] = hash0 + i * hash1;
}

void clear_bloom_key(struct bloom_key *key)
void bloom_key_clear(struct bloom_key *key)
{
FREE_AND_NULL(key->hashes);
}
@ -500,9 +498,9 @@ struct bloom_filter *get_or_compute_bloom_filter(struct repository *r,

hashmap_for_each_entry(&pathmap, &iter, e, entry) {
struct bloom_key key;
fill_bloom_key(e->path, strlen(e->path), &key, settings);
bloom_key_fill(&key, e->path, strlen(e->path), settings);
add_key_to_filter(&key, filter, settings);
clear_bloom_key(&key);
bloom_key_clear(&key);
}

cleanup:

View File

@ -78,11 +78,9 @@ int load_bloom_filter_from_graph(struct commit_graph *g,
struct bloom_filter *filter,
uint32_t graph_pos);

void fill_bloom_key(const char *data,
size_t len,
struct bloom_key *key,
void bloom_key_fill(struct bloom_key *key, const char *data, size_t len,
const struct bloom_filter_settings *settings);
void clear_bloom_key(struct bloom_key *key);
void bloom_key_clear(struct bloom_key *key);

void add_key_to_filter(const struct bloom_key *key,
struct bloom_filter *filter,

View File

@ -1172,12 +1172,13 @@ static int bloom_filter_check(struct rev_info *rev,
return 0;

while (!result && range) {
fill_bloom_key(range->path, strlen(range->path), &key, rev->bloom_filter_settings);
bloom_key_fill(&key, range->path, strlen(range->path),
rev->bloom_filter_settings);

if (bloom_filter_contains(filter, &key, rev->bloom_filter_settings))
result = 1;

clear_bloom_key(&key);
bloom_key_clear(&key);
range = range->next;
}


View File

@ -739,15 +739,15 @@ static void prepare_to_use_bloom_filter(struct rev_info *revs)
revs->bloom_keys_nr = path_component_nr;
ALLOC_ARRAY(revs->bloom_keys, revs->bloom_keys_nr);

fill_bloom_key(path, len, &revs->bloom_keys[0],
bloom_key_fill(&revs->bloom_keys[0], path, len,
revs->bloom_filter_settings);
path_component_nr = 1;

p = path + len - 1;
while (p > path) {
if (*p == '/')
fill_bloom_key(path, p - path,
&revs->bloom_keys[path_component_nr++],
bloom_key_fill(&revs->bloom_keys[path_component_nr++],
path, p - path,
revs->bloom_filter_settings);
p--;
}
@ -3230,7 +3230,7 @@ void release_revisions(struct rev_info *revs)
oidset_clear(&revs->missing_commits);

for (int i = 0; i < revs->bloom_keys_nr; i++)
clear_bloom_key(&revs->bloom_keys[i]);
bloom_key_clear(&revs->bloom_keys[i]);
FREE_AND_NULL(revs->bloom_keys);
revs->bloom_keys_nr = 0;
}

View File

@ -12,13 +12,13 @@ static struct bloom_filter_settings settings = DEFAULT_BLOOM_FILTER_SETTINGS;
static void add_string_to_filter(const char *data, struct bloom_filter *filter) {
struct bloom_key key;

fill_bloom_key(data, strlen(data), &key, &settings);
bloom_key_fill(&key, data, strlen(data), &settings);
printf("Hashes:");
for (size_t i = 0; i < settings.num_hashes; i++)
printf("0x%08x|", key.hashes[i]);
printf("\n");
add_key_to_filter(&key, filter, &settings);
clear_bloom_key(&key);
bloom_key_clear(&key);
}

static void print_bloom_filter(struct bloom_filter *filter) {