isomorfeus-ferret 0.13.7 → 0.13.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 479f3df28144a3ca25194afc36590058e027af38ba43cc42d24ffd83a35a6da7
-  data.tar.gz: 95c80530e4012e0f7219e3b60cc82748f4e6d1824f0958cfda6cd4735c92a82a
+  metadata.gz: 1e6a7a9c17cc344699bee0c8116188f86da73e11fa2a4eed02eea1c4647b6a99
+  data.tar.gz: c94c9a2735b010c02c8d5a793057b94abf8950117153415a731347c21fadf66e
 SHA512:
-  metadata.gz: 0a72ddf5c974896ac0e5d11cdab105c02894f12ffac43db12b7651393f0bfd5ebd5f99f4e03e7714a8d230c6e77f71a1f5ee1c243b01608b23555a170eabe5c9
-  data.tar.gz: 58a803a8de3afae0b2bdf6e0eeda41f6a2e29dc649d8e219d2d7d5c667bd27bea3fa8dd80f16af934456e9414cd0f6a2ec9b998d303593db94f43de208a3eaff
+  metadata.gz: 549a2d3b09dc535278f6c9735f55a47203166df046e5a75ff55589085336bcf2cb7c25cdf491c07eca68da25682316c4bb15e5079f09df95f8a494558fe22260
+  data.tar.gz: e188f428fd881a0285ece69807f13c07dfd1eee131edcad3e38a713ffa820364992bb9068d5f94f567bd7769c7882441ce8eb67199b95b491528fecdd34503f4

data/README.md

@@ -11,12 +11,12 @@ At the [Isomorfeus Framework Project](https://isomorfeus.com)
 
 ## About this project
 
-Isomorfeus-Ferret is a revived version of the original ferret gem created by Dave Balmain.
+Isomorfeus-Ferret is a revived version of the original ferret gem created by Dave Balmain, [https://github.com/dbalmain/ferret](https://github.com/dbalmain/ferret).
 During revival many things havbe been fixed, now all tests pass, no crashes and it
 successfully compiles and runs with rubys >3. Its no longer a goal to have
 a c library available, but instead the usage is meant as ruby gem with a c extension only.
 
-It should work on *nixes, *nuxes, *BSDs and also works on Windows.
+It works on *nixes, *nuxes, *BSDs and also works on Windows and RaspberryPi.
 
 ## Improvements and Changes in Version 0.13
 
@@ -63,7 +63,7 @@ fis.add_field(:compressed_field, :store => :yes, :compression => :brotli, :term_
 
 ### Performance
 
-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.
+For version 0.13.7 the performance bottle neck 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
@@ -99,14 +99,20 @@ 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, Ferret 0.13.7 vs. Lucene 9.1.0, WhitespaceAnalyzer, on old Intel Core i5 from 2015:
+Results, Ferret 0.13.7 vs. Lucene 9.1.0, WhitespaceAnalyzer,
+Linux Ubuntu 20.04, FreeBSD 13.0 and Windows 10 on old Intel Core i5 from 2015,
+LinuxPi on RaspberryPi 400:
 
 | OS      | Task       | Ferret          | Lucene*        |
 |---------|------------|-----------------|----------------|
 | Linux   | Indexing   |     4905 docs/s |    4785 docs/s |
+| FreeBSD | Indexing   |     4516 docs/s |       -        |
 | Windows | Indexing   |     2361 docs/s |    2395 docs/s |
+| LinuxPi | Indexing   |     1161 docs/s |     707 docs/s |
 | Linux   | Searching  | 25664 queries/s | 4708 queries/s |
+| FreeBSD | Searching  | 25073 queries/s |    -           |
 | Windows | Searching  |  3646 queries/s |  935 queries/s |
+| LinuxPi | Searching  |  5768 queries/s |  680 queries/s |
 |         | Index Size |           28 MB |          35 MB |
 
 *Lucene 9.1.0 on JVM 11.0.14.1 (Ubuntu)

data/ext/isomorfeus_ferret_ext/frb_analysis.c

@@ -458,7 +458,7 @@ static VALUE frb_ts_next(VALUE self) {
 
 static void frb_tf_mark(void *p) {
     FrtTokenStream *ts = (FrtTokenStream *)p;
-    if (TkFilt(ts)->sub_ts->rts)
+    if (TkFilt(ts)->sub_ts && TkFilt(ts)->sub_ts->rts)
         rb_gc_mark(TkFilt(ts)->sub_ts->rts);
 }
 
@@ -1331,9 +1331,10 @@ static void frb_h_mark_values_i(void *key, void *value, void *arg) {
 }
 
 static void frb_pfa_mark(void *p) {
-    if (PFA(p)->default_a->ranalyzer)
+    if (PFA(p)->default_a && PFA(p)->default_a->ranalyzer)
         rb_gc_mark(PFA(p)->default_a->ranalyzer);
-    frt_h_each(PFA(p)->dict, &frb_h_mark_values_i, NULL);
+    if (PFA(p)->dict)
+        frt_h_each(PFA(p)->dict, &frb_h_mark_values_i, NULL);
 }
 
 /*** PerFieldAnalyzer ***/
@@ -1370,6 +1371,8 @@ const rb_data_type_t frb_per_field_analyzer_t = {
 
 static VALUE frb_per_field_analyzer_alloc(VALUE rclass) {
     FrtAnalyzer *a = frt_per_field_analyzer_alloc();
+    PFA(a)->default_a = NULL;
+    PFA(a)->dict = NULL;
     return TypedData_Wrap_Struct(rclass, &frb_per_field_analyzer_t, a);
 }
 
@@ -1435,7 +1438,7 @@ static VALUE frb_pfa_analyzer_token_stream(VALUE self, VALUE rfield, VALUE rstri
 /*** RegExpAnalyzer ***/
 
 static void frb_re_analyzer_mark(void *p) {
-    if (((FrtAnalyzer *)p)->current_ts->rts)
+    if (((FrtAnalyzer *)p)->current_ts && ((FrtAnalyzer *)p)->current_ts->rts)
         rb_gc_mark(((FrtAnalyzer *)p)->current_ts->rts);
 }
 

data/ext/isomorfeus_ferret_ext/frb_index.c

@@ -2,7 +2,7 @@
 #include "isomorfeus_ferret.h"
 #include <ruby.h>
 
-#undef close
+// #undef close
 
 VALUE mIndex;
 
@@ -429,6 +429,7 @@ static VALUE frb_get_field_infos(FrtFieldInfos *fis) {
 
 static VALUE frb_fis_alloc(VALUE rclass) {
     FrtFieldInfos *fis = frt_fis_alloc();
+    fis->size = 0;
     return TypedData_Wrap_Struct(rclass, &frb_field_infos_t, fis);
 }
 
@@ -674,8 +675,7 @@ frb_fis_get_tk_fields(VALUE self)
  ****************************************************************************/
 
 static void frb_te_free(void *p) {
-    FrtTermEnum *te = (FrtTermEnum *)p;
-    te->close(te);
+    ((FrtTermEnum *)p)->close((FrtTermEnum *)p);
 }
 
 static size_t frb_te_size(const void *p) {

data/ext/isomorfeus_ferret_ext/frb_qparser.c

@@ -34,7 +34,7 @@ static void frb_qp_free(void *p) {
 }
 
 static void frb_qp_mark(void *p) {
-    if (((FrtQParser *)p)->analyzer->ranalyzer)
+    if (((FrtQParser *)p)->analyzer && ((FrtQParser *)p)->analyzer->ranalyzer)
         rb_gc_mark(((FrtQParser *)p)->analyzer->ranalyzer);
 }
 
@@ -59,6 +59,7 @@ const rb_data_type_t frb_qp_t = {
 
 static VALUE frb_qp_alloc(VALUE rclass) {
     FrtQParser *qp = frt_qp_alloc();
+    qp->analyzer = NULL;
     return TypedData_Wrap_Struct(rclass, &frb_qp_t, qp);
 }
 

data/ext/isomorfeus_ferret_ext/frb_search.c

@@ -4,7 +4,7 @@
 #include "isomorfeus_ferret.h"
 #include <ruby.h>
 
-#undef close
+// #undef close
 
 VALUE mSearch;
 
@@ -713,7 +713,7 @@ static size_t frb_boolean_clause_t_size(const void *p) {
 }
 
 static void frb_bc_mark(void *p) {
-    if (((FrtBooleanClause *)p)->query->rquery)
+    if (((FrtBooleanClause *)p)->query && ((FrtBooleanClause *)p)->query->rquery)
         rb_gc_mark(((FrtBooleanClause *)p)->query->rquery);
 }
 
@@ -1837,11 +1837,11 @@ static size_t frb_filtered_query_size(const void *p) {
 }
 
 static void frb_fqq_mark(void *p) {
-    FrtFilteredQuery *fq = (FrtFilteredQuery *)p;
-    if (fq->query->rquery)
-        rb_gc_mark(fq->query->rquery);
-    if (fq->filter->rfilter)
-        rb_gc_mark(fq->filter->rfilter);
+    FrtFilteredQuery *fqq = (FrtFilteredQuery *)p;
+    if (fqq->query && fqq->query->rquery)
+        rb_gc_mark(fqq->query->rquery);
+    if (fqq->filter && fqq->filter->rfilter)
+        rb_gc_mark(fqq->filter->rfilter);
 }
 
 const rb_data_type_t frb_filtered_query_t = {
@@ -1860,6 +1860,8 @@ const rb_data_type_t frb_filtered_query_t = {
 
 static VALUE frb_fqq_alloc(VALUE rclass) {
     FrtQuery *fqq = frt_fq_alloc();
+    ((FrtFilteredQuery *)fqq)->query = NULL;
+    ((FrtFilteredQuery *)fqq)->filter = NULL;
     return TypedData_Wrap_Struct(rclass, &frb_filtered_query_t, fqq);
 }
 
@@ -2172,6 +2174,7 @@ const rb_data_type_t frb_span_near_query_t = {
 
 static VALUE frb_spannq_alloc(VALUE rclass) {
     FrtQuery *snq = frt_spannq_alloc();
+    ((FrtSpanNearQuery *)snq)->c_cnt = 0;
     return TypedData_Wrap_Struct(rclass, &frb_span_near_query_t, snq);
 }
 
@@ -2352,9 +2355,9 @@ static size_t frb_span_not_query_size(const void *p) {
 
 static void frb_spanxq_mark(void *p) {
     FrtSpanNotQuery *sxq = (FrtSpanNotQuery *)p;
-    if (sxq->inc->rquery)
+    if (sxq->inc && sxq->inc->rquery)
         rb_gc_mark(sxq->inc->rquery);
-    if (sxq->exc->rquery)
+    if (sxq->exc && sxq->exc->rquery)
         rb_gc_mark(sxq->exc->rquery);
 }
 
@@ -3557,10 +3560,12 @@ static size_t frb_index_searcher_size(const void *p) {
 
 static void frb_sea_mark(void *p) {
     FrtIndexSearcher *isea = (FrtIndexSearcher *)p;
-    if (isea->ir->rir)
-        rb_gc_mark(isea->ir->rir);
-    if (isea->ir->store->rstore)
-        rb_gc_mark(isea->ir->store->rstore);
+    if (isea->ir) {
+        if (isea->ir->rir)
+            rb_gc_mark(isea->ir->rir);
+        if (isea->ir->store && isea->ir->store->rstore)
+            rb_gc_mark(isea->ir->store->rstore);
+    }
 }
 
 const rb_data_type_t frb_index_searcher_t = {
@@ -3578,8 +3583,9 @@ const rb_data_type_t frb_index_searcher_t = {
 };
 
 static VALUE frb_sea_alloc(VALUE rclass) {
-    FrtSearcher *s = frt_isea_alloc();
-    return TypedData_Wrap_Struct(rclass, &frb_index_searcher_t, s);
+    FrtSearcher *sea = frt_isea_alloc();
+    ((FrtIndexSearcher *)sea)->ir = NULL;
+    return TypedData_Wrap_Struct(rclass, &frb_index_searcher_t, sea);
 }
 
 /*
@@ -3665,6 +3671,7 @@ const rb_data_type_t frb_multi_searcher_t = {
 
 static VALUE frb_ms_alloc(VALUE rclass) {
     FrtSearcher *s = frt_msea_alloc();
+    ((FrtMultiSearcher *)s)->s_cnt = 0;
     return TypedData_Wrap_Struct(rclass, &frb_multi_searcher_t, s);
 }
 

data/ext/isomorfeus_ferret_ext/frb_store.c

@@ -2,7 +2,7 @@
 #include "isomorfeus_ferret.h"
 #include <time.h>
 
-#undef rename
+// #undef rename
 
 static ID id_ref_cnt;
 VALUE cLock;
@@ -34,7 +34,7 @@ void frb_lock_free(void *p) {
 
 void frb_lock_mark(void *p) {
     FrtLock *lock = (FrtLock *)p;
-    if (lock->store->rstore)
+    if (lock->store && lock->store->rstore)
         rb_gc_mark(lock->store->rstore);
 }
 

data/ext/isomorfeus_ferret_ext/frt_field_index.c

@@ -1,7 +1,7 @@
 #include <string.h>
 #include "frt_field_index.h"
 
-#undef close
+// #undef close
 
 /***************************************************************************
  *

data/ext/isomorfeus_ferret_ext/frt_ind.c

@@ -2,7 +2,7 @@
 #include "frt_array.h"
 #include <string.h>
 
-#undef close
+// #undef close
 
 static const char *NON_UNIQUE_KEY_ERROR_MSG =
     "Tried to use a key that was not unique";

data/ext/isomorfeus_ferret_ext/frt_index.c

@@ -11,8 +11,8 @@
 #include "bzlib.h"
 #include "lz4frame.h"
 
-#undef close
-#undef read
+// #undef close
+// #undef read
 
 extern rb_encoding *utf8_encoding;
 extern void frt_micro_sleep(const int micro_seconds);
@@ -3913,9 +3913,10 @@ static FrtIndexReader *ir_setup(FrtIndexReader *ir, FrtStore *store, FrtSegmentI
         ir->store = store;
         FRT_REF(store);
     }
-    ir->sis = sis;
-    ir->fis = fis;
+    ir->sis     = sis;
+    ir->fis     = fis;
     ir->ref_cnt = 1;
+    ir->rir     = Qnil;
 
     ir->is_owner = is_owner;
     if (is_owner) {
@@ -6431,6 +6432,8 @@ static void iw_cp_fields(FrtIndexWriter *iw, FrtSegmentReader *sr, const char *s
         sprintf(file_name, "%s.del", segment);
         del_out = store_out->new_output(store_out, file_name);
         frt_is2os_copy_bytes(del_in, del_out, frt_is_length(del_in));
+        frt_os_close(del_out);
+        frt_is_close(del_in);
     }
 
     if (map) {

data/ext/isomorfeus_ferret_ext/frt_q_boolean.c

@@ -1280,7 +1280,7 @@ static int  bc_eq(FrtBooleanClause *self, FrtBooleanClause *o) {
 }
 
 FrtBooleanClause *frt_bc_alloc(void) {
-    return FRT_ALLOC(FrtBooleanClause);
+    return FRT_ALLOC_AND_ZERO(FrtBooleanClause);
 }
 
 FrtBooleanClause *frt_bc_init(FrtBooleanClause *self, FrtQuery *query, FrtBCType occur) {

data/ext/isomorfeus_ferret_ext/frt_q_fuzzy.c

@@ -2,7 +2,7 @@
 #include "frt_search.h"
 #include "frt_helper.h"
 
-#undef close
+// #undef close
 
 /****************************************************************************
  *

data/ext/isomorfeus_ferret_ext/frt_q_multi_term.c

@@ -3,8 +3,8 @@
 #include "frt_search.h"
 #include "frt_helper.h"
 
-#undef close
-#undef read
+// #undef close
+// #undef read
 
 #define MTQ(query) ((FrtMultiTermQuery *)(query))
 

data/ext/isomorfeus_ferret_ext/frt_q_phrase.c

@@ -4,7 +4,7 @@
 #include "frt_search.h"
 #include "frt_array.h"
 
-#undef close
+// #undef close
 
 #define PhQ(query) ((FrtPhraseQuery *)(query))
 

data/ext/isomorfeus_ferret_ext/frt_q_prefix.c

@@ -2,7 +2,7 @@
 #include "frt_global.h"
 #include "frt_search.h"
 
-#undef close
+// #undef close
 
 /****************************************************************************
  *

data/ext/isomorfeus_ferret_ext/frt_q_range.c

@@ -2,7 +2,7 @@
 #include "frt_global.h"
 #include "frt_search.h"
 
-#undef close
+// #undef close
 
 /*****************************************************************************
  *

data/ext/isomorfeus_ferret_ext/frt_q_span.c

@@ -4,7 +4,7 @@
 #include "frt_search.h"
 #include "frt_hashset.h"
 
-#undef close
+// #undef close
 
 #define CLAUSE_INIT_CAPA 4
 

data/ext/isomorfeus_ferret_ext/frt_q_term.c

@@ -2,8 +2,8 @@
 #include <string.h>
 #include "frt_search.h"
 
-#undef close
-#undef read
+// #undef close
+// #undef read
 
 #define TQ(query) ((FrtTermQuery *)(query))
 #define TSc(scorer) ((TermScorer *)(scorer))

data/ext/isomorfeus_ferret_ext/frt_q_wildcard.c

@@ -2,7 +2,7 @@
 #include "frt_global.h"
 #include "frt_search.h"
 
-#undef close
+// #undef close
 
 /****************************************************************************
  *

data/ext/isomorfeus_ferret_ext/frt_search.c

@@ -3,7 +3,7 @@
 #include "frt_search.h"
 #include "frt_array.h"
 
-#undef close
+// #undef close
 
 /***************************************************************************
  *

data/ext/isomorfeus_ferret_ext/frt_sort.c

@@ -3,7 +3,7 @@
 #include "frt_index.h"
 #include "frt_field_index.h"
 
-#undef close
+// #undef close
 
 /***************************************************************************
  *

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

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
 

data/ext/isomorfeus_ferret_ext/test_index.c

@@ -2,8 +2,8 @@
 #include "testhelper.h"
 #include "test.h"
 
-#undef close
-#undef read
+// #undef close
+// #undef read
 
 static ID body, title, text, author, year, changing_field, compressed_field_brotli, compressed_field_bzip2, compressed_field_lz4, tag;
 

data/ext/isomorfeus_ferret_ext/test_q_const_score.c

@@ -1,7 +1,7 @@
 #include "frt_search.h"
 #include "test.h"
 
-#undef close
+// #undef close
 
 static ID num;
 

data/ext/isomorfeus_ferret_ext/test_q_filtered.c

@@ -1,7 +1,7 @@
 #include "frt_search.h"
 #include "test.h"
 
-#undef close
+// #undef close
 
 static ID num, flipflop;
 

data/ext/isomorfeus_ferret_ext/test_q_fuzzy.c

@@ -1,7 +1,7 @@
 #include "frt_search.h"
 #include "test.h"
 
-#undef close
+// #undef close
 
 #define ARRAY_SIZE 20
 

data/ext/isomorfeus_ferret_ext/test_q_span.c

@@ -1,7 +1,7 @@
 #include "frt_search.h"
 #include "test.h"
 
-#undef close
+// #undef close
 
 #define ARRAY_SIZE 20
 #define TEST_SE(query, ir, expected) do { \

data/ext/isomorfeus_ferret_ext/test_search.c

@@ -5,7 +5,7 @@
 #include "testhelper.h"
 #include "test.h"
 
-#undef close
+// #undef close
 
 #define ARRAY_SIZE 40
 

data/ext/isomorfeus_ferret_ext/test_sort.c

@@ -3,7 +3,7 @@
 #include "frt_search.h"
 #include "test.h"
 
-#undef close
+// #undef close
 
 #define ARRAY_SIZE 20
 

data/ext/isomorfeus_ferret_ext/test_store.c

@@ -3,7 +3,7 @@
 #include <limits.h>
 #include "test.h"
 
-#undef rename
+// #undef rename
 
 #define TEST_LOCK_NAME "test"
 

data/ext/isomorfeus_ferret_ext/test_term.c

@@ -1,7 +1,7 @@
 #include "frt_index.h"
 #include "test.h"
 
-#undef close
+// #undef close
 
 /***************************************************************************
  *

data/lib/isomorfeus/ferret/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-ferret
 version: !ruby/object:Gem::Version
-  version: 0.13.7
+  version: 0.13.8
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake