isomorfeus-ferret 0.13.8 → 0.13.9

data/ext/isomorfeus_ferret_ext/test_search.c

@@ -1688,8 +1688,9 @@ TestSuite *ts_search(TestSuite *suite)
 
     tst_run_test(suite, test_search_unscored, (void *)searcher);
 
-    frt_store_deref(store);
     frt_searcher_close(searcher);
+    frt_ir_close(ir);
+    frt_store_close(store);
     return suite;
 }
 
@@ -1845,7 +1846,9 @@ TestSuite *ts_multi_search(TestSuite *suite)
     searchers = FRT_ALLOC_N(FrtSearcher *, 2);
     searchers[0] = frt_isea_new(ir0);
     searchers[1] = frt_isea_new(ir1);
-    searcher = frt_msea_new(searchers, 2, true);
+    FRT_DEREF(searchers[0]);
+    FRT_DEREF(searchers[1]);
+    searcher = frt_msea_new(searchers, 2);
 
     tst_run_test(suite, test_get_doc, (void *)searcher);
 
@@ -1862,8 +1865,10 @@ TestSuite *ts_multi_search(TestSuite *suite)
 
     tst_run_test(suite, test_query_combine, NULL);
 
-    frt_store_deref(store0);
-    frt_store_deref(store1);
     frt_searcher_close(searcher);
+    frt_ir_close(ir0);
+    frt_ir_close(ir1);
+    frt_store_close(store0);
+    frt_store_close(store1);
     return suite;
 }

data/ext/isomorfeus_ferret_ext/test_segments.c

@@ -54,6 +54,7 @@ static void test_si(TestCase *tc, void *data)
     si->name[1] = '2';
     si->doc_cnt += 2;
     si->store = store;
+    FRT_REF(store);
     Asi_has_vals(si, "_2", 12, store);
     Assert(!frt_si_has_separate_norms(si), "doesn't use compound file/have norms");
     si->use_compound_file = true;
@@ -65,8 +66,8 @@ static void test_si(TestCase *tc, void *data)
     Assert(!frt_si_has_separate_norms(si), "has norms in compound file");
     frt_si_advance_norm_gen(si, 3);
     Assert(frt_si_has_separate_norms(si), "has seperate norms");
-    frt_si_deref(si);
-    frt_store_deref(store);
+    frt_si_close(si);
+    frt_store_close(store);
 }
 
 /***************************************************************************
@@ -163,6 +164,6 @@ TestSuite *ts_segments(TestSuite *suite)
     tst_run_test(suite, test_sis_add_del, store);
     tst_run_test(suite, test_sis_rw, store);
 
-    frt_store_deref(store);
+    frt_store_close(store);
     return suite;
 }

data/ext/isomorfeus_ferret_ext/test_sort.c

@@ -292,6 +292,8 @@ TestSuite *ts_sort(TestSuite *suite)
 {
     FrtSearcher *sea, **searchers;
     FrtStore *store = frt_open_ram_store(NULL), *fs_store;
+    FrtIndexReader *ir0;
+    FrtIndexReader *ir1;
 
     search = rb_intern("search");
     string = rb_intern("string");
@@ -305,11 +307,13 @@ TestSuite *ts_sort(TestSuite *suite)
     tst_run_test(suite, test_sort_field_to_s, NULL);
     tst_run_test(suite, test_sort_to_s, NULL);
 
-    sea = frt_isea_new(frt_ir_open(NULL, store));
+    ir0 = frt_ir_open(NULL, store);
+    sea = frt_isea_new(ir0);
 
     tst_run_test(suite, test_sorts, (void *)sea);
 
     frt_searcher_close(sea);
+    frt_ir_close(ir0);
 
     do_byte_test = false;
 
@@ -321,16 +325,20 @@ TestSuite *ts_sort(TestSuite *suite)
     sort_multi_test_setup(store, fs_store);
 
     searchers = FRT_ALLOC_N(FrtSearcher *, 2);
-
-    searchers[0] = frt_isea_new(frt_ir_open(NULL, store));
-    searchers[1] = frt_isea_new(frt_ir_open(NULL, fs_store));
-
-    sea = frt_msea_new(searchers, 2, true);
+    ir0 = frt_ir_open(NULL, store);
+    ir1 = frt_ir_open(NULL, fs_store);
+    searchers[0] = frt_isea_new(ir0);
+    searchers[1] = frt_isea_new(ir1);
+    FRT_DEREF(searchers[0]);
+    FRT_DEREF(searchers[1]);
+    sea = frt_msea_new(searchers, 2);
     tst_run_test(suite, test_sorts, (void *)sea);
-    frt_searcher_close(sea);
 
-    frt_store_deref(store);
-    frt_store_deref(fs_store);
+    frt_searcher_close(sea);
+    frt_ir_close(ir0);
+    frt_ir_close(ir1);
+    frt_store_close(store);
+    frt_store_close(fs_store);
 
     return suite;
 }

data/ext/isomorfeus_ferret_ext/test_term.c

@@ -163,7 +163,9 @@ void test_segment_term_enum(TestCase *tc, void *data)
     add_multi_field_terms(store);
 
     sfi = frt_sfi_open(store, "_0");
-    te = frt_ste_new(store->open_input(store, "_0.tis"), sfi);
+    FrtInStream *is = store->open_input(store, "_0.tis");
+    FRT_DEREF(is);
+    te = frt_ste_new(is, sfi);
     te->set_field(te, 0);
     for (i = 0; i < 40; i++) {
         int doc_count = i % 20 + 1;
@@ -347,7 +349,7 @@ TestSuite *ts_term(TestSuite *suite)
     tst_run_test(suite, test_segment_term_enum, store);
     tst_run_test(suite, test_term_infos_reader, store);
 
-    frt_store_deref(store);
+    frt_store_close(store);
 
     return suite;
 }

data/ext/isomorfeus_ferret_ext/test_term_vectors.c

@@ -220,7 +220,7 @@ static void test_tv_single_doc(TestCase *tc, void *data)
 
     frt_fr_close(fr);
     frt_fis_deref(fis);
-    frt_store_deref(store);
+    frt_store_close(store);
 }
 
 static void test_tv_multi_doc(TestCase *tc, void *data)
@@ -352,7 +352,7 @@ static void test_tv_multi_doc(TestCase *tc, void *data)
     frt_h_destroy(tvs);
     frt_fr_close(fr);
     frt_fis_deref(fis);
-    frt_store_deref(store);
+    frt_store_close(store);
 }
 
 

data/ext/isomorfeus_ferret_ext/test_threading.c

@@ -170,18 +170,19 @@ TestSuite *ts_threading(TestSuite *suite)
 
     suite = ADD_SUITE(suite);
 
-    frt_store_deref(store);
+    frt_store_close(store);
     frt_a_deref(a);
 
     tst_run_test(suite, test_number_to_str, NULL);
-    tst_run_test(suite, test_threading_test, index);
-    tst_run_test(suite, test_threading, index);
+    // with pthreads these won't work if frt_micro_sleep depends on ruby threads
+    //tst_run_test(suite, test_threading_test, index);
+    //tst_run_test(suite, test_threading, index);
 
     frt_index_destroy(index);
 
     store = frt_open_fs_store("./test/testdir/store");
     store->clear_all(store);
-    frt_store_deref(store);
+    frt_store_close(store);
 
     return suite;
 }

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

@@ -123,7 +123,10 @@ module Isomorfeus
             @dir = RAMDirectory.new
           end
 
-          @dir.extend(MonitorMixin) unless @dir.kind_of? MonitorMixin
+          unless @dir.kind_of? MonitorMixin
+            @dir.extend(MonitorMixin)
+            @dir.new_cond
+          end
           options[:dir] = @dir
           options[:lock_retry_time]||= 2
           @options = options
@@ -796,7 +799,10 @@ module Isomorfeus
             elsif directory.is_a?(Ferret::Store::Directory)
               @dir = directory
             end
-            @dir.extend(MonitorMixin) unless @dir.kind_of? MonitorMixin
+            unless @dir.kind_of? MonitorMixin
+              @dir.extend(MonitorMixin)
+              @dir.new_cond
+            end
             @options[:dir] = @dir
             @options[:create_if_missing] = true
             add_indexes([old_dir])
@@ -967,4 +973,3 @@ module Isomorfeus
     I = Index::Index
   end
 end
-

data/lib/isomorfeus/ferret/version.rb

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

metadata

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