isomorfeus-ferret 0.13.8 → 0.13.11

data/ext/isomorfeus_ferret_ext/frt_hash.c

@@ -19,9 +19,9 @@ static const char *dummy_int_key = "i";
 static FrtHash *free_hts[MAX_FREE_HASH_TABLES];
 static int num_free_hts = 0;
 
-unsigned long long frt_str_hash(const char *const str)
+unsigned long frt_str_hash(const char *const str)
 {
-    register unsigned long long h = 0;
+    register unsigned long h = 0;
     register unsigned char *p = (unsigned char *)str;
 
     for (; *p; p++) {
@@ -30,9 +30,9 @@ unsigned long long frt_str_hash(const char *const str)
     return h;
 }
 
-unsigned long long frt_ptr_hash(const void *const ptr)
+unsigned long frt_ptr_hash(const void *const ptr)
 {
-    return (unsigned long long)ptr;
+    return (unsigned long)ptr;
 }
 
 int frt_ptr_eq(const void *q1, const void *q2)
@@ -55,7 +55,7 @@ typedef FrtHashEntry *(*lookup_ft)(struct FrtHash *self, register const void *ke
  * @param the hashkey we are looking for
  */
 static FrtHashEntry  *frt_h_resize_lookup(FrtHash *self,
-                                         register const unsigned long long hash)
+                                         register const unsigned long hash)
 {
     register unsigned long perturb;
     register int mask = self->mask;
@@ -78,9 +78,8 @@ static FrtHashEntry  *frt_h_resize_lookup(FrtHash *self,
     }
 }
 
-static FrtHashEntry  *frt_h_lookup_ptr(FrtHash *self, const void *key)
-{
-    register const unsigned long long hash = (unsigned long long)key;
+static FrtHashEntry *frt_h_lookup_ptr(FrtHash *self, const void *key) {
+    register const unsigned long hash = (unsigned long)key;
     register unsigned long perturb;
     register int mask = self->mask;
     register FrtHashEntry *he0 = self->table;
@@ -88,36 +87,34 @@ static FrtHashEntry  *frt_h_lookup_ptr(FrtHash *self, const void *key)
     register FrtHashEntry *he = &he0[i];
     register FrtHashEntry *freeslot = NULL;
 
-    if (he->key == NULL || he->hash == hash) {
+    if (he->key == NULL) {
         he->hash = hash;
         return he;
     }
-    if (he->key == dummy_key) {
-        freeslot = he;
-    }
+
+    if (he->hash == hash) return he;
+
+    if (he->key == dummy_key) freeslot = he;
 
     for (perturb = hash;; perturb >>= PERTURB_SHIFT) {
         i = (i << 2) + i + perturb + 1;
         he = &he0[i & mask];
+
         if (he->key == NULL) {
-            if (freeslot != NULL) {
-                he = freeslot;
-            }
+            if (freeslot != NULL) he = freeslot;
             he->hash = hash;
             return he;
         }
-        if (he->hash == hash) {
-            return he;
-        }
-        if (he->key == dummy_key && freeslot == NULL) {
-            freeslot = he;
-        }
+
+        if (he->hash == hash) return he;
+
+        if (he->key == dummy_key && freeslot == NULL) freeslot = he;
     }
+    return he;
 }
 
-FrtHashEntry *frt_h_lookup(FrtHash *self, register const void *key)
-{
-    register const unsigned long long hash = self->hash_i(key);
+FrtHashEntry *frt_h_lookup(FrtHash *self, register const void *key) {
+    register const unsigned long hash = self->hash_i(key);
     register unsigned long perturb;
     register int mask = self->mask;
     register FrtHashEntry *he0 = self->table;
@@ -185,7 +182,7 @@ FrtHash *frt_h_new_str(frt_free_ft free_key, frt_free_ft free_value)
 
 FrtHash *frt_h_new_int(frt_free_ft free_value)
 {
-    FrtHash *self     = frt_h_new_str(NULL, free_value);
+    FrtHash *self  = frt_h_new_str(NULL, free_value);
 
     self->lookup_i = &frt_h_lookup_ptr;
     self->eq_i     = NULL;
@@ -196,7 +193,7 @@ FrtHash *frt_h_new_int(frt_free_ft free_value)
 
 FrtHash *frt_h_new(frt_hash_ft hash, frt_eq_ft eq, frt_free_ft free_key, frt_free_ft free_value)
 {
-    FrtHash *self     = frt_h_new_str(free_key, free_value);
+    FrtHash *self  = frt_h_new_str(free_key, free_value);
 
     self->lookup_i = &frt_h_lookup;
     self->eq_i     = eq;
@@ -228,27 +225,24 @@ void frt_h_clear(FrtHash *self)
     self->fill = 0;
 }
 
-void frt_h_destroy(FrtHash *self)
-{
-    if (--(self->ref_cnt) <= 0) {
-        frt_h_clear(self);
+void frt_h_destroy(FrtHash *hash) {
+    if (FRT_DEREF(hash) == 0) {
+        frt_h_clear(hash);
 
         /* if a new table was created, be sure to free it */
-        if (self->table != self->smalltable) {
-            free(self->table);
+        if (hash->table != hash->smalltable) {
+            free(hash->table);
         }
 
         if (num_free_hts < MAX_FREE_HASH_TABLES) {
-            free_hts[num_free_hts++] = self;
-        }
-        else {
-            free(self);
+            free_hts[num_free_hts++] = hash;
+        } else {
+            free(hash);
         }
     }
 }
 
-void *frt_h_get(FrtHash *self, const void *key)
-{
+void *frt_h_get(FrtHash *self, const void *key) {
     /* Note: lookup_i will never return NULL. */
     return self->lookup_i(self, key)->value;
 }
@@ -270,8 +264,7 @@ int frt_h_del(FrtHash *self, const void *key)
     }
 }
 
-void *frt_h_rem(FrtHash *self, const void *key, bool destroy_key)
-{
+void *frt_h_rem(FrtHash *self, const void *key, bool destroy_key) {
     void *val;
     FrtHashEntry *he = self->lookup_i(self, key);
 
@@ -285,8 +278,7 @@ void *frt_h_rem(FrtHash *self, const void *key, bool destroy_key)
         he->value = NULL;
         self->size--;
         return val;
-    }
-    else {
+    } else {
         return NULL;
     }
 }
@@ -405,23 +397,23 @@ FrtHashKeyStatus frt_h_has_key(FrtHash *self, const void *key)
     return FRT_HASH_KEY_EQUAL;
 }
 
-void *frt_h_get_int(FrtHash *self, const unsigned long long key)
+void *frt_h_get_int(FrtHash *self, const unsigned long key)
 {
     return frt_h_get(self, (const void *)key);
 }
 
-int frt_h_del_int(FrtHash *self, const unsigned long long key)
+int frt_h_del_int(FrtHash *self, const unsigned long key)
 {
     return frt_h_del(self, (const void *)key);
 }
 
-void *frt_h_rem_int(FrtHash *self, const unsigned long long key)
+void *frt_h_rem_int(FrtHash *self, const unsigned long key)
 {
     return frt_h_rem(self, (const void *)key, false);
 }
 
 FrtHashKeyStatus frt_h_set_int(FrtHash *self,
-                               const unsigned long long key,
+                               const unsigned long key,
                                void *value)
 {
     FrtHashKeyStatus ret_val = FRT_HASH_KEY_DOES_NOT_EXIST;
@@ -439,7 +431,7 @@ FrtHashKeyStatus frt_h_set_int(FrtHash *self,
     return ret_val;
 }
 
-int frt_h_set_safe_int(FrtHash *self, const unsigned long long key, void *value)
+int frt_h_set_safe_int(FrtHash *self, const unsigned long key, void *value)
 {
     FrtHashEntry *he;
     if (frt_h_set_ext(self, (const void *)key, &he)) {
@@ -450,7 +442,7 @@ int frt_h_set_safe_int(FrtHash *self, const unsigned long long key, void *value)
     return false;
 }
 
-int frt_h_has_key_int(FrtHash *self, const unsigned long long key)
+int frt_h_has_key_int(FrtHash *self, const unsigned long key)
 {
     return frt_h_has_key(self, (const void *)key);
 }

data/ext/isomorfeus_ferret_ext/frt_hash.h

@@ -25,9 +25,8 @@ typedef enum
 /**
  * struct used internally to store values in the Hash
  */
-typedef struct
-{
-    unsigned long long hash;
+typedef struct {
+    unsigned long hash;
     void *key;
     void *value;
 } FrtHashEntry;
@@ -40,12 +39,11 @@ typedef struct
  * know when to resize. The Hash is resized when more than two thirds of
  * the Hash is Filled.
  */
-typedef struct FrtHash
-{
+typedef struct FrtHash {
     int fill;                   /* num Active + num Dummy */
     int size;                   /* num Active ie, num keys set */
     int mask;                   /* capacity_of_table - 1 */
-    int ref_cnt;
+    _Atomic unsigned int ref_cnt;
 
     /* table points to smalltable initially. If the table grows beyond 2/3 of
      * FRT_HASH_MINSIZE it will point to newly malloced memory as it grows. */
@@ -60,7 +58,7 @@ typedef struct FrtHash
      * used outside of the Hash methods */
     FrtHashEntry *(*lookup_i)(struct FrtHash *self,
                               register const void *key);
-    unsigned long long  (*hash_i)(const void *key);
+    unsigned long  (*hash_i)(const void *key);
     int                 (*eq_i)(const void *key1, const void *key2);
     void                (*free_key_i)(void *p);
     void                (*free_value_i)(void *p);
@@ -73,7 +71,7 @@ typedef struct FrtHash
  * @param key object to hash
  * @return an unsigned 32-bit integer hash value
  */
-typedef unsigned long long (*frt_hash_ft)(const void *key);
+typedef unsigned long (*frt_hash_ft)(const void *key);
 
 /**
  * Equals function type used by Hash. A function of this type must be
@@ -87,7 +85,7 @@ typedef int (*frt_eq_ft)(const void *key1, const void *key2);
  * @param str string to hash
  * @return an unsigned long integer hash value
  */
-extern unsigned long long frt_str_hash(const char *const str);
+extern unsigned long frt_str_hash(const char *const str);
 
 /**
  * Determine a hash value for a pointer. Just cast the pointer to an unsigned
@@ -96,7 +94,7 @@ extern unsigned long long frt_str_hash(const char *const str);
  * @param ptr pointer to hash
  * @return an unsigned long integer hash value
  */
-extern unsigned long long frt_ptr_hash(const void *const ptr);
+extern unsigned long frt_ptr_hash(const void *const ptr);
 
 /**
  * Determine if two pointers point to the same point in memory.
@@ -320,7 +318,7 @@ extern FrtHashKeyStatus frt_h_has_key(FrtHash *self,
  * @return the value referenced by the key +key+. If there is no value
  *   referenced by that key, NULL is returned.
  */
-extern void *frt_h_get_int(FrtHash *self, const unsigned long long key);
+extern void *frt_h_get_int(FrtHash *self, const unsigned long key);
 
 /**
  * Delete the value in Hash referenced by the integer key +key+. When the
@@ -337,7 +335,7 @@ extern void *frt_h_get_int(FrtHash *self, const unsigned long long key);
  * @return true if the object was successfully deleted or false if the key was
  *   not found
  */
-extern int frt_h_del_int(FrtHash *self, const unsigned long long key);
+extern int frt_h_del_int(FrtHash *self, const unsigned long key);
 
 /**
  * Remove the value in Hash referenced by the integer key +key+. When the
@@ -351,7 +349,7 @@ extern int frt_h_del_int(FrtHash *self, const unsigned long long key);
  * @param key the integer key to lookup
  * @return the value referenced by +key+ if it can be found or NULL otherwise
  */
-extern void *frt_h_rem_int(FrtHash *self, const unsigned long long key);
+extern void *frt_h_rem_int(FrtHash *self, const unsigned long key);
 
 /**
  * WARNING: this function may destroy an old value if the key already exists
@@ -382,7 +380,7 @@ extern void *frt_h_rem_int(FrtHash *self, const unsigned long long key);
  *   </pre>
  */
 extern FrtHashKeyStatus frt_h_set_int(FrtHash *self,
-                                         const unsigned long long key,
+                                         const unsigned long key,
                                          void *value);
 
 /**
@@ -396,7 +394,7 @@ extern FrtHashKeyStatus frt_h_set_int(FrtHash *self,
  * @return true if the value was successfully added or false otherwise
  */
 extern int frt_h_set_safe_int(FrtHash *self,
-                              const unsigned long long key,
+                              const unsigned long key,
                               void *value);
 /**
  * Check whether integer key +key+ exists in the Hash.
@@ -405,7 +403,7 @@ extern int frt_h_set_safe_int(FrtHash *self,
  * @param key the integer key to check for in the Hash
  * @return true if the key exists in the Hash, false otherwise.
  */
-extern int frt_h_has_key_int(FrtHash *self, const unsigned long long key);
+extern int frt_h_has_key_int(FrtHash *self, const unsigned long key);
 
 typedef void (*frt_h_each_key_val_ft)(void *key, void *value, void *arg);
 

data/ext/isomorfeus_ferret_ext/frt_hashset.c

@@ -3,7 +3,7 @@
 
 /*
  * The HashSet contains an array +elems+ of the elements that have been added.
- * It always has +size+ elements so +size+ ane +elems+ can be used to iterate
+ * It always has +size+ elements so +size+ and +elems+ can be used to iterate
  * over all alements in the HashSet. It also uses a Hash to keep track of
  * which elements have been added and their index in the +elems+ array.
  */
@@ -37,7 +37,7 @@ FrtHashSet *frt_hs_new_ptr(frt_free_ft free_func)
     return hs;
 }
 
-static void clear(FrtHashSet *hs, bool destroy)
+static void hs_clear(FrtHashSet *hs, bool destroy)
 {
     FrtHashSetEntry *curr, *next = hs->first;
     frt_free_ft do_free = destroy ? hs->free_elem_i : &frt_dummy_free;
@@ -52,20 +52,20 @@ static void clear(FrtHashSet *hs, bool destroy)
 
 void frt_hs_clear(FrtHashSet *hs)
 {
-    clear(hs, true);
+    hs_clear(hs, true);
     frt_h_clear(hs->ht);
 }
 
 void frt_hs_free(FrtHashSet *hs)
 {
-    clear(hs, false);
+    hs_clear(hs, false);
     frt_h_destroy(hs->ht);
     free(hs);
 }
 
 void frt_hs_destroy(FrtHashSet *hs)
 {
-    clear(hs, true);
+    hs_clear(hs, true);
     frt_h_destroy(hs->ht);
     free(hs);
 }

data/ext/isomorfeus_ferret_ext/frt_ind.c

@@ -40,8 +40,8 @@ FrtIndex *frt_index_new(FrtStore *store, FrtAnalyzer *analyzer, FrtHashSet *def_
     frt_mutex_init(&self->mutex, NULL);
     self->has_writes = false;
     if (store) {
-        FRT_REF(store);
         self->store = store;
+        FRT_REF(store);
     } else {
         self->store = frt_open_ram_store(NULL);
         create = true;
@@ -84,14 +84,13 @@ void frt_index_destroy(FrtIndex *self)
     frt_mutex_destroy(&self->mutex);
     INDEX_CLOSE_READER(self);
     if (self->iw) frt_iw_close(self->iw);
-    frt_store_deref(self->store);
+    frt_store_close(self->store);
     frt_a_deref(self->analyzer);
     if (self->qp) frt_qp_destroy(self->qp);
     if (self->key) frt_hs_destroy(self->key);
     free(self);
 }
 
-
 void frt_ensure_writer_open(FrtIndex *self)
 {
     if (!self->iw) {