pack-bitmap: tag bitmapped packs with their corresponding MIDX
The next commit will need to use the bitmap's MIDX (if one exists) to translate bit positions into pack-relative positions in the source pack. Ordinarily, we'd use the "midx" field of the bitmap_index struct. But since that struct is defined within pack-bitmap.c, and our caller is in a separate compilation unit, we do not have access to the MIDX field. Instead, add a "from_midx" field to the bitmapped_pack structure so that we can use that piece of data from outside of pack-bitmap.c. The caller that uses this new piece of information will be added in the following commit. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Taylor Blau committed
Aug 27, 2024 at 17:13 UTC
41cd4b478f7ee0a9049601afdcd7872bdbeae519
3 files changed
+3
midx.c
+1
@@ -496,6 +496,7 @@ int nth_bitmapped_pack(struct repository *r, struct multi_pack_index *m,
496
MIDX_CHUNK_BITMAPPED_PACKS_WIDTH * local_pack_int_id +
497
sizeof(uint32_t));
498
bp->pack_int_id = pack_int_id;
499
+ bp->from_midx = m;
500
501
return 0;
502
}
pack-bitmap.c
+1
@@ -2322,6 +2322,7 @@ void reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
2322
packs[packs_nr].pack_int_id = pack_int_id;
2323
packs[packs_nr].bitmap_nr = pack->num_objects;
2324
packs[packs_nr].bitmap_pos = 0;
2325
+ packs[packs_nr].from_midx = bitmap_git->midx;
2326
2327
objects_nr = packs[packs_nr++].bitmap_nr;
2328
}
pack-bitmap.h
+1
@@ -60,6 +60,7 @@ struct bitmapped_pack {
60
uint32_t bitmap_pos;
61
uint32_t bitmap_nr;
62
63
+ struct multi_pack_index *from_midx; /* MIDX only */
64
uint32_t pack_int_id; /* MIDX only */
65
};
66