mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-read-graph: include extra post-parse info

Browse Source 
It can be helpful to verify that the 'struct commit_graph' that results
from parsing a commit-graph is correctly structured. The existence of
different chunks is not enough to verify that all of the optional
features are correctly enabled.

Update 'test-tool read-graph' to output an "options:" line that includes
information for different parts of the struct commit_graph.

In particular, this change demonstrates that the read_generation_data
option is never being enabled, which will be fixed in a later change.

Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Derrick Stolee
2022-03-01 19:48:28 +00:00
committed by Junio C Hamano
parent 4c53a8c20f
commit c78c7a959c
4 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
t/helper/test-read-graph.c
View File

@ -3,6 +3,7 @@
#include "commit-graph.h" #include "commit-graph.h"
#include "repository.h" #include "repository.h"
#include "object-store.h" #include "object-store.h"
#include "bloom.h"
int cmd__read_graph(int argc, const char **argv) int cmd__read_graph(int argc, const char **argv)
{ {
@ -45,6 +46,18 @@ int cmd__read_graph(int argc, const char **argv)
printf(" bloom_data"); printf(" bloom_data");
printf("\n"); printf("\n");
printf("options:");
if (graph->bloom_filter_settings)
printf(" bloom(%"PRIu32",%"PRIu32",%"PRIu32")",
graph->bloom_filter_settings->hash_version,
graph->bloom_filter_settings->bits_per_entry,
graph->bloom_filter_settings->num_hashes);
if (graph->read_generation_data)
printf(" read_generation_data");
if (graph->topo_levels)
printf(" topo_levels");
printf("\n");
UNLEAK(graph); UNLEAK(graph);
return 0; return 0;

1
t/t4216-log-bloom.sh
View File

@ -48,6 +48,7 @@ graph_read_expect () {
header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0 header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0
num_commits: $1 num_commits: $1
chunks: oid_fanout oid_lookup commit_metadata generation_data bloom_indexes bloom_data chunks: oid_fanout oid_lookup commit_metadata generation_data bloom_indexes bloom_data
options: bloom(1,10,7)
EOF EOF
test-tool read-graph >actual && test-tool read-graph >actual &&
test_cmp expect actual test_cmp expect actual

1
t/t5318-commit-graph.sh
View File

@ -104,6 +104,7 @@ graph_read_expect() {
header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0 header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0
num_commits: $1 num_commits: $1
chunks: oid_fanout oid_lookup commit_metadata$OPTIONAL chunks: oid_fanout oid_lookup commit_metadata$OPTIONAL
options:
EOF EOF
test-tool read-graph >output && test-tool read-graph >output &&
test_cmp expect output test_cmp expect output

5
t/t5324-split-commit-graph.sh
View File

@ -34,6 +34,7 @@ graph_read_expect() {
header: 43475048 1 $(test_oid oid_version) 4 $NUM_BASE header: 43475048 1 $(test_oid oid_version) 4 $NUM_BASE
num_commits: $1 num_commits: $1
chunks: oid_fanout oid_lookup commit_metadata generation_data chunks: oid_fanout oid_lookup commit_metadata generation_data
options:
EOF EOF
test-tool read-graph >output && test-tool read-graph >output &&
test_cmp expect output test_cmp expect output
@ -508,6 +509,7 @@ test_expect_success 'setup repo for mixed generation commit-graph-chain' '
header: 43475048 1 $(test_oid oid_version) 4 1 header: 43475048 1 $(test_oid oid_version) 4 1
num_commits: $NUM_SECOND_LAYER_COMMITS num_commits: $NUM_SECOND_LAYER_COMMITS
chunks: oid_fanout oid_lookup commit_metadata chunks: oid_fanout oid_lookup commit_metadata
options:
EOF EOF
test_cmp expect output && test_cmp expect output &&
git commit-graph verify && git commit-graph verify &&
@ -540,6 +542,7 @@ test_expect_success 'do not write generation data chunk if not present on existi
header: 43475048 1 $(test_oid oid_version) 4 2 header: 43475048 1 $(test_oid oid_version) 4 2
num_commits: $NUM_THIRD_LAYER_COMMITS num_commits: $NUM_THIRD_LAYER_COMMITS
chunks: oid_fanout oid_lookup commit_metadata chunks: oid_fanout oid_lookup commit_metadata
options:
EOF EOF
test_cmp expect output && test_cmp expect output &&
git commit-graph verify git commit-graph verify
@ -581,6 +584,7 @@ test_expect_success 'do not write generation data chunk if the topmost remaining
header: 43475048 1 $(test_oid oid_version) 4 2 header: 43475048 1 $(test_oid oid_version) 4 2
num_commits: $(($NUM_THIRD_LAYER_COMMITS + $NUM_FOURTH_LAYER_COMMITS)) num_commits: $(($NUM_THIRD_LAYER_COMMITS + $NUM_FOURTH_LAYER_COMMITS))
chunks: oid_fanout oid_lookup commit_metadata chunks: oid_fanout oid_lookup commit_metadata
options:
EOF EOF
test_cmp expect output && test_cmp expect output &&
git commit-graph verify git commit-graph verify
@ -620,6 +624,7 @@ test_expect_success 'write generation data chunk if topmost remaining layer has
header: 43475048 1 $(test_oid oid_version) 5 1 header: 43475048 1 $(test_oid oid_version) 5 1
num_commits: $(($NUM_SECOND_LAYER_COMMITS + $NUM_THIRD_LAYER_COMMITS + $NUM_FOURTH_LAYER_COMMITS + $NUM_FIFTH_LAYER_COMMITS)) num_commits: $(($NUM_SECOND_LAYER_COMMITS + $NUM_THIRD_LAYER_COMMITS + $NUM_FOURTH_LAYER_COMMITS + $NUM_FIFTH_LAYER_COMMITS))
chunks: oid_fanout oid_lookup commit_metadata generation_data chunks: oid_fanout oid_lookup commit_metadata generation_data
options:
EOF EOF
test_cmp expect output test_cmp expect output
) )