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

pack-bitmap: initialize bitmap_writer_init() with packing_data

Browse Source 
In order to determine its object order, the pack-bitmap machinery keeps
a 'struct packing_data' corresponding to the pack or pseudo-pack (when
writing a MIDX bitmap) being written.

The to_pack field is provided to the bitmap machinery by callers of
bitmap_writer_build() and assigned to the bitmap_writer struct at that
point.

But a subsequent commit will want to have access to that data earlier on
during commit selection. Prepare for that by adding a 'to_pack' argument
to 'bitmap_writer_init()', and initializing the field during that
function.

Subsequent commits will clean up other functions which take
now-redundant arguments (like nr_objects, which is equivalent to
pdata->objects_nr, or pdata itself).

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Taylor Blau
2024-08-15 13:31:00 -04:00
committed by Junio C Hamano
parent 39bf06adf9
commit 01e9d12939
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/pack-objects.c
View File

@ -1342,7 +1342,7 @@ static void write_pack_file(void)
if (write_bitmap_index) { if (write_bitmap_index) {
bitmap_writer_init(&bitmap_writer, bitmap_writer_init(&bitmap_writer,
the_repository); the_repository, &to_pack);
bitmap_writer_set_checksum(&bitmap_writer, hash); bitmap_writer_set_checksum(&bitmap_writer, hash);
bitmap_writer_build_type_index(&bitmap_writer, bitmap_writer_build_type_index(&bitmap_writer,
&to_pack, written_list, nr_written); &to_pack, written_list, nr_written);

2
midx-write.c
View File

@ -825,7 +825,7 @@ static int write_midx_bitmap(const char *midx_name,
for (i = 0; i < pdata->nr_objects; i++) for (i = 0; i < pdata->nr_objects; i++)
index[i] = &pdata->objects[i].idx; index[i] = &pdata->objects[i].idx;
bitmap_writer_init(&writer, the_repository); bitmap_writer_init(&writer, the_repository, pdata);
bitmap_writer_show_progress(&writer, flags & MIDX_PROGRESS); bitmap_writer_show_progress(&writer, flags & MIDX_PROGRESS);
bitmap_writer_build_type_index(&writer, pdata, index, bitmap_writer_build_type_index(&writer, pdata, index,
pdata->nr_objects); pdata->nr_objects);

4
pack-bitmap-write.c
View File

@ -41,13 +41,15 @@ static inline int bitmap_writer_nr_selected_commits(struct bitmap_writer *writer
return writer->selected_nr - writer->pseudo_merges_nr; return writer->selected_nr - writer->pseudo_merges_nr;
} }
void bitmap_writer_init(struct bitmap_writer *writer, struct repository *r) void bitmap_writer_init(struct bitmap_writer *writer, struct repository *r,
struct packing_data *pdata)
{ {
memset(writer, 0, sizeof(struct bitmap_writer)); memset(writer, 0, sizeof(struct bitmap_writer));
if (writer->bitmaps) if (writer->bitmaps)
BUG("bitmap writer already initialized"); BUG("bitmap writer already initialized");
writer->bitmaps = kh_init_oid_map(); writer->bitmaps = kh_init_oid_map();
writer->pseudo_merge_commits = kh_init_oid_map(); writer->pseudo_merge_commits = kh_init_oid_map();
writer->to_pack = pdata;
string_list_init_dup(&writer->pseudo_merge_groups); string_list_init_dup(&writer->pseudo_merge_groups);

3
pack-bitmap.h
View File

@ -123,7 +123,8 @@ struct bitmap_writer {
unsigned char pack_checksum[GIT_MAX_RAWSZ]; unsigned char pack_checksum[GIT_MAX_RAWSZ];
}; };
void bitmap_writer_init(struct bitmap_writer *writer, struct repository *r); void bitmap_writer_init(struct bitmap_writer *writer, struct repository *r,
struct packing_data *pdata);
void bitmap_writer_show_progress(struct bitmap_writer *writer, int show); void bitmap_writer_show_progress(struct bitmap_writer *writer, int show);
void bitmap_writer_set_checksum(struct bitmap_writer *writer, void bitmap_writer_set_checksum(struct bitmap_writer *writer,
const unsigned char *sha1); const unsigned char *sha1);