Skip to content

Commit 3b00e35

Browse files
ttaylorrgitster
authored andcommitted
midx: teach fill_midx_entry() about incremental MIDXs
In a similar fashion as previous commits, teach the `fill_midx_entry()` function to work in a incremental MIDX-aware fashion. This function, unlike others which accept an index into either the lexical order of objects or packs, takes in an object_id, and attempts to fill a caller-provided 'struct pack_entry' with the remaining pieces of information about that object from the MIDX. The function uses `bsearch_midx()` which fills out the frame-local 'pos' variable, recording the given object_id's lexical position within the MIDX chain, if found (if no matching object ID was found, we'll return immediately without filling out the `pack_entry` structure). Once given that position, we jump back through the `->base_midx` pointer to ensure that our `m` points at the MIDX layer which contains the given object_id (and not an ancestor or descendant of it in the chain). Note that we can drop the bounds check "if (pos >= m->num_objects)" because `midx_for_object()` performs this check for us. After that point, we only need to make two special considerations within this function: - First, the pack_int_id returned to us by `nth_midxed_pack_int_id()` is a position in the concatenated lexical order of packs, so we must ensure that we subtract `m->num_packs_in_base` before accessing the MIDX-local `packs` array. - Second, we must avoid translating the `pos` back to a MIDX-local index, since we use it as an argument to `nth_midxed_offset()` which expects a position relative to the concatenated lexical order of objects. Signed-off-by: Taylor Blau <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent df7ede8 commit 3b00e35

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

midx.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,14 +407,12 @@ int fill_midx_entry(struct repository *r,
407407
if (!bsearch_midx(oid, m, &pos))
408408
return 0;
409409

410-
if (pos >= m->num_objects)
411-
return 0;
412-
410+
midx_for_object(&m, pos);
413411
pack_int_id = nth_midxed_pack_int_id(m, pos);
414412

415413
if (prepare_midx_pack(r, m, pack_int_id))
416414
return 0;
417-
p = m->packs[pack_int_id];
415+
p = m->packs[pack_int_id - m->num_packs_in_base];
418416

419417
/*
420418
* We are about to tell the caller where they can locate the

0 commit comments

Comments
 (0)