mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ds/midx-too-many-packs'

Browse Source 
The code to generate the multi-pack idx file was not prepared to
see too many packfiles and ran out of open file descriptor, which
has been corrected.

* ds/midx-too-many-packs:
  midx: add packs to packed_git linked list
  midx: pass a repository pointer
This commit is contained in:
Junio C Hamano
2019-05-19 16:45:30 +09:00
parent 97616ca488 af96fe3392
commit 454b419729
7 changed files with 51 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packfile.c
View File

@ -994,8 +994,6 @@ static void prepare_packed_git(struct repository *r)
}
rearrange_packed_git(r);
r->objects->all_packs = NULL;
prepare_packed_git_mru(r);
r->objects->packed_git_initialized = 1;
}
@ -1026,26 +1024,16 @@ struct multi_pack_index *get_multi_pack_index(struct repository *r)
struct packed_git *get_all_packs(struct repository *r)
{
struct multi_pack_index *m;
prepare_packed_git(r);
if (!r->objects->all_packs) {
struct packed_git *p = r->objects->packed_git;
struct multi_pack_index *m;
for (m = r->objects->multi_pack_index; m; m = m->next) {
uint32_t i;
for (i = 0; i < m->num_packs; i++) {
if (!prepare_midx_pack(m, i)) {
m->packs[i]->next = p;
p = m->packs[i];
}
}
}
r->objects->all_packs = p;
for (m = r->objects->multi_pack_index; m; m = m->next) {
uint32_t i;
for (i = 0; i < m->num_packs; i++)
prepare_midx_pack(r, m, i);
}
return r->objects->all_packs;
return r->objects->packed_git;
}
struct list_head *get_packed_git_mru(struct repository *r)
@ -1998,13 +1986,13 @@ int find_pack_entry(struct repository *r, const struct object_id *oid, struct pa
return 0;
for (m = r->objects->multi_pack_index; m; m = m->next) {
if (fill_midx_entry(oid, e, m))
if (fill_midx_entry(r, oid, e, m))
return 1;
}
list_for_each(pos, &r->objects->packed_git_mru) {
struct packed_git *p = list_entry(pos, struct packed_git, mru);
if (fill_pack_entry(oid, e, p)) {
if (!p->multi_pack_index && fill_pack_entry(oid, e, p)) {
list_move(&p->mru, &r->objects->packed_git_mru);
return 1;
}