summaryrefslogtreecommitdiff
path: root/builtin/pack-redundant.c
diff options
context:
space:
mode:
authorJiang Xin <zhiyou.jx@alibaba-inc.com>2019-02-02 13:30:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-02-04 22:18:24 (GMT)
commit301117764041101ae228e8e33c12c0b232b06408 (patch)
tree6287b7de285cd6a39f590e76ea41631065e9f054 /builtin/pack-redundant.c
parent3173a94d577e14501039e85f333e9c98cbd92667 (diff)
downloadgit-301117764041101ae228e8e33c12c0b232b06408.zip
git-301117764041101ae228e8e33c12c0b232b06408.tar.gz
git-301117764041101ae228e8e33c12c0b232b06408.tar.bz2
pack-redundant: delay creation of unique_objects
Instead of initializing unique_objects in `add_pack()`, copy from all_objects in `cmp_two_packs()`, when unwanted objects are removed from all_objects. This will save memory (no allocate memory for alt-odb packs), and run `llist_sorted_difference_inplace()` only once when removing ignored objects and removing objects in alt-odb in `scan_alt_odb_packs()`. Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pack-redundant.c')
-rw-r--r--builtin/pack-redundant.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
index cf9a9aa..f7dab0e 100644
--- a/builtin/pack-redundant.c
+++ b/builtin/pack-redundant.c
@@ -254,6 +254,11 @@ static void cmp_two_packs(struct pack_list *p1, struct pack_list *p2)
struct llist_item *p1_hint = NULL, *p2_hint = NULL;
const unsigned int hashsz = the_hash_algo->rawsz;
+ if (!p1->unique_objects)
+ p1->unique_objects = llist_copy(p1->all_objects);
+ if (!p2->unique_objects)
+ p2->unique_objects = llist_copy(p2->all_objects);
+
p1_base = p1->pack->index_data;
p2_base = p2->pack->index_data;
p1_base += 256 * 4 + ((p1->pack->index_version < 2) ? 4 : 8);
@@ -536,7 +541,7 @@ static void scan_alt_odb_packs(void)
while (alt) {
local = local_packs;
while (local) {
- llist_sorted_difference_inplace(local->unique_objects,
+ llist_sorted_difference_inplace(local->all_objects,
alt->all_objects);
local = local->next;
}
@@ -567,8 +572,7 @@ static struct pack_list * add_pack(struct packed_git *p)
llist_insert_back(l.all_objects, (const struct object_id *)(base + off));
off += step;
}
- /* this list will be pruned in cmp_two_packs later */
- l.unique_objects = llist_copy(l.all_objects);
+ l.unique_objects = NULL;
if (p->pack_local)
return pack_list_insert(&local_packs, &l);
else
@@ -646,7 +650,6 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix)
load_all_objects();
- cmp_local_packs();
if (alt_odb)
scan_alt_odb_packs();
@@ -663,10 +666,12 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix)
llist_sorted_difference_inplace(all_objects, ignore);
pl = local_packs;
while (pl) {
- llist_sorted_difference_inplace(pl->unique_objects, ignore);
+ llist_sorted_difference_inplace(pl->all_objects, ignore);
pl = pl->next;
}
+ cmp_local_packs();
+
minimize(&min);
if (verbose) {