|
@@ -38,7 +38,11 @@ typedef struct ht_iterator_t {
|
|
*/
|
|
*/
|
|
static bool lookup_none_eq_fn (
|
|
static bool lookup_none_eq_fn (
|
|
const VOLK_Key spok[], const VOLK_Key luk[])
|
|
const VOLK_Key spok[], const VOLK_Key luk[])
|
|
-{ return true; }
|
|
|
|
|
|
+{
|
|
|
|
+ (void) spok;
|
|
|
|
+ (void) luk;
|
|
|
|
+ return true;
|
|
|
|
+}
|
|
|
|
|
|
/**
|
|
/**
|
|
* Keyset lookup for S key.
|
|
* Keyset lookup for S key.
|
|
@@ -94,11 +98,19 @@ static bool lookup_spok_eq_fn (
|
|
|
|
|
|
uint64_t trp_key_hash_fn (
|
|
uint64_t trp_key_hash_fn (
|
|
const void *item, uint64_t seed0, uint64_t seed1)
|
|
const void *item, uint64_t seed0, uint64_t seed1)
|
|
-{ return (uint64_t) (VOLK_HASH (item, TRP_KLEN, seed0)); }
|
|
|
|
|
|
+{
|
|
|
|
+ (void) seed1;
|
|
|
|
+
|
|
|
|
+ return (uint64_t) (VOLK_HASH (item, TRP_KLEN, seed0));
|
|
|
|
+}
|
|
|
|
|
|
|
|
|
|
int trp_key_cmp_fn (const void *a, const void *b, void *udata)
|
|
int trp_key_cmp_fn (const void *a, const void *b, void *udata)
|
|
-{ return memcmp (a, b, TRP_KLEN); }
|
|
|
|
|
|
+{
|
|
|
|
+ (void) udata;
|
|
|
|
+
|
|
|
|
+ return memcmp (a, b, TRP_KLEN);
|
|
|
|
+}
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -106,14 +118,23 @@ int trp_key_cmp_fn (const void *a, const void *b, void *udata)
|
|
*/
|
|
*/
|
|
static uint64_t htstore_idx_hash_fn (
|
|
static uint64_t htstore_idx_hash_fn (
|
|
const void *item, uint64_t seed0, uint64_t seed1)
|
|
const void *item, uint64_t seed0, uint64_t seed1)
|
|
-{ return ((IndexEntry *) item)->key; }
|
|
|
|
|
|
+{
|
|
|
|
+ (void) seed0;
|
|
|
|
+ (void) seed1;
|
|
|
|
+
|
|
|
|
+ return ((IndexEntry *) item)->key;
|
|
|
|
+}
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* Compare callback function for index hashmap.
|
|
* Compare callback function for index hashmap.
|
|
*/
|
|
*/
|
|
static int htstore_idx_cmp_fn (const void *a, const void *b, void *udata)
|
|
static int htstore_idx_cmp_fn (const void *a, const void *b, void *udata)
|
|
-{ return ((const IndexEntry *) a)->key - ((const IndexEntry *) b)->key; }
|
|
|
|
|
|
+{
|
|
|
|
+ (void) udata;
|
|
|
|
+
|
|
|
|
+ return ((const IndexEntry *) a)->key - ((const IndexEntry *) b)->key;
|
|
|
|
+}
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -159,6 +180,8 @@ htiter_next_key (HTIterator *it);
|
|
static void *
|
|
static void *
|
|
htstore_new (const char *id, size_t size)
|
|
htstore_new (const char *id, size_t size)
|
|
{
|
|
{
|
|
|
|
+ (void) id;
|
|
|
|
+
|
|
HTStore *ht;
|
|
HTStore *ht;
|
|
CALLOC_GUARD (ht, NULL);
|
|
CALLOC_GUARD (ht, NULL);
|
|
|
|
|
|
@@ -285,9 +308,11 @@ static void *
|
|
htstore_lookup (
|
|
htstore_lookup (
|
|
void *h,
|
|
void *h,
|
|
const VOLK_Buffer *ss, const VOLK_Buffer *sp, const VOLK_Buffer *so,
|
|
const VOLK_Buffer *ss, const VOLK_Buffer *sp, const VOLK_Buffer *so,
|
|
- const VOLK_Buffer *sc, void *_unused, size_t *ct)
|
|
|
|
|
|
+ const VOLK_Buffer *_unused, void *_unused2, size_t *ct)
|
|
{
|
|
{
|
|
(void) _unused;
|
|
(void) _unused;
|
|
|
|
+ (void) _unused2;
|
|
|
|
+
|
|
HTStore *store = h;
|
|
HTStore *store = h;
|
|
HTIterator *it;
|
|
HTIterator *it;
|
|
CALLOC_GUARD (it, NULL);
|
|
CALLOC_GUARD (it, NULL);
|
|
@@ -429,7 +454,7 @@ htiter_next (void *h, VOLK_BufferTriple *sspo, VOLK_Buffer **_unused)
|
|
|
|
|
|
|
|
|
|
const VOLK_StoreInt htstore_int = {
|
|
const VOLK_StoreInt htstore_int = {
|
|
- .name = "Hash Table Store",
|
|
|
|
|
|
+ .name = "Hashtable Store",
|
|
.features = VOLK_STORE_COW,
|
|
.features = VOLK_STORE_COW,
|
|
|
|
|
|
.setup_fn = NULL,
|
|
.setup_fn = NULL,
|