proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-11-02 03:01:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sha1_lookup: do not use the "experimental" lookup mode

Browse Source
This commit is contained in:
Vicent Marti 2013-08-14 10:28:01 +02:00
parent 2af9bcb2db
commit 67591c8cd8
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pack.c
View File

@ -1110,8 +1110,11 @@ static int pack_entry_find_offset(
short_oid->id[0], short_oid->id[1], short_oid->id[2], lo, hi, p->num_objects);
#endif
/* Use git.git lookup code */
#ifdef GIT_USE_LOOKUP
pos = sha1_entry_pos(index, stride, 0, lo, hi, p->num_objects, short_oid->id);
#else
pos = sha1_position(index, stride, lo, hi, short_oid->id);
#endif
if (pos >= 0) {
/* An object matching exactly the oid was found */

24
src/sha1_lookup.c
View File

@ -9,6 +9,7 @@
#include "sha1_lookup.h"
#include "common.h"
#include "oid.h"
/*
* Conventional binary search loop looks like this:
@ -123,7 +124,7 @@ int sha1_entry_pos(const void *table,
lov = (lov << 8) | lo_key[ofs_0+1];
kyv = (kyv << 8) | key[ofs_0+1];
}
assert(lov < hiv);
assert(lov <= hiv);
if (kyv < lov)
return -1 - lo;
@ -176,3 +177,24 @@ int sha1_entry_pos(const void *table,
} while (lo < hi);
return -((int)lo)-1;
}
int sha1_position(const void *table,
size_t stride,
unsigned lo, unsigned hi,
const unsigned char *key)
{
do {
unsigned mi = (lo + hi) / 2;
int cmp = git_oid__cmp(table + mi * stride, (git_oid *)key);
if (!cmp)
return mi;
if (cmp > 0)
hi = mi;
else
lo = mi+1;
} while (lo < hi);
return -((int)lo)-1;
}

5
src/sha1_lookup.h
View File

@ -15,4 +15,9 @@ int sha1_entry_pos(const void *table,
unsigned lo, unsigned hi, unsigned nr,
const unsigned char *key);
int sha1_position(const void *table,
size_t stride,
unsigned lo, unsigned hi,
const unsigned char *key);
#endif