isomorfeus-ferret 0.13.8 → 0.13.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e6a7a9c17cc344699bee0c8116188f86da73e11fa2a4eed02eea1c4647b6a99
-  data.tar.gz: c94c9a2735b010c02c8d5a793057b94abf8950117153415a731347c21fadf66e
+  metadata.gz: 744efe9c78deef0c563e39ae29eb4e755f8afb493be0fe80416a55987db97ce7
+  data.tar.gz: d1f814f14b5a6ef18f612e545b54b0a113544f994c22901e7204ae191ebb644e
 SHA512:
-  metadata.gz: 549a2d3b09dc535278f6c9735f55a47203166df046e5a75ff55589085336bcf2cb7c25cdf491c07eca68da25682316c4bb15e5079f09df95f8a494558fe22260
-  data.tar.gz: e188f428fd881a0285ece69807f13c07dfd1eee131edcad3e38a713ffa820364992bb9068d5f94f567bd7769c7882441ce8eb67199b95b491528fecdd34503f4
+  metadata.gz: 3fd11e3b3f0f04625c14b9b709d69ef6f1a1abdfdf5c50ad5e151a3fd87e300595e29639ac9455c66f8db5452d9569bb1585f6b2f9f57ac5c3103f2ff09bb8d1
+  data.tar.gz: 27ace1a41fcc7557490865e740dfbe9906ce999288bb31306efa9b02f519552f9092391ff64a3ededc6a2285a0e78533a80d43ad48e85abc97c1a154e0060a67

data/ext/isomorfeus_ferret_ext/frb_index.c

@@ -536,7 +536,7 @@ frb_fis_add_field(int argc, VALUE *argv, VALUE self)
 {
     FrtFieldInfos *fis = (FrtFieldInfos *)DATA_PTR(self);
     FrtFieldInfo *fi;
-    FrtStoreValue store = fis->store;
+    FrtStoreValue store_val = fis->store_val;
     FrtCompressionType compression = fis->compression;
     FrtIndexValue index = fis->index;
     FrtTermVectorValue term_vector = fis->term_vector;
@@ -545,9 +545,9 @@ frb_fis_add_field(int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "11", &rname, &roptions);
     if (argc > 1) {
-        frb_fi_get_params(roptions, &store, &compression, &index, &term_vector, &boost);
+        frb_fi_get_params(roptions, &store_val, &compression, &index, &term_vector, &boost);
     }
-    fi = frt_fi_new(frb_field(rname), store, compression, index, term_vector);
+    fi = frt_fi_new(frb_field(rname), store_val, compression, index, term_vector);
     fi->boost = boost;
     frt_fis_add_field(fis, fi);
     return self;
@@ -593,9 +593,7 @@ frb_fis_to_s(VALUE self)
  *
  *  Return the number of fields in the FieldInfos object.
  */
-static VALUE
-frb_fis_size(VALUE self)
-{
+static VALUE frb_fis_size(VALUE self) {
     FrtFieldInfos *fis = (FrtFieldInfos *)DATA_PTR(self);
     return INT2FIX(fis->size);
 }
@@ -610,21 +608,19 @@ frb_fis_size(VALUE self)
  *  existing index (or other files for that matter) will be deleted from the
  *  directory and overwritten by the new index.
  */
-static VALUE
-frb_fis_create_index(VALUE self, VALUE rdir)
-{
+static VALUE frb_fis_create_index(VALUE self, VALUE rdir) {
     FrtFieldInfos *fis = (FrtFieldInfos *)DATA_PTR(self);
     FrtStore *store = NULL;
     if (TYPE(rdir) == T_DATA) {
         store = DATA_PTR(rdir);
-        FRT_REF(store);
+        frt_index_create(store, fis);
     } else {
         StringValue(rdir);
         frb_create_dir(rdir);
         store = frt_open_fs_store(rs2s(rdir));
+        frt_index_create(store, fis);
+        frt_store_close(store);
     }
-    frt_index_create(store, fis);
-    frt_store_deref(store);
     return self;
 }
 
@@ -1344,6 +1340,8 @@ static VALUE frb_iw_alloc(VALUE rclass) {
     return TypedData_Wrap_Struct(rclass, &frb_index_writer_t, iw);
 }
 
+extern rb_data_type_t frb_store_t;
+
 static VALUE frb_iw_init(int argc, VALUE *argv, VALUE self) {
     VALUE roptions, rval;
     bool create = false;
@@ -1363,12 +1361,11 @@ static VALUE frb_iw_init(int argc, VALUE *argv, VALUE self) {
 
             if ((rval = rb_hash_aref(roptions, sym_dir)) != Qnil) {
                 // Check_Type(rval, T_DATA);
-                store = DATA_PTR(rval);
+                TypedData_Get_Struct(rval, FrtStore, &frb_store_t, store);
             } else if ((rval = rb_hash_aref(roptions, sym_path)) != Qnil) {
                 StringValue(rval);
                 frb_create_dir(rval);
                 store = frt_open_fs_store(rs2s(rval));
-                FRT_DEREF(store);
             }
             /* use_compound_file defaults to true */
             config.use_compound_file =
@@ -1393,7 +1390,6 @@ static VALUE frb_iw_init(int argc, VALUE *argv, VALUE self) {
         }
         if (NULL == store) {
             store = frt_open_ram_store(NULL);
-            FRT_DEREF(store);
         }
         if (!create && create_if_missing && !store->exists(store, "segments")) {
             create = true;
@@ -1411,7 +1407,7 @@ static VALUE frb_iw_init(int argc, VALUE *argv, VALUE self) {
         }
 
         TypedData_Get_Struct(self, FrtIndexWriter, &frb_index_writer_t, iw);
-        iw = frt_iw_open(iw, store, analyzer, &config);
+        frt_iw_open(iw, store, analyzer, &config);
     FRT_XCATCHALL
         ex_code = xcontext.excode;
         msg = xcontext.msg;
@@ -1598,9 +1594,9 @@ void frb_ir_free(void *p) {
 
 void frb_ir_mark(void *p) {
     FrtIndexReader *ir = (FrtIndexReader *)p;
-    FrtMultiReader *mr = (FrtMultiReader *)p;
 
     if (ir->type == FRT_MULTI_READER) {
+        FrtMultiReader *mr = (FrtMultiReader *)p;
         int i;
         for (i = 0; i < mr->r_cnt; i++) {
             if (mr->sub_readers[i]->rir)
@@ -1652,6 +1648,7 @@ static VALUE frb_iw_add_readers(VALUE self, VALUE rreaders) {
     while (i-- > 0) {
         FrtIndexReader *ir;
         TypedData_Get_Struct(RARRAY_PTR(rreaders)[i], FrtIndexReader, &frb_index_reader_t, ir);
+        FRT_REF(ir);
         irs[i] = ir;
     }
     frt_iw_add_readers(iw, irs, RARRAY_LEN(rreaders));
@@ -2157,7 +2154,6 @@ static VALUE frb_ir_init(VALUE self, VALUE rdir) {
     VALUE rfield_num_map = rb_hash_new();
     int ex_code = 0;
     const char *msg = NULL;
-
     FRT_TRY
         if (TYPE(rdir) == T_ARRAY) {
             VALUE rdirs = rdir;
@@ -2170,7 +2166,6 @@ static VALUE frb_ir_init(VALUE self, VALUE rdir) {
                     case T_DATA:
                         if (CLASS_OF(rdir) == cIndexReader) {
                             TypedData_Get_Struct(rdir, FrtIndexReader, &frb_index_reader_t, sub_readers[i]);
-                            FRT_REF(sub_readers[i]);
                             continue;
                         } else if (RTEST(rb_obj_is_kind_of(rdir, cDirectory))) {
                             store = DATA_PTR(rdir);
@@ -2185,7 +2180,6 @@ static VALUE frb_ir_init(VALUE self, VALUE rdir) {
                     case T_STRING:
                         frb_create_dir(rdir);
                         store = frt_open_fs_store(rs2s(rdir));
-                        FRT_DEREF(store);
                         break;
                     default:
                         FRT_RAISE(FRT_ARG_ERROR, "%s isn't a valid directory "
@@ -2195,6 +2189,7 @@ static VALUE frb_ir_init(VALUE self, VALUE rdir) {
                         break;
                 }
                 sub_readers[i] = frt_ir_open(NULL, store);
+                FRT_DEREF(sub_readers[i]);
             }
             TypedData_Get_Struct(self, FrtIndexReader, &frb_index_reader_t, ir);
             ir = frt_mr_open(ir, sub_readers, reader_cnt);
@@ -2206,7 +2201,6 @@ static VALUE frb_ir_init(VALUE self, VALUE rdir) {
                 case T_STRING:
                     frb_create_dir(rdir);
                     store = frt_open_fs_store(rs2s(rdir));
-                    FRT_DEREF(store);
                     break;
                 default:
                     FRT_RAISE(FRT_ARG_ERROR, "%s isn't a valid directory argument. "

data/ext/isomorfeus_ferret_ext/frb_search.c

@@ -3606,7 +3606,6 @@ static VALUE frb_sea_init(VALUE self, VALUE obj) {
         frb_create_dir(obj);
         store = frt_open_fs_store(rs2s(obj));
         ir = frt_ir_open(NULL, store);
-        FRT_DEREF(store);
         ir->rir = TypedData_Wrap_Struct(cIndexReader, &frb_index_reader_t, ir);
     } else {
         // Check_Type(obj, T_DATA);
@@ -3616,14 +3615,12 @@ static VALUE frb_sea_init(VALUE self, VALUE obj) {
             ir->rir = TypedData_Wrap_Struct(cIndexReader, &frb_index_reader_t, ir);
         } else if (rb_obj_is_kind_of(obj, cIndexReader) == Qtrue) {
             TypedData_Get_Struct(obj, FrtIndexReader, &frb_index_reader_t, ir);
-            ir->rir = obj;
         } else {
             rb_raise(rb_eArgError, "Unknown type for argument to IndexSearcher.new");
         }
     }
     TypedData_Get_Struct(self, FrtSearcher, &frb_index_searcher_t, sea);
     frt_isea_init(sea, ir);
-    ((FrtIndexSearcher *)sea)->close_ir = false;
     sea->rsea = self;
     return self;
 }
@@ -3710,7 +3707,7 @@ static VALUE frb_ms_init(int argc, VALUE *argv, VALUE self) {
         }
     }
     TypedData_Get_Struct(self, FrtSearcher, &frb_multi_searcher_t, sea);
-    frt_msea_init(sea, searchers, top, false);
+    frt_msea_init(sea, searchers, top);
     sea->rsea = self;
     return self;
 }

data/ext/isomorfeus_ferret_ext/frb_store.c

@@ -185,10 +185,35 @@ static VALUE frb_lock_release(VALUE self) {
  *
  ****************************************************************************/
 
+/*** FrbStore ****************************************************************/
+
+static size_t frb_store_size(const void *p) {
+    return sizeof(FrtStore);
+    (void)p;
+}
+
 void frb_dir_free(void *p) {
-    FrtStore *store = (FrtStore *)p;
-    frb_unwrap_locks(store);
-    frt_store_deref(store);
+    frb_unwrap_locks((FrtStore *)p);
+    frt_store_close((FrtStore *)p);
+}
+
+const rb_data_type_t frb_store_t = {
+    .wrap_struct_name = "FrbStore",
+    .function = {
+        .dmark = NULL,
+        .dfree = frb_dir_free,
+        .dsize = frb_store_size,
+        .dcompact = NULL,
+        .reserved = {0},
+    },
+    .parent = NULL,
+    .data = NULL,
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static VALUE frb_store_alloc(VALUE rclass) {
+    FrtStore *st = frt_store_alloc();
+    return TypedData_Wrap_Struct(rclass, &frb_store_t, st);
 }
 
 /*
@@ -208,7 +233,7 @@ static VALUE frb_dir_close(VALUE self) {
         ((struct RData *)(self))->dmark = NULL;
         ((struct RData *)(self))->dfree = NULL;
         frb_unwrap_locks(store);
-        frt_store_deref(store);
+        frt_store_close(store);
     }
     return Qnil;
 }
@@ -308,32 +333,6 @@ static VALUE frb_dir_make_lock(VALUE self, VALUE rlock_name) {
     return rlock;
 }
 
-/*** FrbStore ****************************************************************/
-
-static size_t frb_store_size(const void *p) {
-    return sizeof(FrtStore);
-    (void)p;
-}
-
-const rb_data_type_t frb_store_t = {
-    .wrap_struct_name = "FrbStore",
-    .function = {
-        .dmark = NULL,
-        .dfree = frb_dir_free,
-        .dsize = frb_store_size,
-        .dcompact = NULL,
-        .reserved = {0},
-    },
-    .parent = NULL,
-    .data = NULL,
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY
-};
-
-static VALUE frb_store_alloc(VALUE rclass) {
-    FrtStore *st = frt_store_alloc();
-    return TypedData_Wrap_Struct(rclass, &frb_store_t, st);
-}
-
 /****************************************************************************
  *
  * RAMDirectory Methods
@@ -403,19 +402,18 @@ static VALUE frb_fsdir_new(int argc, VALUE *argv, VALUE klass) {
         frb_create_dir(rpath);
     }
     if (!rb_funcall(rb_cFile, id_is_directory, 1, rpath)) {
-        rb_raise(rb_eIOError, "No directory <%s> found. Use :create => true"
-                 " to create one.", rs2s(rpath));
+        rb_raise(rb_eIOError, "No directory <%s> found. Use :create => true to create one.", rs2s(rpath));
     }
     store = frt_open_fs_store(rs2s(rpath));
     if (create) store->clear_all(store);
-    if ((self = store->rstore) == Qnil) {
+    self = store->rstore;
+    if (self == Qnil || DATA_PTR(self) == NULL) {
         self = TypedData_Wrap_Struct(klass, &frb_store_t, store);
         store->rstore = self;
         rb_ivar_set(self, id_ref_cnt, INT2FIX(0));
     } else {
         int ref_cnt = FIX2INT(rb_ivar_get(self, id_ref_cnt)) + 1;
         rb_ivar_set(self, id_ref_cnt, INT2FIX(ref_cnt));
-        FRT_DEREF(store);
     }
     return self;
 }

data/ext/isomorfeus_ferret_ext/frt_analysis.c

@@ -133,7 +133,7 @@ FrtToken *frt_tk_new(void) {
 /*****************************************************************************/
 
 void frt_ts_deref(FrtTokenStream *ts) {
-    if (--ts->ref_cnt <= 0)
+    if (FRT_DEREF(ts) == 0)
         ts->destroy_i(ts);
 }
 
@@ -1089,7 +1089,7 @@ FrtTokenStream *frt_stem_filter_new(FrtTokenStream *sub_ts, const char *algorith
 /*****************************************************************************/
 
 void frt_a_deref(FrtAnalyzer *a) {
-    if (--a->ref_cnt <= 0)
+    if (FRT_DEREF(a) == 0)
         a->destroy_i(a);
 }
 

data/ext/isomorfeus_ferret_ext/frt_analysis.h

@@ -33,15 +33,15 @@ typedef struct FrtTokenStream FrtTokenStream;
 struct FrtTokenStream {
     char           *t;             /* ptr used to scan text */
     char           *text;
-    int             length;
+    int            length;
     rb_encoding    *encoding;
     FrtToken       *(*next)(FrtTokenStream *ts);
     FrtTokenStream *(*reset)(FrtTokenStream *ts, char *text, rb_encoding *encoding);
     FrtTokenStream *(*clone_i)(FrtTokenStream *ts);
     void           (*destroy_i)(FrtTokenStream *ts);
-    int             ref_cnt;
-    VALUE           rts;
-    FrtToken        token;
+    _Atomic unsigned int    ref_cnt;
+    VALUE          rts;
+    FrtToken       token;
 };
 
 extern FrtTokenStream *frt_ts_new_i(size_t size);
@@ -184,7 +184,7 @@ typedef struct FrtAnalyzer {
     FrtTokenStream *current_ts;
     FrtTokenStream *(*get_ts)(struct FrtAnalyzer *a, ID field, char *text, rb_encoding *encoding);
     void           (*destroy_i)(struct FrtAnalyzer *a);
-    int            ref_cnt;
+    _Atomic unsigned int    ref_cnt;
     VALUE          ranalyzer;
 } FrtAnalyzer;
 

data/ext/isomorfeus_ferret_ext/frt_bitvector.c

@@ -19,7 +19,7 @@ FrtBitVector *frt_bv_new(void) {
 }
 
 void frt_bv_destroy(FrtBitVector *bv) {
-    if (--(bv->ref_cnt) == 0) {
+    if (FRT_DEREF(bv) == 0) {
         free(bv->bits);
         free(bv);
     }

data/ext/isomorfeus_ferret_ext/frt_bitvector.h

@@ -24,7 +24,7 @@ typedef struct FrtBitVector {
     int curr_bit;
 
     bool extends_as_ones : 1;
-    int ref_cnt;
+    _Atomic unsigned int ref_cnt;
     VALUE rbv;
 } FrtBitVector;
 

data/ext/isomorfeus_ferret_ext/frt_compound_io.c

@@ -1,7 +1,7 @@
 #include "frt_index.h"
 #include "frt_array.h"
 
-extern void frt_store_destroy(FrtStore *store);
+extern void frt_store_close(FrtStore *store);
 extern FrtInStream *frt_is_new();
 extern FrtStore *frt_store_new();
 
@@ -16,45 +16,37 @@ typedef struct FileEntry {
     off_t length;
 } FileEntry;
 
-static void cmpd_touch(FrtStore *store, const char *file_name)
-{
+static void cmpd_touch(FrtStore *store, const char *file_name) {
     store->dir.cmpd->store->touch(store->dir.cmpd->store, file_name);
 }
 
-static int cmpd_exists(FrtStore *store, const char *file_name)
-{
+static int cmpd_exists(FrtStore *store, const char *file_name) {
     if (frt_h_get(store->dir.cmpd->entries, file_name) != NULL) {
         return true;
-    }
-    else {
+    } else {
         return false;
     }
 }
 
-static int cmpd_remove(FrtStore *store, const char *file_name)
-{
+static int cmpd_remove(FrtStore *store, const char *file_name) {
     (void)store;
     (void)file_name;
     FRT_RAISE(FRT_UNSUPPORTED_ERROR, "%s", FRT_UNSUPPORTED_ERROR_MSG);
     return 0;
 }
 
-static void cmpd_rename(FrtStore *store, const char *from, const char *to)
-{
+static void cmpd_rename(FrtStore *store, const char *from, const char *to) {
     (void)store;
     (void)from;
     (void)to;
     FRT_RAISE(FRT_UNSUPPORTED_ERROR, "%s", FRT_UNSUPPORTED_ERROR_MSG);
 }
 
-static int cmpd_count(FrtStore *store)
-{
+static int cmpd_count(FrtStore *store) {
     return store->dir.cmpd->entries->size;
 }
 
-static void cmpd_each(FrtStore *store,
-                     void (*func)(const char *fname, void *arg), void *arg)
-{
+static void cmpd_each(FrtStore *store, void (*func)(const char *fname, void *arg), void *arg) {
     FrtHash *ht = store->dir.cmpd->entries;
     int i;
     for (i = 0; i <= ht->mask; i++) {
@@ -65,15 +57,12 @@ static void cmpd_each(FrtStore *store,
     }
 }
 
-
-static void cmpd_clear(FrtStore *store)
-{
+static void cmpd_clear(FrtStore *store) {
     (void)store;
     FRT_RAISE(FRT_UNSUPPORTED_ERROR, "%s", FRT_UNSUPPORTED_ERROR_MSG);
 }
 
-static void cmpd_close_i(FrtStore *store)
-{
+static void cmpd_close_i(FrtStore *store) {
     FrtCompoundStore *cmpd = store->dir.cmpd;
     if (cmpd->stream == NULL) {
         FRT_RAISE(FRT_IO_ERROR, "Tried to close already closed compound store");
@@ -83,42 +72,37 @@ static void cmpd_close_i(FrtStore *store)
 
     frt_is_close(cmpd->stream);
     cmpd->stream = NULL;
+    frt_store_close(cmpd->store);
     free(store->dir.cmpd);
-    frt_store_destroy(store);
 }
 
-static off_t cmpd_length(FrtStore *store, const char *file_name)
-{
+static off_t cmpd_length(FrtStore *store, const char *file_name) {
     FileEntry *fe = (FileEntry *)frt_h_get(store->dir.cmpd->entries, file_name);
     if (fe != NULL) {
         return fe->length;
-    }
-    else {
+    } else {
         return 0;
     }
 }
 
-static void cmpdi_seek_i(FrtInStream *is, off_t pos)
-{
+static void cmpdi_seek_i(FrtInStream *is, off_t pos) {
     (void)is;
     (void)pos;
 }
 
-static void cmpdi_close_i(FrtInStream *is)
-{
+static void cmpdi_close_i(FrtInStream *is) {
+    frt_is_close(is->d.cis->sub);
     free(is->d.cis);
 }
 
-static off_t cmpdi_length_i(FrtInStream *is)
-{
+static off_t cmpdi_length_i(FrtInStream *is) {
     return (is->d.cis->length);
 }
 
 /*
  * raises: FRT_EOF_ERROR
  */
-static void cmpdi_read_i(FrtInStream *is, frt_uchar *b, int len)
-{
+static void cmpdi_read_i(FrtInStream *is, frt_uchar *b, int len) {
     FrtCompoundInStream *cis = is->d.cis;
     off_t start = frt_is_pos(is);
 
@@ -139,12 +123,12 @@ static const struct FrtInStreamMethods CMPD_IN_STREAM_METHODS = {
     cmpdi_close_i
 };
 
-static FrtInStream *cmpd_create_input(FrtInStream *sub_is, off_t offset, off_t length)
-{
+static FrtInStream *cmpd_create_input(FrtInStream *sub_is, off_t offset, off_t length) {
     FrtInStream *is = frt_is_new();
     FrtCompoundInStream *cis = FRT_ALLOC(FrtCompoundInStream);
 
     cis->sub = sub_is;
+    FRT_REF(sub_is);
     cis->offset = offset;
     cis->length = length;
     is->d.cis = cis;
@@ -153,8 +137,7 @@ static FrtInStream *cmpd_create_input(FrtInStream *sub_is, off_t offset, off_t l
     return is;
 }
 
-static FrtInStream *cmpd_open_input(FrtStore *store, const char *file_name)
-{
+static FrtInStream *cmpd_open_input(FrtStore *store, const char *file_name) {
     FileEntry *entry;
     FrtCompoundStore *cmpd = store->dir.cmpd;
     FrtInStream *is;
@@ -178,30 +161,26 @@ static FrtInStream *cmpd_open_input(FrtStore *store, const char *file_name)
     return is;
 }
 
-static FrtOutStream *cmpd_new_output(FrtStore *store, const char *file_name)
-{
+static FrtOutStream *cmpd_new_output(FrtStore *store, const char *file_name) {
     (void)store;
     (void)file_name;
     FRT_RAISE(FRT_UNSUPPORTED_ERROR, "%s", FRT_UNSUPPORTED_ERROR_MSG);
     return NULL;
 }
 
-static FrtLock *cmpd_open_lock_i(FrtStore *store, const char *lock_name)
-{
+static FrtLock *cmpd_open_lock_i(FrtStore *store, const char *lock_name) {
     (void)store;
     (void)lock_name;
     FRT_RAISE(FRT_UNSUPPORTED_ERROR, "%s", FRT_UNSUPPORTED_ERROR_MSG);
     return NULL;
 }
 
-static void cmpd_close_lock_i(FrtLock *lock)
-{
+static void cmpd_close_lock_i(FrtLock *lock) {
     (void)lock;
     FRT_RAISE(FRT_UNSUPPORTED_ERROR, "%s", FRT_UNSUPPORTED_ERROR_MSG);
 }
 
-FrtStore *frt_open_cmpd_store(FrtStore *store, const char *name)
-{
+FrtStore *frt_open_cmpd_store(FrtStore *store, const char *name) {
     int count, i;
     off_t offset;
     char *fname;
@@ -214,6 +193,7 @@ FrtStore *frt_open_cmpd_store(FrtStore *store, const char *name)
         cmpd = FRT_ALLOC_AND_ZERO(FrtCompoundStore);
 
         cmpd->store       = store;
+        FRT_REF(store);
         cmpd->name        = name;
         cmpd->entries     = frt_h_new_str(&free, &free);
         is = cmpd->stream = store->open_input(store, cmpd->name);
@@ -235,6 +215,7 @@ FrtStore *frt_open_cmpd_store(FrtStore *store, const char *name)
             frt_h_set(cmpd->entries, fname, entry);
         }
     FRT_XCATCHALL
+        frt_store_close(store);
         if (is) frt_is_close(is);
         if (cmpd->entries) frt_h_destroy(cmpd->entries);
         free(cmpd);
@@ -270,18 +251,17 @@ FrtStore *frt_open_cmpd_store(FrtStore *store, const char *name)
  *
  ****************************************************************************/
 
-FrtCompoundWriter *frt_open_cw(FrtStore *store, char *name)
-{
+FrtCompoundWriter *frt_open_cw(FrtStore *store, char *name) {
     FrtCompoundWriter *cw = FRT_ALLOC(FrtCompoundWriter);
     cw->store = store;
+    FRT_REF(store);
     cw->name = name;
     cw->ids = frt_hs_new_str(&free);
     cw->file_entries = frt_ary_new_type_capa(FrtCWFileEntry, FRT_CW_INIT_CAPA);
     return cw;
 }
 
-void frt_cw_add_file(FrtCompoundWriter *cw, char *id)
-{
+void frt_cw_add_file(FrtCompoundWriter *cw, char *id) {
     id = frt_estrdup(id);
     if (frt_hs_add(cw->ids, id) != FRT_HASH_KEY_DOES_NOT_EXIST) {
         FRT_RAISE(FRT_IO_ERROR, "Tried to add file \"%s\" which has already been "
@@ -292,8 +272,7 @@ void frt_cw_add_file(FrtCompoundWriter *cw, char *id)
     frt_ary_last(cw->file_entries).name = id;
 }
 
-static void cw_copy_file(FrtCompoundWriter *cw, FrtCWFileEntry *src, FrtOutStream *os)
-{
+static void cw_copy_file(FrtCompoundWriter *cw, FrtCWFileEntry *src, FrtOutStream *os) {
     off_t start_ptr = frt_os_pos(os);
     off_t end_ptr;
     off_t remainder, length, len;
@@ -329,8 +308,7 @@ static void cw_copy_file(FrtCompoundWriter *cw, FrtCWFileEntry *src, FrtOutStrea
     frt_is_close(is);
 }
 
-void frt_cw_close(FrtCompoundWriter *cw, FrtDeleter *dlr)
-{
+void frt_cw_close(FrtCompoundWriter *cw, FrtDeleter *dlr) {
     FrtOutStream *os = NULL;
     int i;
 
@@ -366,12 +344,9 @@ void frt_cw_close(FrtCompoundWriter *cw, FrtDeleter *dlr)
         frt_os_seek(os, cw->file_entries[i].dir_offset);
         frt_os_write_u64(os, cw->file_entries[i].data_offset);
     }
-
-    if (os) {
-        frt_os_close(os);
-    }
-
+    frt_os_close(os);
     frt_hs_destroy(cw->ids);
     frt_ary_free(cw->file_entries);
+    frt_store_close(cw->store);
     free(cw);
 }

data/ext/isomorfeus_ferret_ext/frt_except.c

@@ -33,6 +33,7 @@ static frt_thread_once_t exception_stack_key_once = FRT_THREAD_ONCE_INIT;
 
 static void exception_stack_alloc(void) {
     frt_thread_key_create(&exception_stack_key, NULL);
+    frt_thread_setspecific(exception_stack_key, NULL);
 }
 
 void frt_xpush_context(frt_xcontext_t *context) {

data/ext/isomorfeus_ferret_ext/frt_filter.c

@@ -14,9 +14,7 @@ void frt_filt_destroy_i(FrtFilter *filt) {
 }
 
 void frt_filt_deref(FrtFilter *filt) {
-    if (--(filt->ref_cnt) == 0) {
-        filt->destroy_i(filt);
-    }
+    if (FRT_DEREF(filt) == 0) filt->destroy_i(filt);
 }
 
 FrtBitVector *frt_filt_get_bv(FrtFilter *filt, FrtIndexReader *ir) {
@@ -97,7 +95,7 @@ static FrtBitVector *qfilt_get_bv_i(FrtFilter *filt, FrtIndexReader *ir) {
         scorer->destroy(scorer);
     }
     weight->destroy(weight);
-    free(sea);
+    frt_searcher_close(sea);
     return bv;
 }