3 test_description
='git log for a path with Bloom filters'
6 GIT_TEST_COMMIT_GRAPH
=0
7 GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS
=0
9 test_expect_success
'setup test - repo, commits, commit graph, log outputs' '
12 test_commit c1 A/file1 &&
13 test_commit c2 A/B/file2 &&
14 test_commit c3 A/B/C/file3 &&
15 test_commit c4 A/file1 &&
16 test_commit c5 A/B/file2 &&
17 test_commit c6 A/B/C/file3 &&
18 test_commit c7 A/file1 &&
19 test_commit c8 A/B/file2 &&
20 test_commit c9 A/B/C/file3 &&
21 test_commit c10 file_to_be_deleted &&
22 git checkout -b side HEAD~4 &&
23 test_commit side-1 file4 &&
24 git checkout master &&
26 test_commit c11 file5 &&
27 mv file5 file5_renamed &&
28 git add file5_renamed &&
29 git commit -m "rename" &&
30 rm file_to_be_deleted &&
32 git commit -m "file removed" &&
33 git commit --allow-empty -m "empty" &&
34 git commit-graph write --reachable --changed-paths &&
42 graph_read_expect
() {
45 header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0
47 chunks: oid_fanout oid_lookup commit_metadata bloom_indexes bloom_data
49 test-tool read-graph
>actual
&&
50 test_cmp expect actual
53 test_expect_success
'commit-graph write wrote out the bloom chunks' '
57 # Turn off any inherited trace2 settings for this test.
58 sane_unset GIT_TRACE2 GIT_TRACE2_PERF GIT_TRACE2_EVENT
59 sane_unset GIT_TRACE2_PERF_BRIEF
60 sane_unset GIT_TRACE2_CONFIG_PARAMS
63 rm -f "$TRASH_DIRECTORY/trace.perf" &&
64 git
-c core.commitGraph
=false log
--pretty="format:%s" $1 >log_wo_bloom
&&
65 GIT_TRACE2_PERF
="$TRASH_DIRECTORY/trace.perf" git
-c core.commitGraph
=true log
--pretty="format:%s" $1 >log_w_bloom
68 test_bloom_filters_used
() {
70 bloom_trace_prefix
="statistics:{\"filter_not_present\":${2:-0},\"maybe\""
72 grep -q "$bloom_trace_prefix" "$TRASH_DIRECTORY/trace.perf" &&
73 test_cmp log_wo_bloom log_w_bloom
&&
74 test_path_is_file
"$TRASH_DIRECTORY/trace.perf"
77 test_bloom_filters_not_used
() {
80 ! grep -q "statistics:{\"filter_not_present\":" "$TRASH_DIRECTORY/trace.perf" &&
81 test_cmp log_wo_bloom log_w_bloom
84 for path
in A A
/B A
/B
/C A
/file1 A
/B
/file2 A
/B
/C
/file3 file4 file5 file5_renamed file_to_be_deleted
89 "--full-history --simplify-merges" \
91 "--simplify-by-decoration" \
96 "--author-date-order" \
97 "--ancestry-path side..master"
99 test_expect_success
"git log option: $option for path: $path" '
100 test_bloom_filters_used "$option -- $path" &&
101 test_config commitgraph.readChangedPaths false &&
102 test_bloom_filters_not_used "$option -- $path"
107 test_expect_success
'git log -- folder works with and without the trailing slash' '
108 test_bloom_filters_used "-- A" &&
109 test_bloom_filters_used "-- A/"
112 test_expect_success
'git log for path that does not exist. ' '
113 test_bloom_filters_used "-- path_does_not_exist"
116 test_expect_success
'git log with --walk-reflogs does not use Bloom filters' '
117 test_bloom_filters_not_used "--walk-reflogs -- A"
120 test_expect_success
'git log -- multiple path specs does not use Bloom filters' '
121 test_bloom_filters_not_used "-- file4 A/file1"
124 test_expect_success
'git log -- "." pathspec at root does not use Bloom filters' '
125 test_bloom_filters_not_used "-- ."
128 test_expect_success
'git log with wildcard that resolves to a single path uses Bloom filters' '
129 test_bloom_filters_used "-- *4" &&
130 test_bloom_filters_used "-- *renamed"
133 test_expect_success
'git log with wildcard that resolves to a multiple paths does not uses Bloom filters' '
134 test_bloom_filters_not_used "-- *" &&
135 test_bloom_filters_not_used "-- file*"
138 test_expect_success
'setup - add commit-graph to the chain without Bloom filters' '
139 test_commit c14 A/anotherFile2 &&
140 test_commit c15 A/B/anotherFile2 &&
141 test_commit c16 A/B/C/anotherFile2 &&
142 git commit-graph write --reachable --split --no-changed-paths &&
143 test_line_count = 2 .git/objects/info/commit-graphs/commit-graph-chain
146 test_expect_success
'use Bloom filters even if the latest graph does not have Bloom filters' '
147 # Ensure that the number of empty filters is equal to the number of
148 # filters in the latest graph layer to prove that they are loaded (and
150 test_bloom_filters_used "-- A/B" 3
153 test_expect_success
'setup - add commit-graph to the chain with Bloom filters' '
154 test_commit c17 A/anotherFile3 &&
155 git commit-graph write --reachable --changed-paths --split &&
156 test_line_count = 3 .git/objects/info/commit-graphs/commit-graph-chain
159 test_bloom_filters_used_when_some_filters_are_missing
() {
161 bloom_trace_prefix
="statistics:{\"filter_not_present\":3,\"maybe\":6,\"definitely_not\":9"
163 grep -q "$bloom_trace_prefix" "$TRASH_DIRECTORY/trace.perf" &&
164 test_cmp log_wo_bloom log_w_bloom
167 test_expect_success
'Use Bloom filters if they exist in the latest but not all commit graphs in the chain.' '
168 test_bloom_filters_used_when_some_filters_are_missing "-- A/B"
171 test_expect_success
'persist filter settings' '
172 test_when_finished rm -rf .git/objects/info/commit-graph* &&
173 rm -rf .git/objects/info/commit-graph* &&
174 GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
175 GIT_TRACE2_EVENT_NESTING=5 \
176 GIT_TEST_BLOOM_SETTINGS_NUM_HASHES=9 \
177 GIT_TEST_BLOOM_SETTINGS_BITS_PER_ENTRY=15 \
178 git commit-graph write --reachable --changed-paths &&
179 grep "{\"hash_version\":1,\"num_hashes\":9,\"bits_per_entry\":15,\"max_changed_paths\":512" trace2.txt &&
180 GIT_TRACE2_EVENT="$(pwd)/trace2-auto.txt" \
181 GIT_TRACE2_EVENT_NESTING=5 \
182 git commit-graph write --reachable --changed-paths &&
183 grep "{\"hash_version\":1,\"num_hashes\":9,\"bits_per_entry\":15,\"max_changed_paths\":512" trace2-auto.txt
186 test_max_changed_paths
() {
187 grep "\"max_changed_paths\":$1" $2
190 test_filter_not_computed
() {
191 grep "\"key\":\"filter-not-computed\",\"value\":\"$1\"" $2
194 test_filter_computed
() {
195 grep "\"key\":\"filter-computed\",\"value\":\"$1\"" $2
198 test_filter_trunc_empty
() {
199 grep "\"key\":\"filter-trunc-empty\",\"value\":\"$1\"" $2
202 test_filter_trunc_large
() {
203 grep "\"key\":\"filter-trunc-large\",\"value\":\"$1\"" $2
206 test_expect_success
'correctly report changes over limit' '
213 for i in $(test_seq 1 2)
215 printf $i >d/file$i.txt &&
216 printf $i >d/e/file$i.txt || return 1
220 printf bash >mode/script.sh &&
226 git add d foo foo.txt mode &&
227 git commit -m "files" &&
229 # Commit has 7 file and 4 directory adds
230 GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS=10 \
231 GIT_TRACE2_EVENT="$(pwd)/trace" \
232 git commit-graph write --reachable --changed-paths &&
233 test_max_changed_paths 10 trace &&
234 test_filter_computed 1 trace &&
235 test_filter_trunc_large 1 trace &&
237 for path in $(git ls-tree -r --name-only HEAD)
239 git -c commitGraph.readChangedPaths=false log \
241 git log -- $path >actual &&
242 test_cmp expect actual || return 1
245 # Make a variety of path changes
246 printf new1 >d/e/file1.txt &&
247 printf new2 >d/file2.txt &&
252 printf new1 >f/file1.txt &&
254 # including a mode-only change (counts as modified)
255 git update-index --chmod=+x mode/script.sh &&
258 git commit -m "complicated" &&
260 # start from scratch and rebuild
261 rm -f .git/objects/info/commit-graph &&
262 GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS=10 \
263 GIT_TRACE2_EVENT="$(pwd)/trace-edit" \
264 git commit-graph write --reachable --changed-paths &&
265 test_max_changed_paths 10 trace-edit &&
266 test_filter_computed 2 trace-edit &&
267 test_filter_trunc_large 2 trace-edit &&
269 for path in $(git ls-tree -r --name-only HEAD)
271 git -c commitGraph.readChangedPaths=false log \
273 git log -- $path >actual &&
274 test_cmp expect actual || return 1
277 # start from scratch and rebuild
278 rm -f .git/objects/info/commit-graph &&
279 GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS=11 \
280 GIT_TRACE2_EVENT="$(pwd)/trace-update" \
281 git commit-graph write --reachable --changed-paths &&
282 test_max_changed_paths 11 trace-update &&
283 test_filter_computed 2 trace-update &&
284 test_filter_trunc_large 0 trace-update &&
286 for path in $(git ls-tree -r --name-only HEAD)
288 git -c commitGraph.readChangedPaths=false log \
290 git log -- $path >actual &&
291 test_cmp expect actual || return 1
296 test_expect_success
'correctly report commits with no changed paths' '
298 test_when_finished "rm -fr empty" &&
302 git commit --allow-empty -m "initial commit" &&
304 GIT_TRACE2_EVENT="$(pwd)/trace.event" \
305 git commit-graph write --reachable --changed-paths &&
306 test_filter_computed 1 trace.event &&
307 test_filter_not_computed 0 trace.event &&
308 test_filter_trunc_empty 1 trace.event &&
309 test_filter_trunc_large 0 trace.event
313 test_expect_success
'Bloom generation is limited by --max-new-filters' '
316 test_commit c2 filter &&
317 test_commit c3 filter &&
318 test_commit c4 no-filter &&
321 GIT_TRACE2_EVENT="$(pwd)/trace.event" \
322 git commit-graph write --reachable --split=replace \
323 --changed-paths --max-new-filters=2 &&
325 test_filter_computed 2 trace.event &&
326 test_filter_not_computed 3 trace.event &&
327 test_filter_trunc_empty 0 trace.event &&
328 test_filter_trunc_large 0 trace.event
332 test_expect_success
'Bloom generation backfills previously-skipped filters' '
333 # Check specifying commitGraph.maxNewFilters over "git config" works.
334 test_config -C limits commitGraph.maxNewFilters 1 &&
339 GIT_TRACE2_EVENT="$(pwd)/trace.event" \
340 git commit-graph write --reachable --changed-paths \
342 test_filter_computed 1 trace.event &&
343 test_filter_not_computed 4 trace.event &&
344 test_filter_trunc_empty 0 trace.event &&
345 test_filter_trunc_large 0 trace.event
349 test_expect_success
'--max-new-filters overrides configuration' '
351 test_when_finished "rm -fr override" &&
352 test_config -C override commitGraph.maxNewFilters 2 &&
359 GIT_TRACE2_EVENT="$(pwd)/trace.event" \
360 git commit-graph write --reachable --changed-paths \
361 --max-new-filters=1 &&
362 test_filter_computed 1 trace.event &&
363 test_filter_not_computed 1 trace.event &&
364 test_filter_trunc_empty 0 trace.event &&
365 test_filter_trunc_large 0 trace.event
369 test_expect_success
'Bloom generation backfills empty commits' '
371 test_when_finished "rm -fr empty" &&
374 for i in $(test_seq 1 6)
376 git commit --allow-empty -m "$i"
379 # Generate Bloom filters for empty commits 1-6, two at a time.
380 for i in $(test_seq 1 3)
383 GIT_TRACE2_EVENT="$(pwd)/trace.event" \
384 git commit-graph write --reachable \
385 --changed-paths --max-new-filters=2 &&
386 test_filter_computed 2 trace.event &&
387 test_filter_not_computed 4 trace.event &&
388 test_filter_trunc_empty 2 trace.event &&
389 test_filter_trunc_large 0 trace.event
392 # Finally, make sure that once all commits have filters, that
393 # none are subsequently recomputed.
395 GIT_TRACE2_EVENT="$(pwd)/trace.event" \
396 git commit-graph write --reachable \
397 --changed-paths --max-new-filters=2 &&
398 test_filter_computed 0 trace.event &&
399 test_filter_not_computed 6 trace.event &&
400 test_filter_trunc_empty 0 trace.event &&
401 test_filter_trunc_large 0 trace.event