averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

pack-revindex.c: avoid direct revindex access in 'offset_to_pack_pos()'

Browse Source 
To prepare for on-disk reverse indexes, remove a spot in
'offset_to_pack_pos()' that looks at the 'revindex' array in 'struct
packed_git'.

Even though this use of the revindex pointer is within pack-revindex.c,
this clean up is still worth doing. Since the 'revindex' pointer will be
NULL when reading from an on-disk reverse index (instead the
'revindex_data' pointer will be mmaped to the 'pack-*.rev' file), this
call-site would have to include a conditional to lookup the offset for
position 'mi' each iteration through the search.

So instead of open-coding 'pack_pos_to_offset()', call it directly from
within 'offset_to_pack_pos()'.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Taylor Blau
2021-01-13 17:25:10 -05:00
committed by Junio C Hamano
parent d5bc7c60c7
commit e5dcd78418
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pack-revindex.c
View File

@@ -177,21 +177,21 @@ int load_pack_revindex(struct packed_git *p)
int offset_to_pack_pos(struct packed_git *p, off_t ofs, uint32_t *pos) int offset_to_pack_pos(struct packed_git *p, off_t ofs, uint32_t *pos)
{ {
unsigned lo, hi; unsigned lo, hi;
const struct revindex_entry *revindex;
if (load_pack_revindex(p) < 0) if (load_pack_revindex(p) < 0)
return -1; return -1;
lo = 0; lo = 0;
hi = p->num_objects + 1; hi = p->num_objects + 1;
revindex = p->revindex;
do { do {
const unsigned mi = lo + (hi - lo) / 2; const unsigned mi = lo + (hi - lo) / 2;
if (revindex[mi].offset == ofs) { off_t got = pack_pos_to_offset(p, mi);
if (got == ofs) {
*pos = mi; *pos = mi;
return 0; return 0;
} else if (ofs < revindex[mi].offset) } else if (ofs < got)
hi = mi; hi = mi;
else else
lo = mi + 1; lo = mi + 1;