kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

revision: move bloom keyvec precondition into function 

There are currently two callsites calling
check_maybe_different_in_bloom_filter(). They both check if
revs->bloom_keyvecs_nr is not zero before they call that function.

Move bloom_keyvecs_nr precondition into
check_maybe_different_in_bloom_filter() to simplify the code.

Note that this changes `bloom_ret` to become -1 when there are no Bloom
key vectors, which results in `count_bloom_filter_false_positive` not
being incremented. This is unobservable, as the Bloom statistics are
only reported when key vectors were set up.

Signed-off-by: Toon Claes <toon@iotcl.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
seen
Toon Claes 2026-07-17 17:46:59 +02:00 committed by Junio C Hamano
parent 41365c2a9b
commit f751ee94c4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
revision.c
View File

@ -752,6 +752,9 @@ static int check_maybe_different_in_bloom_filter(struct rev_info *revs,
struct bloom_filter *filter;
int result = 0;

if (!revs->bloom_keyvecs_nr)
return -1;

if (commit_graph_generation(commit) == GENERATION_NUMBER_INFINITY)
return -1;

@ -806,7 +809,7 @@ static int rev_compare_tree(struct rev_info *revs,
return REV_TREE_SAME;
}

if (revs->bloom_keyvecs_nr && !nth_parent) {
if (!nth_parent) {
bloom_ret = check_maybe_different_in_bloom_filter(revs, commit);

if (bloom_ret == 0)
@ -833,7 +836,7 @@ static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit,
if (!t1)
return 0;

if (!nth_parent && revs->bloom_keyvecs_nr) {
if (!nth_parent) {
bloom_ret = check_maybe_different_in_bloom_filter(revs, commit);
if (!bloom_ret)
return 1;