dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-09 09:34:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

revision: add Bloom check that includes parent directories

Browse Source 
revs_maybe_changed_in_bloom() reports whether a commit may have changed
any of the paths in the pathspec. It uses bloom_filter_contains_vec(),
which requires all keys of a path's key vector to be present, so it only
answers for the paths themselves.

A caller may track more than those paths. git-last-modified(1) with
--show-trees reports the last modifying commit for the tree entries
containing the paths as well, up to the root. For a pathspec "a/b/c/"
that means it reports "a" and "a/b" next to "a/b/c" and its entries, and
those can each resolve to a different commit. A commit that only changed
"a/top" is the answer for "a", even though it touched nothing under
"a/b".

Such a caller needs to know whether the path, or any of the directories
leading up to it, may have changed. Add
revs_maybe_changed_in_bloom_with_parents(), which asks that question by
using bloom_filter_contains_any_vec() instead. A key vector holds a key
for the path and one for each of its leading directories, so looking up
any of them answers it.

There are no callers yet, one is added in a subsequent commit.

Signed-off-by: Toon Claes <toon@iotcl.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Toon Claes
2026-08-07 20:26:50 +02:00
committed by Junio C Hamano
parent 814c55e128
commit 7fc4c80a86
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
revision.c
View File

@@ -789,6 +789,21 @@ bool revs_maybe_changed_in_bloom(struct rev_info *revs,
return false;
}
bool revs_maybe_changed_in_bloom_with_parents(struct rev_info *revs,
struct bloom_filter *filter)
{
if (!revs->bloom_keyvecs_nr || !filter)
return true;
for (size_t nr = 0; nr < revs->bloom_keyvecs_nr; nr++)
if (bloom_filter_contains_any_vec(filter,
revs->bloom_keyvecs[nr],
revs->bloom_filter_settings))
return true;
return false;
}
static int rev_compare_tree(struct rev_info *revs,
struct commit *parent, struct commit *commit, int nth_parent)
{

8
revision.h
View File

@@ -505,6 +505,14 @@ int prepare_revision_walk(struct rev_info *revs);
bool revs_maybe_changed_in_bloom(struct rev_info *revs,
struct bloom_filter *filter);
/**
* Same as revs_maybe_changed_in_bloom(), but a change to any of the directories
* leading up to a path counts as well. Callers that track the tree entries
* containing the paths, and not just the paths themselves, need this.
*/
bool revs_maybe_changed_in_bloom_with_parents(struct rev_info *revs,
struct bloom_filter *filter);
/* Drain the commits linked list into the priority queue. */
void rev_info_commit_list_to_queue(struct rev_info *revs);
/**