isomorfeus-ferret 0.13.8 → 0.13.9

data/ext/isomorfeus_ferret_ext/frt_store.h

@@ -51,11 +51,11 @@ struct FrtOutStreamMethods {
 
 typedef struct FrtRAMFile
 {
-    char   *name;
-    frt_uchar **buffers;
-    int     bufcnt;
-    off_t   len;
-    int     ref_cnt;
+    char        *name;
+    frt_uchar   **buffers;
+    int         bufcnt;
+    off_t       len;
+    _Atomic unsigned int ref_cnt;
 } FrtRAMFile;
 
 struct FrtOutStream
@@ -114,21 +114,23 @@ struct FrtInStreamMethods
     void (*close_i)(struct FrtInStream *is);
 };
 
-struct FrtInStream
-{
-    FrtBuffer buf;
-    union
-    {
+typedef struct FrtInStreamFile {
+    _Atomic unsigned int ref_cnt;
+    union {
         int fd;
         FrtRAMFile *rf;
     } file;
-    union
-    {
+} FrtInStreamFile;
+
+struct FrtInStream {
+    FrtBuffer buf;
+    struct FrtInStreamFile *f;
+    union {
         off_t pointer;          /* only used by RAMIn */
         char *path;             /* only used by FSIn */
         FrtCompoundInStream *cis;
     } d;
-    int *ref_cnt_ptr;
+    _Atomic unsigned int ref_cnt;
     const struct FrtInStreamMethods *m;
 };
 
@@ -161,24 +163,21 @@ typedef struct FrtCompoundStore
     FrtInStream *stream;
 } FrtCompoundStore;
 
-struct FrtStore
-{
-    int ref_cnt;                /* for fs_store only */
+struct FrtStore {
+    _Atomic unsigned int ref_cnt;
     frt_mutex_t mutex_i;        /* for internal use only */
     frt_mutex_t mutex;          /* external mutex for use outside */
-    union
-    {
-        char *path;             /* for fs_store only */
-        FrtHash *ht;            /* for ram_store only */
+    union {
+        char             *path; /* for fs_store only */
+        FrtHash          *ht;   /* for ram_store only */
         FrtCompoundStore *cmpd; /* for compound_store only */
     } dir;
-
 #if defined POSH_OS_WIN32 || defined POSH_OS_WIN64
-    int file_mode;
+    int         file_mode;
 #else
-    mode_t file_mode;
+    mode_t      file_mode;
 #endif
-    FrtHashSet *locks;
+    FrtHashSet  *locks;
 
     /**
      * Create the file +filename+ in the +store+.
@@ -443,7 +442,7 @@ extern void frt_with_lock_name(FrtStore *store, const char *lock_name, void (*fu
  *
  * @param store the store to be dereferenced
  */
-extern void frt_store_deref(FrtStore *store);
+extern void frt_store_close(FrtStore *store);
 
 /**
  * Flush the buffered contents of the FrtOutStream to the store.
@@ -788,7 +787,6 @@ extern void frt_close_lock(FrtLock *lock);
 extern FrtStore *frt_store_alloc();
 extern FrtStore *frt_store_init(FrtStore *store);
 extern FrtStore *frt_store_new();
-extern void frt_store_destroy(FrtStore *store);
 extern FrtOutStream *frt_os_new();
 extern FrtInStream *frt_is_new();
 extern int frt_file_is_lock(const char *filename);

data/ext/isomorfeus_ferret_ext/frt_threading.h

@@ -4,8 +4,15 @@
 #include <pthread.h>
 
 typedef pthread_mutex_t frt_mutex_t;
-typedef pthread_key_t frt_thread_key_t;
+typedef struct FrtHash *frt_thread_key_t;
 typedef pthread_once_t frt_thread_once_t;
+
+// extern void frb_thread_once(int *once_control, void (*init_routine) (void));
+extern int frb_thread_key_create(frt_thread_key_t *key, void (*destr_function)(void *));
+extern void frb_thread_key_delete(frt_thread_key_t key);
+extern void frb_thread_setspecific(frt_thread_key_t key, const void *pointer);
+extern void *frb_thread_getspecific(frt_thread_key_t key);
+
 #define FRT_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
 #define FRT_THREAD_ONCE_INIT PTHREAD_ONCE_INIT
 #define frt_mutex_init(a, b) pthread_mutex_init(a, b)
@@ -13,10 +20,10 @@ typedef pthread_once_t frt_thread_once_t;
 #define frt_mutex_trylock(a) pthread_mutex_trylock(a)
 #define frt_mutex_unlock(a) pthread_mutex_unlock(a)
 #define frt_mutex_destroy(a) pthread_mutex_destroy(a)
-#define frt_thread_key_create(a, b) pthread_key_create(a, b)
-#define frt_thread_key_delete(a) pthread_key_delete(a)
-#define frt_thread_setspecific(a, b) pthread_setspecific(a, b)
-#define frt_thread_getspecific(a) pthread_getspecific(a)
+#define frt_thread_key_create(a, b) frb_thread_key_create(a, b)
+#define frt_thread_key_delete(a) frb_thread_key_delete(a)
+#define frt_thread_setspecific(a, b) frb_thread_setspecific(a, b)
+#define frt_thread_getspecific(a) frb_thread_getspecific(a)
 #define frt_thread_once(a, b) pthread_once(a, b)
 
 #endif

data/ext/isomorfeus_ferret_ext/isomorfeus_ferret.c

@@ -46,8 +46,8 @@ VALUE cStateError;
 void Init_Benchmark(void);
 void Init_Test(void);
 
-unsigned long long value_hash(const void *key) {
-    return (unsigned long long)key;
+unsigned long value_hash(const void *key) {
+    return (unsigned long)key;
 }
 
 int value_eq(const void *key1, const void *key2) {
@@ -61,8 +61,9 @@ void frb_thread_once(int *once_control, void (*init_routine) (void)) {
     }
 }
 
-void frb_thread_key_create(frt_thread_key_t *key, void (*destr_function)(void *)) {
+int frb_thread_key_create(frt_thread_key_t *key, void (*destr_function)(void *)) {
     *key = frt_h_new(&value_hash, &value_eq, NULL, destr_function);
+    return 0;
 }
 
 void frb_thread_key_delete(frt_thread_key_t key) {

data/ext/isomorfeus_ferret_ext/test_1710.c

@@ -55,8 +55,7 @@ TestSuite *ts_1710(TestSuite *suite)
 
     tst_run_test(suite, test_problem_text, store);
 
-    frt_store_deref(store);
+    frt_store_close(store);
 
     return suite;
 }
-

data/ext/isomorfeus_ferret_ext/test_compound_io.c

@@ -29,7 +29,7 @@ void test_compound_reader(TestCase *tc, void *data)
     Asequal("this is file 2", p = frt_is_read_string(is2)); free(p);
     frt_is_close(is1);
     frt_is_close(is2);
-    frt_store_deref(c_reader);
+    frt_store_close(c_reader);
 }
 
 void test_compound_writer(TestCase *tc, void *data)
@@ -42,12 +42,12 @@ void test_compound_writer(TestCase *tc, void *data)
     FrtInStream *is;
 
     frt_os_write_u32(os1, 20);
-    frt_os_write_string(os2,"this is file2");
+    frt_os_write_string(os2, "this is file2");
     frt_os_close(os1);
     frt_os_close(os2);
-    cw = frt_open_cw(store, (char *)"cfile");
-    frt_cw_add_file(cw, (char *)"file1");
-    frt_cw_add_file(cw, (char *)"file2");
+    cw = frt_open_cw(store, "cfile");
+    frt_cw_add_file(cw, "file1");
+    frt_cw_add_file(cw, "file2");
     frt_cw_close(cw, NULL);
 
     is = store->open_input(store, "cfile");
@@ -109,7 +109,7 @@ void test_compound_io(TestCase *tc, void *data)
     Asequal(short_string, p = frt_is_read_string(is3)); free(p);
     frt_is_close(is3);
 
-    frt_store_deref(c_reader);
+    frt_store_close(c_reader);
 }
 
 #define MAX_TEST_WORDS 50
@@ -150,7 +150,7 @@ void test_compound_io_many_files(TestCase *tc, void *data)
         Aiequal(frt_is_length(is), frt_is_pos(is));
         frt_is_close(is);
     }
-    frt_store_deref(c_reader);
+    frt_store_close(c_reader);
 }
 
 TestSuite *ts_compound_io(TestSuite *suite)
@@ -164,7 +164,7 @@ TestSuite *ts_compound_io(TestSuite *suite)
     tst_run_test(suite, test_compound_io, store);
     tst_run_test(suite, test_compound_io_many_files, store);
 
-    frt_store_deref(store);
+    frt_store_close(store);
 
     return suite;
 }

data/ext/isomorfeus_ferret_ext/test_fields.c

@@ -190,7 +190,7 @@ static void test_fis_rw(TestCase *tc, void *data)
     is = store->open_input(store, "fields");
     fis = frt_fis_read(is);
     frt_is_close(is);
-    Aiequal(FRT_STORE_YES, fis->store);
+    Aiequal(FRT_STORE_YES, fis->store_val);
     Aiequal(FRT_INDEX_UNTOKENIZED_OMIT_NORMS, fis->index);
     Aiequal(FRT_TERM_VECTOR_WITH_POSITIONS_OFFSETS, fis->term_vector);
 
@@ -247,7 +247,7 @@ static void test_fis_rw(TestCase *tc, void *data)
             "    term_vector: :with_positions_offsets\n", str);
     free(str);
     frt_fis_deref(fis);
-    frt_store_deref(store);
+    frt_store_close(store);
 }
 
 /****************************************************************************
@@ -373,8 +373,8 @@ static void test_fields_rw_single(TestCase *tc, void *data)
     check_df_data(df, 4, "go");
 
     free(bin_data);
-    frt_store_deref(store);
-   frt_doc_destroy(doc);
+    frt_store_close(store);
+    frt_doc_destroy(doc);
     frt_fis_deref(fis);
 }
 
@@ -453,8 +453,8 @@ static void test_fields_rw_multi(TestCase *tc, void *data)
     check_df_data(df, 4, "go");
 
     free(bin_data);
-    frt_store_deref(store);
-   frt_doc_destroy(doc);
+    frt_store_close(store);
+    frt_doc_destroy(doc);
     frt_fis_deref(fis);
 }
 
@@ -490,7 +490,7 @@ static void test_lazy_field_loading(TestCase *tc, void *data)
     lazy_doc = frt_fr_get_lazy_doc(fr, 0);
     frt_fr_close(fr);
     frt_fis_deref(fis);
-    frt_store_deref(store);
+    frt_store_close(store);
 
     lazy_df = frt_lazy_doc_get(lazy_doc, rb_intern("stored"));
     Apnull(lazy_doc->fields[0]->data[0].text);

data/ext/isomorfeus_ferret_ext/test_file_deleter.c

@@ -163,6 +163,6 @@ TestSuite *ts_file_deleter(TestSuite *suite)
 
     tst_run_test(suite, test_delete_leftover_files, store);
 
-    frt_store_deref(store);
+    frt_store_close(store);
     return suite;
 }

data/ext/isomorfeus_ferret_ext/test_filter.c

@@ -50,7 +50,7 @@ void prepare_filter_index(FrtStore *store)
         frt_doc_add_field(doc, frt_df_add_data(frt_df_new(date), (char *)data[i].date, enc));
         frt_doc_add_field(doc, frt_df_add_data(frt_df_new(flipflop), (char *)data[i].flipflop, enc));
         frt_iw_add_doc(iw, doc);
-       frt_doc_destroy(doc);
+        frt_doc_destroy(doc);
     }
     frt_iw_close(iw);
     return;
@@ -328,7 +328,8 @@ TestSuite *ts_filter(TestSuite *suite)
     tst_run_test(suite, test_filter_func, searcher);
     tst_run_test(suite, test_score_altering_filter_func, searcher);
 
-    frt_store_deref(store);
-    searcher->close(searcher);
+    frt_searcher_close(searcher);
+    frt_ir_close(ir);
+    frt_store_close(store);
     return suite;
 }

data/ext/isomorfeus_ferret_ext/test_fs_store.c

@@ -19,7 +19,7 @@ TestSuite *ts_fs_store(TestSuite *suite)
 
     create_test_store_suite(suite, store);
 
-    frt_store_deref(store);
+    frt_store_close(store);
 
     return suite;
 }

data/ext/isomorfeus_ferret_ext/test_highlighter.c

@@ -120,6 +120,7 @@ static void check_searcher_match_vector(TestCase *tc, FrtStore *store, FrtQuery
     }
     frt_matchv_destroy(mv);
     frt_searcher_close(sea);
+    frt_ir_close(ir);
 }
 
 #define Chk_mv(query, doc_num, expected) check_match_vector(tc, store, query, doc_num, expected)
@@ -529,6 +530,7 @@ static void test_searcher_highlight(TestCase *tc, void *data)
     frt_q_deref(q);
 
     frt_searcher_close(sea);
+    frt_ir_close(ir);
 }
 
 TestSuite *ts_highlighter(TestSuite *suite)
@@ -547,6 +549,6 @@ TestSuite *ts_highlighter(TestSuite *suite)
     tst_run_test(suite, test_searcher_get_match_vector, store);
     tst_run_test(suite, test_searcher_highlight, store);
 
-    frt_store_deref(store);
+    frt_store_close(store);
     return suite;
 }

data/ext/isomorfeus_ferret_ext/test_index.c

@@ -539,7 +539,7 @@ static void prep_test_1seg_index(FrtStore *store, FrtDocument **docs,
 
     frt_dw_close(dw);
     frt_iw_close(iw);
-    frt_si_deref(si);
+    frt_si_close(si);
 }
 
 /****************************************************************************
@@ -725,7 +725,7 @@ static void test_segment_tde_deleted_docs(TestCase *tc, void *data)
     frt_is_close(prx_in);
     frt_tir_close(tir);
     frt_sfi_close(sfi);
-    frt_si_deref(si);
+    frt_si_close(si);
 }
 
 /****************************************************************************
@@ -984,7 +984,7 @@ static void test_create_with_reader(TestCase *tc, void *data)
     frt_ir_close(ir);
     frt_ir_close(ir2);
     store->clear_all(store);
-    frt_store_deref(store);
+    frt_store_close(store);
    frt_doc_destroy(doc);
 }
 
@@ -1312,7 +1312,7 @@ static void reader_test_env_destroy(ReaderTestEnvironment *rte)
 {
     int i;
     for (i = 0; i < rte->store_cnt; i++) {
-        frt_store_deref(rte->stores[i]);
+        frt_store_close(rte->stores[i]);
     }
     free(rte->stores);
     free(rte);
@@ -1328,6 +1328,7 @@ static FrtIndexReader *reader_test_env_ir_open(ReaderTestEnvironment *rte)
         int i;
         for (i = 0; i < rte->store_cnt; i++) {
             sub_readers[i] = frt_ir_open(NULL, rte->stores[i]);
+            FRT_DEREF(sub_readers[i]);
         }
         return (frt_mr_open(NULL, sub_readers, rte->store_cnt));
     }
@@ -1413,7 +1414,7 @@ static ReaderTestEnvironment *reader_test_env_new(int type)
         frt_iw_close(iw);
         for (i = 0; i < rte->store_cnt; i++) {
             frt_ir_close(readers[i]);
-            frt_store_deref(rte->stores[i]);
+            frt_store_close(rte->stores[i]);
         }
         free(readers);
         rte->stores[0] = store;
@@ -1473,7 +1474,6 @@ static void test_ir_open_empty_index(TestCase *tc, void *data)
 static void test_ir_basic_ops(TestCase *tc, void *data)
 {
     FrtIndexReader *ir = (FrtIndexReader *)data;
-
     Aiequal(IR_TEST_DOC_CNT, ir->num_docs(ir));
     Aiequal(IR_TEST_DOC_CNT, ir->max_doc(ir));
 
@@ -1684,55 +1684,55 @@ static void test_ir_term_doc_enum(TestCase *tc, void *data)
 static void test_ir_term_vectors(TestCase *tc, void *data)
 {
     FrtIndexReader *ir = (FrtIndexReader *)data;
-
-    FrtTermVector *tv = ir->term_vector(ir, 3, rb_intern("body"));
     FrtHash *tvs;
-
-    Asequal("body", rb_id2name(tv->field));
-    Aiequal(4, tv->term_cnt);
-    Asequal("word1", tv->terms[0].text);
-    Asequal("word2", tv->terms[1].text);
-    Asequal("word3", tv->terms[2].text);
-    Asequal("word4", tv->terms[3].text);
-    Aiequal(3, tv->terms[0].freq);
-    Aiequal(2, tv->terms[0].positions[0]);
-    Aiequal(4, tv->terms[0].positions[1]);
-    Aiequal(7, tv->terms[0].positions[2]);
-    Aiequal(12, tv->offsets[tv->terms[0].positions[0]].start);
-    Aiequal(17, tv->offsets[tv->terms[0].positions[0]].end);
-    Aiequal(24, tv->offsets[tv->terms[0].positions[1]].start);
-    Aiequal(29, tv->offsets[tv->terms[0].positions[1]].end);
-    Aiequal(42, tv->offsets[tv->terms[0].positions[2]].start);
-    Aiequal(47, tv->offsets[tv->terms[0].positions[2]].end);
-
-    Aiequal(1, tv->terms[1].freq);
-    Aiequal(3, tv->terms[1].positions[0]);
-    Aiequal(18, tv->offsets[tv->terms[1].positions[0]].start);
-    Aiequal(23, tv->offsets[tv->terms[1].positions[0]].end);
-
-    Aiequal(4, tv->terms[2].freq);
-    Aiequal(0, tv->terms[2].positions[0]);
-    Aiequal(5, tv->terms[2].positions[1]);
-    Aiequal(8, tv->terms[2].positions[2]);
-    Aiequal(9, tv->terms[2].positions[3]);
-    Aiequal(0, tv->offsets[tv->terms[2].positions[0]].start);
-    Aiequal(5, tv->offsets[tv->terms[2].positions[0]].end);
-    Aiequal(30, tv->offsets[tv->terms[2].positions[1]].start);
-    Aiequal(35, tv->offsets[tv->terms[2].positions[1]].end);
-    Aiequal(48, tv->offsets[tv->terms[2].positions[2]].start);
-    Aiequal(53, tv->offsets[tv->terms[2].positions[2]].end);
-    Aiequal(54, tv->offsets[tv->terms[2].positions[3]].start);
-    Aiequal(59, tv->offsets[tv->terms[2].positions[3]].end);
-
-    Aiequal(2, tv->terms[3].freq);
-    Aiequal(1, tv->terms[3].positions[0]);
-    Aiequal(6, tv->terms[3].positions[1]);
-    Aiequal(6, tv->offsets[tv->terms[3].positions[0]].start);
-    Aiequal(11, tv->offsets[tv->terms[3].positions[0]].end);
-    Aiequal(36, tv->offsets[tv->terms[3].positions[1]].start);
-    Aiequal(41, tv->offsets[tv->terms[3].positions[1]].end);
-
-    frt_tv_destroy(tv);
+    FrtTermVector *tv = ir->term_vector(ir, 3, rb_intern("body"));
+    if (Apnotnull(tv)) {
+        Asequal("body", rb_id2name(tv->field));
+        Aiequal(4, tv->term_cnt);
+        Asequal("word1", tv->terms[0].text);
+        Asequal("word2", tv->terms[1].text);
+        Asequal("word3", tv->terms[2].text);
+        Asequal("word4", tv->terms[3].text);
+        Aiequal(3, tv->terms[0].freq);
+        Aiequal(2, tv->terms[0].positions[0]);
+        Aiequal(4, tv->terms[0].positions[1]);
+        Aiequal(7, tv->terms[0].positions[2]);
+        Aiequal(12, tv->offsets[tv->terms[0].positions[0]].start);
+        Aiequal(17, tv->offsets[tv->terms[0].positions[0]].end);
+        Aiequal(24, tv->offsets[tv->terms[0].positions[1]].start);
+        Aiequal(29, tv->offsets[tv->terms[0].positions[1]].end);
+        Aiequal(42, tv->offsets[tv->terms[0].positions[2]].start);
+        Aiequal(47, tv->offsets[tv->terms[0].positions[2]].end);
+
+        Aiequal(1, tv->terms[1].freq);
+        Aiequal(3, tv->terms[1].positions[0]);
+        Aiequal(18, tv->offsets[tv->terms[1].positions[0]].start);
+        Aiequal(23, tv->offsets[tv->terms[1].positions[0]].end);
+
+        Aiequal(4, tv->terms[2].freq);
+        Aiequal(0, tv->terms[2].positions[0]);
+        Aiequal(5, tv->terms[2].positions[1]);
+        Aiequal(8, tv->terms[2].positions[2]);
+        Aiequal(9, tv->terms[2].positions[3]);
+        Aiequal(0, tv->offsets[tv->terms[2].positions[0]].start);
+        Aiequal(5, tv->offsets[tv->terms[2].positions[0]].end);
+        Aiequal(30, tv->offsets[tv->terms[2].positions[1]].start);
+        Aiequal(35, tv->offsets[tv->terms[2].positions[1]].end);
+        Aiequal(48, tv->offsets[tv->terms[2].positions[2]].start);
+        Aiequal(53, tv->offsets[tv->terms[2].positions[2]].end);
+        Aiequal(54, tv->offsets[tv->terms[2].positions[3]].start);
+        Aiequal(59, tv->offsets[tv->terms[2].positions[3]].end);
+
+        Aiequal(2, tv->terms[3].freq);
+        Aiequal(1, tv->terms[3].positions[0]);
+        Aiequal(6, tv->terms[3].positions[1]);
+        Aiequal(6, tv->offsets[tv->terms[3].positions[0]].start);
+        Aiequal(11, tv->offsets[tv->terms[3].positions[0]].end);
+        Aiequal(36, tv->offsets[tv->terms[3].positions[1]].start);
+        Aiequal(41, tv->offsets[tv->terms[3].positions[1]].end);
+
+        frt_tv_destroy(tv);
+    }
 
     tvs = ir->term_vectors(ir, 3);
     Aiequal(3, tvs->size);
@@ -2103,7 +2103,7 @@ static void test_ir_delete(TestCase *tc, void *data)
     frt_ir_close(ir);
     frt_ir_close(ir2);
     reader_test_env_destroy(rte);
-    frt_store_deref(store);
+    frt_store_close(store);
 }
 
 static void test_ir_read_while_optimizing(TestCase *tc, void *data)
@@ -2167,7 +2167,7 @@ static void test_ir_multivalue_fields(TestCase *tc, void *data)
     Aiequal(true, fi_store_offsets(fi));
     Aiequal(true, fi_store_positions(fi));
 
-   frt_doc_destroy(doc);
+    frt_doc_destroy(doc);
     frt_iw_close(iw);
 
     ir = frt_ir_open(NULL, store);
@@ -2193,7 +2193,7 @@ static void test_ir_multivalue_fields(TestCase *tc, void *data)
     Aiequal(1, df->size);
     Asequal(author_text, df->data[0]);
 
-   frt_doc_destroy(doc);
+    frt_doc_destroy(doc);
     frt_ir_delete_doc(ir, 0);
     frt_ir_close(ir);
 }
@@ -2324,10 +2324,10 @@ TestSuite *ts_index(TestSuite *suite)
     fs_store = frt_open_fs_store(TEST_DIR);
     tst_run_test_with_name(suite, test_ir_read_while_optimizing, fs_store, "test_ir_read_while_optimizing_on_disk");
     fs_store->clear_all(fs_store);
-    frt_store_deref(fs_store);
+    frt_store_close(fs_store);
 
     tst_run_test(suite, test_ir_multivalue_fields, store);
 
-    frt_store_deref(store);
+    frt_store_close(store);
     return suite;
 }

data/ext/isomorfeus_ferret_ext/test_q_const_score.c

@@ -80,7 +80,8 @@ TestSuite *ts_q_const_score(TestSuite *suite)
     tst_run_test(suite, test_const_score_query, (void *)searcher);
     tst_run_test(suite, test_const_score_query_hash, NULL);
 
-    frt_store_deref(store);
     frt_searcher_close(searcher);
+    frt_ir_close(ir);
+    frt_store_close(store);
     return suite;
 }

data/ext/isomorfeus_ferret_ext/test_q_filtered.c

@@ -57,7 +57,8 @@ TestSuite *ts_q_filtered(TestSuite *suite)
 
     tst_run_test(suite, test_filtered_query, (void *)searcher);
 
-    frt_store_deref(store);
-    searcher->close(searcher);
+    frt_searcher_close(searcher);
+    frt_ir_close(ir);
+    frt_store_close(store);
     return suite;
 }

data/ext/isomorfeus_ferret_ext/test_q_fuzzy.c

@@ -110,6 +110,7 @@ static void test_fuzziness(TestCase *tc, void *data)
     frt_td_destroy(top_docs);
 
     frt_searcher_close(sea);
+    frt_ir_close(ir);
 }
 
 static void test_fuzziness_long(TestCase *tc, void *data)
@@ -165,6 +166,7 @@ static void test_fuzziness_long(TestCase *tc, void *data)
     frt_td_destroy(top_docs);
 
     frt_searcher_close(sea);
+    frt_ir_close(ir);
 }
 
 /**
@@ -239,6 +241,6 @@ TestSuite *ts_q_fuzzy(TestSuite *suite)
     tst_run_test(suite, test_fuzzy_query_hash, (void *)store);
     tst_run_test(suite, test_fuzzy_query_to_s, (void *)store);
 
-    frt_store_deref(store);
+    frt_store_close(store);
     return suite;
 }

data/ext/isomorfeus_ferret_ext/test_q_span.c

@@ -100,6 +100,7 @@ static void test_span_term(TestCase *tc, void *data)
     frt_q_deref(tq);
 
     frt_searcher_close(sea);
+    frt_ir_close(ir);
 }
 
 static void test_span_term_hash(TestCase *tc, void *data)
@@ -169,6 +170,7 @@ static void test_span_multi_term(TestCase *tc, void *data)
     frt_q_deref(mtq);
 
     frt_searcher_close(sea);
+    frt_ir_close(ir);
 }
 
 static void test_span_multi_term_hash(TestCase *tc, void *data)
@@ -230,6 +232,7 @@ static void test_span_prefix(TestCase *tc, void *data)
     frt_q_deref(prq);
 
     frt_searcher_close(sea);
+    frt_ir_close(ir);
 }
 
 static void test_span_prefix_hash(TestCase *tc, void *data)
@@ -279,6 +282,7 @@ static void test_span_first(TestCase *tc, void *data)
     frt_q_deref(q);
 
     frt_searcher_close(sea);
+    frt_ir_close(ir);
 }
 
 static void test_span_first_hash(TestCase *tc, void *data)
@@ -327,6 +331,7 @@ static void test_span_or(TestCase *tc, void *data)
     TEST_SE(q, ir, "SpanOrEnum(span_or[span_terms(field:flip),span_terms(field:flop)])@START");
     frt_q_deref(q);
     frt_searcher_close(sea);
+    frt_ir_close(ir);
 }
 
 static void test_span_or_hash(TestCase *tc, void *data)
@@ -407,6 +412,7 @@ static void test_span_near(TestCase *tc, void *data)
     frt_q_deref(q);
 
     frt_searcher_close(sea);
+    frt_ir_close(ir);
 }
 
 static void test_span_near_hash(TestCase *tc, void *data)
@@ -514,6 +520,7 @@ static void test_span_not(TestCase *tc, void *data)
     frt_q_deref(q);
 
     frt_searcher_close(sea);
+    frt_ir_close(ir);
 }
 
 static void test_span_not_hash(TestCase *tc, void *data)
@@ -573,6 +580,6 @@ TestSuite *ts_q_span(TestSuite *suite)
     tst_run_test(suite, test_span_near_hash, NULL);
     tst_run_test(suite, test_span_not, (void *)store);
     tst_run_test(suite, test_span_not_hash, NULL);
-    frt_store_deref(store);
+    frt_store_close(store);
     return suite;
 }

data/ext/isomorfeus_ferret_ext/test_ram_store.c

@@ -42,7 +42,7 @@ void test_write_to(TestCase *tc, void *data)
     frt_is_close(istream);
 
     Aiequal(17021, fs_store->length(fs_store, "_rw_funny_string.cfs"));
-    frt_store_deref(ram_store);
+    frt_store_close(ram_store);
     ram_store = frt_open_ram_store_and_copy(NULL, fs_store, false);
 
     istream = ram_store->open_input(ram_store, "_rw_funny_string.cfs");
@@ -54,8 +54,8 @@ void test_write_to(TestCase *tc, void *data)
     Aiequal(17021, ram_store->length(ram_store, "_rw_funny_string.cfs"));
 
     fs_store->clear_all(fs_store);
-    frt_store_deref(fs_store);
-    frt_store_deref(ram_store);
+    frt_store_close(fs_store);
+    frt_store_close(ram_store);
 }
 
 /**
@@ -71,7 +71,7 @@ TestSuite *ts_ram_store(TestSuite *suite)
 
     tst_run_test(suite, test_write_to, NULL);
 
-    frt_store_deref(store);
+    frt_store_close(store);
 
     return suite;
 }