The `object_directory` structure is used as an access point for a single
object directory like ".git/objects". While the structure isn't yet
fully self-contained, the intent is for it to eventually contain all
information required to access objects in one specific location.
While the name "object directory" is a good fit for now, this will
change over time as we continue with the agenda to make pluggable object
databases a thing. Eventually, objects may not be accessed via any kind
of directory at all anymore, but they could instead be backed by any
kind of durable storage mechanism. While it seems quite far-fetched for
now, it is thinkable that eventually this might even be some form of a
database, for example.
As such, the current name of this structure will become worse over time
as we evolve into the direction of pluggable ODBs. Immediate next steps
will start to carve out proper self-contained object directories, which
requires us to pass in these object directories as parameters. Based on
our modern naming schema this means that those functions should then be
named after their subsystem, which means that we would start to bake the
current name into the codebase more and more.
Let's preempt this by renaming the structure. There have been a couple
alternatives that were discussed:
- `odb_backend` was discarded because it led to the association that
one object database has a single backend, but the model is that one
alternate has one backend. Furthermore, "backend" is more about the
actual backing implementation and less about the high-level concept.
- `odb_alternate` was discarded because it is a bit of a stretch to
also call the main object directory an "alternate".
Instead, pick `odb_source` as the new name. It makes it sufficiently
clear that there can be multiple sources and does not cause confusion
when mixed with the already-existing "alternate" terminology.
In the future, this change allows us to easily introduce for example a
`odb_files_source` and other format-specific implementations.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
309 lines
8.3 KiB
C
309 lines
8.3 KiB
C
#define USE_THE_REPOSITORY_VARIABLE
|
|
#include "builtin.h"
|
|
#include "abspath.h"
|
|
#include "config.h"
|
|
#include "gettext.h"
|
|
#include "parse-options.h"
|
|
#include "midx.h"
|
|
#include "strbuf.h"
|
|
#include "trace2.h"
|
|
#include "object-store.h"
|
|
#include "replace-object.h"
|
|
#include "repository.h"
|
|
|
|
#define BUILTIN_MIDX_WRITE_USAGE \
|
|
N_("git multi-pack-index [<options>] write [--preferred-pack=<pack>]" \
|
|
"[--refs-snapshot=<path>]")
|
|
|
|
#define BUILTIN_MIDX_VERIFY_USAGE \
|
|
N_("git multi-pack-index [<options>] verify")
|
|
|
|
#define BUILTIN_MIDX_EXPIRE_USAGE \
|
|
N_("git multi-pack-index [<options>] expire")
|
|
|
|
#define BUILTIN_MIDX_REPACK_USAGE \
|
|
N_("git multi-pack-index [<options>] repack [--batch-size=<size>]")
|
|
|
|
static char const * const builtin_multi_pack_index_write_usage[] = {
|
|
BUILTIN_MIDX_WRITE_USAGE,
|
|
NULL
|
|
};
|
|
static char const * const builtin_multi_pack_index_verify_usage[] = {
|
|
BUILTIN_MIDX_VERIFY_USAGE,
|
|
NULL
|
|
};
|
|
static char const * const builtin_multi_pack_index_expire_usage[] = {
|
|
BUILTIN_MIDX_EXPIRE_USAGE,
|
|
NULL
|
|
};
|
|
static char const * const builtin_multi_pack_index_repack_usage[] = {
|
|
BUILTIN_MIDX_REPACK_USAGE,
|
|
NULL
|
|
};
|
|
static char const * const builtin_multi_pack_index_usage[] = {
|
|
BUILTIN_MIDX_WRITE_USAGE,
|
|
BUILTIN_MIDX_VERIFY_USAGE,
|
|
BUILTIN_MIDX_EXPIRE_USAGE,
|
|
BUILTIN_MIDX_REPACK_USAGE,
|
|
NULL
|
|
};
|
|
|
|
static struct opts_multi_pack_index {
|
|
char *object_dir;
|
|
const char *preferred_pack;
|
|
char *refs_snapshot;
|
|
unsigned long batch_size;
|
|
unsigned flags;
|
|
int stdin_packs;
|
|
} opts;
|
|
|
|
|
|
static int parse_object_dir(const struct option *opt, const char *arg,
|
|
int unset)
|
|
{
|
|
char **value = opt->value;
|
|
free(*value);
|
|
if (unset)
|
|
*value = xstrdup(repo_get_object_directory(the_repository));
|
|
else
|
|
*value = real_pathdup(arg, 1);
|
|
return 0;
|
|
}
|
|
|
|
static struct option common_opts[] = {
|
|
OPT_CALLBACK(0, "object-dir", &opts.object_dir,
|
|
N_("directory"),
|
|
N_("object directory containing set of packfile and pack-index pairs"),
|
|
parse_object_dir),
|
|
OPT_END(),
|
|
};
|
|
|
|
static struct option *add_common_options(struct option *prev)
|
|
{
|
|
return parse_options_concat(common_opts, prev);
|
|
}
|
|
|
|
static int git_multi_pack_index_write_config(const char *var, const char *value,
|
|
const struct config_context *ctx UNUSED,
|
|
void *cb UNUSED)
|
|
{
|
|
if (!strcmp(var, "pack.writebitmaphashcache")) {
|
|
if (git_config_bool(var, value))
|
|
opts.flags |= MIDX_WRITE_BITMAP_HASH_CACHE;
|
|
else
|
|
opts.flags &= ~MIDX_WRITE_BITMAP_HASH_CACHE;
|
|
}
|
|
|
|
if (!strcmp(var, "pack.writebitmaplookuptable")) {
|
|
if (git_config_bool(var, value))
|
|
opts.flags |= MIDX_WRITE_BITMAP_LOOKUP_TABLE;
|
|
else
|
|
opts.flags &= ~MIDX_WRITE_BITMAP_LOOKUP_TABLE;
|
|
}
|
|
|
|
/*
|
|
* We should never make a fall-back call to 'git_default_config', since
|
|
* this was already called in 'cmd_multi_pack_index()'.
|
|
*/
|
|
return 0;
|
|
}
|
|
|
|
static void read_packs_from_stdin(struct string_list *to)
|
|
{
|
|
struct strbuf buf = STRBUF_INIT;
|
|
while (strbuf_getline(&buf, stdin) != EOF)
|
|
string_list_append(to, buf.buf);
|
|
string_list_sort(to);
|
|
|
|
strbuf_release(&buf);
|
|
}
|
|
|
|
static int cmd_multi_pack_index_write(int argc, const char **argv,
|
|
const char *prefix,
|
|
struct repository *repo)
|
|
{
|
|
struct option *options;
|
|
static struct option builtin_multi_pack_index_write_options[] = {
|
|
OPT_STRING(0, "preferred-pack", &opts.preferred_pack,
|
|
N_("preferred-pack"),
|
|
N_("pack for reuse when computing a multi-pack bitmap")),
|
|
OPT_BIT(0, "bitmap", &opts.flags, N_("write multi-pack bitmap"),
|
|
MIDX_WRITE_BITMAP | MIDX_WRITE_REV_INDEX),
|
|
OPT_BIT(0, "progress", &opts.flags,
|
|
N_("force progress reporting"), MIDX_PROGRESS),
|
|
OPT_BIT(0, "incremental", &opts.flags,
|
|
N_("write a new incremental MIDX"), MIDX_WRITE_INCREMENTAL),
|
|
OPT_BOOL(0, "stdin-packs", &opts.stdin_packs,
|
|
N_("write multi-pack index containing only given indexes")),
|
|
OPT_FILENAME(0, "refs-snapshot", &opts.refs_snapshot,
|
|
N_("refs snapshot for selecting bitmap commits")),
|
|
OPT_END(),
|
|
};
|
|
int ret;
|
|
|
|
opts.flags |= MIDX_WRITE_BITMAP_HASH_CACHE;
|
|
|
|
git_config(git_multi_pack_index_write_config, NULL);
|
|
|
|
options = add_common_options(builtin_multi_pack_index_write_options);
|
|
|
|
trace2_cmd_mode(argv[0]);
|
|
|
|
if (isatty(2))
|
|
opts.flags |= MIDX_PROGRESS;
|
|
argc = parse_options(argc, argv, prefix,
|
|
options, builtin_multi_pack_index_write_usage,
|
|
0);
|
|
if (argc)
|
|
usage_with_options(builtin_multi_pack_index_write_usage,
|
|
options);
|
|
|
|
FREE_AND_NULL(options);
|
|
|
|
if (opts.stdin_packs) {
|
|
struct string_list packs = STRING_LIST_INIT_DUP;
|
|
|
|
read_packs_from_stdin(&packs);
|
|
|
|
ret = write_midx_file_only(repo, opts.object_dir, &packs,
|
|
opts.preferred_pack,
|
|
opts.refs_snapshot, opts.flags);
|
|
|
|
string_list_clear(&packs, 0);
|
|
free(opts.refs_snapshot);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
ret = write_midx_file(repo, opts.object_dir, opts.preferred_pack,
|
|
opts.refs_snapshot, opts.flags);
|
|
|
|
free(opts.refs_snapshot);
|
|
return ret;
|
|
}
|
|
|
|
static int cmd_multi_pack_index_verify(int argc, const char **argv,
|
|
const char *prefix,
|
|
struct repository *repo UNUSED)
|
|
{
|
|
struct option *options;
|
|
static struct option builtin_multi_pack_index_verify_options[] = {
|
|
OPT_BIT(0, "progress", &opts.flags,
|
|
N_("force progress reporting"), MIDX_PROGRESS),
|
|
OPT_END(),
|
|
};
|
|
options = add_common_options(builtin_multi_pack_index_verify_options);
|
|
|
|
trace2_cmd_mode(argv[0]);
|
|
|
|
if (isatty(2))
|
|
opts.flags |= MIDX_PROGRESS;
|
|
argc = parse_options(argc, argv, prefix,
|
|
options, builtin_multi_pack_index_verify_usage,
|
|
0);
|
|
if (argc)
|
|
usage_with_options(builtin_multi_pack_index_verify_usage,
|
|
options);
|
|
|
|
FREE_AND_NULL(options);
|
|
|
|
return verify_midx_file(the_repository, opts.object_dir, opts.flags);
|
|
}
|
|
|
|
static int cmd_multi_pack_index_expire(int argc, const char **argv,
|
|
const char *prefix,
|
|
struct repository *repo UNUSED)
|
|
{
|
|
struct option *options;
|
|
static struct option builtin_multi_pack_index_expire_options[] = {
|
|
OPT_BIT(0, "progress", &opts.flags,
|
|
N_("force progress reporting"), MIDX_PROGRESS),
|
|
OPT_END(),
|
|
};
|
|
options = add_common_options(builtin_multi_pack_index_expire_options);
|
|
|
|
trace2_cmd_mode(argv[0]);
|
|
|
|
if (isatty(2))
|
|
opts.flags |= MIDX_PROGRESS;
|
|
argc = parse_options(argc, argv, prefix,
|
|
options, builtin_multi_pack_index_expire_usage,
|
|
0);
|
|
if (argc)
|
|
usage_with_options(builtin_multi_pack_index_expire_usage,
|
|
options);
|
|
|
|
FREE_AND_NULL(options);
|
|
|
|
return expire_midx_packs(the_repository, opts.object_dir, opts.flags);
|
|
}
|
|
|
|
static int cmd_multi_pack_index_repack(int argc, const char **argv,
|
|
const char *prefix,
|
|
struct repository *repo UNUSED)
|
|
{
|
|
struct option *options;
|
|
static struct option builtin_multi_pack_index_repack_options[] = {
|
|
OPT_UNSIGNED(0, "batch-size", &opts.batch_size,
|
|
N_("during repack, collect pack-files of smaller size into a batch that is larger than this size")),
|
|
OPT_BIT(0, "progress", &opts.flags,
|
|
N_("force progress reporting"), MIDX_PROGRESS),
|
|
OPT_END(),
|
|
};
|
|
|
|
options = add_common_options(builtin_multi_pack_index_repack_options);
|
|
|
|
trace2_cmd_mode(argv[0]);
|
|
|
|
if (isatty(2))
|
|
opts.flags |= MIDX_PROGRESS;
|
|
argc = parse_options(argc, argv, prefix,
|
|
options,
|
|
builtin_multi_pack_index_repack_usage,
|
|
0);
|
|
if (argc)
|
|
usage_with_options(builtin_multi_pack_index_repack_usage,
|
|
options);
|
|
|
|
FREE_AND_NULL(options);
|
|
|
|
return midx_repack(the_repository, opts.object_dir,
|
|
(size_t)opts.batch_size, opts.flags);
|
|
}
|
|
|
|
int cmd_multi_pack_index(int argc,
|
|
const char **argv,
|
|
const char *prefix,
|
|
struct repository *repo)
|
|
{
|
|
int res;
|
|
parse_opt_subcommand_fn *fn = NULL;
|
|
struct option builtin_multi_pack_index_options[] = {
|
|
OPT_SUBCOMMAND("repack", &fn, cmd_multi_pack_index_repack),
|
|
OPT_SUBCOMMAND("write", &fn, cmd_multi_pack_index_write),
|
|
OPT_SUBCOMMAND("verify", &fn, cmd_multi_pack_index_verify),
|
|
OPT_SUBCOMMAND("expire", &fn, cmd_multi_pack_index_expire),
|
|
OPT_END(),
|
|
};
|
|
struct option *options = parse_options_concat(builtin_multi_pack_index_options, common_opts);
|
|
|
|
disable_replace_refs();
|
|
|
|
git_config(git_default_config, NULL);
|
|
|
|
if (the_repository &&
|
|
the_repository->objects &&
|
|
the_repository->objects->sources)
|
|
opts.object_dir = xstrdup(the_repository->objects->sources->path);
|
|
|
|
argc = parse_options(argc, argv, prefix, options,
|
|
builtin_multi_pack_index_usage, 0);
|
|
FREE_AND_NULL(options);
|
|
|
|
res = fn(argc, argv, prefix, repo);
|
|
|
|
free(opts.object_dir);
|
|
return res;
|
|
}
|