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

multi-pack-index: report progress during 'verify' 

When verifying a multi-pack-index, the only action that takes
significant time is checking the object offsets. For example,
to verify a multi-pack-index containing 6.2 million objects in
the Linux kernel repository takes 1.3 seconds on my machine.
99% of that time is spent looking up object offsets in each of
the packfiles and comparing them to the multi-pack-index offset.

Add a progress indicator for that section of the 'verify' verb.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Derrick Stolee 2018-09-13 11:02:26 -07:00 committed by Junio C Hamano
parent cc6af73c02
commit 144d70333e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
midx.c
View File

@ -7,6 +7,7 @@
#include "object-store.h" #include "object-store.h"
#include "sha1-lookup.h" #include "sha1-lookup.h"
#include "midx.h" #include "midx.h"
#include "progress.h"


#define MIDX_SIGNATURE 0x4d494458 /* "MIDX" */ #define MIDX_SIGNATURE 0x4d494458 /* "MIDX" */
#define MIDX_VERSION 1 #define MIDX_VERSION 1
@ -940,6 +941,7 @@ static void midx_report(const char *fmt, ...)
int verify_midx_file(const char *object_dir) int verify_midx_file(const char *object_dir)
{ {
uint32_t i; uint32_t i;
struct progress *progress = NULL;
struct multi_pack_index *m = load_multi_pack_index(object_dir, 1); struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
verify_midx_error = 0; verify_midx_error = 0;


@ -971,6 +973,7 @@ int verify_midx_file(const char *object_dir)
i, oid_to_hex(&oid1), oid_to_hex(&oid2), i + 1); i, oid_to_hex(&oid1), oid_to_hex(&oid2), i + 1);
} }


progress = start_progress(_("Verifying object offsets"), m->num_objects);
for (i = 0; i < m->num_objects; i++) { for (i = 0; i < m->num_objects; i++) {
struct object_id oid; struct object_id oid;
struct pack_entry e; struct pack_entry e;
@ -995,7 +998,10 @@ int verify_midx_file(const char *object_dir)
if (m_offset != p_offset) if (m_offset != p_offset)
midx_report(_("incorrect object offset for oid[%d] = %s: %"PRIx64" != %"PRIx64), midx_report(_("incorrect object offset for oid[%d] = %s: %"PRIx64" != %"PRIx64),
i, oid_to_hex(&oid), m_offset, p_offset); i, oid_to_hex(&oid), m_offset, p_offset);

display_progress(progress, i + 1);
} }
stop_progress(&progress);


return verify_midx_error; return verify_midx_error;
} }