isomorfeus-ferret 0.17.2 → 0.17.3

data/ext/isomorfeus_ferret_ext/test_term_vectors.c

@@ -5,8 +5,7 @@
 #define TERM_LEN 10
 
 
-static void test_posting(TestCase *tc, void *data)
-{
+static void test_posting(TestCase *tc, void *data) {
     FrtMemoryPool *mp = (FrtMemoryPool *)data;
     FrtPostingList *pl;
     FrtPosting *p = frt_p_new(mp, 0, 10);
@@ -43,8 +42,7 @@ static FrtFieldInfos *create_tv_fis(void) {
     return fis;
 }
 
-static char **create_tv_terms(FrtMemoryPool *mp)
-{
+static char **create_tv_terms(FrtMemoryPool *mp) {
     int i;
     char term_buf[10];
     char **terms = FRT_MP_ALLOC_N(mp, char *, NUM_TERMS);
@@ -55,8 +53,7 @@ static char **create_tv_terms(FrtMemoryPool *mp)
     return terms;
 }
 
-static FrtPostingList **create_tv_plists(FrtMemoryPool *mp, char **terms)
-{
+static FrtPostingList **create_tv_plists(FrtMemoryPool *mp, char **terms) {
     int i, j;
     FrtPostingList **plists, *pl;
     plists = FRT_MP_ALLOC_N(mp, FrtPostingList *, NUM_TERMS);
@@ -70,8 +67,7 @@ static FrtPostingList **create_tv_plists(FrtMemoryPool *mp, char **terms)
     return plists;
 }
 
-static FrtOffset *create_tv_offsets(FrtMemoryPool *mp)
-{
+static FrtOffset *create_tv_offsets(FrtMemoryPool *mp) {
     int i;
     FrtOffset *offsets = FRT_MP_ALLOC_N(mp, FrtOffset, NUM_TERMS);
     for (i = 0; i < NUM_TERMS; i++) {
@@ -81,10 +77,10 @@ static FrtOffset *create_tv_offsets(FrtMemoryPool *mp)
     return offsets;
 }
 
-static void test_tv_single_doc(TestCase *tc, void *data)
-{
+static void test_tv_single_doc(TestCase *tc, void *data) {
     int i, j;
     FrtStore *store = frt_open_ram_store(NULL);
+    store->create_folder(store, segm_idx_name);
     FrtMemoryPool *mp = (FrtMemoryPool *)data;
     FrtFieldsReader *fr;
     FrtFieldsWriter *fw;
@@ -223,10 +219,10 @@ static void test_tv_single_doc(TestCase *tc, void *data)
     frt_store_close(store);
 }
 
-static void test_tv_multi_doc(TestCase *tc, void *data)
-{
+static void test_tv_multi_doc(TestCase *tc, void *data) {
     int i, j;
     FrtStore *store = frt_open_ram_store(NULL);
+    store->create_folder(store, segm_idx_name);
     FrtMemoryPool *mp = (FrtMemoryPool *)data;
     FrtFieldsReader *fr;
     FrtFieldsWriter *fw;
@@ -356,8 +352,7 @@ static void test_tv_multi_doc(TestCase *tc, void *data)
 }
 
 
-TestSuite *ts_term_vectors(TestSuite *suite)
-{
+TestSuite *ts_term_vectors(TestSuite *suite) {
     FrtMemoryPool *mp = frt_mp_new();
 
     suite = ADD_SUITE(suite);

data/ext/isomorfeus_ferret_ext/test_test.c

@@ -8,8 +8,7 @@ static void raise_eof(void) {
 /**
  * Test the basic test functions
  */
-static void test_asserts(TestCase *tc, void *data)
-{
+static void test_asserts(TestCase *tc, void *data) {
     char *p[10];
 
     int ia1[3] = { 1, 2, 3 };
@@ -33,8 +32,7 @@ static void test_asserts(TestCase *tc, void *data)
     Araise(FRT_EOF_ERROR, &raise_eof, NULL);
 }
 
-static void raise_nothing(void *nothing)
-{
+static void raise_nothing(void *nothing) {
     (void)nothing;
 }
 /**
@@ -42,8 +40,7 @@ static void raise_nothing(void *nothing)
  * passing but if you want to check the tests work in case of failure, run
  * this test.
  */
-static void test_failures(TestCase *tc, void *data)
-{
+static void test_failures(TestCase *tc, void *data) {
     void *q = NULL;
     void *p = frt_emalloc(10);
 
@@ -69,8 +66,7 @@ static void test_failures(TestCase *tc, void *data)
     Araise(EXCEPTION, &raise_nothing, NULL);
 }
 
-TestSuite *ts_test(TestSuite *suite)
-{
+TestSuite *ts_test(TestSuite *suite) {
     suite = ADD_SUITE(suite);
 
     tst_run_test(suite, test_asserts, NULL);

data/ext/isomorfeus_ferret_ext/test_threading.c

@@ -9,8 +9,7 @@ extern char *num_to_str(int num);
 
 #define test_num(n, expected) num = num_to_str(n); Asequal(expected, num); free(num)
 
-static void test_number_to_str(TestCase *tc, void *data)
-{
+static void test_number_to_str(TestCase *tc, void *data) {
     char *num;
     (void)data;
     test_num(0, "zero");
@@ -42,8 +41,7 @@ void dummy_log(const void *fmt, ...) {(void)fmt;}
 #define tlog dummy_log
 #endif
 
-static void do_delete_doc(FrtIndex *index)
-{
+static void do_delete_doc(FrtIndex *index) {
     int size;
     if ((size = frt_index_size(index)) > 0) {
         int doc_num = rand() % size;
@@ -60,20 +58,18 @@ static void do_delete_doc(FrtIndex *index)
 ID id;
 ID contents;
 
-static void do_add_doc(FrtIndex *index)
-{
+static void do_add_doc(FrtIndex *index) {
     FrtDocument *doc = frt_doc_new();
     int n = rand();
     rb_encoding *enc = rb_enc_find("ASCII-8BIT");
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(id), frt_strfmt("%d", n), enc))->destroy_data = true;
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(contents), num_to_str(n), enc))->destroy_data = true;
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(id), frt_strfmt("%d", n), enc));
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(contents), num_to_str(n), enc));
     tlog("Adding %d\n", n);
     frt_index_add_doc(index, doc);
     frt_doc_destroy(doc);
 }
 
-static void do_search(FrtIndex *index)
-{
+static void do_search(FrtIndex *index) {
     int n = rand(), i;
     char *query = num_to_str(n);
     FrtTopDocs *td;
@@ -96,8 +92,7 @@ static void do_search(FrtIndex *index)
     frt_td_destroy(td);
 }
 
-static void *indexing_thread(void *p)
-{
+static void *indexing_thread(void *p) {
     int i, choice;
     FrtIndex *index = (FrtIndex *)p;
 
@@ -115,16 +110,14 @@ static void *indexing_thread(void *p)
     return NULL;
 }
 
-static void test_threading_test(TestCase *tc, void *data)
-{
+static void test_threading_test(TestCase *tc, void *data) {
     FrtIndex *index = (FrtIndex *)data;
     (void)data;
     (void)tc;
     indexing_thread(index);
 }
 
-static void test_threading(TestCase *tc, void *data)
-{
+static void test_threading(TestCase *tc, void *data) {
     int i;
     pthread_t thread_id[NTHREADS];
     FrtIndex *index = (FrtIndex *)data;
@@ -140,13 +133,13 @@ static void test_threading(TestCase *tc, void *data)
     }
 }
 
-TestSuite *ts_threading(TestSuite *suite)
-{
+TestSuite *ts_threading(TestSuite *suite) {
     id = rb_intern("id");
     contents = rb_intern("contents");
 
     FrtAnalyzer *a = frt_letter_analyzer_new(true);
     FrtStore *store = frt_open_mdbx_store("./test/testdir/store");
+    store->create_folder(store, segm_idx_name);
     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);
@@ -155,7 +148,7 @@ TestSuite *ts_threading(TestSuite *suite)
     frt_fis_deref(fis);
 
     frt_hs_add(def_fields, (void *)contents);
-    store->clear_all(store);
+    store->clear_all(store, segm_idx_name);
     index = frt_index_new(store, a, def_fields, true);
     frt_hs_destroy(def_fields);
 
@@ -172,7 +165,8 @@ TestSuite *ts_threading(TestSuite *suite)
     frt_index_destroy(index);
 
     store = frt_open_mdbx_store("./test/testdir/store");
-    store->clear_all(store);
+    store->create_folder(store, segm_idx_name);
+    store->clear_all(store, segm_idx_name);
     frt_store_close(store);
 
     return suite;

data/ext/isomorfeus_ferret_ext/testhelper.c

@@ -354,8 +354,7 @@ const char *test_word_list[] = {
     "hippos", "dam's", "expressionists", "peewee", "troop's", NULL
 };
 
-char *make_random_string(char *buf, int max_words)
-{
+char *make_random_string(char *buf, int max_words) {
     char *s = buf;
     int num_words = 5 + rand() % (max_words - 5);
 
@@ -366,9 +365,8 @@ char *make_random_string(char *buf, int max_words)
     return buf;
 }
 
-char *get_nth_word(char *words, char *buf, int n, int *start, int *end)
-{
-    char *s = words, *e;
+char *get_nth_word(const char *words, char *buf, int n, int *start, int *end) {
+    const char *s = words, *e;
     int len;
     while (n > 0) {
         while (*s && *s != ' ') {
@@ -395,8 +393,7 @@ char *get_nth_word(char *words, char *buf, int n, int *start, int *end)
     return buf;
 }
 
-int nth_word_eql(char *words, char *word, int n)
-{
+int nth_word_eql(char *words, char *word, int n) {
     char *s = words;
     while (n > 0) {
         while (*s && *s != ' ') {
@@ -407,18 +404,15 @@ int nth_word_eql(char *words, char *word, int n)
     if (*s) {
         if (strncmp(s, word, strlen(word)) == 0) {
             return 1;
-        }
-        else {
+        } else {
             return 0;
         }
-    }
-    else {
+    } else {
         return 0;
     }
 }
 
-int s2l(const char *str, int *arr)
-{
+int s2l(const char *str, int *arr) {
     int i = 0;
     int num = 0;
     const char *p = str;
@@ -438,8 +432,7 @@ int s2l(const char *str, int *arr)
     return i;
 }
 
-bool frt_ary_includes(int *array, int size, int val)
-{
+bool frt_ary_includes(int *array, int size, int val) {
     bool found = false;
     int i;
     for (i = 0; i < size; i++) {
@@ -503,8 +496,7 @@ static const char *GROUPS[] = {
 
 static const int K = 1000;
 
-static char *under_1000(int val)
-{
+static char *under_1000(int val) {
     const char *hundreds = (val >= 100) ? DIGITS[val/100] : "";
     const char *_and = "";
     const char *tens = "";
@@ -522,8 +514,7 @@ static char *under_1000(int val)
     return frt_strfmt("%s%s%s%s", hundreds, _and, tens, digits);
 }
 
-static char *group(int val, int level)
-{
+static char *group(int val, int level) {
     char *res;
     if (val >= K) {
         char *above = group(val/K, level+1);
@@ -538,8 +529,7 @@ static char *group(int val, int level)
     return res;
 }
 
-char *num_to_str(int num)
-{
+char *num_to_str(int num) {
     char *res;
     if (num < 0) {
         char *neg;

data/ext/isomorfeus_ferret_ext/testhelper.h

@@ -15,7 +15,7 @@
 extern const char *test_word_list[];
 
 extern char *make_random_string(char *buf, int num_words);
-extern char *get_nth_word(char *words, char *buf, int n, int *s, int *e);
+extern char *get_nth_word(const char *words, char *buf, int n, int *s, int *e);
 extern int nth_word_eql(char *words, char *word, int n);
 extern int s2l(const char *str, int *arr);
 extern bool frt_ary_includes(int *array, int size, int val);

data/ext/isomorfeus_ferret_ext/tests_all.h

@@ -40,8 +40,7 @@ TestSuite *ts_term_vectors(TestSuite *suite);
 TestSuite *ts_test(TestSuite *suite);
 TestSuite *ts_threading(TestSuite *suite);
 
-const struct test_list
-{
+const struct test_list {
     TestSuite *(*func)(TestSuite *suite);
 } all_tests[] = {
     {ts_1710},

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

@@ -130,7 +130,7 @@ module Isomorfeus
           options[:dir] = @dir
           options[:lock_retry_time]||= 2
           @options = options
-          if (!@dir.exists?("segments")) || options[:create]
+          if (!@dir.exist?("segments")) || options[:create]
             IndexWriter.new(options).close
           end
           options[:analyzer]||= Ferret::Analysis::StandardAnalyzer.new

data/lib/isomorfeus/ferret/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Ferret
-    VERSION = '0.17.2'
+    VERSION = '0.17.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-ferret
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.3
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-06 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.13.23
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -194,12 +208,18 @@ files:
 - ext/isomorfeus_ferret_ext/frt_bitvector.c
 - ext/isomorfeus_ferret_ext/frt_bitvector.h
 - ext/isomorfeus_ferret_ext/frt_config.h
+- ext/isomorfeus_ferret_ext/frt_doc_field.c
+- ext/isomorfeus_ferret_ext/frt_doc_field.h
 - ext/isomorfeus_ferret_ext/frt_document.c
 - ext/isomorfeus_ferret_ext/frt_document.h
 - ext/isomorfeus_ferret_ext/frt_except.c
 - ext/isomorfeus_ferret_ext/frt_except.h
 - ext/isomorfeus_ferret_ext/frt_field_index.c
 - ext/isomorfeus_ferret_ext/frt_field_index.h
+- ext/isomorfeus_ferret_ext/frt_field_info.c
+- ext/isomorfeus_ferret_ext/frt_field_info.h
+- ext/isomorfeus_ferret_ext/frt_field_infos.c
+- ext/isomorfeus_ferret_ext/frt_field_infos.h
 - ext/isomorfeus_ferret_ext/frt_filter.c
 - ext/isomorfeus_ferret_ext/frt_global.c
 - ext/isomorfeus_ferret_ext/frt_global.h
@@ -393,7 +413,7 @@ metadata:
   source_code_uri: https://github.com/isomorfeus/isomorfeus-ferret
 post_install_message: |2+
 
-  isomorfeus-ferret 0.17.2:
+  isomorfeus-ferret 0.17.3:
 
   Development in progress:
   - It may eat all your files, when hungry!
@@ -414,7 +434,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Indexed document store for Isomorfeus.