isomorfeus-ferret 0.12.6 → 0.13.1

data/ext/isomorfeus_ferret_ext/test_filter.c

@@ -2,6 +2,8 @@
 #include "frt_search.h"
 #include "test.h"
 
+#undef close
+
 #define FILTER_DOCS_SIZE 10
 #define ARRAY_SIZE 20
 
@@ -11,13 +13,14 @@ struct FilterData {
     const char *flipflop;
 };
 
-static FrtSymbol num, date, flipflop;
+static ID num, date, flipflop;
 
 void prepare_filter_index(FrtStore *store)
 {
     int i;
     FrtIndexWriter *iw;
-    FrtFieldInfos *fis = frt_fis_new(FRT_STORE_YES, FRT_INDEX_YES, FRT_TERM_VECTOR_NO);
+    FrtFieldInfos *fis = frt_fis_new(FRT_STORE_YES, FRT_COMPRESSION_NONE, FRT_INDEX_YES, FRT_TERM_VECTOR_NO);
+    rb_encoding *enc = rb_enc_find("ASCII-8BIT");
 
     num      = rb_intern("num");
     date     = rb_intern("date");
@@ -39,13 +42,13 @@ void prepare_filter_index(FrtStore *store)
     frt_index_create(store, fis);
     frt_fis_deref(fis);
 
-    iw = frt_iw_open(store, frt_whitespace_analyzer_new(false), NULL);
+    iw = frt_iw_open(NULL, store, frt_whitespace_analyzer_new(false), NULL);
     for (i = 0; i < FILTER_DOCS_SIZE; i++) {
         FrtDocument *doc = frt_doc_new();
         doc->boost = (float)(i+1);
-        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(num), (char *)data[i].num));
-        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(date), (char *)data[i].date));
-        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(flipflop), (char *)data[i].flipflop));
+        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(num), (char *)data[i].num, enc));
+        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(date), (char *)data[i].date, enc));
+        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(flipflop), (char *)data[i].flipflop, enc));
         frt_iw_add_doc(iw, doc);
        frt_doc_destroy(doc);
     }
@@ -313,9 +316,9 @@ TestSuite *ts_filter(TestSuite *suite)
 
     suite = ADD_SUITE(suite);
 
-    store = frt_open_ram_store();
+    store = frt_open_ram_store(NULL);
     prepare_filter_index(store);
-    ir = frt_ir_open(store);
+    ir = frt_ir_open(NULL, store);
     searcher = frt_isea_new(ir);
 
     tst_run_test(suite, test_range_filter, (void *)searcher);

data/ext/isomorfeus_ferret_ext/test_global.c

@@ -145,50 +145,6 @@ static void test_dbl_to_s(TestCase *tc, void *data)
     Asequal("NaN", frt_dbl_to_s(buf, NAN));
 }
 
-
-/**
- * Generate a stacktrace, make sure it does something
- */
-static void test_stacktrace(TestCase *tc, void *data)
-{
-    FILE *old_stream = frt_x_exception_stream;
-    (void)data; /* suppress warning */
-    int tfd = fio_tmpfile();
-    frt_x_exception_stream = fdopen(tfd, "w+");
-    Atrue(frt_x_exception_stream != NULL);
-    if (frt_x_exception_stream) {
-        frt_print_stacktrace();
-        long int f = ftell(frt_x_exception_stream);
-        Assert(f, "Stream position should not be 0");
-        fclose(frt_x_exception_stream);
-    }
-    frt_x_exception_stream = old_stream;
-}
-
-/**
- * Generate a normally fatal signal, which gets caught
- */
- /*
-static void test_sighandler(TestCase *tc, void *data)
-{
-    bool  old_abort = frt_x_abort_on_exception;
-    FILE *old_stream = frt_x_exception_stream;
-    (void)data;
-    (void)tc;
-
-    frt_x_exception_stream = false;
-    frt_x_exception_stream = tmpfile();
-
-    raise(SIGSEGV);
-
-    Assert(ftell(frt_x_exception_stream), "Stream position should not be 0");
-    fclose(frt_x_exception_stream);
-
-    frt_x_exception_stream = old_stream;
-    frt_x_abort_on_exception = old_abort;
-}
-*/
-
 static void test_count_leading_zeros(TestCase *tc, void *data)
 {
     (void)data;
@@ -284,8 +240,6 @@ TestSuite *ts_global(TestSuite *suite)
     tst_run_test(suite, test_alloc, NULL);
     tst_run_test(suite, test_strfmt, NULL);
     tst_run_test(suite, test_dbl_to_s, NULL);
-    tst_run_test(suite, test_stacktrace, NULL);
-    // tst_run_test(suite, test_sighandler, NULL);
     tst_run_test(suite, test_count_leading_zeros, NULL);
     tst_run_test(suite, test_count_leading_ones, NULL);
     tst_run_test(suite, test_count_trailing_zeros, NULL);

data/ext/isomorfeus_ferret_ext/test_hash.c

@@ -199,8 +199,8 @@ static void test_hash_int(TestCase *tc, void *data)
 static void test_hash_ptr(TestCase *tc, void *data)
 {
     FrtHash *h = frt_h_new_ptr(&free);
-    FrtSymbol word1 = rb_intern("one");
-    FrtSymbol word2 = rb_intern("two");
+    ID word1 = rb_intern("one");
+    ID word2 = rb_intern("two");
     char *word_one = frt_estrdup("one");
     int i;
     char buf[100];

data/ext/isomorfeus_ferret_ext/test_hashset.c

@@ -61,7 +61,7 @@ static void test_hs(TestCase *tc, void *data)
 static void test_hs_ptr(TestCase *tc, void *data)
 {
     FrtHashSet *hs = frt_hs_new_ptr(NULL);
-    FrtSymbol word1 = rb_intern("one"), word2 = rb_intern("two");
+    ID word1 = rb_intern("one"), word2 = rb_intern("two");
     char *word_one = frt_estrdup("one");
     (void)data; /* suppress unused argument warning */
 

data/ext/isomorfeus_ferret_ext/test_highlighter.c

@@ -3,6 +3,8 @@
 #include "testhelper.h"
 #include "test.h"
 
+#undef close
+
 #define ARRAY_SIZE 100
 
 static void test_match_vector(TestCase *tc, void *data)
@@ -79,7 +81,7 @@ static void test_match_vector(TestCase *tc, void *data)
 
 static void make_index(FrtStore *store)
 {
-    FrtFieldInfos *fis = frt_fis_new(FRT_STORE_YES, FRT_INDEX_YES,
+    FrtFieldInfos *fis = frt_fis_new(FRT_STORE_YES, FRT_COMPRESSION_NONE, FRT_INDEX_YES,
                               FRT_TERM_VECTOR_WITH_POSITIONS_OFFSETS);
     frt_index_create(store, fis);
     frt_fis_deref(fis);
@@ -87,13 +89,14 @@ static void make_index(FrtStore *store)
 
 static void add_string_docs(FrtStore *store, const char *string[])
 {
-    FrtIndexWriter *iw = frt_iw_open(store, frt_whitespace_analyzer_new(true), NULL);
+    FrtIndexWriter *iw = frt_iw_open(NULL, store, frt_whitespace_analyzer_new(true), NULL);
+    rb_encoding *enc = rb_enc_find("ASCII-8BIT");
 
     while (*string) {
         FrtDocument *doc = frt_doc_new();
-        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("field")), (char *)*string));
+        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("field")), (char *)*string, enc));
         frt_iw_add_doc(iw, doc);
-       frt_doc_destroy(doc);
+        frt_doc_destroy(doc);
         string++;
     }
     frt_iw_close(iw);
@@ -102,7 +105,7 @@ static void add_string_docs(FrtStore *store, const char *string[])
 #define Chk_sea_mv(query, doc_num, expected) check_searcher_match_vector(tc, store, query, doc_num, expected)
 static void check_searcher_match_vector(TestCase *tc, FrtStore *store, FrtQuery *query, int doc_num, const char *expected)
 {
-    FrtIndexReader *ir = frt_ir_open(store);
+    FrtIndexReader *ir = frt_ir_open(NULL, store);
     FrtSearcher *sea = frt_isea_new(ir);
     FrtMatchVector *mv = frt_searcher_get_match_vector(sea, query, doc_num, rb_intern("field"));
     static int offset_array[ARRAY_SIZE];
@@ -122,7 +125,7 @@ static void check_searcher_match_vector(TestCase *tc, FrtStore *store, FrtQuery
 #define Chk_mv(query, doc_num, expected) check_match_vector(tc, store, query, doc_num, expected)
 static void check_match_vector(TestCase *tc, FrtStore *store, FrtQuery *query, int doc_num, const char *expected)
 {
-    FrtIndexReader *ir = frt_ir_open(store);
+    FrtIndexReader *ir = frt_ir_open(NULL, store);
     FrtMatchVector *mv = frt_matchv_new();
     FrtTermVector *term_vector = ir->term_vector(ir, doc_num, rb_intern("field"));
     static int offset_array[ARRAY_SIZE];
@@ -365,17 +368,18 @@ static void test_searcher_highlight(TestCase *tc, void *data)
         NULL
     };
     FrtDocument *doc = frt_doc_new();
+    rb_encoding *enc = rb_enc_find("ASCII-8BIT");
 
     make_index(store);
     add_string_docs(store, docs);
 
-    iw = frt_iw_open(store, frt_letter_analyzer_new(true), NULL);
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("field")), (char *)"That's how it goes now."));
+    iw = frt_iw_open(NULL, store, frt_letter_analyzer_new(true), NULL);
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("field")), (char *)"That's how it goes now.", enc));
     frt_iw_add_doc(iw, doc);
-   frt_doc_destroy(doc);
+    frt_doc_destroy(doc);
     frt_iw_close(iw);
 
-    ir = frt_ir_open(store);
+    ir = frt_ir_open(NULL, store);
     sea = frt_isea_new(ir);
 
     q = frt_tq_new(rb_intern("field"), "one");
@@ -529,7 +533,7 @@ static void test_searcher_highlight(TestCase *tc, void *data)
 
 TestSuite *ts_highlighter(TestSuite *suite)
 {
-    FrtStore *store = frt_open_ram_store();
+    FrtStore *store = frt_open_ram_store(NULL);
 
     suite = ADD_SUITE(suite);