From dbd5c520d2bb168f58bde4ead407d35589142668 Mon Sep 17 00:00:00 2001 From: Taylor Blau Date: Thu, 14 Dec 2023 17:24:30 -0500 Subject: pack-revindex: implement `midx_pair_to_pack_pos()` Now that we have extracted the `midx_key_to_pack_pos()` function, we can implement the `midx_pair_to_pack_pos()` function which accepts (pack_id, offset) tuples and returns an index into the psuedo-pack order. This will be used in a following commit in order to figure out whether or not the MIDX chose a given delta's base object from the same pack as the delta resides in. It will do so by locating the base object's offset in the pack, and then performing a binary search using the same pack ID with the base object's offset. If (and only if) it finds a match (at any position) we can guarantee that the MIDX selected both halves of the delta/base pair from the same pack. Signed-off-by: Taylor Blau Signed-off-by: Junio C Hamano --- pack-revindex.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'pack-revindex.c') diff --git a/pack-revindex.c b/pack-revindex.c index baa4657ed3..a7624d8be8 100644 --- a/pack-revindex.c +++ b/pack-revindex.c @@ -564,3 +564,14 @@ int midx_to_pack_pos(struct multi_pack_index *m, uint32_t at, uint32_t *pos) return midx_key_to_pack_pos(m, &key, pos); } + +int midx_pair_to_pack_pos(struct multi_pack_index *m, uint32_t pack_int_id, + off_t ofs, uint32_t *pos) +{ + struct midx_pack_key key = { + .pack = pack_int_id, + .offset = ofs, + .midx = m, + }; + return midx_key_to_pack_pos(m, &key, pos); +} -- cgit v1.2.3