isomorfeus-ferret 0.14.4 → 0.16.0

data/ext/isomorfeus_ferret_ext/test.c

@@ -730,14 +730,14 @@ static VALUE frb_ts_except(VALUE v)       { return INT2FIX(execute_test(6)); }
 static VALUE frb_ts_fields(VALUE v)       { return INT2FIX(execute_test(7)); }
 static VALUE frb_ts_file_deleter(VALUE v) { return INT2FIX(execute_test(8)); }
 static VALUE frb_ts_filter(VALUE v)       { return INT2FIX(execute_test(9)); }
-static VALUE frb_ts_fs_store(VALUE v)     { return INT2FIX(execute_test(10)); }
-static VALUE frb_ts_global(VALUE v)       { return INT2FIX(execute_test(11)); }
-static VALUE frb_ts_hash(VALUE v)         { return INT2FIX(execute_test(12)); }
-static VALUE frb_ts_hashset(VALUE v)      { return INT2FIX(execute_test(13)); }
-static VALUE frb_ts_helper(VALUE v)       { return INT2FIX(execute_test(14)); }
-static VALUE frb_ts_highlighter(VALUE v)  { return INT2FIX(execute_test(15)); }
-static VALUE frb_ts_index(VALUE v)        { return INT2FIX(execute_test(16)); }
-static VALUE frb_ts_lang(VALUE v)         { return INT2FIX(execute_test(17)); }
+static VALUE frb_ts_global(VALUE v)       { return INT2FIX(execute_test(10)); }
+static VALUE frb_ts_hash(VALUE v)         { return INT2FIX(execute_test(11)); }
+static VALUE frb_ts_hashset(VALUE v)      { return INT2FIX(execute_test(12)); }
+static VALUE frb_ts_helper(VALUE v)       { return INT2FIX(execute_test(13)); }
+static VALUE frb_ts_highlighter(VALUE v)  { return INT2FIX(execute_test(14)); }
+static VALUE frb_ts_index(VALUE v)        { return INT2FIX(execute_test(15)); }
+static VALUE frb_ts_lang(VALUE v)         { return INT2FIX(execute_test(16)); }
+static VALUE frb_ts_mdbx_store(VALUE v)   { return INT2FIX(execute_test(17)); }
 static VALUE frb_ts_mem_pool(VALUE v)     { return INT2FIX(execute_test(18)); }
 static VALUE frb_ts_multimapper(VALUE v)  { return INT2FIX(execute_test(19)); }
 static VALUE frb_ts_priorityqueue(VALUE v){ return INT2FIX(execute_test(20)); }
@@ -808,7 +808,6 @@ void Init_Test(void) {
     rb_define_singleton_method(mTest, "fields",         frb_ts_fields, 0);
     rb_define_singleton_method(mTest, "file_deleter",   frb_ts_file_deleter, 0);
     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, "test_hash",      frb_ts_hash, 0);
     rb_define_singleton_method(mTest, "hashset",        frb_ts_hashset, 0);
@@ -816,6 +815,7 @@ void Init_Test(void) {
     rb_define_singleton_method(mTest, "highlighter",    frb_ts_highlighter, 0);
     rb_define_singleton_method(mTest, "index",          frb_ts_index, 0);
     rb_define_singleton_method(mTest, "lang",           frb_ts_lang, 0);
+    rb_define_singleton_method(mTest, "mdbx_store",     frb_ts_mdbx_store, 0);
     rb_define_singleton_method(mTest, "mem_pool",       frb_ts_mem_pool, 0);
     rb_define_singleton_method(mTest, "multimapper",    frb_ts_multimapper, 0);
     rb_define_singleton_method(mTest, "priorityqueue",  frb_ts_priorityqueue, 0);

data/ext/isomorfeus_ferret_ext/test_index.c

@@ -956,7 +956,7 @@ static void test_iw_add_doc(TestCase *tc, void *data)
  */
 static void test_create_with_reader(TestCase *tc, void *data)
 {
-    FrtStore *store = frt_open_fs_store(TEST_DIR);
+    FrtStore *store = frt_open_mdbx_store(TEST_DIR);
     (void)data;
     FrtIndexWriter *iw;
     FrtIndexReader *ir, *ir2;
@@ -2208,7 +2208,7 @@ TestSuite *ts_index(TestSuite *suite)
     FrtIndexReader *ir;
     FrtStore *fs_store, *store = frt_open_ram_store(NULL);
     ReaderTestEnvironment *rte = NULL;
-    /* FrtStore *store = frt_open_fs_store(TEST_DIR); */
+    /* FrtStore *store = frt_open_mdbx_store(TEST_DIR); */
 
     /* initialize IDs */
     body             = rb_intern("body");
@@ -2321,7 +2321,7 @@ TestSuite *ts_index(TestSuite *suite)
     /* Other FrtIndexReader Tests */
     tst_run_test_with_name(suite, test_ir_read_while_optimizing, store, "test_ir_read_while_optimizing_in_ram");
 
-    fs_store = frt_open_fs_store(TEST_DIR);
+    fs_store = frt_open_mdbx_store(TEST_DIR);
     tst_run_test_with_name(suite, test_ir_read_while_optimizing, fs_store, "test_ir_read_while_optimizing_on_disk");
     fs_store->clear_all(fs_store);
     frt_store_close(fs_store);

data/ext/isomorfeus_ferret_ext/{test_fs_store.c → test_mdbx_store.c}

@@ -3,23 +3,17 @@
 #include "test.h"
 
 /**
- * Test a FileSystem store
+ * Test a MDBX store
  */
-TestSuite *ts_fs_store(TestSuite *suite)
-{
-
+TestSuite *ts_mdbx_store(TestSuite *suite) {
 #if defined POSH_OS_WIN32 || defined POSH_OS_WIN64
-    FrtStore *store = frt_open_fs_store(".\\test\\testdir\\store");
+    FrtStore *store = frt_open_mdbx_store(".\\test\\testdir\\mdbx_store");
 #else
-    FrtStore *store = frt_open_fs_store("./test/testdir/store");
+    FrtStore *store = frt_open_mdbx_store("./test/testdir/mdbx_store");
 #endif
     store->clear(store);
-
     suite = ADD_SUITE(suite);
-
     create_test_store_suite(suite, store);
-
     frt_store_close(store);
-
     return suite;
 }

data/ext/isomorfeus_ferret_ext/test_ram_store.c

@@ -11,7 +11,7 @@ void test_write_to(TestCase *tc, void *data)
     int i;
     char *tmp;
     FrtStore *ram_store = frt_open_ram_store(NULL);
-    FrtStore *fs_store = frt_open_fs_store("./test/testdir/store");
+    FrtStore *fs_store = frt_open_mdbx_store("./test/testdir/store");
     char str[18] = "³³ øãíøäÄ";
     char buf[18000] = "";
     FrtOutStream *ostream, *fs_ostream;

data/ext/isomorfeus_ferret_ext/test_segments.c

@@ -47,7 +47,7 @@ static void test_si(TestCase *tc, void *data)
     FrtStore *store = (FrtStore *)data;
     FrtSegmentInfo *si = frt_si_new(frt_estrdup("_1"), 10, store);
     Asi_has_vals(si, "_1", 10, store);
-    store = frt_open_fs_store("./test/testdir/store");
+    store = frt_open_mdbx_store("./test/testdir/store");
     si->name[1] = '2';
     si->doc_cnt += 2;
     si->store = store;

data/ext/isomorfeus_ferret_ext/test_sort.c

@@ -318,9 +318,9 @@ TestSuite *ts_sort(TestSuite *suite)
     do_byte_test = false;
 
 #if defined POSH_OS_WIN32 || defined POSH_OS_WIN64
-    fs_store = frt_open_fs_store(".\\test\\testdir\\store");
+    fs_store = frt_open_mdbx_store(".\\test\\testdir\\store");
 #else
-    fs_store = frt_open_fs_store("./test/testdir/store");
+    fs_store = frt_open_mdbx_store("./test/testdir/store");
 #endif
     sort_multi_test_setup(store, fs_store);
 

data/ext/isomorfeus_ferret_ext/test_store.c

@@ -18,8 +18,7 @@ typedef struct WithLockNameTestArg {
     TestCase *tc;
 } WithLockNameTestArg;
 
-static void with_lock_test(void *p)
-{
+static void with_lock_test(void *p) {
     WithLockTestArg *l = (WithLockTestArg *)p;
     TestCase *tc = l->tc;
     Assert(l->lock->is_locked(l->lock), "lock should be locked");
@@ -115,13 +114,11 @@ static void test_lock(TestCase *tc, void *data)
 /**
  * Do basic file operations test.
  */
-static void test_basic_file_ops(TestCase *tc, void *data)
-{
+static void test_basic_file_ops(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
 
     store->clear_all(store);    /* Make sure the test directory is empty. */
-    Assert(!store->exists(store, "_1.f1"),
-           "File1 should not been created yet");
+    Assert(!store->exists(store, "_1.f1"), "File1 should not been created yet");
     store->touch(store, "_1.f1");
     Aiequal(1, store->count(store));
     Assert(store->count(store) == 1, "The store now contains one file");
@@ -567,8 +564,7 @@ static void test_read_bytes(TestCase *tc, void *data)
  * suite for both a FileSystem store and a RAM store and any other type of
  * store that you might want to create.
  */
-void create_test_store_suite(TestSuite *suite, FrtStore *store)
-{
+void create_test_store_suite(TestSuite *suite, FrtStore *store) {
     store->clear_all(store);
 
     tst_run_test(suite, test_basic_file_ops, store);

data/ext/isomorfeus_ferret_ext/test_threading.c

@@ -88,7 +88,7 @@ static void do_search(FrtIndex *index)
 
     tlog("Searching for %d\n", n);
 
-    frt_mutex_lock(&index->mutex);
+    pthread_mutex_lock(&index->mutex);
     td = frt_index_search_str(index, query, 0, 3, NULL, NULL, NULL, enc);
     free(query);
     for (i = 0; i < td->size; i++) {
@@ -98,7 +98,7 @@ static void do_search(FrtIndex *index)
         frt_doc_destroy(doc);
     }
     tlog("Searched for %d: total = %d\n", n, td->total_hits);
-    frt_mutex_unlock(&index->mutex);
+    pthread_mutex_unlock(&index->mutex);
 
     frt_td_destroy(td);
 }
@@ -155,7 +155,7 @@ TestSuite *ts_threading(TestSuite *suite)
     contents = rb_intern("contents");
 
     FrtAnalyzer *a = frt_letter_analyzer_new(true);
-    FrtStore *store = frt_open_fs_store("./test/testdir/store");
+    FrtStore *store = frt_open_mdbx_store("./test/testdir/store");
     FrtIndex *index;
     FrtHashSet *def_fields = frt_hs_new_ptr(NULL);
     FrtFieldInfos *fis = frt_fis_new(0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_POSITIONS_BM | FRT_FI_STORE_OFFSETS_BM);
@@ -180,7 +180,7 @@ TestSuite *ts_threading(TestSuite *suite)
 
     frt_index_destroy(index);
 
-    store = frt_open_fs_store("./test/testdir/store");
+    store = frt_open_mdbx_store("./test/testdir/store");
     store->clear_all(store);
     frt_store_close(store);
 

data/ext/isomorfeus_ferret_ext/tests_all.h

@@ -3,7 +3,6 @@
 
 #include "test.h"
 
-
 TestSuite *ts_1710(TestSuite *suite);
 TestSuite *ts_analysis(TestSuite *suite);
 TestSuite *ts_array(TestSuite *suite);
@@ -14,7 +13,6 @@ TestSuite *ts_except(TestSuite *suite);
 TestSuite *ts_fields(TestSuite *suite);
 TestSuite *ts_file_deleter(TestSuite *suite);
 TestSuite *ts_filter(TestSuite *suite);
-TestSuite *ts_fs_store(TestSuite *suite);
 TestSuite *ts_global(TestSuite *suite);
 TestSuite *ts_hash(TestSuite *suite);
 TestSuite *ts_hashset(TestSuite *suite);
@@ -22,6 +20,7 @@ TestSuite *ts_helper(TestSuite *suite);
 TestSuite *ts_highlighter(TestSuite *suite);
 TestSuite *ts_index(TestSuite *suite);
 TestSuite *ts_lang(TestSuite *suite);
+TestSuite *ts_mdbx_store(TestSuite *suite);
 TestSuite *ts_mem_pool(TestSuite *suite);
 TestSuite *ts_multimapper(TestSuite *suite);
 TestSuite *ts_priorityqueue(TestSuite *suite);
@@ -56,7 +55,6 @@ const struct test_list
     {ts_fields},
     {ts_file_deleter},
     {ts_filter},
-    {ts_fs_store},
     {ts_global},
     {ts_hash},
     {ts_hashset},
@@ -64,6 +62,7 @@ const struct test_list
     {ts_highlighter},
     {ts_index},
     {ts_lang},
+    {ts_mdbx_store},
     {ts_mem_pool},
     {ts_multimapper},
     {ts_priorityqueue},

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

@@ -111,10 +111,9 @@ module Isomorfeus
           if options[:path]
             @close_dir = true
             begin
-              @dir = FSDirectory.new(options[:path], options[:create])
+              @dir = MDBXDirectory.new(options[:path], options[:create])
             rescue IOError
-              @dir = FSDirectory.new(options[:path],
-                                    options[:create_if_missing] != false)
+              @dir = MDBXDirectory.new(options[:path], options[:create_if_missing] != false)
             end
           elsif options[:dir]
             @dir = options[:dir]
@@ -690,9 +689,9 @@ module Isomorfeus
 
         # Returns true if any documents have been deleted since the index was last
         # flushed.
-        def has_deletions?()
+        def has_deletions?
           @dir.synchronize do
-            ensure_reader_open()
+            ensure_reader_open
             return @reader.has_deletions?
           end
         end
@@ -703,7 +702,7 @@ module Isomorfeus
         # NOTE: this is not necessary if you are only using this class. All writes
         # will automatically flush when you perform an operation that reads the
         # index.
-        def flush()
+        def flush
           @dir.synchronize do
             if @reader
               if @searcher
@@ -786,10 +785,10 @@ module Isomorfeus
         #             false.
         def persist(directory, create = true)
           synchronize do
-            close_all()
+            close_all
             old_dir = @dir
             if directory.is_a?(String)
-              @dir = FSDirectory.new(directory, create)
+              @dir = MDBXDirectory.new(directory, create)
             elsif directory.is_a?(Ferret::Store::Directory)
               @dir = directory
             end
@@ -948,7 +947,7 @@ module Isomorfeus
             return @searcher.search(query, options)
           end
 
-          def close_all()
+          def close_all
             @dir.synchronize do
               @searcher.close if @searcher
               @reader.close if @reader

data/lib/isomorfeus/ferret/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Ferret
-    VERSION = '0.14.4'
+    VERSION = '0.16.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-ferret
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.16.0
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2022-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.14
+        version: 3.13.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.14
+        version: 3.13.23
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +202,6 @@ files:
 - ext/isomorfeus_ferret_ext/frt_field_index.c
 - ext/isomorfeus_ferret_ext/frt_field_index.h
 - ext/isomorfeus_ferret_ext/frt_filter.c
-- ext/isomorfeus_ferret_ext/frt_fs_store.c
 - ext/isomorfeus_ferret_ext/frt_global.c
 - ext/isomorfeus_ferret_ext/frt_global.h
 - ext/isomorfeus_ferret_ext/frt_hash.c
@@ -217,6 +216,7 @@ files:
 - ext/isomorfeus_ferret_ext/frt_index.h
 - ext/isomorfeus_ferret_ext/frt_lang.c
 - ext/isomorfeus_ferret_ext/frt_lang.h
+- ext/isomorfeus_ferret_ext/frt_mdbx_store.c
 - ext/isomorfeus_ferret_ext/frt_mempool.c
 - ext/isomorfeus_ferret_ext/frt_mempool.h
 - ext/isomorfeus_ferret_ext/frt_multimapper.c
@@ -262,6 +262,8 @@ files:
 - ext/isomorfeus_ferret_ext/lz4hc.h
 - ext/isomorfeus_ferret_ext/lz4xxhash.c
 - ext/isomorfeus_ferret_ext/lz4xxhash.h
+- ext/isomorfeus_ferret_ext/mdbx.c
+- ext/isomorfeus_ferret_ext/mdbx.h
 - ext/isomorfeus_ferret_ext/stem_UTF_8_arabic.c
 - ext/isomorfeus_ferret_ext/stem_UTF_8_arabic.h
 - ext/isomorfeus_ferret_ext/stem_UTF_8_armenian.c
@@ -337,7 +339,6 @@ files:
 - ext/isomorfeus_ferret_ext/test_fields.c
 - ext/isomorfeus_ferret_ext/test_file_deleter.c
 - ext/isomorfeus_ferret_ext/test_filter.c
-- ext/isomorfeus_ferret_ext/test_fs_store.c
 - ext/isomorfeus_ferret_ext/test_global.c
 - ext/isomorfeus_ferret_ext/test_hash.c
 - ext/isomorfeus_ferret_ext/test_hashset.c
@@ -345,6 +346,7 @@ files:
 - ext/isomorfeus_ferret_ext/test_highlighter.c
 - ext/isomorfeus_ferret_ext/test_index.c
 - ext/isomorfeus_ferret_ext/test_lang.c
+- ext/isomorfeus_ferret_ext/test_mdbx_store.c
 - ext/isomorfeus_ferret_ext/test_mempool.c
 - ext/isomorfeus_ferret_ext/test_multimapper.c
 - ext/isomorfeus_ferret_ext/test_priorityqueue.c
@@ -396,7 +398,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: Indexed document store for Isomorfeus.