kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

pack: move approximate object count to object store 

The approximate_object_count() function maintains a rough count of
objects in a repository to estimate how long object name abbreviates
should be.  Object names are scoped to a repository and the
appropriate length may differ by repository, so the object count
should not be global.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Stefan Beller 2018-03-23 18:21:02 +01:00 committed by Junio C Hamano
parent 5508f69348
commit 9a00580d03
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
object-store.h
View File

@ -99,6 +99,14 @@ struct raw_object_store {
/* A most-recently-used ordered version of the packed_git list. */ /* A most-recently-used ordered version of the packed_git list. */
struct list_head packed_git_mru; struct list_head packed_git_mru;


/*
* A fast, rough count of the number of objects in the repository.
* These two fields are not meant for direct access. Use
* approximate_object_count() instead.
*/
unsigned long approximate_object_count;
unsigned approximate_object_count_valid : 1;

/* /*
* Whether packed_git has already been populated with this repository's * Whether packed_git has already been populated with this repository's
* packs. * packs.

11
packfile.c
View File

@ -803,8 +803,6 @@ static void prepare_packed_git_one(char *objdir, int local)
strbuf_release(&path); strbuf_release(&path);
} }


static int approximate_object_count_valid;

/* /*
* Give a fast, rough count of the number of objects in the repository. This * Give a fast, rough count of the number of objects in the repository. This
* ignores loose objects completely. If you have a lot of them, then either * ignores loose objects completely. If you have a lot of them, then either
@ -814,8 +812,8 @@ static int approximate_object_count_valid;
*/ */
unsigned long approximate_object_count(void) unsigned long approximate_object_count(void)
{ {
static unsigned long count; if (!the_repository->objects->approximate_object_count_valid) {
if (!approximate_object_count_valid) { unsigned long count;
struct packed_git *p; struct packed_git *p;


prepare_packed_git(); prepare_packed_git();
@ -825,8 +823,9 @@ unsigned long approximate_object_count(void)
continue; continue;
count += p->num_objects; count += p->num_objects;
} }
the_repository->objects->approximate_object_count = count;
} }
return count; return the_repository->objects->approximate_object_count;
} }


static void *get_next_packed_git(const void *p) static void *get_next_packed_git(const void *p)
@ -901,7 +900,7 @@ void prepare_packed_git(void)


void reprepare_packed_git(void) void reprepare_packed_git(void)
{ {
approximate_object_count_valid = 0; the_repository->objects->approximate_object_count_valid = 0;
the_repository->objects->packed_git_initialized = 0; the_repository->objects->packed_git_initialized = 0;
prepare_packed_git(); prepare_packed_git();
} }