| Message ID | c1eefeae993f2c8778dd0ec9626f977dbb2011a2.1741983492.git.me@ttaylorr.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | midx: incremental multi-pack indexes, part two | expand |
On Fri, Mar 14, 2025 at 04:18:44PM -0400, Taylor Blau wrote: > In a similar fashion as previous commits, use nth_midxed_pack() instead > of accessing the MIDX's ->packs array directly to support incremental > MIDXs. Probably not worth it to change it in an actual patch, but is it worth renaming midx->packs to something else to make sure we catch all of the spots that need to be considered? Or maybe you already did that, which is how you found all of these. :) -Peff
On Mon, Mar 17, 2025 at 09:41:39PM -0400, Jeff King wrote: > On Fri, Mar 14, 2025 at 04:18:44PM -0400, Taylor Blau wrote: > > > In a similar fashion as previous commits, use nth_midxed_pack() instead > > of accessing the MIDX's ->packs array directly to support incremental > > MIDXs. > > Probably not worth it to change it in an actual patch, but is it worth > renaming midx->packs to something else to make sure we catch all of the > spots that need to be considered? Or maybe you already did that, which > is how you found all of these. :) That's how I found them originally ;-). Thanks, Taylor
diff --git a/pack-bitmap.c b/pack-bitmap.c index bb09ce3cf5..8442f8e55f 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -1778,7 +1778,7 @@ static unsigned long get_size_by_pos(struct bitmap_index *bitmap_git, uint32_t midx_pos = pack_pos_to_midx(bitmap_git->midx, pos); uint32_t pack_id = nth_midxed_pack_int_id(bitmap_git->midx, midx_pos); - pack = bitmap_git->midx->packs[pack_id]; + pack = nth_midxed_pack(bitmap_git->midx, pack_id); ofs = nth_midxed_offset(bitmap_git->midx, midx_pos); } else { pack = bitmap_git->pack; @@ -3047,7 +3047,7 @@ static off_t get_disk_usage_for_type(struct bitmap_index *bitmap_git, off_t offset = nth_midxed_offset(bitmap_git->midx, midx_pos); uint32_t pack_id = nth_midxed_pack_int_id(bitmap_git->midx, midx_pos); - struct packed_git *pack = bitmap_git->midx->packs[pack_id]; + struct packed_git *pack = nth_midxed_pack(bitmap_git->midx, pack_id); if (offset_to_pack_pos(pack, offset, &pack_pos) < 0) { struct object_id oid;
In a similar fashion as previous commits, use nth_midxed_pack() instead of accessing the MIDX's ->packs array directly to support incremental MIDXs. Signed-off-by: Taylor Blau <me@ttaylorr.com> --- pack-bitmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)