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

oidmap: map with OID as key

Browse Source 
This is similar to using the hashmap in hashmap.c, but with an
easier-to-use API. In particular, custom entry comparisons no longer
need to be written, and lookups can be done without constructing a
temporary entry structure.

This is implemented as a thin wrapper over the hashmap API. In
particular, this means that there is an additional 4-byte overhead due
to the fact that the first 4 bytes of the hash is redundantly stored.
For now, I'm taking the simpler approach, but if need be, we can
reimplement oidmap without affecting the callers significantly.

oidset has been updated to use oidmap.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Tan
2017-09-29 15:54:22 -07:00
committed by Junio C Hamano
parent ea220ee40c
commit 9e6fabde82
6 changed files with 133 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
oidset.c
View File

@@ -1,50 +1,30 @@
#include "cache.h"
#include "oidset.h"
struct oidset_entry {
struct hashmap_entry hash;
struct object_id oid;
};
static int oidset_hashcmp(const void *unused_cmp_data,
const void *va, const void *vb,
const void *vkey)
{
const struct oidset_entry *a = va, *b = vb;
const struct object_id *key = vkey;
return oidcmp(&a->oid, key ? key : &b->oid);
}
int oidset_contains(const struct oidset *set, const struct object_id *oid)
{
struct hashmap_entry key;
if (!set->map.cmpfn)
if (!set->map.map.tablesize)
return 0;
hashmap_entry_init(&key, sha1hash(oid->hash));
return !!hashmap_get(&set->map, &key, oid);
return !!oidmap_get(&set->map, oid);
}
int oidset_insert(struct oidset *set, const struct object_id *oid)
{
struct oidset_entry *entry;
struct oidmap_entry *entry;
if (!set->map.cmpfn)
hashmap_init(&set->map, oidset_hashcmp, NULL, 0);
if (oidset_contains(set, oid))
if (!set->map.map.tablesize)
oidmap_init(&set->map, 0);
else if (oidset_contains(set, oid))
return 1;
entry = xmalloc(sizeof(*entry));
hashmap_entry_init(&entry->hash, sha1hash(oid->hash));
oidcpy(&entry->oid, oid);
hashmap_add(&set->map, entry);
oidmap_put(&set->map, entry);
return 0;
}
void oidset_clear(struct oidset *set)
{
hashmap_free(&set->map, 1);
oidmap_free(&set->map, 1);
}