undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace_object: use oidmap

Browse Source 
Load the replace objects into an oidmap to allow for easy lookups in
constant time.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2018-04-11 17:21:04 -07:00 committed by Junio C Hamano
parent fe0a9eaf31
commit f37b9bc00c
1 changed files with 16 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
replace_object.c
View File

@ -1,54 +1,14 @@
#include "cache.h" #include "cache.h"
#include "sha1-lookup.h" #include "oidmap.h"
#include "refs.h" #include "refs.h"
#include "commit.h" #include "commit.h"
/* struct replace_object {
* An array of replacements. The array is kept sorted by the original struct oidmap_entry original;
* sha1.
*/
static struct replace_object {
struct object_id original;
struct object_id replacement; struct object_id replacement;
} **replace_object; };
static int replace_object_alloc, replace_object_nr; static struct oidmap replace_map = OIDMAP_INIT;
static const unsigned char *replace_sha1_access(size_t index, void *table)
{
struct replace_object **replace = table;
return replace[index]->original.hash;
}
static int replace_object_pos(const unsigned char *sha1)
{
return sha1_pos(sha1, replace_object, replace_object_nr,
replace_sha1_access);
}
static int register_replace_object(struct replace_object *replace,
int ignore_dups)
{
int pos = replace_object_pos(replace->original.hash);
if (0 <= pos) {
if (ignore_dups)
free(replace);
else {
free(replace_object[pos]);
replace_object[pos] = replace;
}
return 1;
}
pos = -pos - 1;
ALLOC_GROW(replace_object, replace_object_nr + 1, replace_object_alloc);
replace_object_nr++;
if (pos < replace_object_nr)
MOVE_ARRAY(replace_object + pos + 1, replace_object + pos,
replace_object_nr - pos - 1);
replace_object[pos] = replace;
return 0;
}
static int register_replace_ref(const char *refname, static int register_replace_ref(const char *refname,
const struct object_id *oid, const struct object_id *oid,
@ -59,7 +19,7 @@ static int register_replace_ref(const char *refname,
const char *hash = slash ? slash + 1 : refname; const char *hash = slash ? slash + 1 : refname;
struct replace_object *repl_obj = xmalloc(sizeof(*repl_obj)); struct replace_object *repl_obj = xmalloc(sizeof(*repl_obj));
if (get_oid_hex(hash, &repl_obj->original)) { if (get_oid_hex(hash, &repl_obj->original.oid)) {
free(repl_obj); free(repl_obj);
warning("bad replace ref name: %s", refname); warning("bad replace ref name: %s", refname);
return 0; return 0;
@ -69,7 +29,7 @@ static int register_replace_ref(const char *refname,
oidcpy(&repl_obj->replacement, oid); oidcpy(&repl_obj->replacement, oid);
/* Register new object */ /* Register new object */
if (register_replace_object(repl_obj, 1)) if (oidmap_put(&replace_map, repl_obj))
die("duplicate replace ref: %s", refname); die("duplicate replace ref: %s", refname);
return 0; return 0;
@ -84,7 +44,7 @@ static void prepare_replace_object(void)
for_each_replace_ref(register_replace_ref, NULL); for_each_replace_ref(register_replace_ref, NULL);
replace_object_prepared = 1; replace_object_prepared = 1;
if (!replace_object_nr) if (!replace_map.map.tablesize)
check_replace_refs = 0; check_replace_refs = 0;
} }
@ -100,21 +60,17 @@ static void prepare_replace_object(void)
*/ */
const struct object_id *do_lookup_replace_object(const struct object_id *oid) const struct object_id *do_lookup_replace_object(const struct object_id *oid)
{ {
int pos, depth = MAXREPLACEDEPTH; int depth = MAXREPLACEDEPTH;
const struct object_id *cur = oid; const struct object_id *cur = oid;
prepare_replace_object(); prepare_replace_object();
/* Try to recursively replace the object */ /* Try to recursively replace the object */
do { while (depth-- > 0) {
if (--depth < 0) struct replace_object *repl_obj = oidmap_get(&replace_map, cur);
die("replace depth too high for object %s", if (!repl_obj)
oid_to_hex(oid)); return cur;
cur = &repl_obj->replacement;
pos = replace_object_pos(cur->hash); }
if (0 <= pos) die("replace depth too high for object %s", oid_to_hex(oid));
cur = &replace_object[pos]->replacement;
} while (0 <= pos);
return cur;
} }