mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revindex: export new APIs

Browse Source 
Allow users to efficiently lookup consecutive entries that are expected
to be found on the same revindex by exporting `find_revindex_position`:
this function takes a pointer to revindex itself, instead of looking up
the proper revindex for a given packfile on each call.

Signed-off-by: Vicent Marti <tanoku@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Vicent Marti 2013-10-24 14:00:36 -04:00 committed by Junio C Hamano
parent e74435a516
commit 92e5c77c37
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pack-revindex.c
View File

@ -16,11 +16,6 @@
* get the object sha1 from the main index. * get the object sha1 from the main index.
*/ */
struct pack_revindex {
struct packed_git *p;
struct revindex_entry *revindex;
};
static struct pack_revindex *pack_revindex; static struct pack_revindex *pack_revindex;
static int pack_revindex_hashsz; static int pack_revindex_hashsz;
@ -201,15 +196,14 @@ static void create_pack_revindex(struct pack_revindex *rix)
sort_revindex(rix->revindex, num_ent, p->pack_size); sort_revindex(rix->revindex, num_ent, p->pack_size);
} }
struct revindex_entry *find_pack_revindex(struct packed_git *p, off_t ofs) struct pack_revindex *revindex_for_pack(struct packed_git *p)
{ {
int num; int num;
unsigned lo, hi;
struct pack_revindex *rix; struct pack_revindex *rix;
struct revindex_entry *revindex;
if (!pack_revindex_hashsz) if (!pack_revindex_hashsz)
init_pack_revindex(); init_pack_revindex();
num = pack_revindex_ix(p); num = pack_revindex_ix(p);
if (num < 0) if (num < 0)
die("internal error: pack revindex fubar"); die("internal error: pack revindex fubar");
@ -217,21 +211,39 @@ struct revindex_entry *find_pack_revindex(struct packed_git *p, off_t ofs)
rix = &pack_revindex[num]; rix = &pack_revindex[num];
if (!rix->revindex) if (!rix->revindex)
create_pack_revindex(rix); create_pack_revindex(rix);
revindex = rix->revindex;
lo = 0; return rix;
hi = p->num_objects + 1; }
int find_revindex_position(struct pack_revindex *pridx, off_t ofs)
{
int lo = 0;
int hi = pridx->p->num_objects + 1;
struct revindex_entry *revindex = pridx->revindex;
do { do {
unsigned mi = lo + (hi - lo) / 2; unsigned mi = lo + (hi - lo) / 2;
if (revindex[mi].offset == ofs) { if (revindex[mi].offset == ofs) {
return revindex + mi; return mi;
} else if (ofs < revindex[mi].offset) } else if (ofs < revindex[mi].offset)
hi = mi; hi = mi;
else else
lo = mi + 1; lo = mi + 1;
} while (lo < hi); } while (lo < hi);
error("bad offset for revindex"); error("bad offset for revindex");
return -1;
}
struct revindex_entry *find_pack_revindex(struct packed_git *p, off_t ofs)
{
struct pack_revindex *pridx = revindex_for_pack(p);
int pos = find_revindex_position(pridx, ofs);
if (pos < 0)
return NULL; return NULL;
return pridx->revindex + pos;
} }
void discard_revindex(void) void discard_revindex(void)

8
pack-revindex.h
View File

@ -6,6 +6,14 @@ struct revindex_entry {
unsigned int nr; unsigned int nr;
}; };
struct pack_revindex {
struct packed_git *p;
struct revindex_entry *revindex;
};
struct pack_revindex *revindex_for_pack(struct packed_git *p);
int find_revindex_position(struct pack_revindex *pridx, off_t ofs);
struct revindex_entry *find_pack_revindex(struct packed_git *p, off_t ofs); struct revindex_entry *find_pack_revindex(struct packed_git *p, off_t ofs);
void discard_revindex(void); void discard_revindex(void);