e7da938570
Use of the `the_repository` variable is deprecated nowadays, and we slowly but steadily convert the codebase to not use it anymore. Instead, callers should be passing down the repository to work on via parameters. It is hard though to prove that a given code unit does not use this variable anymore. The most trivial case, merely demonstrating that there is no direct use of `the_repository`, is already a bit of a pain during code reviews as the reviewer needs to manually verify claims made by the patch author. The bigger problem though is that we have many interfaces that implicitly rely on `the_repository`. Introduce a new `USE_THE_REPOSITORY_VARIABLE` macro that allows code units to opt into usage of `the_repository`. The intent of this macro is to demonstrate that a certain code unit does not use this variable anymore, and to keep it from new dependencies on it in future changes, be it explicit or implicit For now, the macro only guards `the_repository` itself as well as `the_hash_algo`. There are many more known interfaces where we have an implicit dependency on `the_repository`, but those are not guarded at the current point in time. Over time though, we should start to add guards as required (or even better, just remove them). Define the macro as required in our code units. As expected, most of our code still relies on the global variable. Nearly all of our builtins rely on the variable as there is no way yet to pass `the_repository` to their entry point. For now, declare the macro in "biultin.h" to keep the required changes at least a little bit more contained. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
103 lines
2.4 KiB
C
103 lines
2.4 KiB
C
#define USE_THE_REPOSITORY_VARIABLE
|
|
|
|
#include "test-tool.h"
|
|
#include "bloom.h"
|
|
#include "hex.h"
|
|
#include "commit.h"
|
|
#include "repository.h"
|
|
#include "setup.h"
|
|
|
|
static struct bloom_filter_settings settings = DEFAULT_BLOOM_FILTER_SETTINGS;
|
|
|
|
static void add_string_to_filter(const char *data, struct bloom_filter *filter) {
|
|
struct bloom_key key;
|
|
int i;
|
|
|
|
fill_bloom_key(data, strlen(data), &key, &settings);
|
|
printf("Hashes:");
|
|
for (i = 0; i < settings.num_hashes; i++){
|
|
printf("0x%08x|", key.hashes[i]);
|
|
}
|
|
printf("\n");
|
|
add_key_to_filter(&key, filter, &settings);
|
|
clear_bloom_key(&key);
|
|
}
|
|
|
|
static void print_bloom_filter(struct bloom_filter *filter) {
|
|
int i;
|
|
|
|
if (!filter) {
|
|
printf("No filter.\n");
|
|
return;
|
|
}
|
|
printf("Filter_Length:%d\n", (int)filter->len);
|
|
printf("Filter_Data:");
|
|
for (i = 0; i < filter->len; i++) {
|
|
printf("%02x|", filter->data[i]);
|
|
}
|
|
printf("\n");
|
|
}
|
|
|
|
static void get_bloom_filter_for_commit(const struct object_id *commit_oid)
|
|
{
|
|
struct commit *c;
|
|
struct bloom_filter *filter;
|
|
c = lookup_commit(the_repository, commit_oid);
|
|
filter = get_or_compute_bloom_filter(the_repository, c, 1,
|
|
&settings,
|
|
NULL);
|
|
print_bloom_filter(filter);
|
|
}
|
|
|
|
static const char *bloom_usage = "\n"
|
|
" test-tool bloom get_murmur3 <string>\n"
|
|
" test-tool bloom generate_filter <string> [<string>...]\n"
|
|
" test-tool bloom get_filter_for_commit <commit-hex>\n";
|
|
|
|
int cmd__bloom(int argc, const char **argv)
|
|
{
|
|
setup_git_directory();
|
|
|
|
if (argc < 2)
|
|
usage(bloom_usage);
|
|
|
|
if (!strcmp(argv[1], "get_murmur3")) {
|
|
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")) {
|
|
struct bloom_filter filter;
|
|
int i = 2;
|
|
filter.len = (settings.bits_per_entry + BITS_PER_WORD - 1) / BITS_PER_WORD;
|
|
CALLOC_ARRAY(filter.data, filter.len);
|
|
|
|
if (argc - 1 < i)
|
|
usage(bloom_usage);
|
|
|
|
while (argv[i]) {
|
|
add_string_to_filter(argv[i], &filter);
|
|
i++;
|
|
}
|
|
|
|
print_bloom_filter(&filter);
|
|
free(filter.data);
|
|
}
|
|
|
|
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();
|
|
get_bloom_filter_for_commit(&oid);
|
|
}
|
|
|
|
return 0;
|
|
}
|