[PATCH v2 22/24] midx: prevent duplicate packfile loads
- From
Derrick Stolee <stolee@gmail.com>
- Date
- Jun 25, 2018, 14:34 UTC
- Message-ID
- <20180625143434.89044-23-dstolee@microsoft.com>
- In-Reply-To
- <20180625143434.89044-1-dstolee@microsoft.com>
The multi-pack-index, when present, tracks the existence of objects and their offsets within a list of packfiles. This allows us to use the multi-pack-index for object lookups, abbreviations, and object counts.
When the multi-pack-index tracks a packfile, then we do not need to add that packfile to the packed_git linked list or the MRU list.
We still need to load the packfiles that are not tracked by the multi-pack-index.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com> --- packfile.c | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/packfile.c b/packfile.c index e72e8a685d..f2b8d6f8a7 100644 --- a/packfile.c +++ b/packfile.c @@ -796,6 +796,7 @@ struct prepare_pack_data struct repository *r; struct string_list *garbage; int local; + struct multi_pack_index *m; }; static void prepare_pack(const char *full_name, size_t full_name_len, const char *file_name, void *_data) @@ -805,6 +806,8 @@ static void prepare_pack(const char *full_name, size_t full_name_len, const char size_t base_len = full_name_len; if (strip_suffix_mem(full_name, &base_len, ".idx")) { + if (data->m && midx_contains_pack(data->m, file_name)) + return; /* Don't reopen a pack we already have. */ for (p = data->r->objects->packed_git; p; p = p->next) { size_t len; @@ -841,6 +844,12 @@ static void prepare_packed_git_one(struct repository *r, char *objdir, int local struct prepare_pack_data data; struct string_list garbage = STRING_LIST_INIT_DUP; + data.m = r->objects->multi_pack_index; + + /* look for the multi-pack-index for this object directory */ + while (data.m && strcmp(data.m->object_dir, objdir)) + data.m = data.m->next; + data.r = r; data.garbage = &garbage; data.local = local;
-- 2.18.0.24.g1b579a2ee9