summaryrefslogtreecommitdiff
path: root/t/helper
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-05-01 20:39:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-05-01 20:39:54 (GMT)
commit6d56d4c7dcd667d28aec28498591723c6febea1c (patch)
tree1d583dce7f1063b570c4d18f223c1ec7b9473836 /t/helper
parent9b6606f43d55bbf33b9924d16e02e60e1c09660a (diff)
parent1b4c57fa87e121f155863f898dc39d06cf4a1d99 (diff)
downloadgit-6d56d4c7dcd667d28aec28498591723c6febea1c.zip
git-6d56d4c7dcd667d28aec28498591723c6febea1c.tar.gz
git-6d56d4c7dcd667d28aec28498591723c6febea1c.tar.bz2
Merge branch 'ds/blame-on-bloom'
"git blame" learns to take advantage of the "changed-paths" Bloom filter stored in the commit-graph file. * ds/blame-on-bloom: test-bloom: check that we have expected arguments test-bloom: fix some whitespace issues blame: drop unused parameter from maybe_changed_path blame: use changed-path Bloom filters tests: write commit-graph with Bloom filters revision: complicated pathspecs disable filters
Diffstat (limited to 't/helper')
-rw-r--r--t/helper/test-bloom.c28
1 files changed, 20 insertions, 8 deletions
diff --git a/t/helper/test-bloom.c b/t/helper/test-bloom.c
index ce41266..77eb27a 100644
--- a/t/helper/test-bloom.c
+++ b/t/helper/test-bloom.c
@@ -27,7 +27,7 @@ static void print_bloom_filter(struct bloom_filter *filter) {
}
printf("Filter_Length:%d\n", (int)filter->len);
printf("Filter_Data:");
- for (i = 0; i < filter->len; i++){
+ for (i = 0; i < filter->len; i++) {
printf("%02x|", filter->data[i]);
}
printf("\n");
@@ -43,22 +43,32 @@ static void get_bloom_filter_for_commit(const struct object_id *commit_oid)
print_bloom_filter(filter);
}
+static const char *bloom_usage = "\n"
+" test-tool bloom get_murmer3 <string>\n"
+" test-tool bloom generate_filter <string> [<string>...]\n"
+" test-tool get_filter_for_commit <commit-hex>\n";
+
int cmd__bloom(int argc, const char **argv)
{
+ if (argc < 2)
+ usage(bloom_usage);
+
if (!strcmp(argv[1], "get_murmur3")) {
- uint32_t hashed = murmur3_seeded(0, argv[2], strlen(argv[2]));
+ uint32_t hashed;
+ if (argc < 3)
+ usage(bloom_usage);
+ hashed = murmur3_seeded(0, argv[2], strlen(argv[2]));
printf("Murmur3 Hash with seed=0:0x%08x\n", hashed);
}
- if (!strcmp(argv[1], "generate_filter")) {
+ if (!strcmp(argv[1], "generate_filter")) {
struct bloom_filter filter;
int i = 2;
filter.len = (settings.bits_per_entry + BITS_PER_WORD - 1) / BITS_PER_WORD;
filter.data = xcalloc(filter.len, sizeof(unsigned char));
- if (!argv[2]){
- die("at least one input string expected");
- }
+ if (argc - 1 < i)
+ usage(bloom_usage);
while (argv[i]) {
add_string_to_filter(argv[i], &filter);
@@ -68,9 +78,11 @@ int cmd__bloom(int argc, const char **argv)
print_bloom_filter(&filter);
}
- if (!strcmp(argv[1], "get_filter_for_commit")) {
+ if (!strcmp(argv[1], "get_filter_for_commit")) {
struct object_id oid;
const char *end;
+ if (argc < 3)
+ usage(bloom_usage);
if (parse_oid_hex(argv[2], &oid, &end))
die("cannot parse oid '%s'", argv[2]);
init_bloom_filters();
@@ -78,4 +90,4 @@ int cmd__bloom(int argc, const char **argv)
}
return 0;
-} \ No newline at end of file
+}