@matheusbsbs / matheus-bagliano / commits / 9675b06917

pack-bitmap: drop unused `max_bitmaps` parameter

The `max_bitmaps` parameter in `bitmap_writer_select_commits()` was introduced back in 7cc8f97108 (pack-objects: implement bitmap writing, 2013-12-21), making it original to the bitmap implementation in Git itself. When that patch was merged via 0f9e62e084 (Merge branch 'jk/pack-bitmap', 2014-02-27), its sole caller in builtin/pack-objects.c passed a value of "-1" for `max_bitmaps`, indicating no limit. Since then, the only other caller (in midx.c, added via c528e17966 (pack-bitmap: write multi-pack bitmaps, 2021-08-31)) also uses a value of "-1" for `max_bitmaps`. Since no callers have needed a finite limit for the `max_bitmaps` parameter in the nearly decade that has passed since 0f9e62e084, let's remove the parameter and any dead pieces of code connected to it. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Taylor Blau committed May 14, 2024 at 15:57 UTC 9675b0691732d5475a353a69c3a8e14804b22a64
4 files changed +4 -12
builtin/pack-objects.c
+1 -2
@@ -1364,8 +1364,7 @@ static void write_pack_file(void)
1364 progress);
1365 bitmap_writer_select_commits(&bitmap_writer,
1366 indexed_commits,
1367 - indexed_commits_nr,
1368 - -1);
1367 + indexed_commits_nr);
1368 if (bitmap_writer_build(&bitmap_writer, &to_pack) < 0)
1369 die(_("failed to write bitmap index"));
1370 bitmap_writer_finish(&bitmap_writer,
midx-write.c
+1 -1
@@ -841,7 +841,7 @@ static int write_midx_bitmap(const char *midx_name,
841 for (i = 0; i < pdata->nr_objects; i++)
842 index[pack_order[i]] = &pdata->objects[i].idx;
843
844 - bitmap_writer_select_commits(&writer, commits, commits_nr, -1);
844 + bitmap_writer_select_commits(&writer, commits, commits_nr);
845 ret = bitmap_writer_build(&writer, pdata);
846 if (ret < 0)
847 goto cleanup;
pack-bitmap-write.c
+1 -7
@@ -587,8 +587,7 @@ static int date_compare(const void *_a, const void *_b)
587
588 void bitmap_writer_select_commits(struct bitmap_writer *writer,
589 struct commit **indexed_commits,
590 - unsigned int indexed_commits_nr,
591 - int max_bitmaps)
590 + unsigned int indexed_commits_nr)
591 {
592 unsigned int i = 0, j, next;
593
@@ -611,11 +610,6 @@ void bitmap_writer_select_commits(struct bitmap_writer *writer,
610 if (i + next >= indexed_commits_nr)
611 break;
612
614 - if (max_bitmaps > 0 && writer->selected_nr >= max_bitmaps) {
615 - writer->selected_nr = max_bitmaps;
616 - break;
617 - }
618 -
613 if (next == 0) {
614 chosen = indexed_commits[i];
615 } else {
pack-bitmap.h
+1 -2
@@ -131,8 +131,7 @@ struct ewah_bitmap *bitmap_for_commit(struct bitmap_index *bitmap_git,
131 struct commit *commit);
132 void bitmap_writer_select_commits(struct bitmap_writer *writer,
133 struct commit **indexed_commits,
134 - unsigned int indexed_commits_nr,
135 - int max_bitmaps);
134 + unsigned int indexed_commits_nr);
135 int bitmap_writer_build(struct bitmap_writer *writer,
136 struct packing_data *to_pack);
137 void bitmap_writer_finish(struct bitmap_writer *writer,