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

builtin/repack.c: store existing cruft packs separately

Browse Source 
When repacking with the `--write-midx` option, we invoke the function
`midx_included_packs()` in order to produce the list of packs we want to
include in the resulting MIDX.

This list is comprised of:

  - existing .keep packs
  - any pack(s) which were written earlier in the same process
  - any unchanged packs when doing a `--geometric` repack
  - any cruft packs

Prior to this patch, we stored pre-existing cruft and non-cruft packs
together (provided those packs are non-kept). This meant we needed an
additional bit to indicate which non-kept pack(s) were cruft versus
those that aren't.

But alternatively we can store cruft packs in a separate list, avoiding
the need for this extra bit, and simplifying the code below.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Taylor Blau
2023-09-13 15:17:57 -04:00
committed by Junio C Hamano
parent 4bbfb003c0
commit eabfaf8e8d
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
builtin/repack.c
View File

@ -27,7 +27,6 @@
#define PACK_CRUFT 4 #define PACK_CRUFT 4
#define DELETE_PACK 1 #define DELETE_PACK 1
#define CRUFT_PACK 2
static int pack_everything; static int pack_everything;
static int delta_base_offset = 1; static int delta_base_offset = 1;
@ -98,16 +97,18 @@ static int repack_config(const char *var, const char *value,
struct existing_packs { struct existing_packs {
struct string_list kept_packs; struct string_list kept_packs;
struct string_list non_kept_packs; struct string_list non_kept_packs;
struct string_list cruft_packs;
}; };
#define EXISTING_PACKS_INIT { \ #define EXISTING_PACKS_INIT { \
.kept_packs = STRING_LIST_INIT_DUP, \ .kept_packs = STRING_LIST_INIT_DUP, \
.non_kept_packs = STRING_LIST_INIT_DUP, \ .non_kept_packs = STRING_LIST_INIT_DUP, \
.cruft_packs = STRING_LIST_INIT_DUP, \
} }
static int has_existing_non_kept_packs(const struct existing_packs *existing) static int has_existing_non_kept_packs(const struct existing_packs *existing)
{ {
return existing->non_kept_packs.nr; return existing->non_kept_packs.nr || existing->cruft_packs.nr;
} }
static void mark_packs_for_deletion_1(struct string_list *names, static void mark_packs_for_deletion_1(struct string_list *names,
@ -138,6 +139,7 @@ static void mark_packs_for_deletion(struct existing_packs *existing,
{ {
mark_packs_for_deletion_1(names, &existing->non_kept_packs); mark_packs_for_deletion_1(names, &existing->non_kept_packs);
mark_packs_for_deletion_1(names, &existing->cruft_packs);
} }
static void remove_redundant_pack(const char *dir_name, const char *base_name) static void remove_redundant_pack(const char *dir_name, const char *base_name)
@ -165,12 +167,14 @@ static void remove_redundant_packs_1(struct string_list *packs)
static void remove_redundant_existing_packs(struct existing_packs *existing) static void remove_redundant_existing_packs(struct existing_packs *existing)
{ {
remove_redundant_packs_1(&existing->non_kept_packs); remove_redundant_packs_1(&existing->non_kept_packs);
remove_redundant_packs_1(&existing->cruft_packs);
} }
static void existing_packs_release(struct existing_packs *existing) static void existing_packs_release(struct existing_packs *existing)
{ {
string_list_clear(&existing->kept_packs, 0); string_list_clear(&existing->kept_packs, 0);
string_list_clear(&existing->non_kept_packs, 0); string_list_clear(&existing->non_kept_packs, 0);
string_list_clear(&existing->cruft_packs, 0);
} }
/* /*
@ -204,12 +208,10 @@ static void collect_pack_filenames(struct existing_packs *existing,
if ((extra_keep->nr > 0 && i < extra_keep->nr) || p->pack_keep) if ((extra_keep->nr > 0 && i < extra_keep->nr) || p->pack_keep)
string_list_append(&existing->kept_packs, buf.buf); string_list_append(&existing->kept_packs, buf.buf);
else { else if (p->is_cruft)
struct string_list_item *item; string_list_append(&existing->cruft_packs, buf.buf);
item = string_list_append(&existing->non_kept_packs, buf.buf); else
if (p->is_cruft) string_list_append(&existing->non_kept_packs, buf.buf);
item->util = (void*)(uintptr_t)CRUFT_PACK;
}
} }
string_list_sort(&existing->kept_packs); string_list_sort(&existing->kept_packs);
@ -691,14 +693,11 @@ static void midx_included_packs(struct string_list *include,
string_list_insert(include, strbuf_detach(&buf, NULL)); string_list_insert(include, strbuf_detach(&buf, NULL));
} }
for_each_string_list_item(item, &existing->non_kept_packs) { for_each_string_list_item(item, &existing->cruft_packs) {
if (!((uintptr_t)item->util & CRUFT_PACK)) { /*
/* * no need to check DELETE_PACK, since we're not
* no need to check DELETE_PACK, since we're not * doing an ALL_INTO_ONE repack
* doing an ALL_INTO_ONE repack */
*/
continue;
}
string_list_insert(include, xstrfmt("%s.idx", item->string)); string_list_insert(include, xstrfmt("%s.idx", item->string));
} }
} else { } else {
@ -707,6 +706,12 @@ static void midx_included_packs(struct string_list *include,
continue; continue;
string_list_insert(include, xstrfmt("%s.idx", item->string)); string_list_insert(include, xstrfmt("%s.idx", item->string));
} }
for_each_string_list_item(item, &existing->cruft_packs) {
if ((uintptr_t)item->util & DELETE_PACK)
continue;
string_list_insert(include, xstrfmt("%s.idx", item->string));
}
} }
} }
@ -836,6 +841,8 @@ static int write_cruft_pack(const struct pack_objects_args *args,
fprintf(in, "%s-%s.pack\n", pack_prefix, item->string); fprintf(in, "%s-%s.pack\n", pack_prefix, item->string);
for_each_string_list_item(item, &existing->non_kept_packs) for_each_string_list_item(item, &existing->non_kept_packs)
fprintf(in, "-%s.pack\n", item->string); fprintf(in, "-%s.pack\n", item->string);
for_each_string_list_item(item, &existing->cruft_packs)
fprintf(in, "-%s.pack\n", item->string);
for_each_string_list_item(item, &existing->kept_packs) for_each_string_list_item(item, &existing->kept_packs)
fprintf(in, "%s.pack\n", item->string); fprintf(in, "%s.pack\n", item->string);
fclose(in); fclose(in);