@matheusbsbs / matheus-bagliano / commits / 59f0d5073f
Fork 0

bloom: encode out-of-bounds filters as non-empty

When a changed-path Bloom filter has either zero, or more than a certain number (commonly 512) of entries, the commit-graph machinery encodes it as "missing". More specifically, it sets the indices adjacent in the BIDX chunk as equal to each other to indicate a "length 0" filter; that is, that the filter occupies zero bytes on disk. This has heretofore been fine, since the commit-graph machinery has no need to care about these filters with too few or too many changed paths. Both cases act like no filter has been generated at all, and so there is no need to store them. In a subsequent commit, however, the commit-graph machinery will learn to only compute Bloom filters for some commits in the current commit-graph layer. This is a change from the current implementation which computes Bloom filters for all commits that are in the layer being written. Critically for this patch, only computing some of the Bloom filters means adding a third state for length 0 Bloom filters: zero entries, too many entries, or "hasn't been computed". It will be important for that future patch to distinguish between "not representable" (i.e., zero or too-many changed paths), and "hasn't been computed". In particular, we don't want to waste time recomputing filters that have already been computed. To that end, change how we store Bloom filters in the "computed but not representable" category: - Bloom filters with no entries are stored as a single byte with all bits low (i.e., all queries to that Bloom filter will return "definitely not") - Bloom filters with too many entries are stored as a single byte with all bits set high (i.e., all queries to that Bloom filter will return "maybe"). These rules are sufficient to not incur a behavior change by changing the on-disk representation of these two classes. Likewise, no specification changes are necessary for the commit-graph format, either: - Filters that were previously empty will be recomputed and stored according to the new rules, and - old clients reading filters generated by new clients will interpret the filters correctly and be none the wiser to how they were generated. Clients will invoke the Bloom machinery in more cases than before, but this can be addressed by returning a NULL filter when all bits are set high. This can be addressed in a future patch. Note that this does increase the size of on-disk commit-graphs, but far less than other proposals. In particular, this is generally more efficient than storing a bitmap for which commits haven't computed their Bloom filters. Storing a bitmap incurs a penalty of one bit per commit, whereas storing explicit filters as above incurs a penalty of one byte per too-large or empty commit. In practice, these boundary commits likely occupy a small proportion of the overall number of commits, and so the size penalty is likely smaller than storing a bitmap for all commits. See, for example, these relative proportions of such boundary commits (collected by SZEDER Gábor): | Percentage of | commit-graph | | | commits modifying | file size | | ├────────┬──────────────┼───────────────────┤ pct. | | 0 path | >= 512 paths | before | after | change | ┌────────────────┼────────┼──────────────┼─────────┼─────────┼───────────┤ | android-base | 13.20% | 0.13% | 37.468M | 37.534M | +0.1741 % | | cmssw | 0.15% | 0.23% | 17.118M | 17.119M | +0.0091 % | | cpython | 3.07% | 0.01% | 7.967M | 7.971M | +0.0423 % | | elasticsearch | 0.70% | 1.00% | 8.833M | 8.835M | +0.0128 % | | gcc | 0.00% | 0.08% | 16.073M | 16.074M | +0.0030 % | | gecko-dev | 0.14% | 0.64% | 59.868M | 59.874M | +0.0105 % | | git | 0.11% | 0.02% | 3.895M | 3.895M | +0.0020 % | | glibc | 0.02% | 0.10% | 3.555M | 3.555M | +0.0021 % | | go | 0.00% | 0.07% | 3.186M | 3.186M | +0.0018 % | | homebrew-cask | 0.40% | 0.02% | 7.035M | 7.035M | +0.0065 % | | homebrew-core | 0.01% | 0.01% | 11.611M | 11.611M | +0.0002 % | | jdk | 0.26% | 5.64% | 5.537M | 5.540M | +0.0590 % | | linux | 0.01% | 0.51% | 63.735M | 63.740M | +0.0073 % | | llvm-project | 0.12% | 0.03% | 25.515M | 25.516M | +0.0050 % | | rails | 0.10% | 0.10% | 6.252M | 6.252M | +0.0027 % | | rust | 0.07% | 0.17% | 9.364M | 9.364M | +0.0033 % | | tensorflow | 0.09% | 1.02% | 7.009M | 7.010M | +0.0158 % | | webkit | 0.05% | 0.31% | 17.405M | 17.406M | +0.0047 % | (where the above increase is determined by computing a non-split commit-graph before and after this patch). Given that these projects are all "large" by commit count, the storage cost by writing these filters explicitly is negligible. In the most extreme example, android-base (which has 494,848 commits at the time of writing) would have its commit-graph increase by a modest 68.4 KB. Finally, a test to exercise filters which contain too many changed path entries will be introduced in a subsequent patch. Suggested-by: SZEDER Gábor <szeder.dev@gmail.com> Suggested-by: Jakub Narębski <jnareb@gmail.com> Helped-by: Derrick Stolee <dstolee@microsoft.com> Helped-by: SZEDER Gábor <szeder.dev@gmail.com> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Taylor Blau committed Sep 17, 2020 at 22:59 UTC 59f0d5073fd9f0497b9ff9a48fb3a7a8d82d1f9d
6 files changed +54 -9
Documentation/technical/commit-graph-format.txt
+1 -1
@@ -120,7 +120,7 @@ CHUNK DATA:
120 * The rest of the chunk is the concatenation of all the computed Bloom
121 filters for the commits in lexicographic order.
122 * Note: Commits with no changes or more than 512 changes have Bloom filters
123 - of length zero.
123 + of length one, with either all bits set to zero or one respectively.
124 * The BDAT chunk is present if and only if BIDX is present.
125
126 Base Graphs List (ID: {'B', 'A', 'S', 'E'}) [Optional]
bloom.c
+14 -2
@@ -177,6 +177,13 @@ static int pathmap_cmp(const void *hashmap_cmp_fn_data,
177 return strcmp(e1->path, e2->path);
178 }
179
180 +static void init_truncated_large_filter(struct bloom_filter *filter)
181 +{
182 + filter->data = xmalloc(1);
183 + filter->data[0] = 0xFF;
184 + filter->len = 1;
185 +}
186 +
187 struct bloom_filter *get_or_compute_bloom_filter(struct repository *r,
188 struct commit *c,
189 int compute_if_not_present,
@@ -260,12 +267,18 @@ struct bloom_filter *get_or_compute_bloom_filter(struct repository *r,
267 }
268
269 if (hashmap_get_size(&pathmap) > settings->max_changed_paths) {
270 + init_truncated_large_filter(filter);
271 if (computed)
272 *computed |= BLOOM_TRUNC_LARGE;
273 goto cleanup;
274 }
275
276 filter->len = (hashmap_get_size(&pathmap) * settings->bits_per_entry + BITS_PER_WORD - 1) / BITS_PER_WORD;
277 + if (!filter->len) {
278 + if (computed)
279 + *computed |= BLOOM_TRUNC_EMPTY;
280 + filter->len = 1;
281 + }
282 filter->data = xcalloc(filter->len, sizeof(unsigned char));
283
284 hashmap_for_each_entry(&pathmap, &iter, e, entry) {
@@ -279,8 +292,7 @@ struct bloom_filter *get_or_compute_bloom_filter(struct repository *r,
292 } else {
293 for (i = 0; i < diff_queued_diff.nr; i++)
294 diff_free_filepair(diff_queued_diff.queue[i]);
282 - filter->data = NULL;
283 - filter->len = 0;
295 + init_truncated_large_filter(filter);
296
297 if (computed)
298 *computed |= BLOOM_TRUNC_LARGE;
bloom.h
+1
@@ -93,6 +93,7 @@ enum bloom_filter_computed {
93 BLOOM_NOT_COMPUTED = (1 << 0),
94 BLOOM_COMPUTED = (1 << 1),
95 BLOOM_TRUNC_LARGE = (1 << 2),
96 + BLOOM_TRUNC_EMPTY = (1 << 3),
97 };
98
99 struct bloom_filter *get_or_compute_bloom_filter(struct repository *r,
commit-graph.c
+5
@@ -968,6 +968,7 @@ struct write_commit_graph_context {
968
969 int count_bloom_filter_computed;
970 int count_bloom_filter_not_computed;
971 + int count_bloom_filter_trunc_empty;
972 int count_bloom_filter_trunc_large;
973 };
974
@@ -1396,6 +1397,8 @@ static void trace2_bloom_filter_write_statistics(struct write_commit_graph_conte
1397 ctx->count_bloom_filter_computed);
1398 trace2_data_intmax("commit-graph", ctx->r, "filter-not-computed",
1399 ctx->count_bloom_filter_not_computed);
1400 + trace2_data_intmax("commit-graph", ctx->r, "filter-trunc-empty",
1401 + ctx->count_bloom_filter_trunc_empty);
1402 trace2_data_intmax("commit-graph", ctx->r, "filter-trunc-large",
1403 ctx->count_bloom_filter_trunc_large);
1404 }
@@ -1432,6 +1435,8 @@ static void compute_bloom_filters(struct write_commit_graph_context *ctx)
1435 &computed);
1436 if (computed & BLOOM_COMPUTED) {
1437 ctx->count_bloom_filter_computed++;
1438 + if (computed & BLOOM_TRUNC_EMPTY)
1439 + ctx->count_bloom_filter_trunc_empty++;
1440 if (computed & BLOOM_TRUNC_LARGE)
1441 ctx->count_bloom_filter_trunc_large++;
1442 } else if (computed & BLOOM_NOT_COMPUTED)
t/t0095-bloom.sh
+4 -4
@@ -71,8 +71,8 @@ test_expect_success 'get bloom filters for commit with no changes' '
71 git init &&
72 git commit --allow-empty -m "c0" &&
73 cat >expect <<-\EOF &&
74 - Filter_Length:0
75 - Filter_Data:
74 + Filter_Length:1
75 + Filter_Data:00|
76 EOF
77 test-tool bloom get_filter_for_commit "$(git rev-parse HEAD)" >actual &&
78 test_cmp expect actual
@@ -107,8 +107,8 @@ test_expect_success EXPENSIVE 'get bloom filter for commit with 513 changes' '
107 git add bigDir &&
108 git commit -m "commit with 513 changes" &&
109 cat >expect <<-\EOF &&
110 - Filter_Length:0
111 - Filter_Data:
110 + Filter_Length:1
111 + Filter_Data:ff|
112 EOF
113 test-tool bloom get_filter_for_commit "$(git rev-parse HEAD)" >actual &&
114 test_cmp expect actual
t/t4216-log-bloom.sh
+29 -2
@@ -30,8 +30,10 @@ test_expect_success 'setup test - repo, commits, commit graph, log outputs' '
30 rm file_to_be_deleted &&
31 git add . &&
32 git commit -m "file removed" &&
33 + git commit --allow-empty -m "empty" &&
34 git commit-graph write --reachable --changed-paths
35 '
36 +
37 graph_read_expect () {
38 NUM_CHUNKS=5
39 cat >expect <<- EOF
@@ -44,7 +46,7 @@ graph_read_expect () {
46 }
47
48 test_expect_success 'commit-graph write wrote out the bloom chunks' '
47 - graph_read_expect 15
49 + graph_read_expect 16
50 '
51
52 # Turn off any inherited trace2 settings for this test.
@@ -151,7 +153,7 @@ test_expect_success 'setup - add commit-graph to the chain with Bloom filters' '
153
154 test_bloom_filters_used_when_some_filters_are_missing () {
155 log_args=$1
154 - bloom_trace_prefix="statistics:{\"filter_not_present\":3,\"maybe\":6,\"definitely_not\":8"
156 + bloom_trace_prefix="statistics:{\"filter_not_present\":3,\"maybe\":6,\"definitely_not\":9"
157 setup "$log_args" &&
158 grep -q "$bloom_trace_prefix" "$TRASH_DIRECTORY/trace.perf" &&
159 test_cmp log_wo_bloom log_w_bloom
@@ -180,10 +182,18 @@ test_max_changed_paths () {
182 grep "\"max_changed_paths\":$1" $2
183 }
184
185 +test_filter_not_computed () {
186 + grep "\"key\":\"filter-not-computed\",\"value\":\"$1\"" $2
187 +}
188 +
189 test_filter_computed () {
190 grep "\"key\":\"filter-computed\",\"value\":\"$1\"" $2
191 }
192
193 +test_filter_trunc_empty () {
194 + grep "\"key\":\"filter-trunc-empty\",\"value\":\"$1\"" $2
195 +}
196 +
197 test_filter_trunc_large () {
198 grep "\"key\":\"filter-trunc-large\",\"value\":\"$1\"" $2
199 }
@@ -278,4 +288,21 @@ test_expect_success 'correctly report changes over limit' '
288 )
289 '
290
291 +test_expect_success 'correctly report commits with no changed paths' '
292 + git init empty &&
293 + test_when_finished "rm -fr empty" &&
294 + (
295 + cd empty &&
296 +
297 + git commit --allow-empty -m "initial commit" &&
298 +
299 + GIT_TRACE2_EVENT="$(pwd)/trace.event" \
300 + git commit-graph write --reachable --changed-paths &&
301 + test_filter_computed 1 trace.event &&
302 + test_filter_not_computed 0 trace.event &&
303 + test_filter_trunc_empty 1 trace.event &&
304 + test_filter_trunc_large 0 trace.event
305 + )
306 +'
307 +
308 test_done