odb/source: introduce generic object counting

Introduce generic object counting on the object database source level
with a new backend-specific callback function.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2026-03-12 09:43:00 +01:00
committed by Junio C Hamano
parent 2b24db1110
commit b259f2175b
4 changed files with 60 additions and 2 deletions

View File

@@ -93,6 +93,35 @@ static int odb_source_files_for_each_object(struct odb_source *source,
return 0;
}
static int odb_source_files_count_objects(struct odb_source *source,
enum odb_count_objects_flags flags,
unsigned long *out)
{
struct odb_source_files *files = odb_source_files_downcast(source);
unsigned long count;
int ret;
ret = packfile_store_count_objects(files->packed, flags, &count);
if (ret < 0)
goto out;
if (!(flags & ODB_COUNT_OBJECTS_APPROXIMATE)) {
unsigned long loose_count;
ret = odb_source_loose_count_objects(source, flags, &loose_count);
if (ret < 0)
goto out;
count += loose_count;
}
*out = count;
ret = 0;
out:
return ret;
}
static int odb_source_files_freshen_object(struct odb_source *source,
const struct object_id *oid)
{
@@ -220,6 +249,7 @@ struct odb_source_files *odb_source_files_new(struct object_database *odb,
files->base.read_object_info = odb_source_files_read_object_info;
files->base.read_object_stream = odb_source_files_read_object_stream;
files->base.for_each_object = odb_source_files_for_each_object;
files->base.count_objects = odb_source_files_count_objects;
files->base.freshen_object = odb_source_files_freshen_object;
files->base.write_object = odb_source_files_write_object;
files->base.write_object_stream = odb_source_files_write_object_stream;

View File

@@ -142,6 +142,21 @@ struct odb_source {
void *cb_data,
unsigned flags);
/*
* This callback is expected to count objects in the given object
* database source. The callback function does not have to guarantee
* that only unique objects are counted. The result shall be assigned
* to the `out` pointer.
*
* Accepts `enum odb_count_objects_flag` flags to alter the behaviour.
*
* The callback is expected to return 0 on success, or a negative error
* code otherwise.
*/
int (*count_objects)(struct odb_source *source,
enum odb_count_objects_flags flags,
unsigned long *out);
/*
* This callback is expected to freshen the given object so that its
* last access time is set to the current time. This is used to ensure
@@ -333,6 +348,18 @@ static inline int odb_source_for_each_object(struct odb_source *source,
return source->for_each_object(source, request, cb, cb_data, flags);
}
/*
* Count the number of objects in the given object database source.
*
* Returns 0 on success, a negative error code otherwise.
*/
static inline int odb_source_count_objects(struct odb_source *source,
enum odb_count_objects_flags flags,
unsigned long *out)
{
return source->count_objects(source, flags, out);
}
/*
* Freshen an object in the object database by updating its timestamp.
* Returns 1 in case the object has been freshened, 0 in case the object does