Skip to content

Commit 4bc0cc1

Browse files
jiangxingitster
jiangxin
authored and
gitster
committed
pack-redundant: rename pack_list.all_objects
New algorithm uses `pack_list.all_objects` to track remaining objects, so rename it to `pack_list.remaining_objects`. Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 3084a01 commit 4bc0cc1

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

‎builtin/pack-redundant.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ static struct pack_list {
3232
struct pack_list *next;
3333
struct packed_git *pack;
3434
struct llist *unique_objects;
35-
struct llist *all_objects;
35+
struct llist *remaining_objects;
3636
} *local_packs = NULL, *altodb_packs = NULL;
3737

3838
static struct llist_item *free_nodes;
@@ -241,9 +241,9 @@ static void cmp_two_packs(struct pack_list *p1, struct pack_list *p2)
241241
const unsigned int hashsz = the_hash_algo->rawsz;
242242

243243
if (!p1->unique_objects)
244-
p1->unique_objects = llist_copy(p1->all_objects);
244+
p1->unique_objects = llist_copy(p1->remaining_objects);
245245
if (!p2->unique_objects)
246-
p2->unique_objects = llist_copy(p2->all_objects);
246+
p2->unique_objects = llist_copy(p2->remaining_objects);
247247

248248
p1_base = p1->pack->index_data;
249249
p2_base = p2->pack->index_data;
@@ -344,8 +344,8 @@ static int cmp_pack_list_reverse(const void *a, const void *b)
344344
{
345345
struct pack_list *pl_a = *((struct pack_list **)a);
346346
struct pack_list *pl_b = *((struct pack_list **)b);
347-
size_t sz_a = pl_a->all_objects->size;
348-
size_t sz_b = pl_b->all_objects->size;
347+
size_t sz_a = pl_a->remaining_objects->size;
348+
size_t sz_b = pl_b->remaining_objects->size;
349349

350350
if (sz_a == sz_b)
351351
return 0;
@@ -355,7 +355,7 @@ static int cmp_pack_list_reverse(const void *a, const void *b)
355355
return -1;
356356
}
357357

358-
/* Sort pack_list, greater size of all_objects first */
358+
/* Sort pack_list, greater size of remaining_objects first */
359359
static void sort_pack_list(struct pack_list **pl)
360360
{
361361
struct pack_list **ary, *p;
@@ -399,7 +399,7 @@ static void minimize(struct pack_list **min)
399399
missing = llist_copy(all_objects);
400400
pl = unique;
401401
while (pl) {
402-
llist_sorted_difference_inplace(missing, pl->all_objects);
402+
llist_sorted_difference_inplace(missing, pl->remaining_objects);
403403
pl = pl->next;
404404
}
405405

@@ -417,20 +417,20 @@ static void minimize(struct pack_list **min)
417417
/* remove unique pack objects from the non_unique packs */
418418
pl = non_unique;
419419
while (pl) {
420-
llist_sorted_difference_inplace(pl->all_objects, unique_pack_objects);
420+
llist_sorted_difference_inplace(pl->remaining_objects, unique_pack_objects);
421421
pl = pl->next;
422422
}
423423

424424
while (non_unique) {
425-
/* sort the non_unique packs, greater size of all_objects first */
425+
/* sort the non_unique packs, greater size of remaining_objects first */
426426
sort_pack_list(&non_unique);
427-
if (non_unique->all_objects->size == 0)
427+
if (non_unique->remaining_objects->size == 0)
428428
break;
429429

430430
pack_list_insert(min, non_unique);
431431

432-
for (pl = non_unique->next; pl && pl->all_objects->size > 0; pl = pl->next)
433-
llist_sorted_difference_inplace(pl->all_objects, non_unique->all_objects);
432+
for (pl = non_unique->next; pl && pl->remaining_objects->size > 0; pl = pl->next)
433+
llist_sorted_difference_inplace(pl->remaining_objects, non_unique->remaining_objects);
434434

435435
non_unique = non_unique->next;
436436
}
@@ -445,7 +445,7 @@ static void load_all_objects(void)
445445

446446
while (pl) {
447447
hint = NULL;
448-
l = pl->all_objects->front;
448+
l = pl->remaining_objects->front;
449449
while (l) {
450450
hint = llist_insert_sorted_unique(all_objects,
451451
l->oid, hint);
@@ -456,7 +456,7 @@ static void load_all_objects(void)
456456
/* remove objects present in remote packs */
457457
pl = altodb_packs;
458458
while (pl) {
459-
llist_sorted_difference_inplace(all_objects, pl->all_objects);
459+
llist_sorted_difference_inplace(all_objects, pl->remaining_objects);
460460
pl = pl->next;
461461
}
462462
}
@@ -481,8 +481,8 @@ static void scan_alt_odb_packs(void)
481481
while (alt) {
482482
local = local_packs;
483483
while (local) {
484-
llist_sorted_difference_inplace(local->all_objects,
485-
alt->all_objects);
484+
llist_sorted_difference_inplace(local->remaining_objects,
485+
alt->remaining_objects);
486486
local = local->next;
487487
}
488488
alt = alt->next;
@@ -499,7 +499,7 @@ static struct pack_list * add_pack(struct packed_git *p)
499499
return NULL;
500500

501501
l.pack = p;
502-
llist_init(&l.all_objects);
502+
llist_init(&l.remaining_objects);
503503

504504
if (open_pack_index(p))
505505
return NULL;
@@ -508,7 +508,7 @@ static struct pack_list * add_pack(struct packed_git *p)
508508
base += 256 * 4 + ((p->index_version < 2) ? 4 : 8);
509509
step = the_hash_algo->rawsz + ((p->index_version < 2) ? 4 : 0);
510510
while (off < p->num_objects * step) {
511-
llist_insert_back(l.all_objects, (const struct object_id *)(base + off));
511+
llist_insert_back(l.remaining_objects, (const struct object_id *)(base + off));
512512
off += step;
513513
}
514514
l.unique_objects = NULL;
@@ -605,7 +605,7 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix)
605605
llist_sorted_difference_inplace(all_objects, ignore);
606606
pl = local_packs;
607607
while (pl) {
608-
llist_sorted_difference_inplace(pl->all_objects, ignore);
608+
llist_sorted_difference_inplace(pl->remaining_objects, ignore);
609609
pl = pl->next;
610610
}
611611

0 commit comments

Comments
 (0)