isomorfeus-ferret 0.13.7 → 0.13.10

data/ext/isomorfeus_ferret_ext/frt_index.h

@@ -100,7 +100,7 @@ typedef struct FrtFieldInfo {
     float        boost;
     unsigned int bits;
     int          number;
-    int          ref_cnt;
+    _Atomic unsigned int  ref_cnt;
     VALUE        rfi;
 } FrtFieldInfo;
 
@@ -133,7 +133,7 @@ extern void frt_fi_deref(FrtFieldInfo *fi);
 #define FIELD_INFOS_INIT_CAPA 4
 /* carry changes over to dummy_fis in test/test_segments.c */
 typedef struct FrtFieldInfos {
-    FrtStoreValue      store;
+    FrtStoreValue      store_val;
     FrtCompressionType compression;
     FrtIndexValue      index;
     FrtTermVectorValue term_vector;
@@ -141,7 +141,7 @@ typedef struct FrtFieldInfos {
     int                capa;
     FrtFieldInfo       **fields;
     FrtHash            *field_dict;
-    int                ref_cnt;
+    _Atomic unsigned int ref_cnt;
     VALUE              rfis;
 } FrtFieldInfos;
 
@@ -167,18 +167,18 @@ extern void frt_fis_deref(FrtFieldInfos *fis);
 #define FRT_SEGMENTS_FILE_NAME "segments"
 
 typedef struct FrtSegmentInfo {
-    int ref_cnt;
-    char *name;
-    FrtStore *store;
-    int doc_cnt;
-    int del_gen;
-    int *norm_gens;
-    int norm_gens_size;
-    bool use_compound_file;
+    _Atomic unsigned int ref_cnt;
+    char        *name;
+    FrtStore    *store;
+    int         doc_cnt;
+    int         del_gen;
+    int         *norm_gens;
+    int         norm_gens_size;
+    bool        use_compound_file;
 } FrtSegmentInfo;
 
 extern FrtSegmentInfo *frt_si_new(char *name, int doc_cnt, FrtStore *store);
-extern void frt_si_deref(FrtSegmentInfo *si);
+extern void frt_si_close(FrtSegmentInfo *si);
 extern bool frt_si_has_deletions(FrtSegmentInfo *si);
 extern bool frt_si_has_separate_norms(FrtSegmentInfo *si);
 extern void frt_si_advance_norm_gen(FrtSegmentInfo *si, int field_num);
@@ -224,9 +224,9 @@ extern void frt_sis_put(FrtSegmentInfos *sis, FILE *stream);
 
 typedef struct FrtTermInfo {
     int   doc_freq;
-    off_t frq_ptr;
-    off_t prx_ptr;
-    off_t skip_offset;
+    frt_off_t frq_ptr;
+    frt_off_t prx_ptr;
+    frt_off_t skip_offset;
 } FrtTermInfo;
 
 #define frt_ti_set(ti, mdf, mfp, mpp, mso) do {\
@@ -265,14 +265,14 @@ FrtTermInfo *frt_te_get_ti(struct FrtTermEnum *te);
 /* FrtSegmentTermIndex */
 
 typedef struct FrtSegmentTermIndex {
-    off_t       index_ptr;
-    off_t       ptr;
+    frt_off_t       index_ptr;
+    frt_off_t       ptr;
     int         index_cnt;
     int         size;
     char        **index_terms;
     int         *index_term_lens;
     FrtTermInfo *index_term_infos;
-    off_t       *index_ptrs;
+    frt_off_t       *index_ptrs;
 } FrtSegmentTermIndex;
 
 /* FrtSegmentFieldIndex */
@@ -281,7 +281,7 @@ typedef struct FrtSegmentFieldIndex {
     frt_mutex_t mutex;
     int         skip_interval;
     int         index_interval;
-    off_t       index_ptr;
+    frt_off_t       index_ptr;
     FrtTermEnum *index_te;
     FrtHash     *field_dict;
 } FrtSegmentFieldIndex;
@@ -349,7 +349,7 @@ typedef struct FrtTermInfosWriter {
     int           field_count;
     int           index_interval;
     int           skip_interval;
-    off_t         last_index_ptr;
+    frt_off_t         last_index_ptr;
     FrtOutStream  *tfx_out;
     FrtTermWriter *tix_writer;
     FrtTermWriter *tis_writer;
@@ -385,7 +385,7 @@ struct FrtTermDocEnum {
 typedef struct FrtSegmentTermDocEnum FrtSegmentTermDocEnum;
 struct FrtSegmentTermDocEnum {
     FrtTermDocEnum tde;
-    void (*seek_prox)(FrtSegmentTermDocEnum *stde, off_t prx_ptr);
+    void (*seek_prox)(FrtSegmentTermDocEnum *stde, frt_off_t prx_ptr);
     void (*skip_prox)(FrtSegmentTermDocEnum *stde);
     FrtTermInfosReader *tir;
     FrtInStream        *frq_in;
@@ -402,9 +402,9 @@ struct FrtSegmentTermDocEnum {
     int skip_doc;
     int prx_cnt;
     int position;
-    off_t frq_ptr;
-    off_t prx_ptr;
-    off_t skip_ptr;
+    frt_off_t frq_ptr;
+    frt_off_t prx_ptr;
+    frt_off_t skip_ptr;
     bool have_skipped : 1;
 };
 
@@ -429,8 +429,8 @@ extern FrtTermDocEnum *frt_mtdpe_new(FrtIndexReader *ir, int field_num, char **t
  ****************************************************************************/
 
 typedef struct FrtOffset {
-    off_t start;
-    off_t end;
+    frt_off_t start;
+    frt_off_t end;
 } FrtOffset;
 
 /****************************************************************************
@@ -529,7 +529,7 @@ extern FrtTVTerm *frt_tv_get_tv_term(FrtTermVector *tv, const char *term);
 
 /* * * FrtLazyDocField * * */
 typedef struct FrtLazyDocFieldData {
-    off_t              start;
+    frt_off_t              start;
     int                length;
     rb_encoding        *encoding;
     FrtCompressionType compression; /* as stored */
@@ -595,7 +595,7 @@ typedef struct FrtFieldsWriter {
     FrtOutStream  *fdx_out;
     FrtOutStream  *buffer;
     FrtTVField    *tv_fields;
-    off_t         start_ptr;
+    frt_off_t         start_ptr;
 } FrtFieldsWriter;
 
 extern FrtFieldsWriter *frt_fw_open(FrtStore *store, const char *segment, FrtFieldInfos *fis);
@@ -671,7 +671,7 @@ struct FrtIndexReader {
     bool            (*is_latest_i)(FrtIndexReader *ir);
     void            (*commit_i)(FrtIndexReader *ir);
     void            (*close_i)(FrtIndexReader *ir);
-    int             ref_cnt;
+    _Atomic unsigned int     ref_cnt;
     FrtDeleter      *deleter;
     FrtStore        *store;
     FrtLock         *write_lock;
@@ -846,8 +846,8 @@ extern void frt_iw_add_readers(FrtIndexWriter *iw, FrtIndexReader **readers, con
 #define FRT_CW_INIT_CAPA 16
 typedef struct FrtCWFileEntry {
     char  *name;
-    off_t dir_offset;
-    off_t data_offset;
+    frt_off_t dir_offset;
+    frt_off_t data_offset;
 } FrtCWFileEntry;
 
 typedef struct FrtCompoundWriter {

data/ext/isomorfeus_ferret_ext/frt_lang.c

@@ -43,10 +43,7 @@ void *frt_erealloc(void *ptr, size_t size)
     return p;
 }
 
-
-struct timeval rb_time_interval _((VALUE));
-
-extern void frt_micro_sleep(const int micro_seconds) {
+void frt_micro_sleep(const int micro_seconds) {
     rb_thread_wait_for(rb_time_interval(rb_float_new((double)micro_seconds/1000000.0)));
 }
 

data/ext/isomorfeus_ferret_ext/frt_multimapper.c

@@ -328,19 +328,18 @@ char *frt_mulmap_dynamic_map(FrtMultiMapper *self, char *from)
     return to;
 }
 
-void frt_mulmap_destroy(FrtMultiMapper *self)
-{
-    if (--(self->ref_cnt) <= 0) {
+void frt_mulmap_destroy(FrtMultiMapper *mulm) {
+    if (FRT_DEREF(mulm) <= 0) {
         int i;
-        mulmap_free_dstates(self);
-        for (i = self->size - 1; i >= 0; i--) {
-            FrtMapping *mapping = self->mappings[i];
+        mulmap_free_dstates(mulm);
+        for (i = mulm->size - 1; i >= 0; i--) {
+            FrtMapping *mapping = mulm->mappings[i];
             free(mapping->pattern);
             free(mapping->replacement);
             free(mapping);
         }
-        free(self->mappings);
-        free(self->dstates);
-        free(self);
+        free(mulm->mappings);
+        free(mulm->dstates);
+        free(mulm);
     }
 }

data/ext/isomorfeus_ferret_ext/frt_multimapper.h

@@ -38,7 +38,7 @@ typedef struct FrtMultiMapper
     FrtState **nstates;
     int nsize;
     int *next_states;
-    int ref_cnt;
+    _Atomic unsigned int ref_cnt;
 } FrtMultiMapper;
 
 extern FrtMultiMapper *frt_mulmap_new();

data/ext/isomorfeus_ferret_ext/frt_q_boolean.c

@@ -1264,10 +1264,10 @@ void frt_bc_set_occur(FrtBooleanClause *self, FrtBCType occur) {
     }
 }
 
-void frt_bc_deref(FrtBooleanClause *self) {
-    if (--self->ref_cnt <= 0) {
-        frt_q_deref(self->query);
-        free(self);
+void frt_bc_deref(FrtBooleanClause *bc) {
+    if (FRT_DEREF(bc) == 0) {
+        frt_q_deref(bc->query);
+        free(bc);
     }
 }
 
@@ -1280,7 +1280,7 @@ static int  bc_eq(FrtBooleanClause *self, FrtBooleanClause *o) {
 }
 
 FrtBooleanClause *frt_bc_alloc(void) {
-    return FRT_ALLOC(FrtBooleanClause);
+    return FRT_ALLOC_AND_ZERO(FrtBooleanClause);
 }
 
 FrtBooleanClause *frt_bc_init(FrtBooleanClause *self, FrtQuery *query, FrtBCType occur) {
@@ -1345,7 +1345,7 @@ static FrtQuery *bq_rewrite(FrtQuery *self, FrtIndexReader *ir) {
         }
     }
 
-    self->ref_cnt++;
+    FRT_REF(self);
     /* replace each clause's query with its rewritten query */
     for (i = 0; i < clause_cnt; i++) {
         FrtBooleanClause *clause = BQ(self)->clauses[i];
@@ -1364,7 +1364,7 @@ static FrtQuery *bq_rewrite(FrtQuery *self, FrtIndexReader *ir) {
                 for (j = 0; j < clause_cnt; j++) {
                     FRT_REF(BQ(self)->clauses[j]);
                 }
-                self->ref_cnt--;
+                FRT_DEREF(self);
                 self = new_self;
                 self->ref_cnt = 1;
                 rewritten = true;

data/ext/isomorfeus_ferret_ext/frt_q_fuzzy.c

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

data/ext/isomorfeus_ferret_ext/frt_q_match_all.c

@@ -45,9 +45,15 @@ static FrtExplanation *masc_explain(FrtScorer *self, int doc_num)
     return frt_expl_new(1.0, "MatchAllScorer");
 }
 
+void masc_destroy_i(FrtScorer *self) {
+    frt_ir_close(MASc(self)->ir);
+    frt_scorer_destroy_i(self);
+}
+
 static FrtScorer *masc_new(FrtWeight *weight, FrtIndexReader *ir) {
-    FrtScorer *self        = frt_scorer_new(MatchAllScorer, weight->similarity);
+    FrtScorer *self     = frt_scorer_new(MatchAllScorer, weight->similarity);
     MASc(self)->ir      = ir;
+    FRT_REF(ir);
     MASc(self)->max_doc = ir->max_doc(ir);
     MASc(self)->score   = weight->value;
     self->doc           = -1;
@@ -55,7 +61,7 @@ static FrtScorer *masc_new(FrtWeight *weight, FrtIndexReader *ir) {
     self->next          = &masc_next;
     self->skip_to       = &masc_skip_to;
     self->explain       = &masc_explain;
-    self->destroy       = &frt_scorer_destroy_i;
+    self->destroy       = &masc_destroy_i;
 
     return self;
 }
@@ -142,4 +148,3 @@ FrtQuery *frt_maq_new(void) {
     FrtQuery *self = frt_maq_alloc();
     return frt_maq_init(self);
 }
-

data/ext/isomorfeus_ferret_ext/frt_q_multi_term.c

@@ -3,8 +3,8 @@
 #include "frt_search.h"
 #include "frt_helper.h"
 
-#undef close
-#undef read
+// #undef close
+// #undef read
 
 #define MTQ(query) ((FrtMultiTermQuery *)(query))