isomorfeus-ferret 0.17.2 → 0.17.3

data/ext/isomorfeus_ferret_ext/test_search.c

@@ -11,8 +11,7 @@
 
 static ID date, field, cat, number;
 
-static void test_byte_float_conversion(TestCase *tc, void *data)
-{
+static void test_byte_float_conversion(TestCase *tc, void *data) {
     int i;
     (void)data;
 
@@ -26,14 +25,12 @@ static int my_doc_freq(FrtSearcher *searcher, ID field, const char *term) {
     return 9;
 }
 
-static int my_max_doc(FrtSearcher *searcher)
-{
+static int my_max_doc(FrtSearcher *searcher) {
     (void)searcher;
     return 10;
 }
 
-static void test_explanation(TestCase *tc, void *data)
-{
+static void test_explanation(TestCase *tc, void *data) {
     FrtExplanation *expl = frt_expl_new(1.6f, "short description");
     char *str = frt_expl_to_s(expl);
     (void)data;
@@ -56,8 +53,7 @@ static void test_explanation(TestCase *tc, void *data)
     free(str);
 }
 
-static void test_default_similarity(TestCase *tc, void *data)
-{
+static void test_default_similarity(TestCase *tc, void *data) {
     FrtPhrasePosition positions[4];
     FrtSearcher searcher;
     FrtSimilarity *dsim = frt_sim_create_default();
@@ -108,8 +104,7 @@ typedef struct DoubleFilter {
     FrtToken *tk;
 } DoubleFilter;
 
-static FrtToken *dbl_tf_next(FrtTokenStream *ts)
-{
+static FrtToken *dbl_tf_next(FrtTokenStream *ts) {
     FrtToken *tk;
     tk = ((DoubleFilter *)ts)->tk;
     if (tk && islower(tk->text[0])) {
@@ -119,8 +114,7 @@ static FrtToken *dbl_tf_next(FrtTokenStream *ts)
             t++;
         }
         tk->pos_inc = 1;
-    }
-    else {
+    } else {
         tk = ((DoubleFilter *)ts)->tk
             = ((FrtTokenFilter *)ts)->sub_ts->next(((FrtTokenFilter *)ts)->sub_ts);
         if (tk && islower(tk->text[0])) {
@@ -130,13 +124,11 @@ static FrtToken *dbl_tf_next(FrtTokenStream *ts)
     return tk;
 }
 
-static FrtTokenStream *dbl_tf_clone_i(FrtTokenStream *ts)
-{
+static FrtTokenStream *dbl_tf_clone_i(FrtTokenStream *ts) {
     return frt_filter_clone_size(ts, sizeof(DoubleFilter));
 }
 
-static FrtTokenStream *dbl_tf_new(FrtTokenStream *sub_ts)
-{
+static FrtTokenStream *dbl_tf_new(FrtTokenStream *sub_ts) {
     FrtTokenStream *ts = frt_tf_new_i(sizeof(DoubleFilter), sub_ts);
     ts->next           = &dbl_tf_next;
     ts->clone_i        = &dbl_tf_clone_i;
@@ -200,8 +192,7 @@ struct Data test_data[SEARCH_DOCS_SIZE] = {
         "cat1/",                "-1.0"}
 };
 
-static void prepare_search_index(FrtStore *store)
-{
+static void prepare_search_index(FrtStore *store) {
     int i;
     FrtIndexWriter *iw;
 
@@ -216,18 +207,17 @@ static void prepare_search_index(FrtStore *store)
     for (i = 0; i < SEARCH_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(date), (char *)test_data[i].date, enc));
-        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(field), (char *)test_data[i].field, enc));
-        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(cat), (char *)test_data[i].cat, enc));
-        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(number), (char *)test_data[i].number, enc));
+        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(date), test_data[i].date, enc));
+        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(field), test_data[i].field, enc));
+        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(cat), test_data[i].cat, enc));
+        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(number), test_data[i].number, enc));
         frt_iw_add_doc(iw, doc);
        frt_doc_destroy(doc);
     }
     frt_iw_close(iw);
 }
 
-static void test_get_doc(TestCase *tc, void *data)
-{
+static void test_get_doc(TestCase *tc, void *data) {
     FrtSearcher *searcher = (FrtSearcher *)data;
     FrtDocument *doc;
     FrtDocField *df;
@@ -252,15 +242,13 @@ static void test_get_doc(TestCase *tc, void *data)
    frt_doc_destroy(doc);
 }
 
-void check_to_s(TestCase *tc, FrtQuery *query, ID field, const char *q_str)
-{
+void check_to_s(TestCase *tc, FrtQuery *query, ID field, const char *q_str) {
     char *q_res = query->to_s(query, field);
     Asequal(q_str, q_res);
     free(q_res);
 }
 
-void tst_check_hits(TestCase *tc, FrtSearcher *searcher, FrtQuery *query, const char *expected_hits, int top)
-{
+void tst_check_hits(TestCase *tc, FrtSearcher *searcher, FrtQuery *query, const char *expected_hits, int top) {
     static int num_array[ARRAY_SIZE];
     static int num_array2[ARRAY_SIZE];
     int i, count;
@@ -316,8 +304,7 @@ void tst_check_hits(TestCase *tc, FrtSearcher *searcher, FrtQuery *query, const
 }
 
 void check_match_vector(TestCase *tc, FrtSearcher *searcher, FrtQuery *query,
-                        int doc, ID field, const char *ranges)
-{
+                        int doc, ID field, const char *ranges) {
     static int range_array[ARRAY_SIZE];
     FrtMatchVector *mv = frt_searcher_get_match_vector(searcher, query, doc, field);
     int num_matches = s2l(ranges, range_array)/2;
@@ -331,8 +318,7 @@ void check_match_vector(TestCase *tc, FrtSearcher *searcher, FrtQuery *query,
     frt_matchv_destroy(mv);
 }
 
-static void test_term_query(TestCase *tc, void *data)
-{
+static void test_term_query(TestCase *tc, void *data) {
     FrtHashSet *hs;
     FrtSearcher *searcher = (FrtSearcher *)data;
     FrtTopDocs *top_docs;
@@ -401,8 +387,7 @@ static void test_term_query(TestCase *tc, void *data)
     frt_q_deref(tq);
 }
 
-static void test_term_query_hash(TestCase *tc, void *data)
-{
+static void test_term_query_hash(TestCase *tc, void *data) {
     FrtQuery *q1, *q2;
     (void)data;
     q1 = frt_tq_new(rb_intern("A"), "a");
@@ -426,8 +411,7 @@ static void test_term_query_hash(TestCase *tc, void *data)
     frt_q_deref(q1);
 }
 
-static void test_boolean_query(TestCase *tc, void *data)
-{
+static void test_boolean_query(TestCase *tc, void *data) {
     FrtSearcher *searcher = (FrtSearcher *)data;
     FrtQuery *bq = frt_bq_new(false);
     FrtQuery *tq1 = frt_tq_new(field, "word1");
@@ -483,8 +467,7 @@ static void test_boolean_query(TestCase *tc, void *data)
     frt_q_deref(bq);
 }
 
-static void test_boolean_query_hash(TestCase *tc, void *data)
-{
+static void test_boolean_query_hash(TestCase *tc, void *data) {
     FrtQuery *tq1, *tq2, *tq3, *q1, *q2;
     (void)data;
 
@@ -543,8 +526,7 @@ static void test_boolean_query_hash(TestCase *tc, void *data)
     frt_q_deref(tq3);
 }
 
-static void test_phrase_query(TestCase *tc, void *data)
-{
+static void test_phrase_query(TestCase *tc, void *data) {
     FrtSearcher *searcher = (FrtSearcher *)data;
     FrtExplanation *explanation;
     FrtQuery *q;
@@ -673,8 +655,7 @@ static void test_phrase_query(TestCase *tc, void *data)
     frt_q_deref(phq);
 }
 
-static void test_phrase_query_hash(TestCase *tc, void *data)
-{
+static void test_phrase_query_hash(TestCase *tc, void *data) {
     FrtQuery *q1, *q2;
     (void)data;
 
@@ -726,12 +707,10 @@ static void test_phrase_query_hash(TestCase *tc, void *data)
     frt_q_deref(q1);
 }
 
-static void test_multi_phrase_query(TestCase *tc, void *data)
-{
+static void test_multi_phrase_query(TestCase *tc, void *data) {
     FrtSearcher *searcher = (FrtSearcher *)data;
     FrtQuery *phq, *q;
 
-
     phq = frt_phq_new(field);
     /* ok to use append_multi_term to start */
     frt_phq_append_multi_term(phq, "quick");
@@ -819,8 +798,7 @@ static void test_multi_phrase_query(TestCase *tc, void *data)
     frt_q_deref(phq);
 }
 
-static void test_multi_phrase_query_hash(TestCase *tc, void *data)
-{
+static void test_multi_phrase_query_hash(TestCase *tc, void *data) {
     FrtQuery *q1, *q2;
     (void)data;
 
@@ -882,11 +860,9 @@ static void test_multi_phrase_query_hash(TestCase *tc, void *data)
     frt_q_deref(q1);
 }
 
-static void mtq_zero_max_terms(void *p)
-{ (void)p; frt_multi_tq_new_conf(field, 0, 0.5); }
+static void mtq_zero_max_terms(void *p) { (void)p; frt_multi_tq_new_conf(field, 0, 0.5); }
 
-static void test_multi_term_query(TestCase *tc, void *data)
-{
+static void test_multi_term_query(TestCase *tc, void *data) {
     FrtWeight *w;
     char *t, e[100];
     FrtSearcher *searcher = (FrtSearcher *)data;
@@ -905,7 +881,6 @@ static void test_multi_term_query(TestCase *tc, void *data)
     check_to_s(tc, mtq, field, "\"brown\"");
     check_to_s(tc, mtq, (ID)NULL, "field:\"brown\"");
 
-
     /* 0.4f boost is below the 0.5 threshold so term is ignored */
     frt_multi_tq_add_term_boost(mtq, "fox", 0.4f);
     tst_check_hits(tc, searcher, mtq, "1, 8, 16, 17", -1);
@@ -969,13 +944,11 @@ static void test_multi_term_query(TestCase *tc, void *data)
     frt_q_deref(mtq);
 }
 
-static void test_multi_term_query_hash(TestCase *tc, void *data)
-{
+static void test_multi_term_query_hash(TestCase *tc, void *data) {
     FrtQuery *q1 = frt_multi_tq_new_conf(field, 100, 0.4);
     FrtQuery *q2 = frt_multi_tq_new(field);
     (void)data;
 
-
     check_to_s(tc, q1, (ID)NULL, "field:\"\"");
     Assert(frt_q_hash(q1) == frt_q_hash(q2), "Queries should be equal");
     Assert(frt_q_eq(q1, q1), "Same queries should be equal");
@@ -1001,8 +974,7 @@ static void test_multi_term_query_hash(TestCase *tc, void *data)
     frt_q_deref(q2);
 }
 
-static void test_prefix_query(TestCase *tc, void *data)
-{
+static void test_prefix_query(TestCase *tc, void *data) {
     FrtSearcher *searcher = (FrtSearcher *)data;
     FrtQuery *prq = frt_prefixq_new(cat, "cat1");
     check_to_s(tc, prq, cat, "cat1*");
@@ -1032,8 +1004,7 @@ static void test_prefix_query(TestCase *tc, void *data)
     frt_q_deref(prq);
 }
 
-static void test_prefix_query_hash(TestCase *tc, void *data)
-{
+static void test_prefix_query_hash(TestCase *tc, void *data) {
     FrtQuery *q1, *q2;
     (void)data;
     q1 = frt_prefixq_new(rb_intern("A"), "a");
@@ -1057,20 +1028,15 @@ static void test_prefix_query_hash(TestCase *tc, void *data)
     frt_q_deref(q1);
 }
 
-static void rq_new_lower_gt_upper(void *p)
-{ (void)p; frt_rq_new(date, "20050101", "20040101", true, true); }
+static void rq_new_lower_gt_upper(void *p) { (void)p; frt_rq_new(date, "20050101", "20040101", true, true); }
 
-static void rq_new_include_lower_and_null_lower(void *p)
-{ (void)p; frt_rq_new(date, NULL, "20040101", true, true); }
+static void rq_new_include_lower_and_null_lower(void *p) { (void)p; frt_rq_new(date, NULL, "20040101", true, true); }
 
-static void rq_new_include_upper_and_null_upper(void *p)
-{ (void)p; frt_rq_new(date, "20050101", NULL, true, true); }
+static void rq_new_include_upper_and_null_upper(void *p) { (void)p; frt_rq_new(date, "20050101", NULL, true, true); }
 
-static void rq_new_null_lower_and_upper(void *p)
-{ (void)p; frt_rq_new(date, NULL, NULL, false, false); }
+static void rq_new_null_lower_and_upper(void *p) { (void)p; frt_rq_new(date, NULL, NULL, false, false); }
 
-static void test_range_query(TestCase *tc, void *data)
-{
+static void test_range_query(TestCase *tc, void *data) {
     FrtSearcher *searcher = (FrtSearcher *)data;
     FrtQuery *rq;
 
@@ -1165,8 +1131,7 @@ static void test_range_query(TestCase *tc, void *data)
     frt_q_deref(rq);
 }
 
-static void test_range_query_hash(TestCase *tc, void *data)
-{
+static void test_range_query_hash(TestCase *tc, void *data) {
     FrtQuery *q1, *q2;
     (void)data;
     q1 = frt_rq_new(date, "20051006", "20051010", true, true);
@@ -1228,26 +1193,19 @@ static void test_range_query_hash(TestCase *tc, void *data)
     frt_q_deref(q1);
 }
 
-static void trq_new_int_lower_gt_upper(void *p)
-{ (void)p; frt_trq_new(date, "20050101", "20040101", true, true); }
+static void trq_new_int_lower_gt_upper(void *p) { (void)p; frt_trq_new(date, "20050101", "20040101", true, true); }
 
-static void trq_new_float_lower_gt_upper(void *p)
-{ (void)p; frt_trq_new(number, "2.5", "-2.5", true, true); }
+static void trq_new_float_lower_gt_upper(void *p) { (void)p; frt_trq_new(number, "2.5", "-2.5", true, true); }
 
-static void trq_new_string_lower_gt_upper(void *p)
-{ (void)p; frt_trq_new(cat, "cat_b", "cat_a", true, true); }
+static void trq_new_string_lower_gt_upper(void *p) { (void)p; frt_trq_new(cat, "cat_b", "cat_a", true, true); }
 
-static void trq_new_include_lower_and_null_lower(void *p)
-{ (void)p; frt_trq_new(date, NULL, "20040101", true, true); }
+static void trq_new_include_lower_and_null_lower(void *p) { (void)p; frt_trq_new(date, NULL, "20040101", true, true); }
 
-static void trq_new_include_upper_and_null_upper(void *p)
-{ (void)p; frt_trq_new(date, "20050101", NULL, true, true); }
+static void trq_new_include_upper_and_null_upper(void *p) { (void)p; frt_trq_new(date, "20050101", NULL, true, true); }
 
-static void trq_new_null_lower_and_upper(void *p)
-{ (void)p; frt_trq_new(date, NULL, NULL, false, false); }
+static void trq_new_null_lower_and_upper(void *p) { (void)p; frt_trq_new(date, NULL, NULL, false, false); }
 
-static void test_typed_range_query(TestCase *tc, void *data)
-{
+static void test_typed_range_query(TestCase *tc, void *data) {
     FrtSearcher *searcher = (FrtSearcher *)data;
     FrtQuery *trq;
 
@@ -1397,8 +1355,7 @@ static void test_typed_range_query(TestCase *tc, void *data)
     frt_q_deref(trq);
 }
 
-static void test_typed_range_query_hash(TestCase *tc, void *data)
-{
+static void test_typed_range_query_hash(TestCase *tc, void *data) {
     FrtQuery *q1, *q2;
     (void)data;
     q1 = frt_trq_new(date, "20051006", "20051010", true, true);
@@ -1467,8 +1424,7 @@ static void test_typed_range_query_hash(TestCase *tc, void *data)
     frt_q_deref(q1);
 }
 
-static void test_wildcard_match(TestCase *tc, void *data)
-{
+static void test_wildcard_match(TestCase *tc, void *data) {
     (void)data;
     (void)tc;
     Assert(!frt_wc_match("", "abc"), "Empty pattern matches nothing");
@@ -1500,8 +1456,7 @@ static void test_wildcard_match(TestCase *tc, void *data)
     Assert(!frt_wc_match("cat1*", "cat2/sub1"), "Do not match");
 }
 
-static void test_wildcard_query(TestCase *tc, void *data)
-{
+static void test_wildcard_query(TestCase *tc, void *data) {
     FrtSearcher *searcher = (FrtSearcher *)data;
     FrtQuery *wq = frt_wcq_new(cat, "cat1*"), *bq;
     tst_check_hits(tc, searcher, wq, "0, 1, 2, 3, 4, 13, 14, 15, 16, 17", -1);
@@ -1538,8 +1493,7 @@ static void test_wildcard_query(TestCase *tc, void *data)
     frt_q_deref(bq);
 }
 
-static void test_wildcard_query_hash(TestCase *tc, void *data)
-{
+static void test_wildcard_query_hash(TestCase *tc, void *data) {
     FrtQuery *q1, *q2;
     (void)data;
     q1 = frt_wcq_new(rb_intern("A"), "a*");
@@ -1563,8 +1517,7 @@ static void test_wildcard_query_hash(TestCase *tc, void *data)
     frt_q_deref(q1);
 }
 
-static void test_match_all_query_hash(TestCase *tc, void *data)
-{
+static void test_match_all_query_hash(TestCase *tc, void *data) {
     FrtQuery *q1, *q2;
     (void)data;
     q1 = frt_maq_new();
@@ -1583,8 +1536,7 @@ static void test_match_all_query_hash(TestCase *tc, void *data)
     frt_q_deref(q1);
 }
 
-static void test_search_unscored(TestCase *tc, void *data)
-{
+static void test_search_unscored(TestCase *tc, void *data) {
     FrtSearcher *searcher = (FrtSearcher *)data;
     int buf[5], expected[5], count;
     FrtQuery *tq = frt_tq_new(field, "word1");
@@ -1633,9 +1585,9 @@ static void test_search_unscored(TestCase *tc, void *data)
     frt_q_deref(tq);
 }
 
-TestSuite *ts_search(TestSuite *suite)
-{
+TestSuite *ts_search(TestSuite *suite) {
     FrtStore *store = frt_open_ram_store(NULL);
+    store->create_folder(store, segm_idx_name);
     FrtIndexReader *ir;
     FrtSearcher *searcher;
 
@@ -1697,8 +1649,7 @@ TestSuite *ts_search(TestSuite *suite)
 
 
 static void prepare_multi_search_index(FrtStore *store, struct Data data[],
-                                       int d_cnt, int w)
-{
+                                       int d_cnt, int w) {
     int i;
     FrtIndexWriter *iw;
     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);
@@ -1712,18 +1663,17 @@ static void prepare_multi_search_index(FrtStore *store, struct Data data[],
     for (i = 0; i < d_cnt; i++) {
         FrtDocument *doc = frt_doc_new();
         doc->boost = (float)(i+w);
-        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(field), (char *)data[i].field, enc));
-        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(cat), (char *)data[i].cat, enc));
-        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(number), (char *)data[i].number, enc));
+        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(date), data[i].date, enc));
+        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(field), data[i].field, enc));
+        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(cat), data[i].cat, enc));
+        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(number), data[i].number, enc));
         frt_iw_add_doc(iw, doc);
        frt_doc_destroy(doc);
     }
     frt_iw_close(iw);
 }
 
-static void test_query_combine(TestCase *tc, void *data)
-{
+static void test_query_combine(TestCase *tc, void *data) {
     FrtQuery *q, *cq, **queries;
     FrtBooleanQuery *bq;
     (void)data;
@@ -1822,10 +1772,11 @@ static void test_query_combine(TestCase *tc, void *data)
     free(queries);
 }
 
-TestSuite *ts_multi_search(TestSuite *suite)
-{
+TestSuite *ts_multi_search(TestSuite *suite) {
     FrtStore *store0 = frt_open_ram_store(NULL);
+    store0->create_folder(store0, segm_idx_name);
     FrtStore *store1 = frt_open_ram_store(NULL);
+    store1->create_folder(store1, segm_idx_name);
 
     FrtIndexReader *ir0, *ir1;
     FrtSearcher **searchers;

data/ext/isomorfeus_ferret_ext/test_segments.c

@@ -29,21 +29,18 @@ static int tst_si_eql(int line_num,
                       FrtSegmentInfo *si,
                       const char *name,
                       int doc_cnt,
-                      FrtStore *store)
-{
+                      FrtStore *store) {
     if (tst_str_equal(line_num, tc, name, si->name) &&
         tst_int_equal(line_num, tc, doc_cnt, si->doc_cnt) &&
         tst_ptr_equal(line_num, tc, store, si->store)) {
         return true;
-    }
-    else {
+    } else {
         return false;
     }
 
 }
 
-static void test_si(TestCase *tc, void *data)
-{
+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);
@@ -66,8 +63,7 @@ static void test_si(TestCase *tc, void *data)
  ***************************************************************************/
 
 
-void test_sis_add_del(TestCase *tc, void *data)
-{
+void test_sis_add_del(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
     FrtSegmentInfos *sis = frt_sis_new(&dummy_fis);
     FrtSegmentInfo *seg0 = frt_sis_new_segment(sis, 123, store);
@@ -97,8 +93,7 @@ void test_sis_add_del(TestCase *tc, void *data)
     frt_sis_destroy(sis);
 }
 
-void test_sis_rw(TestCase *tc, void *data)
-{
+void test_sis_rw(TestCase *tc, void *data) {
     frt_u64 version;
     FrtStore *store = (FrtStore *)data;
     FrtSegmentInfos *sis = frt_sis_new(&dummy_fis);
@@ -120,7 +115,7 @@ void test_sis_rw(TestCase *tc, void *data)
     Apequal(seg2, sis->segs[2]);
     frt_sis_write(sis, store, NULL);
     version = frt_sis_read_current_version(store);
-    Assert(store->exists(store, "segments_0"),
+    Assert(store->exists(store, segm_idx_name, "segments_0"),
            "segments file should have been created");
     sis2 = frt_sis_read(store);
     Aiequal(3, sis2->size);
@@ -143,9 +138,9 @@ void test_sis_rw(TestCase *tc, void *data)
     frt_sis_destroy(sis3);
 }
 
-TestSuite *ts_segments(TestSuite *suite)
-{
+TestSuite *ts_segments(TestSuite *suite) {
     FrtStore *store = frt_open_ram_store(NULL);
+    store->create_folder(store, segm_idx_name);
 
     suite = ADD_SUITE(suite);
 

data/ext/isomorfeus_ferret_ext/test_similarity.c

@@ -2,8 +2,7 @@
 #include "frt_similarity.h"
 #include "test.h"
 
-void test_default_similarity(TestCase *tc, void *data)
-{
+void test_default_similarity(TestCase *tc, void *data) {
   FrtSimilarity *dsim = frt_sim_create_default();
   (void)data;
 
@@ -15,8 +14,7 @@ void test_default_similarity(TestCase *tc, void *data)
   Afequal(4.0, frt_sim_coord(dsim, 12, 3));
 }
 
-TestSuite *ts_similarity(TestSuite *suite)
-{
+TestSuite *ts_similarity(TestSuite *suite) {
     suite = ADD_SUITE(suite);
 
     tst_run_test(suite, test_default_similarity, NULL);

data/ext/isomorfeus_ferret_ext/test_sort.c

@@ -16,14 +16,13 @@ typedef struct SortTestData {
     const char *flt;
 } SortTestData;
 
-static void add_sort_test_data(SortTestData *std, FrtIndexWriter *iw)
-{
+static void add_sort_test_data(SortTestData *std, FrtIndexWriter *iw) {
     FrtDocument *doc = frt_doc_new();
     rb_encoding *enc = rb_enc_find("ASCII-8BIT");
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(search), (char *)std->search, enc));
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(string), (char *)std->string, enc));
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(integer), (char *)std->integer, enc));
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(flt), (char *)std->flt, enc));
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(search), std->search, enc));
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(string), std->string, enc));
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(integer), std->integer, enc));
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(flt), std->flt, enc));
 
     sscanf(std->flt, "%f", &doc->boost);
 
@@ -44,8 +43,7 @@ static SortTestData data[] = {     /* len mod */
     {"findall","b","4","0.000001"} /*  8   0  */
 };
 
-static void sort_test_setup(FrtStore *store)
-{
+static void sort_test_setup(FrtStore *store) {
     int i;
     FrtIndexWriter *iw;
     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);
@@ -60,8 +58,7 @@ static void sort_test_setup(FrtStore *store)
     frt_iw_close(iw);
 }
 
-static void sort_multi_test_setup(FrtStore *store1, FrtStore *store2)
-{
+static void sort_multi_test_setup(FrtStore *store1, FrtStore *store2) {
     int i;
     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);
     FrtIndexWriter *iw;
@@ -87,8 +84,7 @@ static void sort_multi_test_setup(FrtStore *store1, FrtStore *store2)
 
 #define R_START 3
 #define R_END 6
-static void do_test_top_docs(TestCase *tc, FrtSearcher *searcher, FrtQuery *query, const char *expected_hits, FrtSort *sort)
-{
+static void do_test_top_docs(TestCase *tc, FrtSearcher *searcher, FrtQuery *query, const char *expected_hits, FrtSort *sort) {
     static int num_array[ARRAY_SIZE];
     int i;
     int total_hits = s2l(expected_hits, num_array);
@@ -147,8 +143,7 @@ static void do_test_top_docs(TestCase *tc, FrtSearcher *searcher, FrtQuery *quer
     } while (0)
 
 
-static void test_sort_field_to_s(TestCase *tc, void *data)
-{
+static void test_sort_field_to_s(TestCase *tc, void *data) {
     (void)data;
     TEST_SF_TO_S("<SCORE>", frt_sort_field_score_new(false));
     TEST_SF_TO_S("<SCORE>!", frt_sort_field_score_new(true));
@@ -171,8 +166,7 @@ static void test_sort_field_to_s(TestCase *tc, void *data)
         free(_str);\
     } while (0)
 
-static void test_sort_to_s(TestCase *tc, void *data)
-{
+static void test_sort_to_s(TestCase *tc, void *data) {
     FrtSort *sort = frt_sort_new();
     (void)data;
 
@@ -198,8 +192,7 @@ static void test_sort_to_s(TestCase *tc, void *data)
 }
 
 static bool do_byte_test = true;
-static void test_sorts(TestCase *tc, void *data)
-{
+static void test_sorts(TestCase *tc, void *data) {
     FrtSearcher *sea = (FrtSearcher *)data;
     FrtQuery *q;
     FrtSort *sort = NULL;
@@ -288,10 +281,10 @@ static void test_sorts(TestCase *tc, void *data)
     frt_q_deref(q);
 }
 
-TestSuite *ts_sort(TestSuite *suite)
-{
+TestSuite *ts_sort(TestSuite *suite) {
     FrtSearcher *sea, **searchers;
     FrtStore *store = frt_open_ram_store(NULL), *fs_store;
+    store->create_folder(store, segm_idx_name);
     FrtIndexReader *ir0;
     FrtIndexReader *ir1;
 
@@ -317,11 +310,8 @@ TestSuite *ts_sort(TestSuite *suite)
 
     do_byte_test = false;
 
-#if defined POSH_OS_WIN32 || defined POSH_OS_WIN64
-    fs_store = frt_open_mdbx_store(".\\test\\testdir\\store");
-#else
     fs_store = frt_open_mdbx_store("./test/testdir/store");
-#endif
+
     sort_multi_test_setup(store, fs_store);
 
     searchers = FRT_ALLOC_N(FrtSearcher *, 2);