isomorfeus-ferret 0.17.2 → 0.17.3

data/ext/isomorfeus_ferret_ext/test_lang.c

@@ -3,27 +3,23 @@
 
 typedef void *(*alloc_ft)(size_t);
 
-static void huge_emalloc(void *data)
-{
+static void huge_emalloc(void *data) {
     (void)data;
     frt_emalloc((size_t)-1);
 }
 
-static void huge_ecalloc(void *data)
-{
+static void huge_ecalloc(void *data) {
     (void)data;
     frt_ecalloc((size_t)-1);
 }
 
-static void huge_erealloc(void *data)
-{
+static void huge_erealloc(void *data) {
     char *p = NULL;
     (void)data;
     frt_erealloc(p, (size_t)-1);
 }
 
-static void test_emalloc(TestCase *tc, void *data)
-{
+static void test_emalloc(TestCase *tc, void *data) {
     char *p;
     (void)data; /* suppress warning */
 
@@ -34,8 +30,7 @@ static void test_emalloc(TestCase *tc, void *data)
     Araise(FRT_MEM_ERROR, huge_emalloc, NULL);
 }
 
-static void test_ecalloc(TestCase *tc, void *data)
-{
+static void test_ecalloc(TestCase *tc, void *data) {
     int i;
     char *p;
     (void)data; /* suppress warning */
@@ -50,8 +45,7 @@ static void test_ecalloc(TestCase *tc, void *data)
     Araise(FRT_MEM_ERROR, huge_ecalloc, NULL);
 }
 
-static void test_erealloc(TestCase *tc, void *data)
-{
+static void test_erealloc(TestCase *tc, void *data) {
     char *p = NULL;
     (void)data; /* suppress warning */
 
@@ -62,8 +56,7 @@ static void test_erealloc(TestCase *tc, void *data)
     Araise(FRT_MEM_ERROR, huge_erealloc, NULL);
 }
 
-TestSuite *ts_lang(TestSuite *suite)
-{
+TestSuite *ts_lang(TestSuite *suite) {
     suite = ADD_SUITE(suite);
 
     tst_run_test(suite, test_emalloc, NULL);

data/ext/isomorfeus_ferret_ext/test_mdbx_store.c

@@ -6,12 +6,9 @@
  * Test a MDBX store
  */
 TestSuite *ts_mdbx_store(TestSuite *suite) {
-#if defined POSH_OS_WIN32 || defined POSH_OS_WIN64
-    FrtStore *store = frt_open_mdbx_store(".\\test\\testdir\\mdbx_store");
-#else
     FrtStore *store = frt_open_mdbx_store("./test/testdir/mdbx_store");
-#endif
-    store->clear(store);
+    store->create_folder(store, segm_idx_name);
+    store->clear(store, segm_idx_name);
     suite = ADD_SUITE(suite);
     create_test_store_suite(suite, store);
     frt_store_close(store);

data/ext/isomorfeus_ferret_ext/test_mempool.c

@@ -3,8 +3,7 @@
 #include "frt_mempool.h"
 
 
-static void test_mp_default_capa(TestCase *tc, void *data)
-{
+static void test_mp_default_capa(TestCase *tc, void *data) {
     FrtMemoryPool *mp = frt_mp_new();
     (void)data;
     Aiequal(FRT_MP_INIT_CAPA, mp->buf_capa);
@@ -19,8 +18,7 @@ struct MemChecker {
 #define NUM_ALLOCS 10000
 #define MAX_SIZE 100
 
-static void do_mp_test(TestCase *tc, FrtMemoryPool *mp)
-{
+static void do_mp_test(TestCase *tc, FrtMemoryPool *mp) {
     int i, j;
     int max_necessary;
     int total_bytes = 0;
@@ -57,8 +55,7 @@ static void do_mp_test(TestCase *tc, FrtMemoryPool *mp)
     }
 }
 
-static void test_mp_dup(TestCase *tc, void *data)
-{
+static void test_mp_dup(TestCase *tc, void *data) {
     FrtMemoryPool *mp = frt_mp_new_capa(2000, 16);
     (void)data;
 
@@ -68,8 +65,7 @@ static void test_mp_dup(TestCase *tc, void *data)
     frt_mp_destroy(mp);
 }
 
-static void test_mp_alloc(TestCase *tc, void *data)
-{
+static void test_mp_alloc(TestCase *tc, void *data) {
     FrtMemoryPool *mp = frt_mp_new_capa(20, 16);
     char *t;
     (void)data;
@@ -90,8 +86,7 @@ static void test_mp_alloc(TestCase *tc, void *data)
     frt_mp_destroy(mp);
 }
 
-TestSuite *ts_mem_pool(TestSuite *suite)
-{
+TestSuite *ts_mem_pool(TestSuite *suite) {
     suite = ADD_SUITE(suite);
 
     tst_run_test(suite, test_mp_default_capa, NULL);

data/ext/isomorfeus_ferret_ext/test_multimapper.c

@@ -2,8 +2,7 @@
 #include "frt_multimapper.h"
 #include "test.h"
 
-static void test_multimapper(TestCase *tc, void *data)
-{
+static void test_multimapper(TestCase *tc, void *data) {
     char text[] = "abc cabc abd cabcd";
     char dest[1000];
     FrtMultiMapper *mapper = frt_mulmap_new();
@@ -29,8 +28,7 @@ static void test_multimapper(TestCase *tc, void *data)
     frt_mulmap_destroy(mapper);
 }
 
-static void test_multimapper_utf8(TestCase *tc, void *data)
-{
+static void test_multimapper_utf8(TestCase *tc, void *data) {
     char text[] = "zàáâãäåāăz";
     char dest[1000];
     char *dest_dynamic;
@@ -53,8 +51,7 @@ static void test_multimapper_utf8(TestCase *tc, void *data)
     frt_mulmap_destroy(mapper);
 }
 
-TestSuite *ts_multimapper(TestSuite *suite)
-{
+TestSuite *ts_multimapper(TestSuite *suite) {
     suite = ADD_SUITE(suite);
 
     tst_run_test(suite, test_multimapper, NULL);

data/ext/isomorfeus_ferret_ext/test_priorityqueue.c

@@ -7,21 +7,18 @@
  * Simple string less than function used for testing adding of strings to the
  * priority queue.
  */
-static bool str_lt(void *p1, void *p2)
-{
+static bool str_lt(void *p1, void *p2) {
     return (strcmp((char *) p1, (char *) p2) < 0);
 }
 
-static bool str_lt_rev(void *p1, void *p2)
-{
+static bool str_lt_rev(void *p1, void *p2) {
     return (strcmp((char *) p1, (char *) p2) > 0);
 }
 
 /**
  * Test basic FrtPriorityQueue functions.
  */
-static void test_pq(TestCase *tc, void *data)
-{
+static void test_pq(TestCase *tc, void *data) {
     char *tmp;
     FrtPriorityQueue *pq = frt_pq_new(4, (frt_lt_ft)&str_lt, &free);
     (void)data; /* suppress unused argument warning */
@@ -58,8 +55,7 @@ static void test_pq(TestCase *tc, void *data)
 /**
  * Test basic FrtPriorityQueue functions.
  */
-static void test_pq_reverse(TestCase *tc, void *data)
-{
+static void test_pq_reverse(TestCase *tc, void *data) {
     char *tmp;
     FrtPriorityQueue *pq = frt_pq_new(4, (frt_lt_ft)&str_lt_rev, &free);
     (void)data; /* suppress unused argument warning */
@@ -97,8 +93,7 @@ static void test_pq_reverse(TestCase *tc, void *data)
  * Free mock used to test that the FrtPriorityQueue is being destroyed correctly
  * including it's elements
  */
-static void pq_free_mock(void *p)
-{
+static void pq_free_mock(void *p) {
     char *str = (char *) p;
     strcpy(str, "free");
 }
@@ -106,8 +101,7 @@ static void pq_free_mock(void *p)
 /**
  * Test pq_clear function
  */
-static void test_pq_clear(TestCase *tc, void *data)
-{
+static void test_pq_clear(TestCase *tc, void *data) {
     char word1[10] = "word1";
     char word2[10] = "word2";
     char word3[10] = "word3";
@@ -131,8 +125,7 @@ static void test_pq_clear(TestCase *tc, void *data)
  * insert more than the PriorityQueue's capacity, the extra elements that drop
  * off the bottom are destroyed.
  */
-static void test_pq_insert_overflow(TestCase *tc, void *data)
-{
+static void test_pq_insert_overflow(TestCase *tc, void *data) {
     char word1[10] = "word1";
     char word2[10] = "word2";
     char word3[10] = "word3";
@@ -168,8 +161,7 @@ static void test_pq_insert_overflow(TestCase *tc, void *data)
  * to really stress test PriorityQueue.
  */
 #define PQ_STRESS_SIZE 1000
-static void stress_pq(TestCase *tc, void *data)
-{
+static void stress_pq(TestCase *tc, void *data) {
     int i;
     char buf[100], *prev, *curr;
     FrtPriorityQueue *pq = frt_pq_new(PQ_STRESS_SIZE, (frt_lt_ft)&str_lt, &free);
@@ -199,8 +191,7 @@ static void stress_pq(TestCase *tc, void *data)
 /**
  * PriorityQueue's test suite
  */
-TestSuite *ts_priorityqueue(TestSuite *suite)
-{
+TestSuite *ts_priorityqueue(TestSuite *suite) {
     suite = ADD_SUITE(suite);
 
     tst_run_test(suite, test_pq, NULL);

data/ext/isomorfeus_ferret_ext/test_q_const_score.c

@@ -7,8 +7,7 @@ static ID num;
 
 extern void prepare_filter_index(FrtStore *store);
 
-static void test_const_score_query(TestCase *tc, void *data)
-{
+static void test_const_score_query(TestCase *tc, void *data) {
     FrtSearcher *searcher = (FrtSearcher *)data;
     FrtQuery *q;
     q = frt_csq_new_nr(frt_rfilt_new(num, "2", "6", true, true));
@@ -37,8 +36,7 @@ static void test_const_score_query(TestCase *tc, void *data)
     frt_q_deref(q);
 }
 
-static void test_const_score_query_hash(TestCase *tc, void *data)
-{
+static void test_const_score_query_hash(TestCase *tc, void *data) {
     FrtFilter *f;
     FrtQuery *q1, *q2;
     (void)data;
@@ -63,9 +61,9 @@ static void test_const_score_query_hash(TestCase *tc, void *data)
     frt_q_deref(q1);
 }
 
-TestSuite *ts_q_const_score(TestSuite *suite)
-{
+TestSuite *ts_q_const_score(TestSuite *suite) {
     FrtStore *store = frt_open_ram_store(NULL);
+    store->create_folder(store, segm_idx_name);
     FrtIndexReader *ir;
     FrtSearcher *searcher;
 

data/ext/isomorfeus_ferret_ext/test_q_filtered.c

@@ -7,8 +7,7 @@ static ID num, flipflop;
 
 extern void prepare_filter_index(FrtStore *store);
 
-static void test_filtered_query(TestCase *tc, void *data)
-{
+static void test_filtered_query(TestCase *tc, void *data) {
     FrtSearcher *searcher = (FrtSearcher *)data;
     FrtQuery *q;
     q = frt_fq_new(frt_maq_new(), frt_rfilt_new(num, "2", "6", true, true));
@@ -40,9 +39,9 @@ static void test_filtered_query(TestCase *tc, void *data)
     frt_q_deref(q);
 }
 
-TestSuite *ts_q_filtered(TestSuite *suite)
-{
+TestSuite *ts_q_filtered(TestSuite *suite) {
     FrtStore *store = frt_open_ram_store(NULL);
+    store->create_folder(store, segm_idx_name);
     FrtIndexReader *ir;
     FrtSearcher *searcher;
 

data/ext/isomorfeus_ferret_ext/test_q_fuzzy.c

@@ -7,26 +7,23 @@
 
 static ID field;
 
-static void add_doc(const char *text, FrtIndexWriter *iw)
-{
+static void add_doc(const char *text, 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(field), (char *)text, enc));
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(field), text, enc));
     frt_iw_add_doc(iw, doc);
     frt_doc_destroy(doc);
 }
 
 void check_to_s(TestCase *tc, FrtQuery *query, ID field, const char *q_str);
 
-static void do_prefix_test(TestCase *tc, FrtSearcher *searcher, const char *qstr, const char *expected_hits, int pre_len, float min_sim)
-{
+static void do_prefix_test(TestCase *tc, FrtSearcher *searcher, const char *qstr, const char *expected_hits, int pre_len, float min_sim) {
     FrtQuery *fq = frt_fuzq_new_conf(field, qstr, min_sim, pre_len, 10);
     tst_check_hits(tc, searcher, fq, expected_hits, -1);
     frt_q_deref(fq);
 }
 
-static void test_fuzziness(TestCase *tc, void *data)
-{
+static void test_fuzziness(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
     FrtIndexWriter *iw;
     FrtIndexReader *ir;
@@ -113,8 +110,7 @@ static void test_fuzziness(TestCase *tc, void *data)
     frt_ir_close(ir);
 }
 
-static void test_fuzziness_long(TestCase *tc, void *data)
-{
+static void test_fuzziness_long(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
     FrtIndexWriter *iw;
     FrtSearcher *sea;
@@ -172,8 +168,7 @@ static void test_fuzziness_long(TestCase *tc, void *data)
 /**
  * Test query->to_s functionality
  */
-static void test_fuzzy_query_to_s(TestCase *tc, void *data)
-{
+static void test_fuzzy_query_to_s(TestCase *tc, void *data) {
     FrtQuery *q;
     (void)data;
 
@@ -192,8 +187,7 @@ static void test_fuzzy_query_to_s(TestCase *tc, void *data)
 /**
  * Test query hashing functionality
  */
-static void test_fuzzy_query_hash(TestCase *tc, void *data)
-{
+static void test_fuzzy_query_hash(TestCase *tc, void *data) {
     FrtQuery *q1, *q2;
     (void)data;
 
@@ -228,9 +222,9 @@ static void test_fuzzy_query_hash(TestCase *tc, void *data)
     frt_q_deref(q1);
 }
 
-TestSuite *ts_q_fuzzy(TestSuite *suite)
-{
+TestSuite *ts_q_fuzzy(TestSuite *suite) {
     FrtStore *store = frt_open_ram_store(NULL);
+    store->create_folder(store, segm_idx_name);
 
     field = rb_intern("field");
 

data/ext/isomorfeus_ferret_ext/test_q_parser.c

@@ -16,8 +16,7 @@ typedef struct QPTestPair {
     free(qres);\
 } while (0);
 
-static void test_q_parser(TestCase *tc, void *data)
-{
+static void test_q_parser(TestCase *tc, void *data) {
     int i;
     FrtAnalyzer *analyzer = frt_letter_analyzer_new(true);
     FrtQParser *parser;
@@ -185,8 +184,7 @@ static void test_q_parser(TestCase *tc, void *data)
     frt_qp_destroy(parser);
 }
 
-static void test_q_parser_standard_analyzer(TestCase *tc, void *data)
-{
+static void test_q_parser_standard_analyzer(TestCase *tc, void *data) {
     int i;
     FrtAnalyzer *analyzer = frt_standard_analyzer_new(true);
     FrtQParser *parser;
@@ -352,8 +350,7 @@ static void test_q_parser_standard_analyzer(TestCase *tc, void *data)
     frt_qp_destroy(parser);
 }
 
-static void test_qp_clean_str(TestCase *tc, void *data)
-{
+static void test_qp_clean_str(TestCase *tc, void *data) {
     int i;
     QPTestPair pairs[] = {
         {"", ""},
@@ -382,8 +379,7 @@ static void test_qp_clean_str(TestCase *tc, void *data)
     }
 }
 
-static void test_qp_bad_queries(TestCase *tc, void *data)
-{
+static void test_qp_bad_queries(TestCase *tc, void *data) {
     int i;
     FrtQParser *parser;
     QPTestPair pairs[] = {
@@ -413,8 +409,7 @@ static void test_qp_bad_queries(TestCase *tc, void *data)
     frt_qp_destroy(parser);
 }
 
-static void test_mb_qp_bad_queries(TestCase *tc, void *data)
-{
+static void test_mb_qp_bad_queries(TestCase *tc, void *data) {
     int i;
     FrtQParser *parser;
     QPTestPair pairs[] = {
@@ -444,8 +439,7 @@ static void test_mb_qp_bad_queries(TestCase *tc, void *data)
     frt_qp_destroy(parser);
 }
 
-static void test_qp_prefix_query(TestCase *tc, void *data)
-{
+static void test_qp_prefix_query(TestCase *tc, void *data) {
     FrtQParser *parser;
     FrtQuery *q;
     (void)data;
@@ -469,8 +463,7 @@ static void test_qp_prefix_query(TestCase *tc, void *data)
     frt_qp_destroy(parser);
 }
 
-static void test_qp_keyword_switch(TestCase *tc, void *data)
-{
+static void test_qp_keyword_switch(TestCase *tc, void *data) {
     FrtQParser *parser;
     (void)data;
     rb_encoding *enc = rb_enc_find("ASCII-8BIT");
@@ -486,8 +479,7 @@ static void test_qp_keyword_switch(TestCase *tc, void *data)
     frt_qp_destroy(parser);
 }
 
-TestSuite *ts_q_parser(TestSuite *suite)
-{
+TestSuite *ts_q_parser(TestSuite *suite) {
     suite = ADD_SUITE(suite);
 
     tst_run_test(suite, test_q_parser, NULL);

data/ext/isomorfeus_ferret_ext/test_q_span.c

@@ -14,18 +14,16 @@
 
 static ID field;
 
-static void add_doc(const char *text, FrtIndexWriter *iw)
-{
+static void add_doc(const char *text, 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(field), (char *)text, enc));
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(field), text, enc));
     frt_iw_add_doc(iw, doc);
    frt_doc_destroy(doc);
 }
 
 
-static void span_test_setup(FrtStore *store)
-{
+static void span_test_setup(FrtStore *store) {
     const char **d;
     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);
@@ -74,8 +72,7 @@ static void span_test_setup(FrtStore *store)
     frt_iw_close(iw);
 }
 
-static void test_span_term(TestCase *tc, void *data)
-{
+static void test_span_term(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
     FrtIndexReader *ir;
     FrtSearcher *sea;
@@ -103,8 +100,7 @@ static void test_span_term(TestCase *tc, void *data)
     frt_ir_close(ir);
 }
 
-static void test_span_term_hash(TestCase *tc, void *data)
-{
+static void test_span_term_hash(TestCase *tc, void *data) {
     FrtQuery *q1, *q2;
     (void)data;
 
@@ -129,8 +125,7 @@ static void test_span_term_hash(TestCase *tc, void *data)
     frt_q_deref(q1);
 }
 
-static void test_span_multi_term(TestCase *tc, void *data)
-{
+static void test_span_multi_term(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
     FrtIndexReader *ir;
     FrtSearcher *sea;
@@ -173,8 +168,7 @@ static void test_span_multi_term(TestCase *tc, void *data)
     frt_ir_close(ir);
 }
 
-static void test_span_multi_term_hash(TestCase *tc, void *data)
-{
+static void test_span_multi_term_hash(TestCase *tc, void *data) {
     FrtQuery *q1 = frt_spanmtq_new_conf(field, 100);
     FrtQuery *q2 = frt_spanmtq_new(field);
     (void)data, (void)tc;
@@ -203,8 +197,7 @@ static void test_span_multi_term_hash(TestCase *tc, void *data)
     frt_q_deref(q2);
 }
 
-static void test_span_prefix(TestCase *tc, void *data)
-{
+static void test_span_prefix(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
     FrtIndexReader *ir;
     FrtSearcher *sea;
@@ -235,8 +228,7 @@ static void test_span_prefix(TestCase *tc, void *data)
     frt_ir_close(ir);
 }
 
-static void test_span_prefix_hash(TestCase *tc, void *data)
-{
+static void test_span_prefix_hash(TestCase *tc, void *data) {
     FrtQuery *q1, *q2;
     (void)data;
     q1 = frt_spanprq_new(rb_intern("A"), "a");
@@ -260,8 +252,7 @@ static void test_span_prefix_hash(TestCase *tc, void *data)
     frt_q_deref(q1);
 }
 
-static void test_span_first(TestCase *tc, void *data)
-{
+static void test_span_first(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
     FrtIndexReader *ir;
     FrtSearcher *sea;
@@ -285,8 +276,7 @@ static void test_span_first(TestCase *tc, void *data)
     frt_ir_close(ir);
 }
 
-static void test_span_first_hash(TestCase *tc, void *data)
-{
+static void test_span_first_hash(TestCase *tc, void *data) {
     FrtQuery *q1, *q2;
     (void)data;
 
@@ -311,8 +301,7 @@ static void test_span_first_hash(TestCase *tc, void *data)
     frt_q_deref(q1);
 }
 
-static void test_span_or(TestCase *tc, void *data)
-{
+static void test_span_or(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
     FrtIndexReader *ir;
     FrtSearcher *sea;
@@ -334,8 +323,7 @@ static void test_span_or(TestCase *tc, void *data)
     frt_ir_close(ir);
 }
 
-static void test_span_or_hash(TestCase *tc, void *data)
-{
+static void test_span_or_hash(TestCase *tc, void *data) {
     FrtQuery *q1, *q2;
     (void)data;
 
@@ -366,8 +354,7 @@ static void test_span_or_hash(TestCase *tc, void *data)
     frt_q_deref(q1);
 }
 
-static void test_span_near(TestCase *tc, void *data)
-{
+static void test_span_near(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
     FrtIndexReader *ir;
     FrtSearcher *sea;
@@ -415,8 +402,7 @@ static void test_span_near(TestCase *tc, void *data)
     frt_ir_close(ir);
 }
 
-static void test_span_near_hash(TestCase *tc, void *data)
-{
+static void test_span_near_hash(TestCase *tc, void *data) {
     FrtQuery *q1, *q2;
     (void)data;
 
@@ -468,8 +454,7 @@ static void test_span_near_hash(TestCase *tc, void *data)
     frt_q_deref(q1);
 }
 
-static void test_span_not(TestCase *tc, void *data)
-{
+static void test_span_not(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
     FrtIndexReader *ir;
     FrtSearcher *sea;
@@ -523,8 +508,7 @@ static void test_span_not(TestCase *tc, void *data)
     frt_ir_close(ir);
 }
 
-static void test_span_not_hash(TestCase *tc, void *data)
-{
+static void test_span_not_hash(TestCase *tc, void *data) {
     FrtQuery *q1, *q2;
     (void)data;
 
@@ -559,9 +543,9 @@ static void test_span_not_hash(TestCase *tc, void *data)
     frt_q_deref(q1);
 }
 
-TestSuite *ts_q_span(TestSuite *suite)
-{
+TestSuite *ts_q_span(TestSuite *suite) {
     FrtStore *store = frt_open_ram_store(NULL);
+    store->create_folder(store, segm_idx_name);
     field = rb_intern("field");
     span_test_setup(store);
 

data/ext/isomorfeus_ferret_ext/test_ram_store.c

@@ -6,54 +6,55 @@
  * Test ramo_write_to which basically writes the contents of a RAM output
  * stream to another output stream, usually a FileSystem output stream.
  */
-void test_write_to(TestCase *tc, void *data)
-{
+void test_write_to(TestCase *tc, void *data) {
     int i;
     char *tmp;
     FrtStore *ram_store = frt_open_ram_store(NULL);
+    ram_store->create_folder(ram_store, segm_idx_name);
     FrtStore *fs_store = frt_open_mdbx_store("./test/testdir/store");
+    fs_store->create_folder(fs_store, segm_idx_name);
     char str[18] = "³³ øãíøäÄ";
     char buf[18000] = "";
     FrtOutStream *ostream, *fs_ostream;
     FrtInStream *istream;
     (void)data;/* suppress unused parameter warning */
 
-    fs_store->clear(fs_store);
+    fs_store->clear(fs_store, segm_idx_name);
 
     for (i = 0; i < 1000; i++) {
         strcat(buf, str);
     }
 
-    ostream = ram_store->new_output(ram_store, "_rw_funny_string.cfs");
+    ostream = ram_store->new_output(ram_store, segm_idx_name, "_rw_funny_string.fdt");
     frt_os_write_string(ostream, str);
     frt_os_write_string(ostream, buf);
 
-    fs_ostream = fs_store->new_output(fs_store, "_rw_funny_string.cfs");
+    fs_ostream = fs_store->new_output(fs_store, segm_idx_name, "_rw_funny_string.fdt");
     frt_ramo_write_to(ostream, fs_ostream);
 
     frt_os_close(ostream);
     frt_os_close(fs_ostream);
 
-    istream = fs_store->open_input(fs_store, "_rw_funny_string.cfs");
+    istream = fs_store->open_input(fs_store, segm_idx_name, "_rw_funny_string.fdt");
     Asequal(str, tmp = frt_is_read_string(istream));
     free(tmp);
     Asequal(buf, tmp = frt_is_read_string(istream));
     free(tmp);
     frt_is_close(istream);
 
-    Aiequal(17021, fs_store->length(fs_store, "_rw_funny_string.cfs"));
+    Aiequal(17021, fs_store->length(fs_store, segm_idx_name, "_rw_funny_string.fdt"));
     frt_store_close(ram_store);
-    ram_store = frt_open_ram_store_and_copy(NULL, fs_store, false);
+    ram_store = frt_open_ram_store_and_copy(NULL, fs_store, segm_idx_name, false);
 
-    istream = ram_store->open_input(ram_store, "_rw_funny_string.cfs");
+    istream = ram_store->open_input(ram_store, segm_idx_name, "_rw_funny_string.fdt");
     Asequal(str, tmp = frt_is_read_string(istream));
     free(tmp);
     Asequal(buf, tmp = frt_is_read_string(istream));
     free(tmp);
     frt_is_close(istream);
-    Aiequal(17021, ram_store->length(ram_store, "_rw_funny_string.cfs"));
+    Aiequal(17021, ram_store->length(ram_store, segm_idx_name, "_rw_funny_string.fdt"));
 
-    fs_store->clear_all(fs_store);
+    fs_store->clear_all(fs_store, segm_idx_name);
     frt_store_close(fs_store);
     frt_store_close(ram_store);
 }
@@ -61,9 +62,9 @@ void test_write_to(TestCase *tc, void *data)
 /**
  * Create the RAMStore test suite
  */
-TestSuite *ts_ram_store(TestSuite *suite)
-{
+TestSuite *ts_ram_store(TestSuite *suite) {
     FrtStore *store = frt_open_ram_store(NULL);
+    store->create_folder(store, segm_idx_name);
 
     suite = ADD_SUITE(suite);