isomorfeus-ferret 0.13.4 → 0.13.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19cfca9e5508c89a931678c23a5b0b32d8759d0d1839ac0ecf0b043d93cd1ddf
-  data.tar.gz: 5999edb4c8ce46718264abdfac47cdd2bcc0f8e0ddf46a0af69bfba1ec024a1c
+  metadata.gz: 479f3df28144a3ca25194afc36590058e027af38ba43cc42d24ffd83a35a6da7
+  data.tar.gz: 95c80530e4012e0f7219e3b60cc82748f4e6d1824f0958cfda6cd4735c92a82a
 SHA512:
-  metadata.gz: e8ab5a9574a3b610b4d554a94ecbdf3252a77d7947f81fdd21bdd0c87ed6bd0940f4842091f0bec793b4e061fe218706d0e16ef64ab19d85ca48d825a1867beb
-  data.tar.gz: 474d0d57a321f3eaf47e372f76c7102592b85c7d0bf2e8506e7e3baf6ad3cbba2b5628296b5a3cf50b9bdba3031a2712225234143343cb9dbf80bc3781d00faa
+  metadata.gz: 0a72ddf5c974896ac0e5d11cdab105c02894f12ffac43db12b7651393f0bfd5ebd5f99f4e03e7714a8d230c6e77f71a1f5ee1c243b01608b23555a170eabe5c9
+  data.tar.gz: 58a803a8de3afae0b2bdf6e0eeda41f6a2e29dc649d8e219d2d7d5c667bd27bea3fa8dd80f16af934456e9414cd0f6a2ec9b998d303593db94f43de208a3eaff

data/README.md

@@ -63,14 +63,8 @@ fis.add_field(:compressed_field, :store => :yes, :compression => :brotli, :term_
 
 ### Performance
 
-The encoding support demands its toll, indexing performance dropped a bit in comparision to 0.12, but still thousands of docs per second, depending on machine/docs.
-On Windows the indexing performance is still terrible, but that may be resolved in a future project.
-
-Search performance is still excellent and multiple times faster than Lucene.
-
-Lucene achieves roughly double the indexing performance. This seems to be because of the different way strings and
-encodings are handled in Java. For example, the Java WhitespaceTokenizer code requires only one method call per character (check for whitespace), but for Ruby, to support all the different encodings, several method calls are required per character (retrieve character according to encoding, check character for whitespace).
-Ferret is internally using the standard Ruby string encoding methods.
+For version 0.13.7 the performance bottle-nack has been identified and removed, ferret now delivers excellent indexing perfomance on all platforms, see numbers below.
+On Windows performance is still not as good as on Linux, but that is equally true for Lucene and because of how the Windows filesystem works.
 
 ## Documentation
 
@@ -105,43 +99,35 @@ Ensure your locale is set to C.UTF-8, because the internal c tests don't know ho
 
 A recent Java JDK must be installed to compile and run lucene benchmarks.
 
-Results on Linux:
-```
-Ferret 0.13.0:
-Indexing: 9.35 secs, Docs: 19043, 2035 docs/s
-Searching took: 0.3133133s for 8000 queries
-thats 25533 q/s
-Total found: 42000
-Index size: 28Mb
-
-Lucene 9.1.0:
-Indexing: 4.20 secs, Docs: 19043, 4538 docs/s
-Searching took: 1.64s for 8000 queries
-thats 4875 q/s
-Total found: 41000
-index size: 35Mb
-
-JVM 11.0.14.1 (Ubuntu)
-```
+Results, Ferret 0.13.7 vs. Lucene 9.1.0, WhitespaceAnalyzer, on old Intel Core i5 from 2015:
+
+| OS      | Task       | Ferret          | Lucene*        |
+|---------|------------|-----------------|----------------|
+| Linux   | Indexing   |     4905 docs/s |    4785 docs/s |
+| Windows | Indexing   |     2361 docs/s |    2395 docs/s |
+| Linux   | Searching  | 25664 queries/s | 4708 queries/s |
+| Windows | Searching  |  3646 queries/s |  935 queries/s |
+|         | Index Size |           28 MB |          35 MB |
+
+*Lucene 9.1.0 on JVM 11.0.14.1 (Ubuntu)
 
 ### Storing Fields with Compression, Indexing and Retrieval
 - clone repo
 - bundle install
 - rake ferret_compression_benchmark
 
-Results on Linux, 0.13.0:
+Results on Linux, 0.13.7, on old Intel Core i5 from 2015:
 
 | Compression | Index & Store | Retrieve      | Index size |
 |-------------|---------------|---------------|------------|
-| none        |   2008 docs/s | 153853 docs/s |      43 MB |
-| brotli      |   1726 docs/s |  58315 docs/s |      36 MB |
-| bzip2       |   1438 docs/s |  15382 docs/s |      38 MB |
-| lz4         |   1932 docs/s | 127100 docs/s |      41 MB |
+| none        |   4866 docs/s | 153853 docs/s |      43 MB |
+| brotli      |   3539 docs/s |  58315 docs/s |      36 MB |
+| bzip2       |   2624 docs/s |  15382 docs/s |      38 MB |
+| lz4         |   4639 docs/s | 127100 docs/s |      41 MB |
 
 ## Future
 
 Lots of things to do:
-- Improve indexing performance on Windows (WriteFile is terribly slow, maybe use mapping, see libuv)
 - Bring documentation in order in a docs directory
 - Review code (especially for memory/stack issues, typical c issues)
 - Take care of ruby GVL and threading

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

@@ -13,7 +13,7 @@
 
 #define FRT_MAX_WORD_SIZE 255
 #define FRT_MAX_FILE_PATH 1024
-#define FRT_BUFFER_SIZE 1024
+#define FRT_BUFFER_SIZE 16384
 
 typedef enum {
     FRT_COMPRESSION_NONE = 0,
@@ -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.c

@@ -149,7 +149,7 @@ void frt_os_seek(FrtOutStream *os, off_t new_pos)
  */
 void frt_os_write_byte(FrtOutStream *os, frt_uchar b)
 {
-    if (os->buf.pos >= FRT_BUFFER_SIZE) {
+    if (os->buf.pos >= (FRT_BUFFER_SIZE - 1)) {
         frt_os_flush(os);
     }
     write_byte(os, b);
@@ -157,15 +157,12 @@ void frt_os_write_byte(FrtOutStream *os, frt_uchar b)
 
 void frt_os_write_bytes(FrtOutStream *os, const frt_uchar *buf, int len)
 {
-    if (os->buf.pos > 0) {      /* flush buffer */
-        frt_os_flush(os);
-    }
-
-    if (len < FRT_BUFFER_SIZE) {
-        os->m->flush_i(os, buf, len);
-        os->buf.start += len;
+    if (len < (FRT_BUFFER_SIZE - os->buf.pos)) {
+        memcpy(os->buf.buf + os->buf.pos, buf, len);
+        os->buf.pos += len;
     }
     else {
+        frt_os_flush(os);
         int pos = 0;
         int size;
         while (pos < len) {

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/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Ferret
-    VERSION = '0.13.4'
+    VERSION = '0.13.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-ferret
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.13.7
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-04-27 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

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