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>
Derrick Stolee committed
Sep 13, 2018 at 11:02 UTC
144d70333e826ea2480d60eb2298013eeef0cabf
1 file changed
+6
midx.c
+6
@@ -7,6 +7,7 @@
7
#include "object-store.h"
8
#include "sha1-lookup.h"
9
#include "midx.h"
10
+#include "progress.h"
11
12
#define MIDX_SIGNATURE 0x4d494458 /* "MIDX" */
13
#define MIDX_VERSION 1
@@ -940,6 +941,7 @@ static void midx_report(const char *fmt, ...)
941
int verify_midx_file(const char *object_dir)
942
{
943
uint32_t i;
944
+ struct progress *progress = NULL;
945
struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
946
verify_midx_error = 0;
947
@@ -971,6 +973,7 @@ int verify_midx_file(const char *object_dir)
973
i, oid_to_hex(&oid1), oid_to_hex(&oid2), i + 1);
974
}
975
976
+ progress = start_progress(_("Verifying object offsets"), m->num_objects);
977
for (i = 0; i < m->num_objects; i++) {
978
struct object_id oid;
979
struct pack_entry e;
@@ -995,7 +998,10 @@ int verify_midx_file(const char *object_dir)
998
if (m_offset != p_offset)
999
midx_report(_("incorrect object offset for oid[%d] = %s: %"PRIx64" != %"PRIx64),
1000
i, oid_to_hex(&oid), m_offset, p_offset);
1001
+
1002
+ display_progress(progress, i + 1);
1003
}
1004
+ stop_progress(&progress);
1005
1006
return verify_midx_error;
1007
}