isomorfeus-ferret 0.17.2 → 0.17.4

data/ext/isomorfeus_ferret_ext/frt_field_infos.h

@@ -0,0 +1,35 @@
+#ifndef FRT_FIELD_INFOS_H
+#define FRT_FIELD_INFOS_H
+
+#include "frt_field_info.h"
+#include "frt_hash.h"
+#include "frt_in_stream.h"
+#include "frt_out_stream.h"
+
+#define FIELD_INFOS_INIT_CAPA 4
+
+/* carry changes over to dummy_fis in test/test_segments.c */
+typedef struct FrtFieldInfos {
+    unsigned int bits;
+    int          size;
+    int          capa;
+    FrtFieldInfo **fields;
+    FrtHash      *field_dict;
+    _Atomic unsigned int ref_cnt;
+    VALUE        rfis;
+} FrtFieldInfos;
+
+FrtFieldInfos *frt_fis_alloc();
+FrtFieldInfos *frt_fis_init(FrtFieldInfos *fis, unsigned int bits);
+FrtFieldInfos *frt_fis_new(unsigned int bits);
+extern FrtFieldInfo *frt_fis_add_field(FrtFieldInfos *fis, FrtFieldInfo *fi);
+extern FrtFieldInfo *frt_fis_get_field(FrtFieldInfos *fis, ID name);
+extern int frt_fis_get_field_num(FrtFieldInfos *fis, ID name);
+extern FrtFieldInfo *frt_fis_get_or_add_field(FrtFieldInfos *fis, ID name);
+extern bool frt_fis_has_vectors(FrtFieldInfos *fis);
+extern void frt_fis_write(FrtFieldInfos *fis, FrtOutStream *os);
+extern FrtFieldInfos *frt_fis_read(FrtInStream *is);
+extern char *frt_fis_to_s(FrtFieldInfos *fis);
+extern void frt_fis_deref(FrtFieldInfos *fis);
+
+#endif

data/ext/isomorfeus_ferret_ext/frt_filter.c

@@ -84,13 +84,13 @@ static char *qfilt_to_s(FrtFilter *filt) {
 }
 
 static FrtBitVector *qfilt_get_bv_i(FrtFilter *filt, FrtIndexReader *ir) {
-    FrtBitVector *bv = frt_bv_new_capa(ir->max_doc(ir));
+    FrtBitVector *bv = frt_bv_new_capa(ir->max_doc_num(ir));
     FrtSearcher *sea = frt_isea_new(ir);
     FrtWeight *weight = frt_q_weight(QF(filt)->query, sea);
     FrtScorer *scorer = weight->scorer(weight, ir);
     if (scorer) {
         while (scorer->next(scorer)) {
-            frt_bv_set(bv, scorer->doc);
+            frt_bv_set(bv, scorer->doc_num);
         }
         scorer->destroy(scorer);
     }

data/ext/isomorfeus_ferret_ext/frt_global.c

@@ -44,8 +44,7 @@ int frt_icmp(const void *p1, const void *p2) {
 
     if (i1 > i2) {
         return 1;
-    }
-    else if (i1 < i2) {
+    } else if (i1 < i2) {
         return -1;
     }
     return 0;
@@ -110,6 +109,14 @@ char *frt_estrdup(const char *s) {
     return t;
 }
 
+/* frt_estrndup: duplicate a string with length given, report if error */
+char *frt_estrndup(const char *s, int len) {
+    char *t = FRT_ALLOC_N(char, len + 1);
+    strncpy(t, s, len);
+    t[len] = '\0';
+    return t;
+}
+
 /* Pretty print a float to the buffer. The buffer should have at least 32
  * bytes available.
  */
@@ -248,8 +255,7 @@ void frt_register_for_cleanup(void *p, frt_free_ft free_func) {
     if (free_mes_capa == 0) {
         free_mes_capa = 16;
         free_mes = FRT_ALLOC_N(FreeMe, free_mes_capa);
-    }
-    else if (free_mes_capa <= free_mes_size) {
+    } else if (free_mes_capa <= free_mes_size) {
         free_mes_capa *= 2;
         FRT_REALLOC_N(free_mes, FreeMe, free_mes_capa);
     }

data/ext/isomorfeus_ferret_ext/frt_global.h

@@ -83,12 +83,15 @@ typedef void (*frt_free_ft)(void *key);
 # define Xj fprintf(stdout,"%s, %d: %s\n", __FILE__, __LINE__, __func__);
 #endif
 
+extern const char *segm_idx_name;
+
 extern unsigned int *frt_imalloc(unsigned int value);
 extern unsigned long *frt_lmalloc(unsigned long value);
 extern frt_u32 *frt_u32malloc(frt_u32 value);
 extern frt_u64 *frt_u64malloc(frt_u64 value);
 
 extern char *frt_estrdup(const char *s);
+extern char *frt_estrndup(const char *s, int len);
 extern char *frt_estrcat(char *str, char *str_cat);
 extern char *frt_epstrdup(const char *fmt, int len, ...);
 
@@ -120,8 +123,7 @@ extern void frt_dummy_free(void *p);
  * Returns the count of leading [MSB] 0 bits in +word+.
  */
 static FRT_ATTR_ALWAYS_INLINE FRT_ATTR_CONST
-int frt_count_leading_zeros(frt_u32 word)
-{
+int frt_count_leading_zeros(frt_u32 word) {
 #ifdef __GNUC__
     if (word)
         return __builtin_clz(word);
@@ -153,8 +155,7 @@ int frt_count_leading_zeros(frt_u32 word)
 }
 
 static FRT_ATTR_ALWAYS_INLINE FRT_ATTR_CONST
-int frt_count_leading_ones(frt_u32 word)
-{
+int frt_count_leading_ones(frt_u32 word) {
     return frt_count_leading_zeros(~word);
 }
 
@@ -163,8 +164,7 @@ int frt_count_leading_ones(frt_u32 word)
  */
 
 static FRT_ATTR_ALWAYS_INLINE FRT_ATTR_CONST
-int frt_count_trailing_zeros(frt_u32 word)
-{
+int frt_count_trailing_zeros(frt_u32 word) {
 #ifdef __GNUC__
     if (word)
         return __builtin_ctz(word);
@@ -196,14 +196,12 @@ int frt_count_trailing_zeros(frt_u32 word)
 }
 
 static FRT_ATTR_ALWAYS_INLINE FRT_ATTR_CONST
-int frt_count_trailing_ones(frt_u32 word)
-{
+int frt_count_trailing_ones(frt_u32 word) {
     return frt_count_trailing_zeros(~word);
 }
 
 static FRT_ATTR_ALWAYS_INLINE FRT_ATTR_CONST
-int frt_count_ones(frt_u32 word)
-{
+int frt_count_ones(frt_u32 word) {
 #ifdef __GNUC__
     return __builtin_popcount(word);
 #else
@@ -233,8 +231,7 @@ int frt_count_ones(frt_u32 word)
 }
 
 static FRT_ATTR_ALWAYS_INLINE FRT_ATTR_CONST
-int frt_count_zeros(frt_u32 word)
-{
+int frt_count_zeros(frt_u32 word) {
     return frt_count_ones(~word);
 }
 
@@ -242,8 +239,7 @@ int frt_count_zeros(frt_u32 word)
  * Round up to the next power of 2
  */
 static FRT_ATTR_ALWAYS_INLINE FRT_ATTR_CONST
-int frt_round2(frt_u32 word)
-{
+int frt_round2(frt_u32 word) {
     return 1 << (32 - frt_count_leading_zeros(word));
 }
 
@@ -261,7 +257,7 @@ extern FILE *frt_x_exception_stream;
 
 /**
  * The convenience macro +EXCEPTION_STREAM+ returns stderr when
- * +frt_x_exception_stream+ isn't explicitely set.
+ * +frt_x_exception_stream+ isn't explicitly set.
  */
 #define EXCEPTION 2
 #define EXCEPTION_STREAM (frt_x_exception_stream ? frt_x_exception_stream : stderr)

data/ext/isomorfeus_ferret_ext/frt_hash.c

@@ -30,7 +30,7 @@ unsigned long frt_str_hash(const char *const str) {
 }
 
 unsigned long frt_ptr_hash(const void *const ptr) {
-    return (unsigned long)ptr;
+    return (unsigned long)(uintptr_t)ptr;
 }
 
 int frt_ptr_eq(const void *q1, const void *q2) {
@@ -73,7 +73,7 @@ static FrtHashEntry  *frt_h_resize_lookup(FrtHash *self, register const unsigned
 }
 
 static FrtHashEntry *frt_h_lookup_ptr(FrtHash *self, const void *key) {
-    register const unsigned long hash = (unsigned long)key;
+    register const unsigned long hash = (unsigned long)(uintptr_t)key;
     register unsigned long perturb;
     register int mask = self->mask;
     register FrtHashEntry *he0 = self->table;
@@ -375,21 +375,21 @@ FrtHashKeyStatus frt_h_has_key(FrtHash *self, const void *key) {
 }
 
 void *frt_h_get_int(FrtHash *self, const unsigned long key) {
-    return frt_h_get(self, (const void *)key);
+    return frt_h_get(self, (const void *)(uintptr_t)key);
 }
 
 int frt_h_del_int(FrtHash *self, const unsigned long key) {
-    return frt_h_del(self, (const void *)key);
+    return frt_h_del(self, (const void *)(uintptr_t)key);
 }
 
 void *frt_h_rem_int(FrtHash *self, const unsigned long key) {
-    return frt_h_rem(self, (const void *)key, false);
+    return frt_h_rem(self, (const void *)(uintptr_t)key, false);
 }
 
 FrtHashKeyStatus frt_h_set_int(FrtHash *self, const unsigned long key, void *value) {
     FrtHashKeyStatus ret_val = FRT_HASH_KEY_DOES_NOT_EXIST;
     FrtHashEntry *he;
-    if (!frt_h_set_ext(self, (const void *)key, &he)) {
+    if (!frt_h_set_ext(self, (const void *)(uintptr_t)key, &he)) {
         /* Only free old value if it isn't the new value */
         if (he->value != value) {
             self->free_value_i(he->value);
@@ -404,7 +404,7 @@ FrtHashKeyStatus frt_h_set_int(FrtHash *self, const unsigned long key, void *val
 
 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)) {
+    if (frt_h_set_ext(self, (const void *)(uintptr_t)key, &he)) {
         he->key = (char *)dummy_int_key;
         he->value = value;
         return true;
@@ -413,7 +413,7 @@ int frt_h_set_safe_int(FrtHash *self, const unsigned long key, void *value) {
 }
 
 int frt_h_has_key_int(FrtHash *self, const unsigned long key) {
-    return frt_h_has_key(self, (const void *)key);
+    return frt_h_has_key(self, (const void *)(uintptr_t)key);
 }
 
 void frt_h_each(FrtHash *self, void (*each_kv) (void *key, void *value, void *arg), void *arg) {

data/ext/isomorfeus_ferret_ext/frt_hash.h

@@ -15,8 +15,7 @@
 /**
  * Return values for frt_h_set
  */
-typedef enum
-{
+typedef enum {
     FRT_HASH_KEY_DOES_NOT_EXIST = 0,
     FRT_HASH_KEY_EQUAL = 1,
     FRT_HASH_KEY_SAME = 2

data/ext/isomorfeus_ferret_ext/frt_hashset.c

@@ -7,8 +7,7 @@
  * 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.
  */
-static FrtHashSet *hs_alloc(frt_free_ft free_func)
-{
+static FrtHashSet *hs_alloc(frt_free_ft free_func) {
     FrtHashSet *hs = FRT_ALLOC(FrtHashSet);
     hs->size = 0;
     hs->first = hs->last = NULL;
@@ -16,29 +15,25 @@ static FrtHashSet *hs_alloc(frt_free_ft free_func)
     return hs;
 }
 
-FrtHashSet *frt_hs_new(frt_hash_ft hash_func, frt_eq_ft eq_func, frt_free_ft free_func)
-{
+FrtHashSet *frt_hs_new(frt_hash_ft hash_func, frt_eq_ft eq_func, frt_free_ft free_func) {
     FrtHashSet *hs = hs_alloc(free_func);
     hs->ht = frt_h_new(hash_func, eq_func, NULL, NULL);
     return hs;
 }
 
-FrtHashSet *frt_hs_new_str(frt_free_ft free_func)
-{
+FrtHashSet *frt_hs_new_str(frt_free_ft free_func) {
     FrtHashSet *hs = hs_alloc(free_func);
     hs->ht = frt_h_new_str((frt_free_ft) NULL, NULL);
     return hs;
 }
 
-FrtHashSet *frt_hs_new_ptr(frt_free_ft free_func)
-{
+FrtHashSet *frt_hs_new_ptr(frt_free_ft free_func) {
     FrtHashSet *hs = hs_alloc(free_func);
     hs->ht = frt_h_new_ptr(NULL);
     return hs;
 }
 
-static void hs_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;
     while (NULL != (curr = next)) {
@@ -50,36 +45,31 @@ static void hs_clear(FrtHashSet *hs, bool destroy)
     hs->size = 0;
 }
 
-void frt_hs_clear(FrtHashSet *hs)
-{
+void frt_hs_clear(FrtHashSet *hs) {
     hs_clear(hs, true);
     frt_h_clear(hs->ht);
 }
 
-void frt_hs_free(FrtHashSet *hs)
-{
+void frt_hs_free(FrtHashSet *hs) {
     hs_clear(hs, false);
     frt_h_destroy(hs->ht);
     free(hs);
 }
 
-void frt_hs_destroy(FrtHashSet *hs)
-{
+void frt_hs_destroy(FrtHashSet *hs) {
     hs_clear(hs, true);
     frt_h_destroy(hs->ht);
     free(hs);
 }
 
-static void append(FrtHashSet *hs, void *elem)
-{
+static void append(FrtHashSet *hs, void *elem) {
     FrtHashSetEntry *entry = FRT_ALLOC(FrtHashSetEntry);
     entry->elem = elem;
     entry->prev = hs->last;
     entry->next = NULL;
     if (!hs->first) {
         hs->first = hs->last = entry;
-    }
-    else {
+    } else {
         hs->last->next = entry;
         hs->last = entry;
     }
@@ -87,8 +77,7 @@ static void append(FrtHashSet *hs, void *elem)
     hs->size++;
 }
 
-FrtHashKeyStatus frt_hs_add(FrtHashSet *hs, void *elem)
-{
+FrtHashKeyStatus frt_hs_add(FrtHashSet *hs, void *elem) {
     FrtHashKeyStatus has_elem = frt_h_has_key(hs->ht, elem);
     switch (has_elem)
     {
@@ -111,8 +100,7 @@ FrtHashKeyStatus frt_hs_add(FrtHashSet *hs, void *elem)
     return has_elem;
 }
 
-int frt_hs_add_safe(FrtHashSet *hs, void *elem)
-{
+int frt_hs_add_safe(FrtHashSet *hs, void *elem) {
     switch(frt_h_has_key(hs->ht, elem))
     {
         /* element can't be added */
@@ -128,24 +116,20 @@ int frt_hs_add_safe(FrtHashSet *hs, void *elem)
     return true;
 }
 
-void *frt_hs_rem(FrtHashSet *hs, const void *elem)
-{
+void *frt_hs_rem(FrtHashSet *hs, const void *elem) {
     void *return_elem;
     FrtHashSetEntry *entry = (FrtHashSetEntry *)frt_h_get(hs->ht, elem);
     if (entry == NULL) return NULL;
 
     if (hs->first == hs->last) {
         hs->first = hs->last = NULL;
-    }
-    else if (hs->first == entry) {
+    } else if (hs->first == entry) {
         hs->first = entry->next;
         hs->first->prev = NULL;
-    }
-    else if (hs->last == entry) {
+    } else if (hs->last == entry) {
         hs->last = entry->prev;
         hs->last->next = NULL;
-    }
-    else {
+    } else {
         entry->prev->next = entry->next;
         entry->next->prev = entry->prev;
     }
@@ -156,8 +140,7 @@ void *frt_hs_rem(FrtHashSet *hs, const void *elem)
     return return_elem;
 }
 
-int frt_hs_del(FrtHashSet *hs, const void *elem)
-{
+int frt_hs_del(FrtHashSet *hs, const void *elem) {
     void *tmp_elem = frt_hs_rem(hs, elem);
     if (tmp_elem != NULL) {
         hs->free_elem_i(tmp_elem);
@@ -166,13 +149,11 @@ int frt_hs_del(FrtHashSet *hs, const void *elem)
     return 0;
 }
 
-FrtHashKeyStatus frt_hs_exists(FrtHashSet *hs, const void *elem)
-{
+FrtHashKeyStatus frt_hs_exists(FrtHashSet *hs, const void *elem) {
     return frt_h_has_key(hs->ht, elem);
 }
 
-FrtHashSet *frt_hs_merge(FrtHashSet *hs, FrtHashSet * other)
-{
+FrtHashSet *frt_hs_merge(FrtHashSet *hs, FrtHashSet * other) {
     FrtHashSetEntry *entry = other->first;
     for (; entry != NULL; entry = entry->next) {
         frt_hs_add(hs, entry->elem);
@@ -184,8 +165,7 @@ FrtHashSet *frt_hs_merge(FrtHashSet *hs, FrtHashSet * other)
     return hs;
 }
 
-void *frt_hs_orig(FrtHashSet *hs, const void *elem)
-{
+void *frt_hs_orig(FrtHashSet *hs, const void *elem) {
     FrtHashSetEntry *entry = (FrtHashSetEntry *)frt_h_get(hs->ht, elem);
     return entry ? entry->elem : NULL;
 }

data/ext/isomorfeus_ferret_ext/frt_hashset.h

@@ -10,8 +10,7 @@ typedef struct FrtHashSetEntry {
     struct FrtHashSetEntry *prev;
 } FrtHashSetEntry;
 
-typedef struct FrtHashSet
-{
+typedef struct FrtHashSet {
     /* the number of elements in the instance */
     int size;
 

data/ext/isomorfeus_ferret_ext/frt_helper.c

@@ -1,8 +1,6 @@
 #include "frt_helper.h"
 
-int frt_hlp_string_diff(register const char *const s1,
-                           register const char *const s2)
-{
+int frt_hlp_string_diff(register const char *const s1, register const char *const s2) {
     register int i = 0;
     while (s1[i] && (s1[i] == s2[i])) {
         i++;
@@ -10,26 +8,22 @@ int frt_hlp_string_diff(register const char *const s1,
     return i;
 }
 
-frt_i32 frt_float2int(float f)
-{
+frt_i32 frt_float2int(float f) {
     union { frt_i32 i; float f; } tmp;
     tmp.f = f;
     return tmp.i;
 }
 
-float frt_int2float(frt_i32 v)
-{
+float frt_int2float(frt_i32 v) {
     union { frt_i32 i; float f; } tmp;
     tmp.i = v;
     return tmp.f;
 }
 
-float frt_byte2float(unsigned char b)
-{
+float frt_byte2float(unsigned char b) {
     if (b == 0) {
         return 0.0;
-    }
-    else {
+    } else {
         frt_u32 mantissa = b & 0x07;
         frt_u32 exponent = (b >> 3) & 0x1f;
 
@@ -37,12 +31,10 @@ float frt_byte2float(unsigned char b)
     }
 }
 
-unsigned char frt_float2byte(float f)
-{
+unsigned char frt_float2byte(float f) {
     if (f <= 0.0) {
         return 0;
-    }
-    else {
+    } else {
         /* correctly order the bytes for encoding */
         frt_u32 i = frt_float2int(f);
         int mantissa = (i & 0xEf0000) >> 21;