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

odb: rename oid_object_info()

Browse Source 
Rename `oid_object_info()` to `odb_read_object_info()` as well as their
`_extended()` variant to match other functions related to the object
database and our modern coding guidelines.

Introduce compatibility wrappers so that any in-flight topics will
continue to compile.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2025-07-01 14:22:25 +02:00
committed by Junio C Hamano
parent 16cf749496
commit e989dd96b8
48 changed files with 213 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
archive.c
View File

@@ -215,7 +215,7 @@ static int write_archive_entry(const struct object_id *oid, const char *base,
/* Stream it? */ /* Stream it? */
if (S_ISREG(mode) && !args->convert && if (S_ISREG(mode) && !args->convert &&
oid_object_info(args->repo, oid, &size) == OBJ_BLOB && odb_read_object_info(args->repo->objects, oid, &size) == OBJ_BLOB &&
size > repo_settings_get_big_file_threshold(the_repository)) size > repo_settings_get_big_file_threshold(the_repository))
return write_entry(args, oid, path.buf, path.len, mode, NULL, size); return write_entry(args, oid, path.buf, path.len, mode, NULL, size);

4
blame.c
View File

@@ -116,7 +116,7 @@ static void verify_working_tree_path(struct repository *r,
unsigned short mode; unsigned short mode;
if (!get_tree_entry(r, commit_oid, path, &blob_oid, &mode) && if (!get_tree_entry(r, commit_oid, path, &blob_oid, &mode) &&
oid_object_info(r, &blob_oid, NULL) == OBJ_BLOB) odb_read_object_info(r->objects, &blob_oid, NULL) == OBJ_BLOB)
return; return;
} }
@@ -1245,7 +1245,7 @@ static int fill_blob_sha1_and_mode(struct repository *r,
return 0; return 0;
if (get_tree_entry(r, &origin->commit->object.oid, origin->path, &origin->blob_oid, &origin->mode)) if (get_tree_entry(r, &origin->commit->object.oid, origin->path, &origin->blob_oid, &origin->mode))
goto error_out; goto error_out;
if (oid_object_info(r, &origin->blob_oid, NULL) != OBJ_BLOB) if (odb_read_object_info(r->objects, &origin->blob_oid, NULL) != OBJ_BLOB)
goto error_out; goto error_out;
return 0; return 0;
error_out: error_out:

4
builtin/blame.c
View File

@@ -837,7 +837,7 @@ static int is_a_rev(const char *name)
if (repo_get_oid(the_repository, name, &oid)) if (repo_get_oid(the_repository, name, &oid))
return 0; return 0;
return OBJ_NONE < oid_object_info(the_repository, &oid, NULL); return OBJ_NONE < odb_read_object_info(the_repository->objects, &oid, NULL);
} }
static int peel_to_commit_oid(struct object_id *oid_ret, void *cbdata) static int peel_to_commit_oid(struct object_id *oid_ret, void *cbdata)
@@ -848,7 +848,7 @@ static int peel_to_commit_oid(struct object_id *oid_ret, void *cbdata)
oidcpy(&oid, oid_ret); oidcpy(&oid, oid_ret);
while (1) { while (1) {
struct object *obj; struct object *obj;
int kind = oid_object_info(r, &oid, NULL); int kind = odb_read_object_info(r->objects, &oid, NULL);
if (kind == OBJ_COMMIT) { if (kind == OBJ_COMMIT) {
oidcpy(oid_ret, &oid); oidcpy(oid_ret, &oid);
return 0; return 0;

22
builtin/cat-file.c
View File

@@ -132,7 +132,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
switch (opt) { switch (opt) {
case 't': case 't':
oi.typep = &type; oi.typep = &type;
if (oid_object_info_extended(the_repository, &oid, &oi, flags) < 0) if (odb_read_object_info_extended(the_repository->objects, &oid, &oi, flags) < 0)
die("git cat-file: could not get object info"); die("git cat-file: could not get object info");
printf("%s\n", type_name(type)); printf("%s\n", type_name(type));
ret = 0; ret = 0;
@@ -146,7 +146,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
oi.contentp = (void**)&buf; oi.contentp = (void**)&buf;
} }
if (oid_object_info_extended(the_repository, &oid, &oi, flags) < 0) if (odb_read_object_info_extended(the_repository->objects, &oid, &oi, flags) < 0)
die("git cat-file: could not get object info"); die("git cat-file: could not get object info");
if (use_mailmap && (type == OBJ_COMMIT || type == OBJ_TAG)) { if (use_mailmap && (type == OBJ_COMMIT || type == OBJ_TAG)) {
@@ -180,7 +180,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
/* else fallthrough */ /* else fallthrough */
case 'p': case 'p':
type = oid_object_info(the_repository, &oid, NULL); type = odb_read_object_info(the_repository->objects, &oid, NULL);
if (type < 0) if (type < 0)
die("Not a valid object name %s", obj_name); die("Not a valid object name %s", obj_name);
@@ -217,7 +217,8 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
if (exp_type_id == OBJ_BLOB) { if (exp_type_id == OBJ_BLOB) {
struct object_id blob_oid; struct object_id blob_oid;
if (oid_object_info(the_repository, &oid, NULL) == OBJ_TAG) { if (odb_read_object_info(the_repository->objects,
&oid, NULL) == OBJ_TAG) {
char *buffer = repo_read_object_file(the_repository, char *buffer = repo_read_object_file(the_repository,
&oid, &oid,
&type, &type,
@@ -235,7 +236,8 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
} else } else
oidcpy(&blob_oid, &oid); oidcpy(&blob_oid, &oid);
if (oid_object_info(the_repository, &blob_oid, NULL) == OBJ_BLOB) { if (odb_read_object_info(the_repository->objects,
&blob_oid, NULL) == OBJ_BLOB) {
ret = stream_blob(&blob_oid); ret = stream_blob(&blob_oid);
goto cleanup; goto cleanup;
} }
@@ -294,7 +296,7 @@ struct expand_data {
/* /*
* After a mark_query run, this object_info is set up to be * After a mark_query run, this object_info is set up to be
* passed to oid_object_info_extended. It will point to the data * passed to odb_read_object_info_extended. It will point to the data
* elements above, so you can retrieve the response from there. * elements above, so you can retrieve the response from there.
*/ */
struct object_info info; struct object_info info;
@@ -484,10 +486,10 @@ static void batch_object_write(const char *obj_name,
data->info.sizep = &data->size; data->info.sizep = &data->size;
if (pack) if (pack)
ret = packed_object_info(the_repository, pack, offset, ret = packed_object_info(the_repository, pack,
&data->info); offset, &data->info);
else else
ret = oid_object_info_extended(the_repository, ret = odb_read_object_info_extended(the_repository->objects,
&data->oid, &data->info, &data->oid, &data->info,
OBJECT_INFO_LOOKUP_REPLACE); OBJECT_INFO_LOOKUP_REPLACE);
if (ret < 0) { if (ret < 0) {
@@ -872,7 +874,7 @@ static int batch_objects(struct batch_options *opt)
/* /*
* Expand once with our special mark_query flag, which will prime the * Expand once with our special mark_query flag, which will prime the
* object_info to be handed to oid_object_info_extended for each * object_info to be handed to odb_read_object_info_extended for each
* object. * object.
*/ */
memset(&data, 0, sizeof(data)); memset(&data, 0, sizeof(data));

3
builtin/describe.c
View File

@@ -552,7 +552,8 @@ static void describe(const char *arg, int last_one)
if (cmit) if (cmit)
describe_commit(&oid, &sb); describe_commit(&oid, &sb);
else if (oid_object_info(the_repository, &oid, NULL) == OBJ_BLOB) else if (odb_read_object_info(the_repository->objects,
&oid, NULL) == OBJ_BLOB)
describe_blob(oid, &sb); describe_blob(oid, &sb);
else else
die(_("%s is neither a commit nor blob"), arg); die(_("%s is neither a commit nor blob"), arg);

2
builtin/fast-export.c
View File

@@ -1200,7 +1200,7 @@ static void import_marks(char *input_file, int check_exists)
if (last_idnum < mark) if (last_idnum < mark)
last_idnum = mark; last_idnum = mark;
type = oid_object_info(the_repository, &oid, NULL); type = odb_read_object_info(the_repository->objects, &oid, NULL);
if (type < 0) if (type < 0)
die("object not found: %s", oid_to_hex(&oid)); die("object not found: %s", oid_to_hex(&oid));

15
builtin/fast-import.c
View File

@@ -1756,7 +1756,7 @@ static void insert_object_entry(struct mark_set **s, struct object_id *oid, uint
struct object_entry *e; struct object_entry *e;
e = find_object(oid); e = find_object(oid);
if (!e) { if (!e) {
enum object_type type = oid_object_info(the_repository, enum object_type type = odb_read_object_info(the_repository->objects,
oid, NULL); oid, NULL);
if (type < 0) if (type < 0)
die("object not found: %s", oid_to_hex(oid)); die("object not found: %s", oid_to_hex(oid));
@@ -2416,8 +2416,8 @@ static void file_change_m(const char *p, struct branch *b)
enum object_type expected = S_ISDIR(mode) ? enum object_type expected = S_ISDIR(mode) ?
OBJ_TREE: OBJ_BLOB; OBJ_TREE: OBJ_BLOB;
enum object_type type = oe ? oe->type : enum object_type type = oe ? oe->type :
oid_object_info(the_repository, &oid, odb_read_object_info(the_repository->objects,
NULL); &oid, NULL);
if (type < 0) if (type < 0)
die("%s not found: %s", die("%s not found: %s",
S_ISDIR(mode) ? "Tree" : "Blob", S_ISDIR(mode) ? "Tree" : "Blob",
@@ -2553,7 +2553,7 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa
die("Not a blob (actually a %s): %s", die("Not a blob (actually a %s): %s",
type_name(oe->type), command_buf.buf); type_name(oe->type), command_buf.buf);
} else if (!is_null_oid(&oid)) { } else if (!is_null_oid(&oid)) {
enum object_type type = oid_object_info(the_repository, &oid, enum object_type type = odb_read_object_info(the_repository->objects, &oid,
NULL); NULL);
if (type < 0) if (type < 0)
die("Blob not found: %s", command_buf.buf); die("Blob not found: %s", command_buf.buf);
@@ -2895,7 +2895,8 @@ static void parse_new_tag(const char *arg)
} else if (!repo_get_oid(the_repository, from, &oid)) { } else if (!repo_get_oid(the_repository, from, &oid)) {
struct object_entry *oe = find_object(&oid); struct object_entry *oe = find_object(&oid);
if (!oe) { if (!oe) {
type = oid_object_info(the_repository, &oid, NULL); type = odb_read_object_info(the_repository->objects,
&oid, NULL);
if (type < 0) if (type < 0)
die("Not a valid object: %s", from); die("Not a valid object: %s", from);
} else } else
@@ -3085,8 +3086,8 @@ static struct object_entry *dereference(struct object_entry *oe,
const unsigned hexsz = the_hash_algo->hexsz; const unsigned hexsz = the_hash_algo->hexsz;
if (!oe) { if (!oe) {
enum object_type type = oid_object_info(the_repository, oid, enum object_type type = odb_read_object_info(the_repository->objects,
NULL); oid, NULL);
if (type < 0) if (type < 0)
die("object not found: %s", oid_to_hex(oid)); die("object not found: %s", oid_to_hex(oid));
/* cache it! */ /* cache it! */

5
builtin/fsck.c
View File

@@ -71,7 +71,8 @@ static const char *printable_type(const struct object_id *oid,
const char *ret; const char *ret;
if (type == OBJ_NONE) if (type == OBJ_NONE)
type = oid_object_info(the_repository, oid, NULL); type = odb_read_object_info(the_repository->objects,
oid, NULL);
ret = type_name(type); ret = type_name(type);
if (!ret) if (!ret)
@@ -232,7 +233,7 @@ static void mark_unreachable_referents(const struct object_id *oid)
* (and we want to avoid parsing blobs). * (and we want to avoid parsing blobs).
*/ */
if (obj->type == OBJ_NONE) { if (obj->type == OBJ_NONE) {
enum object_type type = oid_object_info(the_repository, enum object_type type = odb_read_object_info(the_repository->objects,
&obj->oid, NULL); &obj->oid, NULL);
if (type > 0) if (type > 0)
object_as_type(obj, type, 0); object_as_type(obj, type, 0);

2
builtin/gc.c
View File

@@ -1080,7 +1080,7 @@ static int dfs_on_ref(const char *refname UNUSED,
if (!peel_iterated_oid(the_repository, oid, &peeled)) if (!peel_iterated_oid(the_repository, oid, &peeled))
oid = &peeled; oid = &peeled;
if (oid_object_info(the_repository, oid, NULL) != OBJ_COMMIT) if (odb_read_object_info(the_repository->objects, oid, NULL) != OBJ_COMMIT)
return 0; return 0;
commit = lookup_commit(the_repository, oid); commit = lookup_commit(the_repository, oid);

2
builtin/grep.c
View File

@@ -520,7 +520,7 @@ static int grep_submodule(struct grep_opt *opt,
struct strbuf base = STRBUF_INIT; struct strbuf base = STRBUF_INIT;
obj_read_lock(); obj_read_lock();
object_type = oid_object_info(subrepo, oid, NULL); object_type = odb_read_object_info(subrepo->objects, oid, NULL);
obj_read_unlock(); obj_read_unlock();
data = read_object_with_reference(subrepo, data = read_object_with_reference(subrepo,
oid, OBJ_TREE, oid, OBJ_TREE,

11
builtin/index-pack.c
View File

@@ -260,7 +260,8 @@ static unsigned check_object(struct object *obj)
if (!(obj->flags & FLAG_CHECKED)) { if (!(obj->flags & FLAG_CHECKED)) {
unsigned long size; unsigned long size;
int type = oid_object_info(the_repository, &obj->oid, &size); int type = odb_read_object_info(the_repository->objects,
&obj->oid, &size);
if (type <= 0) if (type <= 0)
die(_("did not receive expected object %s"), die(_("did not receive expected object %s"),
oid_to_hex(&obj->oid)); oid_to_hex(&obj->oid));
@@ -908,7 +909,7 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
enum object_type has_type; enum object_type has_type;
unsigned long has_size; unsigned long has_size;
read_lock(); read_lock();
has_type = oid_object_info(the_repository, oid, &has_size); has_type = odb_read_object_info(the_repository->objects, oid, &has_size);
if (has_type < 0) if (has_type < 0)
die(_("cannot read existing object info %s"), oid_to_hex(oid)); die(_("cannot read existing object info %s"), oid_to_hex(oid));
if (has_type != type || has_size != size) if (has_type != type || has_size != size)
@@ -1501,8 +1502,8 @@ static void fix_unresolved_deltas(struct hashfile *f)
struct oid_array to_fetch = OID_ARRAY_INIT; struct oid_array to_fetch = OID_ARRAY_INIT;
for (i = 0; i < nr_ref_deltas; i++) { for (i = 0; i < nr_ref_deltas; i++) {
struct ref_delta_entry *d = sorted_by_pos[i]; struct ref_delta_entry *d = sorted_by_pos[i];
if (!oid_object_info_extended(the_repository, &d->oid, if (!odb_read_object_info_extended(the_repository->objects,
NULL, &d->oid, NULL,
OBJECT_INFO_FOR_PREFETCH)) OBJECT_INFO_FOR_PREFETCH))
continue; continue;
oid_array_append(&to_fetch, &d->oid); oid_array_append(&to_fetch, &d->oid);
@@ -1829,7 +1830,7 @@ static void repack_local_links(void)
oidset_iter_init(&outgoing_links, &iter); oidset_iter_init(&outgoing_links, &iter);
while ((oid = oidset_iter_next(&iter))) { while ((oid = oidset_iter_next(&iter))) {
struct object_info info = OBJECT_INFO_INIT; struct object_info info = OBJECT_INFO_INIT;
if (oid_object_info_extended(the_repository, oid, &info, 0)) if (odb_read_object_info_extended(the_repository->objects, oid, &info, 0))
/* Missing; assume it is a promisor object */ /* Missing; assume it is a promisor object */
continue; continue;
if (info.whence == OI_PACKED && info.u.packed.pack->pack_promisor) if (info.whence == OI_PACKED && info.u.packed.pack->pack_promisor)

2
builtin/ls-files.c
View File

@@ -251,7 +251,7 @@ static void expand_objectsize(struct repository *repo, struct strbuf *line,
{ {
if (type == OBJ_BLOB) { if (type == OBJ_BLOB) {
unsigned long size; unsigned long size;
if (oid_object_info(repo, oid, &size) < 0) if (odb_read_object_info(repo->objects, oid, &size) < 0)
die(_("could not get object info about '%s'"), die(_("could not get object info about '%s'"),
oid_to_hex(oid)); oid_to_hex(oid));
if (padded) if (padded)

4
builtin/ls-tree.c
View File

@@ -27,7 +27,7 @@ static void expand_objectsize(struct strbuf *line, const struct object_id *oid,
{ {
if (type == OBJ_BLOB) { if (type == OBJ_BLOB) {
unsigned long size; unsigned long size;
if (oid_object_info(the_repository, oid, &size) < 0) if (odb_read_object_info(the_repository->objects, oid, &size) < 0)
die(_("could not get object info about '%s'"), die(_("could not get object info about '%s'"),
oid_to_hex(oid)); oid_to_hex(oid));
if (padded) if (padded)
@@ -217,7 +217,7 @@ static int show_tree_long(const struct object_id *oid, struct strbuf *base,
if (type == OBJ_BLOB) { if (type == OBJ_BLOB) {
unsigned long size; unsigned long size;
if (oid_object_info(the_repository, oid, &size) == OBJ_BAD) if (odb_read_object_info(the_repository->objects, oid, &size) == OBJ_BAD)
xsnprintf(size_text, sizeof(size_text), "BAD"); xsnprintf(size_text, sizeof(size_text), "BAD");
else else
xsnprintf(size_text, sizeof(size_text), xsnprintf(size_text, sizeof(size_text),

2
builtin/mktree.c
View File

@@ -124,7 +124,7 @@ static void mktree_line(char *buf, int nul_term_line, int allow_missing)
/* Check the type of object identified by oid without fetching objects */ /* Check the type of object identified by oid without fetching objects */
oi.typep = &obj_type; oi.typep = &obj_type;
if (oid_object_info_extended(the_repository, &oid, &oi, if (odb_read_object_info_extended(the_repository->objects, &oid, &oi,
OBJECT_INFO_LOOKUP_REPLACE | OBJECT_INFO_LOOKUP_REPLACE |
OBJECT_INFO_QUICK | OBJECT_INFO_QUICK |
OBJECT_INFO_SKIP_FETCH_OBJECT) < 0) OBJECT_INFO_SKIP_FETCH_OBJECT) < 0)

20
builtin/pack-objects.c
View File

@@ -2154,7 +2154,7 @@ static void prefetch_to_pack(uint32_t object_index_start) {
for (i = object_index_start; i < to_pack.nr_objects; i++) { for (i = object_index_start; i < to_pack.nr_objects; i++) {
struct object_entry *entry = to_pack.objects + i; struct object_entry *entry = to_pack.objects + i;
if (!oid_object_info_extended(the_repository, if (!odb_read_object_info_extended(the_repository->objects,
&entry->idx.oid, &entry->idx.oid,
NULL, NULL,
OBJECT_INFO_FOR_PREFETCH)) OBJECT_INFO_FOR_PREFETCH))
@@ -2298,18 +2298,18 @@ static void check_object(struct object_entry *entry, uint32_t object_index)
/* /*
* No choice but to fall back to the recursive delta walk * No choice but to fall back to the recursive delta walk
* with oid_object_info() to find about the object type * with odb_read_object_info() to find about the object type
* at this point... * at this point...
*/ */
give_up: give_up:
unuse_pack(&w_curs); unuse_pack(&w_curs);
} }
if (oid_object_info_extended(the_repository, &entry->idx.oid, &oi, if (odb_read_object_info_extended(the_repository->objects, &entry->idx.oid, &oi,
OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_LOOKUP_REPLACE) < 0) { OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_LOOKUP_REPLACE) < 0) {
if (repo_has_promisor_remote(the_repository)) { if (repo_has_promisor_remote(the_repository)) {
prefetch_to_pack(object_index); prefetch_to_pack(object_index);
if (oid_object_info_extended(the_repository, &entry->idx.oid, &oi, if (odb_read_object_info_extended(the_repository->objects, &entry->idx.oid, &oi,
OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_LOOKUP_REPLACE) < 0) OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_LOOKUP_REPLACE) < 0)
type = -1; type = -1;
} else { } else {
@@ -2384,12 +2384,13 @@ static void drop_reused_delta(struct object_entry *entry)
if (packed_object_info(the_repository, IN_PACK(entry), entry->in_pack_offset, &oi) < 0) { if (packed_object_info(the_repository, IN_PACK(entry), entry->in_pack_offset, &oi) < 0) {
/* /*
* We failed to get the info from this pack for some reason; * We failed to get the info from this pack for some reason;
* fall back to oid_object_info, which may find another copy. * fall back to odb_read_object_info, which may find another copy.
* And if that fails, the error will be recorded in oe_type(entry) * And if that fails, the error will be recorded in oe_type(entry)
* and dealt with in prepare_pack(). * and dealt with in prepare_pack().
*/ */
oe_set_type(entry, oe_set_type(entry,
oid_object_info(the_repository, &entry->idx.oid, &size)); odb_read_object_info(the_repository->objects,
&entry->idx.oid, &size));
} else { } else {
oe_set_type(entry, type); oe_set_type(entry, type);
} }
@@ -2677,7 +2678,8 @@ unsigned long oe_get_size_slow(struct packing_data *pack,
if (e->type_ != OBJ_OFS_DELTA && e->type_ != OBJ_REF_DELTA) { if (e->type_ != OBJ_OFS_DELTA && e->type_ != OBJ_REF_DELTA) {
packing_data_lock(&to_pack); packing_data_lock(&to_pack);
if (oid_object_info(the_repository, &e->idx.oid, &size) < 0) if (odb_read_object_info(the_repository->objects,
&e->idx.oid, &size) < 0)
die(_("unable to get size of %s"), die(_("unable to get size of %s"),
oid_to_hex(&e->idx.oid)); oid_to_hex(&e->idx.oid));
packing_data_unlock(&to_pack); packing_data_unlock(&to_pack);
@@ -4063,7 +4065,7 @@ static void add_objects_in_unpacked_packs(void)
static int add_loose_object(const struct object_id *oid, const char *path, static int add_loose_object(const struct object_id *oid, const char *path,
void *data UNUSED) void *data UNUSED)
{ {
enum object_type type = oid_object_info(the_repository, oid, NULL); enum object_type type = odb_read_object_info(the_repository->objects, oid, NULL);
if (type < 0) { if (type < 0) {
warning(_("loose object at %s could not be examined"), path); warning(_("loose object at %s could not be examined"), path);
@@ -4449,7 +4451,7 @@ static int option_parse_cruft_expiration(const struct option *opt UNUSED,
static int is_not_in_promisor_pack_obj(struct object *obj, void *data UNUSED) static int is_not_in_promisor_pack_obj(struct object *obj, void *data UNUSED)
{ {
struct object_info info = OBJECT_INFO_INIT; struct object_info info = OBJECT_INFO_INIT;
if (oid_object_info_extended(the_repository, &obj->oid, &info, 0)) if (odb_read_object_info_extended(the_repository->objects, &obj->oid, &info, 0))
BUG("should_include_obj should only be called on existing objects"); BUG("should_include_obj should only be called on existing objects");
return info.whence != OI_PACKED || !info.u.packed.pack->pack_promisor; return info.whence != OI_PACKED || !info.u.packed.pack->pack_promisor;
} }

4
builtin/prune.c
View File

@@ -99,8 +99,8 @@ static int prune_object(const struct object_id *oid, const char *fullpath,
if (st.st_mtime > expire) if (st.st_mtime > expire)
return 0; return 0;
if (show_only || verbose) { if (show_only || verbose) {
enum object_type type = oid_object_info(the_repository, oid, enum object_type type = odb_read_object_info(the_repository->objects,
NULL); oid, NULL);
printf("%s %s\n", oid_to_hex(oid), printf("%s %s\n", oid_to_hex(oid),
(type > 0) ? type_name(type) : "unknown"); (type > 0) ? type_name(type) : "unknown");
} }

2
builtin/repack.c
View File

@@ -707,7 +707,7 @@ static int midx_snapshot_ref_one(const char *refname UNUSED,
if (oidset_insert(&data->seen, oid)) if (oidset_insert(&data->seen, oid))
return 0; /* already seen */ return 0; /* already seen */
if (oid_object_info(the_repository, oid, NULL) != OBJ_COMMIT) if (odb_read_object_info(the_repository->objects, oid, NULL) != OBJ_COMMIT)
return 0; return 0;
fprintf(data->f->fp, "%s%s\n", data->preferred ? "+" : "", fprintf(data->f->fp, "%s%s\n", data->preferred ? "+" : "",

10
builtin/replace.c
View File

@@ -65,8 +65,8 @@ static int show_reference(const char *refname,
if (repo_get_oid(data->repo, refname, &object)) if (repo_get_oid(data->repo, refname, &object))
return error(_("failed to resolve '%s' as a valid ref"), refname); return error(_("failed to resolve '%s' as a valid ref"), refname);
obj_type = oid_object_info(data->repo, &object, NULL); obj_type = odb_read_object_info(data->repo->objects, &object, NULL);
repl_type = oid_object_info(data->repo, oid, NULL); repl_type = odb_read_object_info(data->repo->objects, oid, NULL);
printf("%s (%s) -> %s (%s)\n", refname, type_name(obj_type), printf("%s (%s) -> %s (%s)\n", refname, type_name(obj_type),
oid_to_hex(oid), type_name(repl_type)); oid_to_hex(oid), type_name(repl_type));
@@ -185,8 +185,8 @@ static int replace_object_oid(const char *object_ref,
struct strbuf err = STRBUF_INIT; struct strbuf err = STRBUF_INIT;
int res = 0; int res = 0;
obj_type = oid_object_info(the_repository, object, NULL); obj_type = odb_read_object_info(the_repository->objects, object, NULL);
repl_type = oid_object_info(the_repository, repl, NULL); repl_type = odb_read_object_info(the_repository->objects, repl, NULL);
if (!force && obj_type != repl_type) if (!force && obj_type != repl_type)
return error(_("Objects must be of the same type.\n" return error(_("Objects must be of the same type.\n"
"'%s' points to a replaced object of type '%s'\n" "'%s' points to a replaced object of type '%s'\n"
@@ -334,7 +334,7 @@ static int edit_and_replace(const char *object_ref, int force, int raw)
if (repo_get_oid(the_repository, object_ref, &old_oid) < 0) if (repo_get_oid(the_repository, object_ref, &old_oid) < 0)
return error(_("not a valid object name: '%s'"), object_ref); return error(_("not a valid object name: '%s'"), object_ref);
type = oid_object_info(the_repository, &old_oid, NULL); type = odb_read_object_info(the_repository->objects, &old_oid, NULL);
if (type < 0) if (type < 0)
return error(_("unable to get object type for %s"), return error(_("unable to get object type for %s"),
oid_to_hex(&old_oid)); oid_to_hex(&old_oid));

6
builtin/rev-list.c
View File

@@ -110,7 +110,8 @@ static off_t get_object_disk_usage(struct object *obj)
off_t size; off_t size;
struct object_info oi = OBJECT_INFO_INIT; struct object_info oi = OBJECT_INFO_INIT;
oi.disk_sizep = &size; oi.disk_sizep = &size;
if (oid_object_info_extended(the_repository, &obj->oid, &oi, 0) < 0) if (odb_read_object_info_extended(the_repository->objects,
&obj->oid, &oi, 0) < 0)
die(_("unable to get disk usage of %s"), oid_to_hex(&obj->oid)); die(_("unable to get disk usage of %s"), oid_to_hex(&obj->oid));
return size; return size;
} }
@@ -346,7 +347,8 @@ static void show_commit(struct commit *commit, void *data)
static int finish_object(struct object *obj, const char *name, void *cb_data) static int finish_object(struct object *obj, const char *name, void *cb_data)
{ {
struct rev_list_info *info = cb_data; struct rev_list_info *info = cb_data;
if (oid_object_info_extended(the_repository, &obj->oid, NULL, 0) < 0) { if (odb_read_object_info_extended(the_repository->objects,
&obj->oid, NULL, 0) < 0) {
finish_object__ma(obj, name); finish_object__ma(obj, name);
return 1; return 1;
} }

4
builtin/tag.c
View File

@@ -304,7 +304,7 @@ static void create_tag(const struct object_id *object, const char *object_ref,
struct strbuf header = STRBUF_INIT; struct strbuf header = STRBUF_INIT;
int should_edit; int should_edit;
type = oid_object_info(the_repository, object, NULL); type = odb_read_object_info(the_repository->objects, object, NULL);
if (type <= OBJ_NONE) if (type <= OBJ_NONE)
die(_("bad object type.")); die(_("bad object type."));
@@ -401,7 +401,7 @@ static void create_reflog_msg(const struct object_id *oid, struct strbuf *sb)
} }
strbuf_addstr(sb, " ("); strbuf_addstr(sb, " (");
type = oid_object_info(the_repository, oid, NULL); type = odb_read_object_info(the_repository->objects, oid, NULL);
switch (type) { switch (type) {
default: default:
strbuf_addstr(sb, "object of unknown type"); strbuf_addstr(sb, "object of unknown type");

2
builtin/unpack-objects.c
View File

@@ -232,7 +232,7 @@ static int check_object(struct object *obj, enum object_type type,
if (!(obj->flags & FLAG_OPEN)) { if (!(obj->flags & FLAG_OPEN)) {
unsigned long size; unsigned long size;
int type = oid_object_info(the_repository, &obj->oid, &size); int type = odb_read_object_info(the_repository->objects, &obj->oid, &size);
if (type != obj->type || type <= 0) if (type != obj->type || type <= 0)
die("object of unexpected type"); die("object of unexpected type");
obj->flags |= FLAG_WRITTEN; obj->flags |= FLAG_WRITTEN;

2
commit-graph.c
View File

@@ -1862,7 +1862,7 @@ static int add_ref_to_set(const char *refname UNUSED,
if (!peel_iterated_oid(the_repository, oid, &peeled)) if (!peel_iterated_oid(the_repository, oid, &peeled))
oid = &peeled; oid = &peeled;
if (oid_object_info(the_repository, oid, NULL) == OBJ_COMMIT) if (odb_read_object_info(the_repository->objects, oid, NULL) == OBJ_COMMIT)
oidset_insert(data->commits, oid); oidset_insert(data->commits, oid);
display_progress(data->progress, oidset_size(data->commits)); display_progress(data->progress, oidset_size(data->commits));

3
commit.c
View File

@@ -585,7 +585,8 @@ int repo_parse_commit_internal(struct repository *r,
return 0; return 0;
} }
if (oid_object_info_extended(r, &item->object.oid, &oi, flags) < 0) if (odb_read_object_info_extended(r->objects, &item->object.oid,
&oi, flags) < 0)
return quiet_on_missing ? -1 : return quiet_on_missing ? -1 :
error("Could not read %s", error("Could not read %s",
oid_to_hex(&item->object.oid)); oid_to_hex(&item->object.oid));

8
diff.c
View File

@@ -4230,13 +4230,13 @@ int diff_populate_filespec(struct repository *r,
info.contentp = &s->data; info.contentp = &s->data;
if (options && options->missing_object_cb) { if (options && options->missing_object_cb) {
if (!oid_object_info_extended(r, &s->oid, &info, if (!odb_read_object_info_extended(r->objects, &s->oid, &info,
OBJECT_INFO_LOOKUP_REPLACE | OBJECT_INFO_LOOKUP_REPLACE |
OBJECT_INFO_SKIP_FETCH_OBJECT)) OBJECT_INFO_SKIP_FETCH_OBJECT))
goto object_read; goto object_read;
options->missing_object_cb(options->missing_object_data); options->missing_object_cb(options->missing_object_data);
} }
if (oid_object_info_extended(r, &s->oid, &info, if (odb_read_object_info_extended(r->objects, &s->oid, &info,
OBJECT_INFO_LOOKUP_REPLACE)) OBJECT_INFO_LOOKUP_REPLACE))
die("unable to read %s", oid_to_hex(&s->oid)); die("unable to read %s", oid_to_hex(&s->oid));
@@ -4252,7 +4252,7 @@ object_read:
} }
if (!info.contentp) { if (!info.contentp) {
info.contentp = &s->data; info.contentp = &s->data;
if (oid_object_info_extended(r, &s->oid, &info, if (odb_read_object_info_extended(r->objects, &s->oid, &info,
OBJECT_INFO_LOOKUP_REPLACE)) OBJECT_INFO_LOOKUP_REPLACE))
die("unable to read %s", oid_to_hex(&s->oid)); die("unable to read %s", oid_to_hex(&s->oid));
} }
@@ -7019,7 +7019,7 @@ void diff_add_if_missing(struct repository *r,
{ {
if (filespec && filespec->oid_valid && if (filespec && filespec->oid_valid &&
!S_ISGITLINK(filespec->mode) && !S_ISGITLINK(filespec->mode) &&
oid_object_info_extended(r, &filespec->oid, NULL, odb_read_object_info_extended(r->objects, &filespec->oid, NULL,
OBJECT_INFO_FOR_PREFETCH)) OBJECT_INFO_FOR_PREFETCH))
oid_array_append(to_fetch, &filespec->oid); oid_array_append(to_fetch, &filespec->oid);
} }

2
fetch-pack.c
View File

@@ -149,7 +149,7 @@ static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
} }
while (1) { while (1) {
if (oid_object_info_extended(the_repository, oid, &info, if (odb_read_object_info_extended(the_repository->objects, oid, &info,
OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_QUICK)) OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_QUICK))
return NULL; return NULL;
if (type == OBJ_TAG) { if (type == OBJ_TAG) {

2
list-objects-filter.c
View File

@@ -310,7 +310,7 @@ static enum list_objects_filter_result filter_blobs_limit(
assert(obj->type == OBJ_BLOB); assert(obj->type == OBJ_BLOB);
assert((obj->flags & SEEN) == 0); assert((obj->flags & SEEN) == 0);
t = oid_object_info(r, &obj->oid, &object_length); t = odb_read_object_info(r->objects, &obj->oid, &object_length);
if (t != OBJ_BLOB) { /* probably OBJ_NONE */ if (t != OBJ_BLOB) { /* probably OBJ_NONE */
/* /*
* We DO NOT have the blob locally, so we cannot * We DO NOT have the blob locally, so we cannot

2
log-tree.c
View File

@@ -176,7 +176,7 @@ static int add_ref_decoration(const char *refname, const char *referent UNUSED,
return 0; return 0;
} }
objtype = oid_object_info(the_repository, oid, NULL); objtype = odb_read_object_info(the_repository->objects, oid, NULL);
if (objtype < 0) if (objtype < 0)
return 0; return 0;
obj = lookup_object_by_type(the_repository, oid, objtype); obj = lookup_object_by_type(the_repository, oid, objtype);

2
merge-ort.c
View File

@@ -4385,7 +4385,7 @@ static void prefetch_for_content_merges(struct merge_options *opt,
if ((ci->filemask & side_mask) && if ((ci->filemask & side_mask) &&
S_ISREG(vi->mode) && S_ISREG(vi->mode) &&
oid_object_info_extended(opt->repo, &vi->oid, NULL, odb_read_object_info_extended(opt->repo->objects, &vi->oid, NULL,
OBJECT_INFO_FOR_PREFETCH)) OBJECT_INFO_FOR_PREFETCH))
oid_array_append(&to_fetch, &vi->oid); oid_array_append(&to_fetch, &vi->oid);
} }

2
object-file.c
View File

@@ -1108,7 +1108,7 @@ int force_object_loose(const struct object_id *oid, time_t mtime)
oi.typep = &type; oi.typep = &type;
oi.sizep = &len; oi.sizep = &len;
oi.contentp = &buf; oi.contentp = &buf;
if (oid_object_info_extended(the_repository, oid, &oi, 0)) if (odb_read_object_info_extended(the_repository->objects, oid, &oi, 0))
return error(_("cannot read object for %s"), oid_to_hex(oid)); return error(_("cannot read object for %s"), oid_to_hex(oid));
if (compat) { if (compat) {
if (repo_oid_to_algop(repo, oid, compat, &compat_oid)) if (repo_oid_to_algop(repo, oid, compat, &compat_oid))

2
object-file.h
View File

@@ -8,7 +8,7 @@
struct index_state; struct index_state;
/* /*
* Set this to 0 to prevent oid_object_info_extended() from fetching missing * Set this to 0 to prevent odb_read_object_info_extended() from fetching missing
* blobs. This has a difference only if extensions.partialClone is set. * blobs. This has a difference only if extensions.partialClone is set.
* *
* Its default value is 1. * Its default value is 1.

16
object-name.c
View File

@@ -251,7 +251,7 @@ static int disambiguate_commit_only(struct repository *r,
const struct object_id *oid, const struct object_id *oid,
void *cb_data UNUSED) void *cb_data UNUSED)
{ {
int kind = oid_object_info(r, oid, NULL); int kind = odb_read_object_info(r->objects, oid, NULL);
return kind == OBJ_COMMIT; return kind == OBJ_COMMIT;
} }
@@ -262,7 +262,7 @@ static int disambiguate_committish_only(struct repository *r,
struct object *obj; struct object *obj;
int kind; int kind;
kind = oid_object_info(r, oid, NULL); kind = odb_read_object_info(r->objects, oid, NULL);
if (kind == OBJ_COMMIT) if (kind == OBJ_COMMIT)
return 1; return 1;
if (kind != OBJ_TAG) if (kind != OBJ_TAG)
@@ -279,7 +279,7 @@ static int disambiguate_tree_only(struct repository *r,
const struct object_id *oid, const struct object_id *oid,
void *cb_data UNUSED) void *cb_data UNUSED)
{ {
int kind = oid_object_info(r, oid, NULL); int kind = odb_read_object_info(r->objects, oid, NULL);
return kind == OBJ_TREE; return kind == OBJ_TREE;
} }
@@ -290,7 +290,7 @@ static int disambiguate_treeish_only(struct repository *r,
struct object *obj; struct object *obj;
int kind; int kind;
kind = oid_object_info(r, oid, NULL); kind = odb_read_object_info(r->objects, oid, NULL);
if (kind == OBJ_TREE || kind == OBJ_COMMIT) if (kind == OBJ_TREE || kind == OBJ_COMMIT)
return 1; return 1;
if (kind != OBJ_TAG) if (kind != OBJ_TAG)
@@ -307,7 +307,7 @@ static int disambiguate_blob_only(struct repository *r,
const struct object_id *oid, const struct object_id *oid,
void *cb_data UNUSED) void *cb_data UNUSED)
{ {
int kind = oid_object_info(r, oid, NULL); int kind = odb_read_object_info(r->objects, oid, NULL);
return kind == OBJ_BLOB; return kind == OBJ_BLOB;
} }
@@ -399,7 +399,7 @@ static int show_ambiguous_object(const struct object_id *oid, void *data)
return 0; return 0;
hash = repo_find_unique_abbrev(ds->repo, oid, DEFAULT_ABBREV); hash = repo_find_unique_abbrev(ds->repo, oid, DEFAULT_ABBREV);
type = oid_object_info(ds->repo, oid, NULL); type = odb_read_object_info(ds->repo->objects, oid, NULL);
if (type < 0) { if (type < 0) {
/* /*
@@ -514,8 +514,8 @@ static int sort_ambiguous(const void *va, const void *vb, void *ctx)
{ {
struct repository *sort_ambiguous_repo = ctx; struct repository *sort_ambiguous_repo = ctx;
const struct object_id *a = va, *b = vb; const struct object_id *a = va, *b = vb;
int a_type = oid_object_info(sort_ambiguous_repo, a, NULL); int a_type = odb_read_object_info(sort_ambiguous_repo->objects, a, NULL);
int b_type = oid_object_info(sort_ambiguous_repo, b, NULL); int b_type = odb_read_object_info(sort_ambiguous_repo->objects, b, NULL);
int a_type_sort; int a_type_sort;
int b_type_sort; int b_type_sort;

6
object.c
View File

@@ -214,7 +214,7 @@ enum peel_status peel_object(struct repository *r,
struct object *o = lookup_unknown_object(r, name); struct object *o = lookup_unknown_object(r, name);
if (o->type == OBJ_NONE) { if (o->type == OBJ_NONE) {
int type = oid_object_info(r, name, NULL); int type = odb_read_object_info(r->objects, name, NULL);
if (type < 0 || !object_as_type(o, type, 0)) if (type < 0 || !object_as_type(o, type, 0))
return PEEL_INVALID; return PEEL_INVALID;
} }
@@ -315,7 +315,7 @@ struct object *parse_object_with_flags(struct repository *r,
} }
if ((!obj || obj->type == OBJ_BLOB) && if ((!obj || obj->type == OBJ_BLOB) &&
oid_object_info(r, oid, NULL) == OBJ_BLOB) { odb_read_object_info(r->objects, oid, NULL) == OBJ_BLOB) {
if (!skip_hash && stream_object_signature(r, repl) < 0) { if (!skip_hash && stream_object_signature(r, repl) < 0) {
error(_("hash mismatch %s"), oid_to_hex(oid)); error(_("hash mismatch %s"), oid_to_hex(oid));
return NULL; return NULL;
@@ -331,7 +331,7 @@ struct object *parse_object_with_flags(struct repository *r,
*/ */
if (skip_hash && discard_tree && if (skip_hash && discard_tree &&
(!obj || obj->type == OBJ_TREE) && (!obj || obj->type == OBJ_TREE) &&
oid_object_info(r, oid, NULL) == OBJ_TREE) { odb_read_object_info(r->objects, oid, NULL) == OBJ_TREE) {
return &lookup_tree(r, oid)->object; return &lookup_tree(r, oid)->object;
} }

54
odb.c
View File

@@ -647,7 +647,7 @@ static int register_all_submodule_sources(struct object_database *odb)
return ret; return ret;
} }
static int do_oid_object_info_extended(struct repository *r, static int do_oid_object_info_extended(struct object_database *odb,
const struct object_id *oid, const struct object_id *oid,
struct object_info *oi, unsigned flags) struct object_info *oi, unsigned flags)
{ {
@@ -660,7 +660,7 @@ static int do_oid_object_info_extended(struct repository *r,
if (flags & OBJECT_INFO_LOOKUP_REPLACE) if (flags & OBJECT_INFO_LOOKUP_REPLACE)
real = lookup_replace_object(r, oid); real = lookup_replace_object(odb->repo, oid);
if (is_null_oid(real)) if (is_null_oid(real))
return -1; return -1;
@@ -668,7 +668,7 @@ static int do_oid_object_info_extended(struct repository *r,
if (!oi) if (!oi)
oi = &blank_oi; oi = &blank_oi;
co = find_cached_object(r->objects, real); co = find_cached_object(odb, real);
if (co) { if (co) {
if (oi->typep) if (oi->typep)
*(oi->typep) = co->type; *(oi->typep) = co->type;
@@ -677,7 +677,7 @@ static int do_oid_object_info_extended(struct repository *r,
if (oi->disk_sizep) if (oi->disk_sizep)
*(oi->disk_sizep) = 0; *(oi->disk_sizep) = 0;
if (oi->delta_base_oid) if (oi->delta_base_oid)
oidclr(oi->delta_base_oid, r->hash_algo); oidclr(oi->delta_base_oid, odb->repo->hash_algo);
if (oi->contentp) if (oi->contentp)
*oi->contentp = xmemdupz(co->buf, co->size); *oi->contentp = xmemdupz(co->buf, co->size);
oi->whence = OI_CACHED; oi->whence = OI_CACHED;
@@ -685,17 +685,17 @@ static int do_oid_object_info_extended(struct repository *r,
} }
while (1) { while (1) {
if (find_pack_entry(r, real, &e)) if (find_pack_entry(odb->repo, real, &e))
break; break;
/* Most likely it's a loose object. */ /* Most likely it's a loose object. */
if (!loose_object_info(r, real, oi, flags)) if (!loose_object_info(odb->repo, real, oi, flags))
return 0; return 0;
/* Not a loose object; someone else may have just packed it. */ /* Not a loose object; someone else may have just packed it. */
if (!(flags & OBJECT_INFO_QUICK)) { if (!(flags & OBJECT_INFO_QUICK)) {
reprepare_packed_git(r); reprepare_packed_git(odb->repo);
if (find_pack_entry(r, real, &e)) if (find_pack_entry(odb->repo, real, &e))
break; break;
} }
@@ -705,15 +705,15 @@ static int do_oid_object_info_extended(struct repository *r,
* `odb_add_submodule_source_by_path()` on that submodule's * `odb_add_submodule_source_by_path()` on that submodule's
* ODB). If any such ODBs exist, register them and try again. * ODB). If any such ODBs exist, register them and try again.
*/ */
if (register_all_submodule_sources(r->objects)) if (register_all_submodule_sources(odb))
/* We added some alternates; retry */ /* We added some alternates; retry */
continue; continue;
/* Check if it is a missing object */ /* Check if it is a missing object */
if (fetch_if_missing && repo_has_promisor_remote(r) && if (fetch_if_missing && repo_has_promisor_remote(odb->repo) &&
!already_retried && !already_retried &&
!(flags & OBJECT_INFO_SKIP_FETCH_OBJECT)) { !(flags & OBJECT_INFO_SKIP_FETCH_OBJECT)) {
promisor_remote_get_direct(r, real, 1); promisor_remote_get_direct(odb->repo, real, 1);
already_retried = 1; already_retried = 1;
continue; continue;
} }
@@ -723,7 +723,7 @@ static int do_oid_object_info_extended(struct repository *r,
if ((flags & OBJECT_INFO_LOOKUP_REPLACE) && !oideq(real, oid)) if ((flags & OBJECT_INFO_LOOKUP_REPLACE) && !oideq(real, oid))
die(_("replacement %s not found for %s"), die(_("replacement %s not found for %s"),
oid_to_hex(real), oid_to_hex(oid)); oid_to_hex(real), oid_to_hex(oid));
if ((p = has_packed_and_bad(r, real))) if ((p = has_packed_and_bad(odb->repo, real)))
die(_("packed object %s (stored in %s) is corrupt"), die(_("packed object %s (stored in %s) is corrupt"),
oid_to_hex(real), p->pack_name); oid_to_hex(real), p->pack_name);
} }
@@ -736,10 +736,10 @@ static int do_oid_object_info_extended(struct repository *r,
* information below, so return early. * information below, so return early.
*/ */
return 0; return 0;
rtype = packed_object_info(r, e.p, e.offset, oi); rtype = packed_object_info(odb->repo, e.p, e.offset, oi);
if (rtype < 0) { if (rtype < 0) {
mark_bad_packed_object(e.p, real); mark_bad_packed_object(e.p, real);
return do_oid_object_info_extended(r, real, oi, 0); return do_oid_object_info_extended(odb, real, oi, 0);
} else if (oi->whence == OI_PACKED) { } else if (oi->whence == OI_PACKED) {
oi->u.packed.offset = e.offset; oi->u.packed.offset = e.offset;
oi->u.packed.pack = e.p; oi->u.packed.pack = e.p;
@@ -787,7 +787,7 @@ static int oid_object_info_convert(struct repository *r,
oi = &new_oi; oi = &new_oi;
} }
ret = oid_object_info_extended(r, &oid, oi, flags); ret = odb_read_object_info_extended(r->objects, &oid, oi, flags);
if (ret) if (ret)
return -1; return -1;
if (oi == input_oi) if (oi == input_oi)
@@ -830,23 +830,25 @@ static int oid_object_info_convert(struct repository *r,
return ret; return ret;
} }
int oid_object_info_extended(struct repository *r, const struct object_id *oid, int odb_read_object_info_extended(struct object_database *odb,
struct object_info *oi, unsigned flags) const struct object_id *oid,
struct object_info *oi,
unsigned flags)
{ {
int ret; int ret;
if (oid->algo && (hash_algo_by_ptr(r->hash_algo) != oid->algo)) if (oid->algo && (hash_algo_by_ptr(odb->repo->hash_algo) != oid->algo))
return oid_object_info_convert(r, oid, oi, flags); return oid_object_info_convert(odb->repo, oid, oi, flags);
obj_read_lock(); obj_read_lock();
ret = do_oid_object_info_extended(r, oid, oi, flags); ret = do_oid_object_info_extended(odb, oid, oi, flags);
obj_read_unlock(); obj_read_unlock();
return ret; return ret;
} }
/* returns enum object_type or negative */ /* returns enum object_type or negative */
int oid_object_info(struct repository *r, int odb_read_object_info(struct object_database *odb,
const struct object_id *oid, const struct object_id *oid,
unsigned long *sizep) unsigned long *sizep)
{ {
@@ -855,7 +857,7 @@ int oid_object_info(struct repository *r,
oi.typep = &type; oi.typep = &type;
oi.sizep = sizep; oi.sizep = sizep;
if (oid_object_info_extended(r, oid, &oi, if (odb_read_object_info_extended(odb, oid, &oi,
OBJECT_INFO_LOOKUP_REPLACE) < 0) OBJECT_INFO_LOOKUP_REPLACE) < 0)
return -1; return -1;
return type; return type;
@@ -887,7 +889,7 @@ int pretend_object_file(struct repository *repo,
/* /*
* This function dies on corrupt objects; the callers who want to * This function dies on corrupt objects; the callers who want to
* deal with them should arrange to call oid_object_info_extended() and give * deal with them should arrange to call odb_read_object_info_extended() and give
* error messages themselves. * error messages themselves.
*/ */
void *repo_read_object_file(struct repository *r, void *repo_read_object_file(struct repository *r,
@@ -902,7 +904,7 @@ void *repo_read_object_file(struct repository *r,
oi.typep = type; oi.typep = type;
oi.sizep = size; oi.sizep = size;
oi.contentp = &data; oi.contentp = &data;
if (oid_object_info_extended(r, oid, &oi, flags)) if (odb_read_object_info_extended(r->objects, oid, &oi, flags))
return NULL; return NULL;
return data; return data;
@@ -968,13 +970,13 @@ int has_object(struct repository *r, const struct object_id *oid,
if (!(flags & HAS_OBJECT_FETCH_PROMISOR)) if (!(flags & HAS_OBJECT_FETCH_PROMISOR))
object_info_flags |= OBJECT_INFO_SKIP_FETCH_OBJECT; object_info_flags |= OBJECT_INFO_SKIP_FETCH_OBJECT;
return oid_object_info_extended(r, oid, NULL, object_info_flags) >= 0; return odb_read_object_info_extended(r->objects, oid, NULL, object_info_flags) >= 0;
} }
void odb_assert_oid_type(struct object_database *odb, void odb_assert_oid_type(struct object_database *odb,
const struct object_id *oid, enum object_type expect) const struct object_id *oid, enum object_type expect)
{ {
enum object_type type = oid_object_info(odb->repo, oid, NULL); enum object_type type = odb_read_object_info(odb, oid, NULL);
if (type < 0) if (type < 0)
die(_("%s is not a valid object"), oid_to_hex(oid)); die(_("%s is not a valid object"), oid_to_hex(oid));
if (type != expect) if (type != expect)

46
odb.h
View File

@@ -265,9 +265,6 @@ void *repo_read_object_file(struct repository *r,
enum object_type *type, enum object_type *type,
unsigned long *size); unsigned long *size);
/* Read and unpack an object file into memory, write memory to an object file */
int oid_object_info(struct repository *r, const struct object_id *, unsigned long *);
/* /*
* Add an object file to the in-memory object store, without writing it * Add an object file to the in-memory object store, without writing it
* to disk. * to disk.
@@ -336,9 +333,24 @@ struct object_info {
/* Die if object corruption (not just an object being missing) was detected. */ /* Die if object corruption (not just an object being missing) was detected. */
#define OBJECT_INFO_DIE_IF_CORRUPT 32 #define OBJECT_INFO_DIE_IF_CORRUPT 32
int oid_object_info_extended(struct repository *r, /*
const struct object_id *, * Read object info from the object database and populate the `object_info`
struct object_info *, unsigned flags); * structure. Returns 0 on success, a negative error code otherwise.
*/
int odb_read_object_info_extended(struct object_database *odb,
const struct object_id *oid,
struct object_info *oi,
unsigned flags);
/*
* Read a subset of object info for the given object ID. Returns an `enum
* object_type` on success, a negative error code otherwise. If successful and
* `sizep` is non-NULL, then the size of the object will be written to the
* pointer.
*/
int odb_read_object_info(struct object_database *odb,
const struct object_id *oid,
unsigned long *sizep);
enum { enum {
/* Retry packed storage after checking packed and loose storage */ /* Retry packed storage after checking packed and loose storage */
@@ -360,7 +372,7 @@ void odb_assert_oid_type(struct object_database *odb,
/* /*
* Enabling the object read lock allows multiple threads to safely call the * Enabling the object read lock allows multiple threads to safely call the
* following functions in parallel: repo_read_object_file(), * following functions in parallel: repo_read_object_file(),
* read_object_with_reference(), oid_object_info() and oid_object_info_extended(). * read_object_with_reference(), odb_read_object_info() and odb().
* *
* obj_read_lock() and obj_read_unlock() may also be used to protect other * obj_read_lock() and obj_read_unlock() may also be used to protect other
* section which cannot execute in parallel with object reading. Since the used * section which cannot execute in parallel with object reading. Since the used
@@ -368,7 +380,7 @@ void odb_assert_oid_type(struct object_database *odb,
* reading functions. However, beware that in these cases zlib inflation won't * reading functions. However, beware that in these cases zlib inflation won't
* be performed in parallel, losing performance. * be performed in parallel, losing performance.
* *
* TODO: oid_object_info_extended()'s call stack has a recursive behavior. If * TODO: odb_read_object_info_extended()'s call stack has a recursive behavior. If
* any of its callees end up calling it, this recursive call won't benefit from * any of its callees end up calling it, this recursive call won't benefit from
* parallel inflation. * parallel inflation.
*/ */
@@ -416,4 +428,22 @@ void *read_object_with_reference(struct repository *r,
unsigned long *size, unsigned long *size,
struct object_id *oid_ret); struct object_id *oid_ret);
/* Compatibility wrappers, to be removed once Git 2.51 has been released. */
#include "repository.h"
static inline int oid_object_info_extended(struct repository *r,
const struct object_id *oid,
struct object_info *oi,
unsigned flags)
{
return odb_read_object_info_extended(r->objects, oid, oi, flags);
}
static inline int oid_object_info(struct repository *r,
const struct object_id *oid,
unsigned long *sizep)
{
return odb_read_object_info(r->objects, oid, sizep);
}
#endif /* ODB_H */ #endif /* ODB_H */

2
pack-bitmap-write.c
View File

@@ -144,7 +144,7 @@ void bitmap_writer_build_type_index(struct bitmap_writer *writer,
break; break;
default: default:
real_type = oid_object_info(writer->to_pack->repo, real_type = odb_read_object_info(writer->to_pack->repo->objects,
&entry->idx.oid, NULL); &entry->idx.oid, NULL);
break; break;
} }

6
pack-bitmap.c
View File

@@ -1868,7 +1868,7 @@ static unsigned long get_size_by_pos(struct bitmap_index *bitmap_git,
size_t eindex_pos = pos - bitmap_num_objects_total(bitmap_git); size_t eindex_pos = pos - bitmap_num_objects_total(bitmap_git);
struct eindex *eindex = &bitmap_git->ext_index; struct eindex *eindex = &bitmap_git->ext_index;
struct object *obj = eindex->objects[eindex_pos]; struct object *obj = eindex->objects[eindex_pos];
if (oid_object_info_extended(bitmap_repo(bitmap_git), &obj->oid, if (odb_read_object_info_extended(bitmap_repo(bitmap_git)->objects, &obj->oid,
&oi, 0) < 0) &oi, 0) < 0)
die(_("unable to get size of %s"), oid_to_hex(&obj->oid)); die(_("unable to get size of %s"), oid_to_hex(&obj->oid));
} }
@@ -3220,8 +3220,8 @@ static off_t get_disk_usage_for_extended(struct bitmap_index *bitmap_git)
i))) i)))
continue; continue;
if (oid_object_info_extended(bitmap_repo(bitmap_git), &obj->oid, if (odb_read_object_info_extended(bitmap_repo(bitmap_git)->objects,
&oi, 0) < 0) &obj->oid, &oi, 0) < 0)
die(_("unable to get disk usage of '%s'"), die(_("unable to get disk usage of '%s'"),
oid_to_hex(&obj->oid)); oid_to_hex(&obj->oid));

5
packfile.c
View File

@@ -1321,7 +1321,7 @@ static int retry_bad_packed_offset(struct repository *r,
return OBJ_BAD; return OBJ_BAD;
nth_packed_object_id(&oid, p, pack_pos_to_index(p, pos)); nth_packed_object_id(&oid, p, pack_pos_to_index(p, pos));
mark_bad_packed_object(p, &oid); mark_bad_packed_object(p, &oid);
type = oid_object_info(r, &oid, NULL); type = odb_read_object_info(r->objects, &oid, NULL);
if (type <= OBJ_NONE) if (type <= OBJ_NONE)
return OBJ_BAD; return OBJ_BAD;
return type; return type;
@@ -1849,7 +1849,8 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset,
oi.typep = &type; oi.typep = &type;
oi.sizep = &base_size; oi.sizep = &base_size;
oi.contentp = &base; oi.contentp = &base;
if (oid_object_info_extended(r, &base_oid, &oi, 0) < 0) if (odb_read_object_info_extended(r->objects, &base_oid,
&oi, 0) < 0)
base = NULL; base = NULL;
external_base = base; external_base = base;

2
promisor-remote.c
View File

@@ -245,7 +245,7 @@ static int remove_fetched_oids(struct repository *repo,
struct object_id *new_oids; struct object_id *new_oids;
for (i = 0; i < oid_nr; i++) for (i = 0; i < oid_nr; i++)
if (oid_object_info_extended(repo, &old_oids[i], NULL, if (odb_read_object_info_extended(repo->objects, &old_oids[i], NULL,
OBJECT_INFO_SKIP_FETCH_OBJECT)) { OBJECT_INFO_SKIP_FETCH_OBJECT)) {
remaining[i] = 1; remaining[i] = 1;
remaining_nr++; remaining_nr++;

2
protocol-caps.c
View File

@@ -64,7 +64,7 @@ static void send_info(struct repository *r, struct packet_writer *writer,
strbuf_addstr(&send_buffer, oid_str); strbuf_addstr(&send_buffer, oid_str);
if (info->size) { if (info->size) {
if (oid_object_info(r, &oid, &object_size) < 0) { if (odb_read_object_info(r->objects, &oid, &object_size) < 0) {
strbuf_addstr(&send_buffer, " "); strbuf_addstr(&send_buffer, " ");
} else { } else {
strbuf_addf(&send_buffer, " %lu", object_size); strbuf_addf(&send_buffer, " %lu", object_size);

2
reachable.c
View File

@@ -211,7 +211,7 @@ static void add_recent_object(const struct object_id *oid,
* later processing, and the revision machinery expects * later processing, and the revision machinery expects
* commits and tags to have been parsed. * commits and tags to have been parsed.
*/ */
type = oid_object_info(the_repository, oid, NULL); type = odb_read_object_info(the_repository->objects, oid, NULL);
if (type < 0) if (type < 0)
die("unable to get object info for %s", oid_to_hex(oid)); die("unable to get object info for %s", oid_to_hex(oid));

4
read-cache.c
View File

@@ -3729,8 +3729,8 @@ void prefetch_cache_entries(const struct index_state *istate,
if (S_ISGITLINK(ce->ce_mode) || !must_prefetch(ce)) if (S_ISGITLINK(ce->ce_mode) || !must_prefetch(ce))
continue; continue;
if (!oid_object_info_extended(the_repository, &ce->oid, if (!odb_read_object_info_extended(the_repository->objects,
NULL, &ce->oid, NULL,
OBJECT_INFO_FOR_PREFETCH)) OBJECT_INFO_FOR_PREFETCH))
continue; continue;
oid_array_append(&to_fetch, &ce->oid); oid_array_append(&to_fetch, &ce->oid);

2
ref-filter.c
View File

@@ -2302,7 +2302,7 @@ static int get_object(struct ref_array_item *ref, int deref, struct object **obj
oi->info.sizep = &oi->size; oi->info.sizep = &oi->size;
oi->info.typep = &oi->type; oi->info.typep = &oi->type;
} }
if (oid_object_info_extended(the_repository, &oi->oid, &oi->info, if (odb_read_object_info_extended(the_repository->objects, &oi->oid, &oi->info,
OBJECT_INFO_LOOKUP_REPLACE)) OBJECT_INFO_LOOKUP_REPLACE))
return strbuf_addf_ret(err, -1, _("missing object %s for %s"), return strbuf_addf_ret(err, -1, _("missing object %s for %s"),
oid_to_hex(&oi->oid), ref->refname); oid_to_hex(&oi->oid), ref->refname);

5
remote.c
View File

@@ -1182,7 +1182,7 @@ static void show_push_unqualified_ref_name_error(const char *dst_value,
BUG("'%s' is not a valid object, " BUG("'%s' is not a valid object, "
"match_explicit_lhs() should catch this!", "match_explicit_lhs() should catch this!",
matched_src_name); matched_src_name);
type = oid_object_info(the_repository, &oid, NULL); type = odb_read_object_info(the_repository->objects, &oid, NULL);
if (type == OBJ_COMMIT) { if (type == OBJ_COMMIT) {
advise(_("The <src> part of the refspec is a commit object.\n" advise(_("The <src> part of the refspec is a commit object.\n"
"Did you mean to create a new branch by pushing to\n" "Did you mean to create a new branch by pushing to\n"
@@ -1412,7 +1412,8 @@ static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***ds
continue; /* not a tag */ continue; /* not a tag */
if (string_list_has_string(&dst_tag, ref->name)) if (string_list_has_string(&dst_tag, ref->name))
continue; /* they already have it */ continue; /* they already have it */
if (oid_object_info(the_repository, &ref->new_oid, NULL) != OBJ_TAG) if (odb_read_object_info(the_repository->objects,
&ref->new_oid, NULL) != OBJ_TAG)
continue; /* be conservative */ continue; /* be conservative */
item = string_list_append(&src_tag, ref->name); item = string_list_append(&src_tag, ref->name);
item->util = ref; item->util = ref;

5
sequencer.c
View File

@@ -5503,9 +5503,8 @@ int sequencer_pick_revisions(struct repository *r,
if (!repo_get_oid(r, name, &oid)) { if (!repo_get_oid(r, name, &oid)) {
if (!lookup_commit_reference_gently(r, &oid, 1)) { if (!lookup_commit_reference_gently(r, &oid, 1)) {
enum object_type type = oid_object_info(r, enum object_type type = odb_read_object_info(r->objects,
&oid, &oid, NULL);
NULL);
res = error(_("%s: can't cherry-pick a %s"), res = error(_("%s: can't cherry-pick a %s"),
name, type_name(type)); name, type_name(type));
goto out; goto out;

6
streaming.c
View File

@@ -44,7 +44,7 @@ struct git_istream {
union { union {
struct { struct {
char *buf; /* from oid_object_info_extended() */ char *buf; /* from odb_read_object_info_extended() */
unsigned long read_ptr; unsigned long read_ptr;
} incore; } incore;
@@ -403,7 +403,7 @@ static int open_istream_incore(struct git_istream *st, struct repository *r,
oi.typep = type; oi.typep = type;
oi.sizep = &st->size; oi.sizep = &st->size;
oi.contentp = (void **)&st->u.incore.buf; oi.contentp = (void **)&st->u.incore.buf;
return oid_object_info_extended(r, oid, &oi, return odb_read_object_info_extended(r->objects, oid, &oi,
OBJECT_INFO_DIE_IF_CORRUPT); OBJECT_INFO_DIE_IF_CORRUPT);
} }
@@ -422,7 +422,7 @@ static int istream_source(struct git_istream *st,
oi.typep = type; oi.typep = type;
oi.sizep = &size; oi.sizep = &size;
status = oid_object_info_extended(r, oid, &oi, 0); status = odb_read_object_info_extended(r->objects, oid, &oi, 0);
if (status < 0) if (status < 0)
return status; return status;

5
submodule.c
View File

@@ -968,7 +968,7 @@ static int check_has_commit(const struct object_id *oid, void *data)
return 0; return 0;
} }
type = oid_object_info(&subrepo, oid, NULL); type = odb_read_object_info(subrepo.objects, oid, NULL);
switch (type) { switch (type) {
case OBJ_COMMIT: case OBJ_COMMIT:
@@ -1752,8 +1752,7 @@ static int fetch_start_failure(struct strbuf *err UNUSED,
static int commit_missing_in_sub(const struct object_id *oid, void *data) static int commit_missing_in_sub(const struct object_id *oid, void *data)
{ {
struct repository *subrepo = data; struct repository *subrepo = data;
enum object_type type = odb_read_object_info(subrepo->objects, oid, NULL);
enum object_type type = oid_object_info(subrepo, oid, NULL);
return type != OBJ_COMMIT; return type != OBJ_COMMIT;
} }

2
t/helper/test-partial-clone.c
View File

@@ -23,7 +23,7 @@ static void object_info(const char *gitdir, const char *oid_hex)
die("could not init repo"); die("could not init repo");
if (parse_oid_hex_algop(oid_hex, &oid, &p, r.hash_algo)) if (parse_oid_hex_algop(oid_hex, &oid, &p, r.hash_algo))
die("could not parse oid"); die("could not parse oid");
if (oid_object_info_extended(&r, &oid, &oi, 0)) if (odb_read_object_info_extended(r.objects, &oid, &oi, 0))
die("could not obtain object info"); die("could not obtain object info");
printf("%d\n", (int) size); printf("%d\n", (int) size);

2
tag.c
View File

@@ -52,7 +52,7 @@ int gpg_verify_tag(const struct object_id *oid, const char *name_to_report,
unsigned long size; unsigned long size;
int ret; int ret;
type = oid_object_info(the_repository, oid, NULL); type = odb_read_object_info(the_repository->objects, oid, NULL);
if (type != OBJ_TAG) if (type != OBJ_TAG)
return error("%s: cannot verify a non-tag object of type %s.", return error("%s: cannot verify a non-tag object of type %s.",
name_to_report ? name_to_report ?