isomorfeus-ferret 0.13.7 → 0.13.10

data/ext/isomorfeus_ferret_ext/frt_store.c

@@ -28,17 +28,6 @@ void frt_with_lock_name(FrtStore *store, const char *lock_name, void (*func)(voi
     store->close_lock_i(lock);
 }
 
-void frt_store_deref(FrtStore *store)
-{
-    frt_mutex_lock(&store->mutex_i);
-    if (--store->ref_cnt <= 0) {
-        store->close_i(store);
-    }
-    else {
-        frt_mutex_unlock(&store->mutex_i);
-    }
-}
-
 FrtLock *frt_open_lock(FrtStore *store, const char *lockname)
 {
     FrtLock *lock = store->open_lock_i(store, lockname);
@@ -78,16 +67,25 @@ FrtStore *frt_store_new(void) {
 }
 
 /**
- * Destroy the store freeing allocated resources
+ * close the store freeing allocated resources
  *
  * @param store the store struct to free
  */
-void frt_store_destroy(FrtStore *store)
-{
-    frt_mutex_destroy(&store->mutex_i);
-    frt_mutex_destroy(&store->mutex);
-    frt_hs_destroy(store->locks);
-    free(store);
+void frt_store_close(FrtStore *store) {
+    if (store->ref_cnt == 0) {
+        fprintf(stderr, "store ref_cnt to low\n");
+        FRT_RAISE(FRT_STATE_ERROR, "store ref_cnt to low\n");
+    }
+
+    if (FRT_DEREF(store) == 0) {
+        frt_mutex_lock(&store->mutex_i);
+        store->close_i(store);
+        frt_hs_destroy(store->locks);
+        frt_mutex_destroy(&store->mutex);
+        frt_mutex_unlock(&store->mutex_i);
+        frt_mutex_destroy(&store->mutex_i);
+        free(store);
+    }
 }
 
 /**
@@ -127,7 +125,7 @@ off_t frt_os_pos(FrtOutStream *os)
     return os->buf.start + os->buf.pos;
 }
 
-void frt_os_seek(FrtOutStream *os, off_t new_pos)
+void frt_os_seek(FrtOutStream *os, frt_off_t new_pos)
 {
     frt_os_flush(os);
     os->buf.start = new_pos;
@@ -186,10 +184,12 @@ void frt_os_write_bytes(FrtOutStream *os, const frt_uchar *buf, int len)
  */
 FrtInStream *frt_is_new(void) {
     FrtInStream *is = FRT_ALLOC(FrtInStream);
+    is->f = FRT_ALLOC_AND_ZERO(FrtInStreamFile);
+    is->f->ref_cnt = 1;
     is->buf.start = 0;
     is->buf.pos = 0;
     is->buf.len = 0;
-    is->ref_cnt_ptr = FRT_ALLOC_AND_ZERO(int);
+    is->ref_cnt = 1;
     return is;
 }
 
@@ -202,9 +202,9 @@ FrtInStream *frt_is_new(void) {
  */
 static void is_refill(FrtInStream *is)
 {
-    off_t start = is->buf.start + is->buf.pos;
-    off_t last = start + FRT_BUFFER_SIZE;
-    off_t flen = is->m->length_i(is);
+    frt_off_t start = is->buf.start + is->buf.pos;
+    frt_off_t last = start + FRT_BUFFER_SIZE;
+    frt_off_t flen = is->m->length_i(is);
 
     if (last > flen) {          /* don't read past EOF */
         last = flen;
@@ -254,7 +254,7 @@ off_t frt_is_pos(FrtInStream *is)
 frt_uchar *frt_is_read_bytes(FrtInStream *is, frt_uchar *buf, int len)
 {
     int i;
-    off_t start;
+    frt_off_t start;
 
     if ((is->buf.pos + len) < is->buf.len) {
         for (i = 0; i < len; i++) {
@@ -273,12 +273,10 @@ frt_uchar *frt_is_read_bytes(FrtInStream *is, frt_uchar *buf, int len)
     return buf;
 }
 
-void frt_is_seek(FrtInStream *is, off_t pos)
-{
+void frt_is_seek(FrtInStream *is, frt_off_t pos) {
     if (pos >= is->buf.start && pos < (is->buf.start + is->buf.len)) {
         is->buf.pos = pos - is->buf.start;  /* seek within buffer */
-    }
-    else {
+    } else {
         is->buf.start = pos;
         is->buf.pos = 0;
         is->buf.len = 0;                    /* trigger refill() on read() */
@@ -286,21 +284,30 @@ void frt_is_seek(FrtInStream *is, off_t pos)
     }
 }
 
-void frt_is_close(FrtInStream *is)
-{
-    if (--(*(is->ref_cnt_ptr)) < 0) {
-        is->m->close_i(is);
-        free(is->ref_cnt_ptr);
+void frt_is_close(FrtInStream *is) {
+    if (is->ref_cnt == 0) {
+        fprintf(stderr, "is ref_cnt to low\n");
+        FRT_RAISE(FRT_STATE_ERROR, "is ref_cnt to low\n");
+    }
+
+    if (FRT_DEREF(is) == 0) {
+        if (FRT_DEREF(is->f) == 0) {
+            is->m->close_i(is);
+            free(is->f);
+        }
+        free(is);
     }
-    free(is);
 }
 
 FrtInStream *frt_is_clone(FrtInStream *is)
 {
-    FrtInStream *new_index_i = FRT_ALLOC(FrtInStream);
-    memcpy(new_index_i, is, sizeof(FrtInStream));
-    (*(new_index_i->ref_cnt_ptr))++;
-    return new_index_i;
+    if (!(is->f))
+        return NULL;
+    FrtInStream *new_is = FRT_ALLOC(FrtInStream);
+    memcpy(new_is, is, sizeof(FrtInStream));
+    new_is->ref_cnt = 1;
+    FRT_REF(new_is->f);
+    return new_is;
 }
 
 frt_i32 frt_is_read_i32(FrtInStream *is)
@@ -377,7 +384,7 @@ unsigned int frt_is_read_vint(FrtInStream *is)
 /* optimized to use unchecked read_byte if there is definitely space */
 off_t frt_is_read_voff_t(FrtInStream *is)
 {
-    register off_t res, b;
+    register frt_off_t res, b;
     register int shift = 7;
 
     if (is->buf.pos > (is->buf.len - VINT_MAX_LEN)) {
@@ -546,7 +553,7 @@ void frt_os_write_vint(FrtOutStream *os, register unsigned int num)
 }
 
 /* optimized to use an unchecked write if there is space */
-void frt_os_write_voff_t(FrtOutStream *os, register off_t num)
+void frt_os_write_voff_t(FrtOutStream *os, register frt_off_t num)
 {
     if (os->buf.pos > VINT_END) {
         while (num > 127) {

data/ext/isomorfeus_ferret_ext/frt_store.h

@@ -13,9 +13,9 @@
 typedef struct FrtBuffer
 {
     frt_uchar buf[FRT_BUFFER_SIZE];
-    off_t start;
-    off_t pos;
-    off_t len;
+    frt_off_t start;
+    frt_off_t pos;
+    frt_off_t len;
 } FrtBuffer;
 
 typedef struct FrtOutStream FrtOutStream;
@@ -38,7 +38,7 @@ struct FrtOutStreamMethods {
      * @param pos the position to seek in the stream
      * @raise FRT_IO_ERROR if there is an error seeking in the output stream
      */
-    void (*seek_i)(struct FrtOutStream *os, off_t pos);
+    void (*seek_i)(struct FrtOutStream *os, frt_off_t pos);
 
     /**
      * Close any resources used by the output stream +os+
@@ -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;
+    frt_off_t       len;
+    _Atomic unsigned int ref_cnt;
 } FrtRAMFile;
 
 struct FrtOutStream
@@ -66,7 +66,7 @@ struct FrtOutStream
         int fd;
         FrtRAMFile *rf;
     } file;
-    off_t  pointer;             /* only used by RAMOut */
+    frt_off_t  pointer;             /* only used by RAMOut */
     const struct FrtOutStreamMethods *m;
 };
 
@@ -95,7 +95,7 @@ struct FrtInStreamMethods
      * @param pos the position to seek
      * @raise FRT_IO_ERROR if the seek fails
      */
-    void (*seek_i)(struct FrtInStream *is, off_t pos);
+    void (*seek_i)(struct FrtInStream *is, frt_off_t pos);
 
     /**
      * Returns the length of the input stream +is+
@@ -103,7 +103,7 @@ struct FrtInStreamMethods
      * @param is self
      * @raise FRT_IO_ERROR if there is an error getting the file length
      */
-    off_t (*length_i)(struct FrtInStream *is);
+    frt_off_t (*length_i)(struct FrtInStream *is);
 
     /**
      * Close the resources allocated to the inputstream +is+
@@ -114,29 +114,31 @@ 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
-    {
-        off_t pointer;          /* only used by RAMIn */
+} FrtInStreamFile;
+
+struct FrtInStream {
+    FrtBuffer buf;
+    struct FrtInStreamFile *f;
+    union {
+        frt_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;
 };
 
 struct FrtCompoundInStream
 {
     FrtInStream *sub;
-    off_t offset;
-    off_t length;
+    frt_off_t offset;
+    frt_off_t length;
 };
 
 #define frt_is_length(mis) mis->m->length_i(mis)
@@ -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+.
@@ -275,7 +274,7 @@ struct FrtStore
      * @return the length of the file in bytes
      * @raise FRT_IO_ERROR if there is an error checking the file length
      */
-    off_t (*length)(FrtStore *store, const char *filename);
+    frt_off_t (*length)(FrtStore *store, const char *filename);
 
     /**
      * Allocate the resources needed for the output stream in the +store+ with
@@ -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.
@@ -466,7 +465,7 @@ extern void frt_os_close(FrtOutStream *os);
  * @param os the FrtOutStream to get the position from
  * @return the current position in FrtOutStream +os+
  */
-extern off_t frt_os_pos(FrtOutStream *os);
+extern frt_off_t frt_os_pos(FrtOutStream *os);
 
 /**
  * Set the current position in FrtOutStream +os+.
@@ -475,7 +474,7 @@ extern off_t frt_os_pos(FrtOutStream *os);
  * @param pos the new position in the FrtOutStream
  * @raise FRT_IO_ERROR if there is a file-system IO error seeking the file
  */
-extern void frt_os_seek(FrtOutStream *os, off_t new_pos);
+extern void frt_os_seek(FrtOutStream *os, frt_off_t new_pos);
 
 /**
  * Write a single byte +b+ to the FrtOutStream +os+
@@ -542,14 +541,14 @@ extern void frt_os_write_u64(FrtOutStream *os, frt_u64 num);
 extern void frt_os_write_vint(FrtOutStream *os, register unsigned int num);
 
 /**
- * Write an unsigned off_t to FrtOutStream in compressed VINT format.
+ * Write an unsigned frt_off_t to FrtOutStream in compressed VINT format.
  * TODO: describe VINT format
  *
  * @param os FrtOutStream to write to
- * @param num the off_t to write
+ * @param num the frt_off_t to write
  * @raise FRT_IO_ERROR if there is an error writing to the file-system
  */
-extern void frt_os_write_voff_t(FrtOutStream *os, register off_t num);
+extern void frt_os_write_voff_t(FrtOutStream *os, register frt_off_t num);
 
 /**
  * Write an unsigned 64bit int to FrtOutStream in compressed VINT format.
@@ -592,7 +591,7 @@ extern void frt_os_write_string(FrtOutStream *os, const char *str);
  * @param is the FrtInStream to get the current position from
  * @return the current position within the FrtInStream +is+
  */
-extern off_t frt_is_pos(FrtInStream *is);
+extern frt_off_t frt_is_pos(FrtInStream *is);
 
 /**
  * Set the current position in FrtInStream +is+ to +pos+.
@@ -602,7 +601,7 @@ extern off_t frt_is_pos(FrtInStream *is);
  * @raise FRT_IO_ERROR if there is a error seeking from the file-system
  * @raise FRT_EOF_ERROR if there is an attempt to seek past the end of the file
  */
-extern void frt_is_seek(FrtInStream *is, off_t pos);
+extern void frt_is_seek(FrtInStream *is, frt_off_t pos);
 
 /**
  * Close the FrtInStream freeing all allocated resources.
@@ -706,15 +705,15 @@ extern unsigned int frt_is_read_vint(FrtInStream *is);
 extern void frt_is_skip_vints(FrtInStream *is, register int cnt);
 
 /**
- * Read a compressed (VINT) unsigned off_t from the FrtInStream.
+ * Read a compressed (VINT) unsigned frt_off_t from the FrtInStream.
  * TODO: describe VINT format
  *
  * @param is the FrtInStream to read from
- * @return a off_t
+ * @return a frt_off_t
  * @raise FRT_IO_ERROR if there is a error reading from the file-system
  * @raise FRT_EOF_ERROR if there is an attempt to read past the end of the file
  */
-extern off_t frt_is_read_voff_t(FrtInStream *is);
+extern frt_off_t frt_is_read_voff_t(FrtInStream *is);
 
 /**
  * Read a compressed (VINT) unsigned 64bit int from the FrtInStream.
@@ -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

@@ -2,7 +2,7 @@
 #include "frt_search.h"
 #include "test.h"
 
-#undef close
+// #undef close
 
 #define FILTER_DOCS_SIZE 10
 #define ARRAY_SIZE 20
@@ -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

@@ -3,7 +3,7 @@
 #include "testhelper.h"
 #include "test.h"
 
-#undef close
+// #undef close
 
 #define ARRAY_SIZE 100
 
@@ -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;
 }