isomorfeus-ferret 0.13.7 → 0.13.10

data/ext/isomorfeus_ferret_ext/frt_q_phrase.c

@@ -4,7 +4,7 @@
 #include "frt_search.h"
 #include "frt_array.h"
 
-#undef close
+// #undef close
 
 #define PhQ(query) ((FrtPhraseQuery *)(query))
 
@@ -27,7 +27,6 @@ static int phrase_pos_cmp(const void *p1, const void *p2) {
     return strcmp(((FrtPhrasePosition *)p1)->terms[0], ((FrtPhrasePosition *)p2)->terms[0]);
 }
 
-
 /***************************************************************************
  *
  * PhraseScorer
@@ -1061,7 +1060,7 @@ static FrtQuery *phq_rewrite(FrtQuery *self, FrtIndexReader *ir)
             return q;
         }
     } else {
-        self->ref_cnt++;
+        FRT_REF(self);
         return self;
     }
 }

data/ext/isomorfeus_ferret_ext/frt_q_prefix.c

@@ -2,7 +2,7 @@
 #include "frt_global.h"
 #include "frt_search.h"
 
-#undef close
+// #undef close
 
 /****************************************************************************
  *

data/ext/isomorfeus_ferret_ext/frt_q_range.c

@@ -2,7 +2,7 @@
 #include "frt_global.h"
 #include "frt_search.h"
 
-#undef close
+// #undef close
 
 /*****************************************************************************
  *

data/ext/isomorfeus_ferret_ext/frt_q_span.c

@@ -4,7 +4,7 @@
 #include "frt_search.h"
 #include "frt_hashset.h"
 
-#undef close
+// #undef close
 
 #define CLAUSE_INIT_CAPA 4
 
@@ -66,11 +66,11 @@ static FrtMatchVector *mv_to_term_mv(FrtMatchVector *term_mv, FrtMatchVector *fu
 typedef struct TVTermDocEnum
 {
     FrtTermDocEnum super;
-    int         doc;
-    int         index;
-    int         freq;
-    int        *positions;
-    FrtTermVector *tv;
+    int            doc;
+    int            index;
+    int            freq;
+    int            *positions;
+    FrtTermVector  *tv;
 } TVTermDocEnum;
 
 static void tv_tde_seek(FrtTermDocEnum *tde, int field_num, const char *term)
@@ -131,7 +131,7 @@ static int tv_tde_doc_num(FrtTermDocEnum *tde)
 static FrtTermDocEnum *spanq_ir_term_positions(FrtIndexReader *ir)
 {
     TVTermDocEnum *tv_tde = FRT_ALLOC(TVTermDocEnum);
-    FrtTermDocEnum *tde      = (FrtTermDocEnum *)tv_tde;
+    FrtTermDocEnum *tde   = (FrtTermDocEnum *)tv_tde;
     tv_tde->tv            = (FrtTermVector *)ir->store;
     tde->seek             = &tv_tde_seek;
     tde->doc_num          = &tv_tde_doc_num;
@@ -154,6 +154,7 @@ static FrtMatchVector *spanq_get_matchv_i(FrtQuery *self, FrtMatchVector *mv, Fr
         ir->fis = frt_fis_new(FRT_STORE_NO, FRT_COMPRESSION_NONE, FRT_INDEX_NO, FRT_TERM_VECTOR_NO);
         frt_fis_add_field(ir->fis, frt_fi_new(tv->field, FRT_STORE_NO, FRT_COMPRESSION_NONE, FRT_INDEX_NO, FRT_TERM_VECTOR_NO));
         ir->store = (FrtStore *)tv;
+        FRT_REF((FrtStore *)tv);
         ir->term_positions = &spanq_ir_term_positions;
         sp_enum = SpQ(self)->get_spans(self, ir);
         while (sp_enum->next(sp_enum)) {
@@ -1727,7 +1728,7 @@ static FrtQuery *spanfq_rewrite(FrtQuery *self, FrtIndexReader *ir) {
     frt_q_deref(q);
     SpFQ(self)->match = rq;
 
-    self->ref_cnt++;
+    FRT_REF(self);
     return self;                    /* no clauses rewrote */
 }
 
@@ -1864,7 +1865,7 @@ static FrtQuery *spanoq_rewrite(FrtQuery *self, FrtIndexReader *ir) {
         soq->clauses[i] = rewritten;
     }
 
-    self->ref_cnt++;
+    FRT_REF(self);
     return self;
 }
 
@@ -2050,7 +2051,7 @@ static FrtQuery *spannq_rewrite(FrtQuery *self, FrtIndexReader *ir)
         snq->clauses[i] = rewritten;
     }
 
-    self->ref_cnt++;
+    FRT_REF(self);
     return self;
 }
 
@@ -2207,7 +2208,7 @@ static FrtQuery *spanxq_rewrite(FrtQuery *self, FrtIndexReader *ir) {
     frt_q_deref(q);
     sxq->exc = rq;
 
-    self->ref_cnt++;
+    FRT_REF(self);
     return self;
 }
 

data/ext/isomorfeus_ferret_ext/frt_q_term.c

@@ -2,8 +2,8 @@
 #include <string.h>
 #include "frt_search.h"
 
-#undef close
-#undef read
+// #undef close
+// #undef read
 
 #define TQ(query) ((FrtTermQuery *)(query))
 #define TSc(scorer) ((TermScorer *)(scorer))

data/ext/isomorfeus_ferret_ext/frt_q_wildcard.c

@@ -2,7 +2,7 @@
 #include "frt_global.h"
 #include "frt_search.h"
 
-#undef close
+// #undef close
 
 /****************************************************************************
  *

data/ext/isomorfeus_ferret_ext/frt_ram_store.c

@@ -20,17 +20,16 @@ static void rf_extend_if_necessary(FrtRAMFile *rf, int buf_num) {
 }
 
 static void rf_close(void *p) {
-    int i;
     FrtRAMFile *rf = (FrtRAMFile *)p;
-    if (rf->ref_cnt > 0) {
-        return;
-    }
-    free(rf->name);
-    for (i = 0; i < rf->bufcnt; i++) {
-        free(rf->buffers[i]);
+    if (FRT_DEREF(rf) == 0) {
+        int i;
+        free(rf->name);
+        for (i = 0; i < rf->bufcnt; i++) {
+            free(rf->buffers[i]);
+        }
+        free(rf->buffers);
+        free(rf);
     }
-    free(rf->buffers);
-    free(rf);
 }
 
 static void ram_touch(FrtStore *store, const char *filename) {
@@ -50,7 +49,6 @@ static int ram_exists(FrtStore *store, const char *filename) {
 static int ram_remove(FrtStore *store, const char *filename) {
     FrtRAMFile *rf = (FrtRAMFile *)frt_h_rem(store->dir.ht, filename, false);
     if (rf != NULL) {
-        FRT_DEREF(rf);
         rf_close(rf);
         return true;
     } else {
@@ -74,7 +72,7 @@ static void ram_rename(FrtStore *store, const char *from, const char *to) {
     /* clean up the file we are overwriting */
     tmp = (FrtRAMFile *)frt_h_get(store->dir.ht, to);
     if (tmp != NULL) {
-        FRT_DEREF(tmp);
+        frt_h_del(store->dir.ht, to);
     }
 
     frt_h_set(store->dir.ht, rf->name, rf);
@@ -99,16 +97,7 @@ static void ram_each(FrtStore *store, void (*func)(const char *fname, void *arg)
 }
 
 static void ram_close_i(FrtStore *store) {
-    FrtHash *ht = store->dir.ht;
-    int i;
-    for (i = 0; i <= ht->mask; i++) {
-        FrtRAMFile *rf = (FrtRAMFile *)ht->table[i].value;
-        if (rf) {
-            FRT_DEREF(rf);
-        }
-    }
     frt_h_destroy(store->dir.ht);
-    frt_store_destroy(store);
 }
 
 /*
@@ -120,7 +109,6 @@ static void ram_clear(FrtStore *store) {
     for (i = 0; i <= ht->mask; i++) {
         FrtRAMFile *rf = (FrtRAMFile *)ht->table[i].value;
         if (rf && !frt_file_is_lock(rf->name)) {
-            FRT_DEREF(rf);
             frt_h_del(ht, rf->name);
         }
     }
@@ -132,7 +120,6 @@ static void ram_clear_locks(FrtStore *store) {
     for (i = 0; i <= ht->mask; i++) {
         FrtRAMFile *rf = (FrtRAMFile *)ht->table[i].value;
         if (rf && frt_file_is_lock(rf->name)) {
-            FRT_DEREF(rf);
             frt_h_del(ht, rf->name);
         }
     }
@@ -144,13 +131,12 @@ static void ram_clear_all(FrtStore *store) {
     for (i = 0; i <= ht->mask; i++) {
         FrtRAMFile *rf = (FrtRAMFile *)ht->table[i].value;
         if (rf) {
-            FRT_DEREF(rf);
             frt_h_del(ht, rf->name);
         }
     }
 }
 
-static off_t ram_length(FrtStore *store, const char *filename) {
+static frt_off_t ram_length(FrtStore *store, const char *filename) {
     FrtRAMFile *rf = (FrtRAMFile *)frt_h_get(store->dir.ht, filename);
     if (rf != NULL) {
         return rf->len;
@@ -165,7 +151,7 @@ static void ramo_flush_i(FrtOutStream *os, const frt_uchar *src, int len) {
     FrtRAMFile *rf = os->file.rf;
     int buffer_number, buffer_offset, bytes_in_buffer, bytes_to_copy;
     int src_offset;
-    off_t pointer = os->pointer;
+    frt_off_t pointer = os->pointer;
 
     buffer_number = (int)(pointer / FRT_BUFFER_SIZE);
     buffer_offset = pointer % FRT_BUFFER_SIZE;
@@ -193,7 +179,7 @@ static void ramo_flush_i(FrtOutStream *os, const frt_uchar *src, int len) {
     }
 }
 
-static void ramo_seek_i(FrtOutStream *os, off_t pos) {
+static void ramo_seek_i(FrtOutStream *os, frt_off_t pos) {
     os->pointer = pos;
 }
 
@@ -203,9 +189,7 @@ void frt_ramo_reset(FrtOutStream *os) {
 }
 
 static void ramo_close_i(FrtOutStream *os) {
-    FrtRAMFile *rf = os->file.rf;
-    FRT_DEREF(rf);
-    rf_close(rf);
+    rf_close(os->file.rf);
 }
 
 void frt_ramo_write_to(FrtOutStream *os, FrtOutStream *other_o) {
@@ -232,8 +216,6 @@ static const struct FrtOutStreamMethods RAM_OUT_STREAM_METHODS = {
 FrtOutStream *frt_ram_new_buffer(void) {
     FrtRAMFile *rf = rf_new("");
     FrtOutStream *os = frt_os_new();
-
-    FRT_DEREF(rf);
     os->file.rf = rf;
     os->pointer = 0;
     os->m = &RAM_OUT_STREAM_METHODS;
@@ -261,12 +243,12 @@ static FrtOutStream *ram_new_output(FrtStore *store, const char *filename) {
 }
 
 static void rami_read_i(FrtInStream *is, frt_uchar *b, int len) {
-    FrtRAMFile *rf = is->file.rf;
+    FrtRAMFile *rf = is->f->file.rf;
 
     int offset = 0;
     int buffer_number, buffer_offset, bytes_in_buffer, bytes_to_copy;
     int remainder = len;
-    off_t start = is->d.pointer;
+    frt_off_t start = is->d.pointer;
     frt_uchar *buffer;
 
     while (remainder > 0) {
@@ -289,17 +271,16 @@ static void rami_read_i(FrtInStream *is, frt_uchar *b, int len) {
     is->d.pointer += len;
 }
 
-static off_t rami_length_i(FrtInStream *is) {
-    return is->file.rf->len;
+static frt_off_t rami_length_i(FrtInStream *is) {
+    return is->f->file.rf->len;
 }
 
-static void rami_seek_i(FrtInStream *is, off_t pos) {
+static void rami_seek_i(FrtInStream *is, frt_off_t pos) {
     is->d.pointer = pos;
 }
 
 static void rami_close_i(FrtInStream *is) {
-    FrtRAMFile *rf = is->file.rf;
-    FRT_DEREF(rf);
+    FrtRAMFile *rf = is->f->file.rf;
     rf_close(rf);
 }
 
@@ -319,7 +300,8 @@ static FrtInStream *ram_open_input(FrtStore *store, const char *filename) {
     }
     FRT_REF(rf);
     is = frt_is_new();
-    is->file.rf = rf;
+    is->f->file.rf = rf;
+    is->f->ref_cnt = 1;
     is->d.pointer = 0;
     is->m = &RAM_IN_STREAM_METHODS;
 
@@ -351,6 +333,7 @@ static FrtLock *ram_open_lock_i(FrtStore *store, const char *lockname) {
     snprintf(lname, 100, "%s%s.lck", FRT_LOCK_PREFIX, lockname);
     lock->name = frt_estrdup(lname);
     lock->store = store;
+    FRT_REF(store);
     lock->obtain = &ram_lock_obtain;
     lock->release = &ram_lock_release;
     lock->is_locked = &ram_lock_is_locked;
@@ -359,6 +342,7 @@ static FrtLock *ram_open_lock_i(FrtStore *store, const char *lockname) {
 }
 
 static void ram_close_lock_i(FrtLock *lock) {
+    FRT_DEREF(lock->store);
     free(lock->name);
     free(lock);
 }
@@ -415,7 +399,7 @@ FrtStore *frt_open_ram_store_and_copy(FrtStore *store, FrtStore *from_store, boo
     from_store->each(from_store, &copy_files, &cfa);
 
     if (close_dir) {
-        frt_store_deref(from_store);
+        frt_store_close(from_store);
     }
 
     return store;

data/ext/isomorfeus_ferret_ext/frt_search.c

@@ -3,7 +3,7 @@
 #include "frt_search.h"
 #include "frt_array.h"
 
-#undef close
+// #undef close
 
 /***************************************************************************
  *
@@ -303,7 +303,7 @@ const char *frt_q_get_query_name(FrtQueryType type) {
 static FrtQuery *q_rewrite(FrtQuery *self, FrtIndexReader *ir)
 {
     (void)ir;
-    self->ref_cnt++;
+    FRT_REF(self);
     return self;
 }
 
@@ -318,13 +318,12 @@ FrtSimilarity *frt_q_get_similarity_i(FrtQuery *self, FrtSearcher *searcher) {
     return searcher->get_similarity(searcher);
 }
 
-void frt_q_destroy_i(FrtQuery *self) {
-    free(self);
+void frt_q_destroy_i(FrtQuery *q) {
+    free(q);
 }
 
-void frt_q_deref(FrtQuery *self) {
-    if (--(self->ref_cnt) == 0)
-        self->destroy_i(self);
+void frt_q_deref(FrtQuery *q) {
+    if (FRT_DEREF(q) == 0) q->destroy_i(q);
 }
 
 FrtWeight *frt_q_create_weight_unsup(FrtQuery *self, FrtSearcher *searcher) {
@@ -1180,11 +1179,13 @@ static FrtTermVector *isea_get_term_vector(FrtSearcher *self, const int doc_num,
     return ir->term_vector(ir, doc_num, field);
 }
 
-static void isea_close(FrtSearcher *self) {
-    if (ISEA(self)->ir && ISEA(self)->close_ir) {
-        frt_ir_close(ISEA(self)->ir);
+static void isea_close(FrtSearcher *isea) {
+    if (FRT_DEREF(isea) == 0) {
+        if (ISEA(isea)->ir) {
+            frt_ir_close(ISEA(isea)->ir);
+        }
+        free(isea);
     }
-    free(self);
 }
 
 FrtSearcher *frt_isea_alloc(void) {
@@ -1193,8 +1194,8 @@ FrtSearcher *frt_isea_alloc(void) {
 
 FrtSearcher *frt_isea_init(FrtSearcher *self, FrtIndexReader *ir) {
     ISEA(self)->ir          = ir;
-    ISEA(self)->close_ir    = true;
-
+    FRT_REF(ir);
+    self->ref_cnt           = 1;
     self->similarity        = frt_sim_create_default();
     self->doc_freq          = &frt_isea_doc_freq;
     self->get_doc           = &isea_get_doc;
@@ -1304,7 +1305,7 @@ static void cdfsea_search_each_w(FrtSearcher *self, FrtWeight *w, FrtFilter *fil
 static FrtQuery *cdfsea_rewrite(FrtSearcher *self, FrtQuery *original)
 {
     (void)self;
-    original->ref_cnt++;
+    FRT_REF(original);
     return original;
 }
 
@@ -1721,31 +1722,32 @@ static FrtSimilarity *msea_get_similarity(FrtSearcher *self) {
     return self->similarity;
 }
 
-static void msea_close(FrtSearcher *self) {
-    int i;
-    FrtSearcher *s;
-    FrtMultiSearcher *msea = MSEA(self);
-    if (msea->close_subs) {
-        for (i = 0; i < msea->s_cnt; i++) {
-            s = msea->searchers[i];
+static void msea_close(FrtSearcher *msea) {
+    if (FRT_DEREF(msea) == 0) {
+        FrtMultiSearcher *rmsea = MSEA(msea);
+        FrtSearcher *s;
+        int i;
+        for (i = 0; i < rmsea->s_cnt; i++) {
+            s = rmsea->searchers[i];
             s->close(s);
         }
+        free(rmsea->searchers);
+        free(rmsea->starts);
+        free(msea);
     }
-    free(msea->searchers);
-    free(msea->starts);
-    free(self);
 }
 
 FrtSearcher *frt_msea_alloc(void) {
     return (FrtSearcher *)FRT_ALLOC(FrtMultiSearcher);
 }
 
-FrtSearcher *frt_msea_init(FrtSearcher *self, FrtSearcher **searchers, int s_cnt, bool close_subs) {
+FrtSearcher *frt_msea_init(FrtSearcher *self, FrtSearcher **searchers, int s_cnt) {
     int i, max_doc = 0;
     int *starts = FRT_ALLOC_N(int, s_cnt + 1);
     for (i = 0; i < s_cnt; i++) {
         starts[i] = max_doc;
         max_doc += searchers[i]->max_doc(searchers[i]);
+        FRT_REF(searchers[i]);
     }
     starts[i] = max_doc;
 
@@ -1753,8 +1755,7 @@ FrtSearcher *frt_msea_init(FrtSearcher *self, FrtSearcher **searchers, int s_cnt
     MSEA(self)->searchers   = searchers;
     MSEA(self)->starts      = starts;
     MSEA(self)->max_doc     = max_doc;
-    MSEA(self)->close_subs  = close_subs;
-
+    self->ref_cnt           = 1;
     self->similarity        = frt_sim_create_default();
     self->doc_freq          = &msea_doc_freq;
     self->get_doc           = &msea_get_doc;
@@ -1777,7 +1778,7 @@ FrtSearcher *frt_msea_init(FrtSearcher *self, FrtSearcher **searchers, int s_cnt
     return self;
 }
 
-FrtSearcher *frt_msea_new(FrtSearcher **searchers, int s_cnt, bool close_subs) {
+FrtSearcher *frt_msea_new(FrtSearcher **searchers, int s_cnt) {
     FrtSearcher *self = frt_msea_alloc();
-    return frt_msea_init(self, searchers, s_cnt, close_subs);
+    return frt_msea_init(self, searchers, s_cnt);
 }

data/ext/isomorfeus_ferret_ext/frt_search.h

@@ -103,7 +103,7 @@ typedef struct FrtFilter {
     unsigned long long (*hash)(struct FrtFilter *self);
     int           (*eq)(struct FrtFilter *self, struct FrtFilter *o);
     void          (*destroy_i)(struct FrtFilter *self);
-    int           ref_cnt;
+    _Atomic unsigned int   ref_cnt;
     VALUE         rfilter;
 } FrtFilter;
 
@@ -228,7 +228,7 @@ typedef enum {
 } FrtQueryType;
 
 struct FrtQuery {
-    int                ref_cnt;
+    _Atomic unsigned int        ref_cnt;
     float              boost;
     FrtWeight          *weight;
     FrtQuery           *(*rewrite)(FrtQuery *self, FrtIndexReader *ir);
@@ -264,7 +264,7 @@ extern FrtQuery *frt_q_create(size_t size);
 
 typedef struct FrtTermQuery {
     FrtQuery  super;
-    ID field;
+    ID        field;
     char      *term;
 } FrtTermQuery;
 
@@ -283,12 +283,12 @@ typedef enum {
 } FrtBCType;
 
 typedef struct FrtBooleanClause {
-    int       ref_cnt;
-    FrtQuery  *query;
-    FrtBCType occur;
-    bool      is_prohibited : 1;
-    bool      is_required : 1;
-    VALUE     rbc;
+    _Atomic unsigned int ref_cnt;
+    FrtQuery    *query;
+    FrtBCType   occur;
+    bool        is_prohibited : 1;
+    bool        is_required : 1;
+    VALUE       rbc;
 } FrtBooleanClause;
 
 extern FrtBooleanClause *frt_bc_alloc(void);
@@ -330,7 +330,7 @@ extern FrtBooleanClause *frt_bq_add_clause_nr(FrtQuery *self, FrtBooleanClause *
 typedef struct FrtPhraseQuery {
     FrtQuery          super;
     int               slop;
-    ID         field;
+    ID                field;
     FrtPhrasePosition *positions;
     int               pos_cnt;
     int               pos_capa;
@@ -351,7 +351,7 @@ extern void frt_phq_set_slop(FrtQuery *self, int slop);
 #define MULTI_TERM_QUERY_MAX_TERMS 256
 typedef struct FrtMultiTermQuery {
     FrtQuery         super;
-    ID        field;
+    ID               field;
     FrtPriorityQueue *boosted_terms;
     float            min_boost;
 } FrtMultiTermQuery;
@@ -377,7 +377,7 @@ typedef struct FrtMTQSubQuery {
 
 typedef struct FrtPrefixQuery {
     FrtMTQSubQuery super;
-    ID      field;
+    ID             field;
     char           *prefix;
 } FrtPrefixQuery;
 
@@ -395,7 +395,7 @@ extern FrtQuery *frt_prefixq_new(ID field, const char *prefix);
 
 typedef struct FrtWildCardQuery {
     FrtMTQSubQuery super;
-    ID      field;
+    ID             field;
     char           *pattern;
 } FrtWildCardQuery;
 
@@ -415,7 +415,7 @@ extern bool frt_wc_match(const char *pattern, const char *text);
 
 typedef struct FrtFuzzyQuery {
     FrtMTQSubQuery super;
-    ID      field;
+    ID             field;
     char           *term;
     const char     *text; /* term text after prefix */
     int            text_len;
@@ -514,7 +514,7 @@ struct FrtSpanEnum {
 /* ** FrtSpanQuery ** */
 typedef struct FrtSpanQuery {
     FrtQuery    super;
-    ID   field;
+    ID          field;
     FrtSpanEnum *(*get_spans)(FrtQuery *self, FrtIndexReader *ir);
     FrtHashSet  *(*get_terms)(FrtQuery *self);
 } FrtSpanQuery;
@@ -790,6 +790,7 @@ typedef struct FrtPostFilter {
 } FrtPostFilter;
 
 struct FrtSearcher {
+    _Atomic unsigned int    ref_cnt;
     FrtSimilarity  *similarity;
     int            (*doc_freq)(FrtSearcher *self, ID field, const char *term);
     FrtDocument    *(*get_doc)(FrtSearcher *self, int doc_num);
@@ -849,7 +850,6 @@ extern char **frt_searcher_highlight(FrtSearcher *self,
 typedef struct FrtIndexSearcher {
     FrtSearcher    super;
     FrtIndexReader *ir;
-    bool           close_ir : 1;
 } FrtIndexSearcher;
 
 extern FrtSearcher *frt_isea_alloc(void);
@@ -869,12 +869,11 @@ typedef struct FrtMultiSearcher {
     FrtSearcher **searchers;
     int         *starts;
     int         max_doc;
-    bool        close_subs : 1;
 } FrtMultiSearcher;
 
 extern FrtSearcher *frt_msea_alloc(void);
-extern FrtSearcher *frt_msea_init(FrtSearcher *self, FrtSearcher **searchers, int s_cnt, bool close_subs);
-extern FrtSearcher *frt_msea_new(FrtSearcher **searchers, int s_cnt, bool close_subs);
+extern FrtSearcher *frt_msea_init(FrtSearcher *self, FrtSearcher **searchers, int s_cnt);
+extern FrtSearcher *frt_msea_new(FrtSearcher **searchers, int s_cnt);
 
 /***************************************************************************
  *

data/ext/isomorfeus_ferret_ext/frt_sort.c

@@ -3,7 +3,7 @@
 #include "frt_index.h"
 #include "frt_field_index.h"
 
-#undef close
+// #undef close
 
 /***************************************************************************
  *