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

pack-bitmap: simplify reuse_partial_packfile_from_bitmap() signature

Browse Source 
The signature of `reuse_partial_packfile_from_bitmap()` currently takes
in a bitmap, as well as three output parameters (filled through
pointers, and passed as arguments), and also returns an integer result.

The output parameters are filled out with: (a) the packfile used for
pack-reuse, (b) the number of objects from that pack that we can reuse,
and (c) a bitmap indicating which objects we can reuse. The return value
is either -1 (when there are no objects to reuse), or 0 (when there is
at least one object to reuse).

Some of these parameters are redundant. Notably, we can infer from the
bitmap how many objects are reused by calling bitmap_popcount(). And we
can similar compute the return value based on that number as well.

As such, clean up the signature of this function to drop the "*entries"
parameter, as well as the int return value, since the single caller of
this function can infer these values themself.

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-12-14 17:24:01 -05:00
committed by Junio C Hamano
parent e5d48bf38b
commit 35e156b9de
3 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/pack-objects.c
View File

@ -3943,13 +3943,15 @@ static int get_object_list_from_bitmap(struct rev_info *revs)
if (!(bitmap_git = prepare_bitmap_walk(revs, 0))) if (!(bitmap_git = prepare_bitmap_walk(revs, 0)))
return -1; return -1;
if (pack_options_allow_reuse() && if (pack_options_allow_reuse())
!reuse_partial_packfile_from_bitmap( reuse_partial_packfile_from_bitmap(bitmap_git, &reuse_packfile,
bitmap_git, &reuse_packfile_bitmap);
&reuse_packfile,
&reuse_packfile_objects, if (reuse_packfile) {
&reuse_packfile_bitmap)) { reuse_packfile_objects = bitmap_popcount(reuse_packfile_bitmap);
assert(reuse_packfile_objects); if (!reuse_packfile_objects)
BUG("expected non-empty reuse bitmap");
nr_result += reuse_packfile_objects; nr_result += reuse_packfile_objects;
nr_seen += reuse_packfile_objects; nr_seen += reuse_packfile_objects;
display_progress(progress_state, nr_seen); display_progress(progress_state, nr_seen);

16
pack-bitmap.c
View File

@ -2000,10 +2000,9 @@ static int bitmapped_pack_cmp(const void *va, const void *vb)
return 0; return 0;
} }
int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git, void reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
struct packed_git **packfile_out, struct packed_git **packfile_out,
uint32_t *entries, struct bitmap **reuse_out)
struct bitmap **reuse_out)
{ {
struct repository *r = the_repository; struct repository *r = the_repository;
struct bitmapped_pack *packs = NULL; struct bitmapped_pack *packs = NULL;
@ -2025,7 +2024,7 @@ int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
warning(_("unable to load pack: '%s', disabling pack-reuse"), warning(_("unable to load pack: '%s', disabling pack-reuse"),
bitmap_git->midx->pack_names[i]); bitmap_git->midx->pack_names[i]);
free(packs); free(packs);
return -1; return;
} }
if (!pack.bitmap_nr) if (!pack.bitmap_nr)
continue; /* no objects from this pack */ continue; /* no objects from this pack */
@ -2059,10 +2058,10 @@ int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
reuse_partial_packfile_from_bitmap_1(bitmap_git, packs, reuse); reuse_partial_packfile_from_bitmap_1(bitmap_git, packs, reuse);
*entries = bitmap_popcount(reuse); if (bitmap_is_empty(reuse)) {
if (!*entries) { free(packs);
bitmap_free(reuse); bitmap_free(reuse);
return -1; return;
} }
/* /*
@ -2072,7 +2071,6 @@ int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
bitmap_and_not(result, reuse); bitmap_and_not(result, reuse);
*packfile_out = packs[0].p; *packfile_out = packs[0].p;
*reuse_out = reuse; *reuse_out = reuse;
return 0;
} }
int bitmap_walk_contains(struct bitmap_index *bitmap_git, int bitmap_walk_contains(struct bitmap_index *bitmap_git,

7
pack-bitmap.h
View File

@ -78,10 +78,9 @@ int test_bitmap_hashes(struct repository *r);
struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs, struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
int filter_provided_objects); int filter_provided_objects);
uint32_t midx_preferred_pack(struct bitmap_index *bitmap_git); uint32_t midx_preferred_pack(struct bitmap_index *bitmap_git);
int reuse_partial_packfile_from_bitmap(struct bitmap_index *, void reuse_partial_packfile_from_bitmap(struct bitmap_index *,
struct packed_git **packfile, struct packed_git **packfile,
uint32_t *entries, struct bitmap **reuse_out);
struct bitmap **reuse_out);
int rebuild_existing_bitmaps(struct bitmap_index *, struct packing_data *mapping, int rebuild_existing_bitmaps(struct bitmap_index *, struct packing_data *mapping,
kh_oid_map_t *reused_bitmaps, int show_progress); kh_oid_map_t *reused_bitmaps, int show_progress);
void free_bitmap_index(struct bitmap_index *); void free_bitmap_index(struct bitmap_index *);