pack-revindex: ensure that on-disk reverse indexes are given precedence
When an on-disk reverse index exists, there is no need to generate one in memory. In fact, doing so can be slow, and require large amounts of the heap. Let's make sure that we treat the on-disk reverse index with precedence (i.e., that when it exists, we don't bother trying to generate an equivalent one in memory) by teaching Git how to conditionally die() when generating a reverse index in memory. Then, add a test to ensure that when (a) an on-disk reverse index exists, and (b) when setting GIT_TEST_REV_INDEX_DIE_IN_MEMORY, that we do not die, implying that we read from the on-disk one. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Taylor Blau committed
Jan 25, 2021 at 18:37 UTC
ec8e7760ac38ef426f87ec738454e574be53a00e
3 files changed
+14
pack-revindex.c
+4
@@ -2,6 +2,7 @@
2
#include "pack-revindex.h"
3
#include "object-store.h"
4
#include "packfile.h"
5
+#include "config.h"
6
7
struct revindex_entry {
8
off_t offset;
@@ -166,6 +167,9 @@ static void create_pack_revindex(struct packed_git *p)
167
168
static int create_pack_revindex_in_memory(struct packed_git *p)
169
{
170
+ if (git_env_bool(GIT_TEST_REV_INDEX_DIE_IN_MEMORY, 0))
171
+ die("dying as requested by '%s'",
172
+ GIT_TEST_REV_INDEX_DIE_IN_MEMORY);
173
if (open_pack_index(p))
174
return -1;
175
create_pack_revindex(p);
pack-revindex.h
+1
@@ -21,6 +21,7 @@
21
#define RIDX_VERSION 1
22
23
#define GIT_TEST_WRITE_REV_INDEX "GIT_TEST_WRITE_REV_INDEX"
24
+#define GIT_TEST_REV_INDEX_DIE_IN_MEMORY "GIT_TEST_REV_INDEX_DIE_IN_MEMORY"
25
26
struct packed_git;
27
t/t5325-reverse-index.sh
+9
@@ -85,4 +85,13 @@ test_expect_success 'pack-objects respects pack.writeReverseIndex' '
85
test_path_is_file pack-1-*.rev
86
'
87
88
+test_expect_success 'reverse index is not generated when available on disk' '
89
+ test_index_pack true &&
90
+ test_path_is_file $rev &&
91
+
92
+ git rev-parse HEAD >tip &&
93
+ GIT_TEST_REV_INDEX_DIE_IN_MEMORY=1 git cat-file \
94
+ --batch-check="%(objectsize:disk)" <tip
95
+'
96
+
97
test_done