isomorfeus-ferret 0.13.3 → 0.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 958c051fa7f771e25ee1fb29c47aad9ab1cd7a570750f73450ae582474ef6fb5
-  data.tar.gz: beba6b22ba7493f324be38997fee4f4a56efc896281fcbb2f3521ebef6795029
+  metadata.gz: 524b384c2ab35457603726287160b443a50939473bab7852e5e6f5f886ded0a7
+  data.tar.gz: b304d0386bc0b14e68167bfcc1b62346f81c02f6eff25c3a6633bb0a1919083e
 SHA512:
-  metadata.gz: 98bef5c79e3d4e8854d6a4cb68e2cb796c6f27bbaf1c7b7669ab895e8656d12d033651f8d8b29ac8d7504b46dba7567aa52f2ac297285ff2c6c62e52c48d0019
-  data.tar.gz: 165497f356ab32cdc6250b3eada43d9ec36d61ee992114bffa9c38372c7894455caeb95aa789cf025c2538c7f9e1eddafe87e66b58536424a4c8e116a123af88
+  metadata.gz: b378ce12aa56bb35e57eec2c8df64152a7a7bd5cb1345d4a7dc0264e236fddcea3ffbc41a7213401cf50ff163c3172169fbf93699a4a7f96505f300782bc9a92
+  data.tar.gz: 6954e297df285f7726bd925a6f4dda4300f06d059dc4b674a494e775b901f7ea9e529e62be8793049c6df20a17515c41741f63155fbdd661de4595694deb4c27

data/LICENSE

@@ -139,32 +139,6 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-lib/isomorfeus/ferret/monitor.rb originally taken from the gem 'monitor':
-
-Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright notice,
-     this list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 The following licenses apply to files, which are distributed within the repo
 but not distributed with the gem and not used at runtime:
 

data/ext/isomorfeus_ferret_ext/benchmark.c

@@ -117,13 +117,13 @@ static void bm_single_run(BenchMarkUnit *unit, BenchMarkTimes *bm_times)
     struct rusage ru_before, ru_after;
 
     if (gettimeofday(&tv_before, NULL) == -1)
-        FRT_RAISE(FRT_UNSUPPORTED_ERROR, "gettimeofday failed\n");
+        rb_raise(rb_eRuntimeError, "gettimeofday failed\n");
     getrusage(RUSAGE_SELF, &ru_before);
 
     unit->run();
 
     if (gettimeofday(&tv_after, NULL) == -1)
-        FRT_RAISE(FRT_UNSUPPORTED_ERROR, "gettimeofday failed\n");
+        rb_raise(rb_eRuntimeError, "gettimeofday failed\n");
     getrusage(RUSAGE_SELF, &ru_after);
 
     bm_times->rtime = TVAL_TO_SEC(tv_before, tv_after);

data/ext/isomorfeus_ferret_ext/frb_index.c

@@ -1271,11 +1271,11 @@ void frb_iw_free(void *p) {
 
 void frb_iw_mark(void *p) {
     FrtIndexWriter *iw = (FrtIndexWriter *)p;
-    if (iw->analyzer->ranalyzer)
+    if (iw->analyzer && iw->analyzer->ranalyzer)
         rb_gc_mark(iw->analyzer->ranalyzer);
-    if (iw->store->rstore)
+    if (iw->store && iw->store->rstore)
         rb_gc_mark(iw->store->rstore);
-    if (iw->fis->rfis)
+    if (iw->fis && iw->fis->rfis)
         rb_gc_mark(iw->fis->rfis);
 }
 

data/ext/isomorfeus_ferret_ext/frt_compound_io.c

@@ -329,7 +329,7 @@ static void cw_copy_file(FrtCompoundWriter *cw, FrtCWFileEntry *src, FrtOutStrea
     frt_is_close(is);
 }
 
-void frt_cw_close(FrtCompoundWriter *cw)
+void frt_cw_close(FrtCompoundWriter *cw, FrtDeleter *dlr)
 {
     FrtOutStream *os = NULL;
     int i;
@@ -356,6 +356,9 @@ void frt_cw_close(FrtCompoundWriter *cw)
     for (i = 0; i < frt_ary_size(cw->file_entries); i++) {
         cw->file_entries[i].data_offset = frt_os_pos(os);
         cw_copy_file(cw, &cw->file_entries[i], os);
+        if (dlr) {
+            frt_deleter_queue_file(dlr, cw->file_entries[i].name);
+        }
     }
 
     /* Write the data offsets into the directory of the compound stream */

data/ext/isomorfeus_ferret_ext/frt_except.c

@@ -19,7 +19,6 @@ const char *const ERROR_TYPES[] = {
     "Lock Error"
 };
 
-bool frt_x_do_logging = false;
 bool frt_x_abort_on_exception = true;
 bool frt_x_has_aborted = false;
 FILE *frt_x_exception_stream = NULL;

data/ext/isomorfeus_ferret_ext/frt_fs_store.c

@@ -272,15 +272,13 @@ static const struct FrtOutStreamMethods FS_OUT_STREAM_METHODS = {
 static FrtOutStream *fs_new_output(FrtStore *store, const char *filename)
 {
     char path[FRT_MAX_FILE_PATH];
-    int fd = open(join_path(path, store->dir.path, filename),
-                  O_WRONLY | O_CREAT | O_BINARY, store->file_mode);
-    FrtOutStream *os;
+    int fd = open(join_path(path, store->dir.path, filename), O_WRONLY | O_CREAT | O_BINARY, store->file_mode);
     if (fd < 0) {
         FRT_RAISE(FRT_IO_ERROR, "couldn't create OutStream %s: <%s>",
               path, strerror(errno));
     }
 
-    os = frt_os_new();
+    FrtOutStream *os = frt_os_new();
     os->file.fd = fd;
     os->m = &FS_OUT_STREAM_METHODS;
     return os;
@@ -418,9 +416,7 @@ static void fs_close_lock_i(FrtLock *lock)
 
 static FrtHash *stores = NULL;
 
-#ifndef UNTHREADED
 static frt_mutex_t stores_mutex = FRT_MUTEX_INITIALIZER;
-#endif
 
 static void fs_close_i(FrtStore *store)
 {

data/ext/isomorfeus_ferret_ext/frt_global.h

@@ -266,13 +266,6 @@ extern FILE *frt_x_exception_stream;
 #define EXCEPTION 2
 #define EXCEPTION_STREAM (frt_x_exception_stream ? frt_x_exception_stream : stderr)
 
-#ifdef DEBUG
-extern bool frt_x_do_logging;
-#define xlog if (frt_x_do_logging) printf
-#else
-#define xlog()
-#endif
-
 extern void frt_init(int arc, const char *const argv[]);
 extern void frt_micro_sleep(const int micro_seconds);
 

data/ext/isomorfeus_ferret_ext/frt_index.c

@@ -681,15 +681,13 @@ static char *si_norm_file_name(FrtSegmentInfo *si, char *buf, int field_num)
     if (field_num >= si->norm_gens_size
         || 0 > (norm_gen = si->norm_gens[field_num])) {
         return NULL;
-    }
-    else {
+    } else {
         const char *ext = (si->use_compound_file && norm_gen > 0) ? "s" : "f";
         return fn_for_gen_field(buf, si->name, ext, norm_gen, field_num);
     }
 }
 
-static void deleter_queue_file(FrtDeleter *dlr, const char *file_name);
-#define DEL(file_name) deleter_queue_file(dlr, file_name)
+void frt_deleter_queue_file(FrtDeleter *dlr, const char *file_name);
 
 static void si_delete_files(FrtSegmentInfo *si, FrtFieldInfos *fis, FrtDeleter *dlr)
 {
@@ -700,7 +698,7 @@ static void si_delete_files(FrtSegmentInfo *si, FrtFieldInfos *fis, FrtDeleter *
 
     for (i = si->norm_gens_size - 1; i >= 0; i--) {
         if (0 <= si->norm_gens[i]) {
-            DEL(si_norm_file_name(si, file_name, fis->fields[i]->number));
+            frt_deleter_queue_file(dlr, si_norm_file_name(si, file_name, fis->fields[i]->number));
         }
     }
 
@@ -710,15 +708,14 @@ static void si_delete_files(FrtSegmentInfo *si, FrtFieldInfos *fis, FrtDeleter *
 
     if (si->use_compound_file) {
         memcpy(ext, "cfs", 4);
-        DEL(file_name);
+        frt_deleter_queue_file(dlr, file_name);
         if (0 <= si->del_gen) {
-            DEL(frt_fn_for_generation(file_name, si->name, "del", si->del_gen));
+            frt_deleter_queue_file(dlr, frt_fn_for_generation(file_name, si->name, "del", si->del_gen));
         }
-    }
-    else {
+    } else {
         for (i = FRT_NELEMS(INDEX_EXTENSIONS) - 1; i >= 0; i--) {
             memcpy(ext, INDEX_EXTENSIONS[i], 4);
-            DEL(file_name);
+            frt_deleter_queue_file(dlr, file_name);
         }
     }
 }
@@ -3695,8 +3692,7 @@ static bool file_name_filter_is_cfs_file(const char *file_name) {
  ****************************************************************************/
 
 #define DELETABLE_START_CAPA 8
-FrtDeleter *frt_deleter_new(FrtSegmentInfos *sis, FrtStore *store)
-{
+FrtDeleter *frt_deleter_new(FrtSegmentInfos *sis, FrtStore *store) {
     FrtDeleter *dlr = FRT_ALLOC(FrtDeleter);
     dlr->sis = sis;
     dlr->store = store;
@@ -3704,19 +3700,16 @@ FrtDeleter *frt_deleter_new(FrtSegmentInfos *sis, FrtStore *store)
     return dlr;
 }
 
-void frt_deleter_destroy(FrtDeleter *dlr)
-{
+void frt_deleter_destroy(FrtDeleter *dlr) {
     frt_hs_destroy(dlr->pending);
     free(dlr);
 }
 
-static void deleter_queue_file(FrtDeleter *dlr, const char *file_name)
-{
+void frt_deleter_queue_file(FrtDeleter *dlr, const char *file_name) {
     frt_hs_add(dlr->pending, frt_estrdup(file_name));
 }
 
-void frt_deleter_delete_file(FrtDeleter *dlr, char *file_name)
-{
+void frt_deleter_delete_file(FrtDeleter *dlr, char *file_name) {
     FrtStore *store = dlr->store;
     FRT_TRY
         if (store->exists(store, file_name)) {
@@ -3728,8 +3721,7 @@ void frt_deleter_delete_file(FrtDeleter *dlr, char *file_name)
     FRT_XENDTRY
 }
 
-static void deleter_commit_pending_deletions(FrtDeleter *dlr)
-{
+static void deleter_commit_pending_deletions(FrtDeleter *dlr) {
     FrtHashSetEntry *hse, *hse_next = dlr->pending->first;
     while ((hse = hse_next) != NULL) {
         hse_next = hse->next;
@@ -3737,23 +3729,13 @@ static void deleter_commit_pending_deletions(FrtDeleter *dlr)
     }
 }
 
-void frt_deleter_delete_files(FrtDeleter *dlr, char **files, int file_cnt)
-{
-    int i;
-    for (i = file_cnt - 1; i >= 0; i--) {
-        deleter_queue_file(dlr, files[i]);
-    }
-    deleter_commit_pending_deletions(dlr);
-}
-
 struct DelFilesArg {
     char  curr_seg_file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
     FrtDeleter *dlr;
     FrtHash *current;
 };
 
-static void frt_deleter_find_deletable_files_i(const char *file_name, void *arg)
-{
+static void frt_deleter_find_deletable_files_i(const char *file_name, void *arg) {
     struct DelFilesArg *dfa = (struct DelFilesArg *)arg;
     FrtDeleter *dlr = dfa->dlr;
 
@@ -3773,8 +3755,7 @@ static void frt_deleter_find_deletable_files_i(const char *file_name, void *arg)
         if (NULL != p) {
             *p = '\0';
             extension = p + 1;
-        }
-        else {
+        } else {
             extension = NULL;
         }
 
@@ -3789,16 +3770,14 @@ static void frt_deleter_find_deletable_files_i(const char *file_name, void *arg)
         if (NULL == (si = (FrtSegmentInfo *)frt_h_get(dfa->current, segment_name))) {
             /* Delete if segment is not referenced: */
             do_delete = true;
-        }
-        else {
+        } else {
             char tmp_fn[FRT_SEGMENT_NAME_MAX_LENGTH];
             /* OK, segment is referenced, but file may still be orphan'd: */
             if (file_name_filter_is_cfs_file(file_name)
                 && si->use_compound_file) {
                 /* This file is stored in a CFS file for this segment: */
                 do_delete = true;
-            }
-            else if (0 == strcmp("del", extension)) {
+            } else if (0 == strcmp("del", extension)) {
                 /* This is a _segmentName_N.del file: */
                 if (!frt_fn_for_generation(tmp_fn, segment_name, "del", si->del_gen)
                     || 0 != strcmp(file_name, tmp_fn)) {
@@ -3807,8 +3786,7 @@ static void frt_deleter_find_deletable_files_i(const char *file_name, void *arg)
                      * this segment, then delete it: */
                     do_delete = true;
                 }
-            }
-            else if (NULL != extension
+            } else if (NULL != extension
                      && ('s' == *extension || 'f' == *extension)
                      && isdigit(extension[1])) {
                 si_norm_file_name(si, tmp_fn, atoi(extension + 1));
@@ -3817,15 +3795,14 @@ static void frt_deleter_find_deletable_files_i(const char *file_name, void *arg)
                     /* This is an orphan'd norms file: */
                     do_delete = true;
                 }
-            }
-            else if (0 == strcmp("cfs", extension) && !si->use_compound_file) {
+            } else if (0 == strcmp("cfs", extension) && !si->use_compound_file) {
                 /* This is a partially written _segmentName.cfs: */
                 do_delete = true;
             }
         }
 
         if (do_delete) {
-            deleter_queue_file(dlr, file_name);
+            frt_deleter_queue_file(dlr, file_name);
         }
     }
 }
@@ -3837,8 +3814,7 @@ static void frt_deleter_find_deletable_files_i(const char *file_name, void *arg)
  * create the unused file (eg when merging segments), and we only remove from
  * deletable when a file is successfully deleted.
  */
-void frt_deleter_find_deletable_files(FrtDeleter *dlr)
-{
+void frt_deleter_find_deletable_files(FrtDeleter *dlr) {
     /* Gather all "current" segments: */
     int i;
     FrtSegmentInfos *sis = dlr->sis;
@@ -4207,7 +4183,7 @@ static void norm_rewrite(Norm *norm, FrtStore *store, FrtDeleter *dlr,
     const int field_num = norm->field_num;
 
     if (si_norm_file_name(si, norm_file_name, field_num)) {
-        deleter_queue_file(dlr, norm_file_name);
+        frt_deleter_queue_file(dlr, norm_file_name);
     }
     frt_si_advance_norm_gen(si, field_num);
     si_norm_file_name(si, norm_file_name, field_num);
@@ -4363,7 +4339,7 @@ static void sr_commit_i(FrtIndexReader *ir)
     if (SR(ir)->undelete_all || SR(ir)->deleted_docs_dirty) {
         if (si->del_gen >= 0) {
             frt_fn_for_generation(tmp_file_name, segment, "del", si->del_gen);
-            deleter_queue_file(ir->deleter, tmp_file_name);
+            frt_deleter_queue_file(ir->deleter, tmp_file_name);
         }
         if (SR(ir)->undelete_all) {
             si->del_gen = -1;
@@ -5687,7 +5663,6 @@ static SegmentMergeInfo *smi_new(int base, FrtStore *store, FrtSegmentInfo *si)
         smi->store = frt_open_cmpd_store(store, file_name);
     }
 
-
     sprintf(file_name, "%s.fdx", segment);
     smi->doc_cnt = smi->max_doc
         = smi->store->length(smi->store, file_name) / FIELDS_IDX_PTR_SIZE;
@@ -6116,14 +6091,7 @@ int frt_iw_doc_count(FrtIndexWriter *iw)
     return doc_cnt;
 }
 
-#define MOVE_TO_COMPOUND_DIR(file_name)\
-    deleter_queue_file(dlr, file_name);\
-    frt_cw_add_file(cw, file_name)
-
-static void iw_create_compound_file(FrtStore *store, FrtFieldInfos *fis,
-                                    FrtSegmentInfo *si, char *cfs_file_name,
-                                    FrtDeleter *dlr)
-{
+static void iw_create_compound_file(FrtStore *store, FrtFieldInfos *fis, FrtSegmentInfo *si, char *cfs_file_name, FrtDeleter *dlr) {
     int i;
     FrtCompoundWriter *cw;
     char file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
@@ -6137,19 +6105,18 @@ static void iw_create_compound_file(FrtStore *store, FrtFieldInfos *fis,
     cw = frt_open_cw(store, cfs_file_name);
     for (i = 0; i < FRT_NELEMS(COMPOUND_EXTENSIONS); i++) {
         memcpy(ext, COMPOUND_EXTENSIONS[i], 4);
-        MOVE_TO_COMPOUND_DIR(file_name);
+        frt_cw_add_file(cw, file_name);
     }
 
     /* Field norm file_names */
     for (i = fis->size - 1; i >= 0; i--) {
-        if (fi_has_norms(fis->fields[i])
-            && si_norm_file_name(si, file_name, i)) {
-            MOVE_TO_COMPOUND_DIR(file_name);
+        if (fi_has_norms(fis->fields[i]) && si_norm_file_name(si, file_name, i)) {
+            frt_cw_add_file(cw, file_name);
         }
     }
 
     /* Perform the merge */
-    frt_cw_close(cw);
+    frt_cw_close(cw, dlr);
 }
 
 static void iw_commit_compound_file(FrtIndexWriter *iw, FrtSegmentInfo *si)

data/ext/isomorfeus_ferret_ext/frt_index.h

@@ -627,9 +627,9 @@ struct FrtDeleter {
 
 extern FrtDeleter *frt_deleter_new(FrtSegmentInfos *sis, FrtStore *store);
 extern void frt_deleter_destroy(FrtDeleter *dlr);
+extern void frt_deleter_queue_file(FrtDeleter *dlr, const char *file_name);
 extern void frt_deleter_delete_file(FrtDeleter *dlr, char *file_name);
 extern void frt_deleter_find_deletable_files(FrtDeleter *dlr);
-extern void frt_deleter_delete_files(FrtDeleter *dlr, char **files, int file_cnt);
 
 /****************************************************************************
  *
@@ -859,6 +859,6 @@ typedef struct FrtCompoundWriter {
 
 extern FrtCompoundWriter *frt_open_cw(FrtStore *store, char *name);
 extern void frt_cw_add_file(FrtCompoundWriter *cw, char *id);
-extern void frt_cw_close(FrtCompoundWriter *cw);
+extern void frt_cw_close(FrtCompoundWriter *cw, FrtDeleter *dlr);
 
 #endif

data/ext/isomorfeus_ferret_ext/frt_lang.c

@@ -43,7 +43,14 @@ void *frt_erealloc(void *ptr, size_t size)
     return p;
 }
 
-/* void micro_sleep(const int micro_seconds)
+
+struct timeval rb_time_interval _((VALUE));
+
+extern void frt_micro_sleep(const int micro_seconds) {
+    rb_thread_wait_for(rb_time_interval(rb_float_new((double)micro_seconds/1000000.0)));
+}
+
+/* void frt_micro_sleep(const int micro_seconds)
 {
 #if (defined POSH_OS_WIN32 || defined POSH_OS_WIN64) && !defined __MINGW32__
     Sleep(micro_seconds / 1000);

data/ext/isomorfeus_ferret_ext/frt_store.h

@@ -5,7 +5,7 @@
 #include "frt_global.h"
 #include "frt_hash.h"
 #include "frt_hashset.h"
-#include "frb_threading.h"
+#include "frt_threading.h"
 
 #define FRT_LOCK_PREFIX "ferret-"
 #define FRT_LOCK_EXT ".lck"

data/ext/isomorfeus_ferret_ext/isomorfeus_ferret.c

@@ -4,8 +4,8 @@
 #include "frt_except.h"
 #include "frt_hash.h"
 #include "frt_hashset.h"
-#include "frb_threading.h"
-#include "frb_lang.h"
+#include "frt_threading.h"
+#include "ruby.h"
 
 /* IDs */
 ID id_new;

data/ext/isomorfeus_ferret_ext/isomorfeus_ferret.h

@@ -1,10 +1,9 @@
 #ifndef __FERRET_H_
 #define __FERRET_H_
-#include <ruby.h>
 #include "frt_global.h"
 #include "frt_hashset.h"
 #include "frt_document.h"
-#include "frb_lang.h"
+#include <ruby.h>
 
 /* IDs */
 extern ID id_new;

data/ext/isomorfeus_ferret_ext/test.c

@@ -810,7 +810,7 @@ void Init_Test(void) {
     rb_define_singleton_method(mTest, "filter",         frb_ts_filter, 0);
     rb_define_singleton_method(mTest, "fs_store",       frb_ts_fs_store, 0);
     rb_define_singleton_method(mTest, "global",         frb_ts_global, 0);
-    rb_define_singleton_method(mTest, "hash",           frb_ts_hash, 0);
+    rb_define_singleton_method(mTest, "test_hash",      frb_ts_hash, 0);
     rb_define_singleton_method(mTest, "hashset",        frb_ts_hashset, 0);
     rb_define_singleton_method(mTest, "helper",         frb_ts_helper, 0);
     rb_define_singleton_method(mTest, "highlighter",    frb_ts_highlighter, 0);

data/ext/isomorfeus_ferret_ext/test_compound_io.c

@@ -48,7 +48,7 @@ void test_compound_writer(TestCase *tc, void *data)
     cw = frt_open_cw(store, (char *)"cfile");
     frt_cw_add_file(cw, (char *)"file1");
     frt_cw_add_file(cw, (char *)"file2");
-    frt_cw_close(cw);
+    frt_cw_close(cw, NULL);
 
     is = store->open_input(store, "cfile");
     Aiequal(2, frt_is_read_vint(is));
@@ -94,7 +94,7 @@ void test_compound_io(TestCase *tc, void *data)
     frt_cw_add_file(cw, (char *)"file1");
     frt_cw_add_file(cw, (char *)"file2");
     frt_cw_add_file(cw, (char *)"file3");
-    frt_cw_close(cw);
+    frt_cw_close(cw, NULL);
 
     c_reader = frt_open_cmpd_store(store, "cfile");
     is1 = c_reader->open_input(c_reader, "file1");
@@ -137,7 +137,7 @@ void test_compound_io_many_files(TestCase *tc, void *data)
         frt_os_write_vint(os, MAGIC);
         frt_os_close(os);
     }
-    frt_cw_close(cw);
+    frt_cw_close(cw, NULL);
 
     c_reader = frt_open_cmpd_store(store, "_.cfs");
     for (i = 0; i < TEST_FILE_CNT; i++) {

data/ext/isomorfeus_ferret_ext/test_hash.c

@@ -45,6 +45,7 @@ static void test_hash_str(TestCase *tc, void *data)
 
     size_t res;
     f = temp_open();
+    Assert(f != NULL, "Could not open tempfile");
     frt_h_str_print_keys(h, f);
     fseek(f, 0, SEEK_SET);
     res = fread(buf, 1, 100, f);

data/ext/isomorfeus_ferret_ext/test_threading.c

@@ -175,7 +175,7 @@ TestSuite *ts_threading(TestSuite *suite)
 
     tst_run_test(suite, test_number_to_str, NULL);
     tst_run_test(suite, test_threading_test, index);
-    // tst_run_test(suite, test_threading, index);
+    tst_run_test(suite, test_threading, index);
 
     frt_index_destroy(index);
 

data/lib/isomorfeus/ferret/index/index.rb

@@ -4,7 +4,7 @@ module Isomorfeus
       # This is a simplified interface to the index. See the TUTORIAL for more
       # information on how to use this class.
       class Index
-        include Isomorfeus::Ferret::MonitorMixin
+        include MonitorMixin
         include Isomorfeus::Ferret::Store
         include Isomorfeus::Ferret::Search
 

data/lib/isomorfeus/ferret/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Ferret
-    VERSION = '0.13.3'
+    VERSION = '0.13.6'
   end
 end

data/lib/isomorfeus-ferret.rb

@@ -2,7 +2,7 @@ require 'isomorfeus_ferret_ext'
 require 'isomorfeus/ferret/version'
 require 'isomorfeus/ferret/field_symbol'
 require 'isomorfeus/ferret/stdlib_patches'
-require 'isomorfeus/ferret/monitor'
+require 'monitor'
 require 'isomorfeus/ferret/index/field_infos'
 require 'isomorfeus/ferret/index/index'
 require 'isomorfeus/ferret/document'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-ferret
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.6
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -167,12 +167,9 @@ files:
 - ext/isomorfeus_ferret_ext/fio_tmpfile.h
 - ext/isomorfeus_ferret_ext/frb_analysis.c
 - ext/isomorfeus_ferret_ext/frb_index.c
-- ext/isomorfeus_ferret_ext/frb_lang.c
-- ext/isomorfeus_ferret_ext/frb_lang.h
 - ext/isomorfeus_ferret_ext/frb_qparser.c
 - ext/isomorfeus_ferret_ext/frb_search.c
 - ext/isomorfeus_ferret_ext/frb_store.c
-- ext/isomorfeus_ferret_ext/frb_threading.h
 - ext/isomorfeus_ferret_ext/frb_utils.c
 - ext/isomorfeus_ferret_ext/frt_analysis.c
 - ext/isomorfeus_ferret_ext/frt_analysis.h
@@ -360,7 +357,6 @@ files:
 - lib/isomorfeus/ferret/field_symbol.rb
 - lib/isomorfeus/ferret/index/field_infos.rb
 - lib/isomorfeus/ferret/index/index.rb
-- lib/isomorfeus/ferret/monitor.rb
 - lib/isomorfeus/ferret/stdlib_patches.rb
 - lib/isomorfeus/ferret/version.rb
 homepage: https://isomorfeus.com

data/ext/isomorfeus_ferret_ext/frb_lang.c

@@ -1,9 +0,0 @@
-#include "frt_except.h"
-#include "frb_lang.h"
-
-struct timeval rb_time_interval _((VALUE));
-
-extern 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/frb_lang.h

@@ -1,17 +0,0 @@
-#ifndef FRT_LANG_H
-#define FRT_LANG_H
-
-#define RUBY_BINDINGS 1
-
-#include <stdarg.h>
-#include <ruby.h>
-
-#undef close
-#undef rename
-#undef read
-
-#define frt_emalloc xmalloc
-#define frt_ecalloc(n) xcalloc(n, 1)
-#define frt_erealloc xrealloc
-
-#endif

data/ext/isomorfeus_ferret_ext/frb_threading.h

@@ -1,29 +0,0 @@
-#ifndef FRT_THREADING_H
-#define FRT_THREADING_H
-
-#include "frt_hash.h"
-#define UNTHREADED 1
-
-typedef void * frt_mutex_t;
-typedef struct FrtHash *frt_thread_key_t;
-typedef int frt_thread_once_t;
-#define FRT_MUTEX_INITIALIZER NULL
-#define FRT_THREAD_ONCE_INIT 1;
-#define frt_mutex_init(a, b)
-#define frt_mutex_lock(a)
-#define frt_mutex_trylock(a)
-#define frt_mutex_unlock(a)
-#define frt_mutex_destroy(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) frb_thread_once(a, b)
-
-void frb_thread_once(int *once_control, void (*init_routine)(void));
-void frb_thread_key_create(frt_thread_key_t *key, frt_free_ft destroy);
-void frb_thread_key_delete(frt_thread_key_t key);
-void frb_thread_setspecific(frt_thread_key_t key, const void *pointer);
-void *frb_thread_getspecific(frt_thread_key_t key);
-
-#endif

data/lib/isomorfeus/ferret/monitor.rb

@@ -1,323 +0,0 @@
-# frozen_string_literal: false
-# = monitor.rb
-#
-# Copyright (C) 2001  Shugo Maeda <shugo@ruby-lang.org>
-#
-# This library is distributed under the terms of the Ruby license.
-# You can freely distribute/modify this library.
-#
-
-#
-# In concurrent programming, a monitor is an object or module intended to be
-# used safely by more than one thread.  The defining characteristic of a
-# monitor is that its methods are executed with mutual exclusion.  That is, at
-# each point in time, at most one thread may be executing any of its methods.
-# This mutual exclusion greatly simplifies reasoning about the implementation
-# of monitors compared to reasoning about parallel code that updates a data
-# structure.
-#
-# You can read more about the general principles on the Wikipedia page for
-# Monitors[http://en.wikipedia.org/wiki/Monitor_%28synchronization%29]
-#
-# == Examples
-#
-# === Simple object.extend
-#
-#   require 'monitor.rb'
-#
-#   buf = []
-#   buf.extend(MonitorMixin)
-#   empty_cond = buf.new_cond
-#
-#   # consumer
-#   Thread.start do
-#     loop do
-#       buf.synchronize do
-#         empty_cond.wait_while { buf.empty? }
-#         print buf.shift
-#       end
-#     end
-#   end
-#
-#   # producer
-#   while line = ARGF.gets
-#     buf.synchronize do
-#       buf.push(line)
-#       empty_cond.signal
-#     end
-#   end
-#
-# The consumer thread waits for the producer thread to push a line to buf
-# while <tt>buf.empty?</tt>.  The producer thread (main thread) reads a
-# line from ARGF and pushes it into buf then calls <tt>empty_cond.signal</tt>
-# to notify the consumer thread of new data.
-#
-# === Simple Class include
-#
-#   require 'monitor'
-#
-#   class SynchronizedArray < Array
-#
-#     include MonitorMixin
-#
-#     def initialize(*args)
-#       super(*args)
-#     end
-#
-#     alias :old_shift :shift
-#     alias :old_unshift :unshift
-#
-#     def shift(n=1)
-#       self.synchronize do
-#         self.old_shift(n)
-#       end
-#     end
-#
-#     def unshift(item)
-#       self.synchronize do
-#         self.old_unshift(item)
-#       end
-#     end
-#
-#     # other methods ...
-#   end
-#
-# +SynchronizedArray+ implements an Array with synchronized access to items.
-# This Class is implemented as subclass of Array which includes the
-# MonitorMixin module.
-#
-module Isomorfeus
-  module Ferret
-    module MonitorMixin
-      #
-      # FIXME: This isn't documented in Nutshell.
-      #
-      # Since MonitorMixin.new_cond returns a ConditionVariable, and the example
-      # above calls while_wait and signal, this class should be documented.
-      #
-      class ConditionVariable
-        class Timeout < Exception; end
-
-        #
-        # Releases the lock held in the associated monitor and waits; reacquires the lock on wakeup.
-        #
-        # If +timeout+ is given, this method returns after +timeout+ seconds passed,
-        # even if no other thread doesn't signal.
-        #
-        def wait(timeout = nil)
-          Thread.handle_interrupt(Exception => :never) do
-            @monitor.__send__(:mon_check_owner)
-            count = @monitor.__send__(:mon_exit_for_cond)
-            begin
-              Thread.handle_interrupt(Exception => :immediate) do
-                @cond.wait(@monitor.instance_variable_get(:@mon_mutex), timeout)
-              end
-              return true
-            ensure
-              @monitor.__send__(:mon_enter_for_cond, count)
-            end
-          end
-        end
-
-        #
-        # Calls wait repeatedly while the given block yields a truthy value.
-        #
-        def wait_while
-          while yield
-            wait
-          end
-        end
-
-        #
-        # Calls wait repeatedly until the given block yields a truthy value.
-        #
-        def wait_until
-          until yield
-            wait
-          end
-        end
-
-        #
-        # Wakes up the first thread in line waiting for this lock.
-        #
-        def signal
-          @monitor.__send__(:mon_check_owner)
-          @cond.signal
-        end
-
-        #
-        # Wakes up all threads waiting for this lock.
-        #
-        def broadcast
-          @monitor.__send__(:mon_check_owner)
-          @cond.broadcast
-        end
-
-        private
-
-        def initialize(monitor)
-          @monitor = monitor
-          @cond = Thread::ConditionVariable.new
-        end
-      end
-
-      def self.extend_object(obj)
-        super(obj)
-        obj.__send__(:mon_initialize)
-      end
-
-      #
-      # Attempts to enter exclusive section.  Returns +false+ if lock fails.
-      #
-      def mon_try_enter
-        if @mon_owner != Thread.current
-          unless @mon_mutex.try_lock
-            return false
-          end
-          @mon_owner = Thread.current
-          @mon_count = 0
-        end
-        @mon_count += 1
-        return true
-      end
-      # For backward compatibility
-      alias try_mon_enter mon_try_enter
-
-      #
-      # Enters exclusive section.
-      #
-      def mon_enter
-        if @mon_owner != Thread.current
-          @mon_mutex.lock
-          @mon_owner = Thread.current
-          @mon_count = 0
-        end
-        @mon_count += 1
-      end
-
-      #
-      # Leaves exclusive section.
-      #
-      def mon_exit
-        mon_check_owner
-        @mon_count -=1
-        if @mon_count == 0
-          @mon_owner = nil
-          @mon_mutex.unlock
-        end
-      end
-
-      #
-      # Returns true if this monitor is locked by any thread
-      #
-      def mon_locked?
-        @mon_mutex.locked?
-      end
-
-      #
-      # Returns true if this monitor is locked by current thread.
-      #
-      def mon_owned?
-        @mon_mutex.locked? && @mon_owner == Thread.current
-      end
-
-      #
-      # Enters exclusive section and executes the block.  Leaves the exclusive
-      # section automatically when the block exits.  See example under
-      # +MonitorMixin+.
-      #
-      def mon_synchronize
-        # Prevent interrupt on handling interrupts; for example timeout errors
-        # it may break locking state.
-        Thread.handle_interrupt(Exception => :never){ mon_enter }
-        begin
-          yield
-        ensure
-          Thread.handle_interrupt(Exception => :never){ mon_exit }
-        end
-      end
-      alias synchronize mon_synchronize
-
-      #
-      # Creates a new MonitorMixin::ConditionVariable associated with the
-      # receiver.
-      #
-      def new_cond
-        return ConditionVariable.new(self)
-      end
-
-      private
-
-      # Use <tt>extend MonitorMixin</tt> or <tt>include MonitorMixin</tt> instead
-      # of this constructor.  Have look at the examples above to understand how to
-      # use this module.
-      def initialize(*args)
-        super
-        mon_initialize
-      end
-
-      # Initializes the MonitorMixin after being included in a class or when an
-      # object has been extended with the MonitorMixin
-      def mon_initialize
-        if defined?(@mon_mutex) && @mon_mutex_owner_object_id == object_id
-          raise ThreadError, "already initialized"
-        end
-        @mon_mutex = Thread::Mutex.new
-        @mon_mutex_owner_object_id = object_id
-        @mon_owner = nil
-        @mon_count = 0
-      end
-
-      def mon_check_owner
-        if @mon_owner != Thread.current
-          raise ThreadError, "current thread not owner"
-        end
-      end
-
-      def mon_enter_for_cond(count)
-        @mon_owner = Thread.current
-        @mon_count = count
-      end
-
-      def mon_exit_for_cond
-        count = @mon_count
-        @mon_owner = nil
-        @mon_count = 0
-        return count
-      end
-    end
-
-    # Use the Monitor class when you want to have a lock object for blocks with
-    # mutual exclusion.
-    #
-    #   require 'monitor'
-    #
-    #   lock = Monitor.new
-    #   lock.synchronize do
-    #     # exclusive access
-    #   end
-    #
-    class Monitor
-      include MonitorMixin
-      alias try_enter try_mon_enter
-      alias enter mon_enter
-      alias exit mon_exit
-    end
-  end
-end
-
-# Documentation comments:
-#  - All documentation comes from Nutshell.
-#  - MonitorMixin.new_cond appears in the example, but is not documented in
-#    Nutshell.
-#  - All the internals (internal modules Accessible and Initializable, class
-#    ConditionVariable) appear in RDoc.  It might be good to hide them, by
-#    making them private, or marking them :nodoc:, etc.
-#  - RDoc doesn't recognise aliases, so we have mon_synchronize documented, but
-#    not synchronize.
-#  - mon_owner is in Nutshell, but appears as an accessor in a separate module
-#    here, so is hard/impossible to RDoc.  Some other useful accessors
-#    (mon_count and some queue stuff) are also in this module, and don't appear
-#    directly in the RDoc output.
-#  - in short, it may be worth changing the code layout in this file to make the
-#    documentation easier