isomorfeus-ferret 0.17.2 → 0.17.3

data/ext/isomorfeus_ferret_ext/test_document.c

@@ -1,15 +1,13 @@
 #include "frt_document.h"
 #include "test.h"
 
-void test_df_standard(TestCase *tc, void *data)
-{
+void test_df_standard(TestCase *tc, void *data) {
     char *s;
     FrtDocField *df;
     (void)data;
     rb_encoding *enc = rb_enc_find("ASCII-8BIT");
 
-    df = frt_df_add_data(frt_df_new(rb_intern("title")), frt_estrdup("Life of Pi"), enc);
-    df->destroy_data = true;
+    df = frt_df_add_data(frt_df_new(rb_intern("title")), "Life of Pi", enc);
     Aiequal(1, df->size);
     Asequal("title", rb_id2name(df->name));
     Asequal("Life of Pi", df->data[0]);
@@ -19,7 +17,7 @@ void test_df_standard(TestCase *tc, void *data)
     free(s);
     frt_df_destroy(df);
 
-    df = frt_df_add_data_len(frt_df_new(rb_intern("title")), (char *)"new title", 9, enc);
+    df = frt_df_add_data_len(frt_df_new(rb_intern("title")), "new title", 9, enc);
     Aiequal(1, df->size);
     Asequal("title", rb_id2name(df->name));
     Asequal("new title", df->data[0]);
@@ -27,27 +25,24 @@ void test_df_standard(TestCase *tc, void *data)
     frt_df_destroy(df);
 }
 
-void test_df_multi_fields(TestCase *tc, void *data)
-{
+void test_df_multi_fields(TestCase *tc, void *data) {
     int i;
     char *s;
     FrtDocField *df;
     (void)data;
     rb_encoding *enc = rb_enc_find("ASCII-8BIT");
 
-    df = frt_df_add_data(frt_df_new(rb_intern("title")), frt_estrdup("Vernon God Little"), enc);
-    df->destroy_data = true;
+    df = frt_df_add_data(frt_df_new(rb_intern("title")), "Vernon God Little", enc);
     Aiequal(1, df->size);
     Asequal("title", rb_id2name(df->name));
     Asequal("Vernon God Little", df->data[0]);
     Aiequal(strlen("Vernon God Little"), df->lengths[0]);
 
-    frt_df_add_data(df, frt_estrdup("some more data"), enc);
+    frt_df_add_data(df, "some more data", enc);
     Aiequal(2, df->size);
-    Asequal("title: [\"Vernon God Little\", \"some more data\"]",
-            s = frt_df_to_s(df));
+    Asequal("title: [\"Vernon God Little\", \"some more data\"]", s = frt_df_to_s(df));
     free(s);
-    frt_df_add_data_len(df, frt_estrdup("and more data"), 14, enc);
+    frt_df_add_data_len(df, "and more data", 14, enc);
     Aiequal(3, df->size);
     Asequal("title", rb_id2name(df->name));
     Asequal("Vernon God Little", df->data[0]);
@@ -56,20 +51,18 @@ void test_df_multi_fields(TestCase *tc, void *data)
 
     frt_df_destroy(df);
 
-    df = frt_df_add_data(frt_df_new(rb_intern("data")), frt_estrdup("start"), enc);
-    df->destroy_data = true;
+    df = frt_df_add_data(frt_df_new(rb_intern("data")), "start", enc);
     Aiequal(1, df->size);
     for (i = 0; i < 1000; i++) {
         char buf[100];
         sprintf(buf, "<<%d>>", i);
-        frt_df_add_data(df, frt_estrdup(buf), enc);
+        frt_df_add_data(df, buf, enc);
         Aiequal(i + 2, df->size);
     }
     frt_df_destroy(df);
 }
 
-void test_doc(TestCase *tc, void *data)
-{
+void test_doc(TestCase *tc, void *data) {
     int i;
     FrtDocument *doc;
     FrtDocField *df;
@@ -77,14 +70,14 @@ void test_doc(TestCase *tc, void *data)
     rb_encoding *enc = rb_enc_find("ASCII-8BIT");
 
     doc = frt_doc_new();
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("title")), (char *)"title", enc));
-    Aiequal(1, doc->size);
-    df = frt_df_add_data(frt_df_new(rb_intern("data")), (char *)"data1", enc);
-    frt_df_add_data(df, (char *)"data2", enc);
-    frt_df_add_data(df, (char *)"data3", enc);
-    frt_df_add_data(df, (char *)"data4", enc);
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("title")), "title", enc));
+    Aiequal(1, doc->field_count);
+    df = frt_df_add_data(frt_df_new(rb_intern("data")), "data1", enc);
+    frt_df_add_data(df, "data2", enc);
+    frt_df_add_data(df, "data3", enc);
+    frt_df_add_data(df, "data4", enc);
     frt_doc_add_field(doc, df);
-    Aiequal(2, doc->size);
+    Aiequal(2, doc->field_count);
     Asequal("title", rb_id2name(frt_doc_get_field(doc, rb_intern("title"))->name));
     Aiequal(1, frt_doc_get_field(doc, rb_intern("title"))->size);
     Asequal("title", frt_doc_get_field(doc, rb_intern("title"))->data[0]);
@@ -104,9 +97,8 @@ void test_doc(TestCase *tc, void *data)
         sprintf(buf, "<<%d>>", i);
         bufc = frt_estrdup(buf);
         df = frt_df_add_data(frt_df_new(rb_intern(bufc)), bufc, enc);
-        df->destroy_data = true;
         frt_doc_add_field(doc, df);
-        Aiequal(i + 1, doc->size);
+        Aiequal(i + 1, doc->field_count);
     }
 
     for (i = 0; i < 1000; i++) {
@@ -119,8 +111,7 @@ void test_doc(TestCase *tc, void *data)
    frt_doc_destroy(doc);
 }
 
-void test_double_field_exception(TestCase *tc, void *data)
-{
+void test_double_field_exception(TestCase *tc, void *data) {
     volatile bool exception_thrown = false;
     FrtDocument *doc;
     FrtDocField *volatile df = NULL;
@@ -128,10 +119,10 @@ void test_double_field_exception(TestCase *tc, void *data)
     rb_encoding *enc = rb_enc_find("ASCII-8BIT");
 
     doc = frt_doc_new();
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("title")), (char *)"title", enc));
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("title")), "title", enc));
 
     FRT_TRY
-        df = frt_df_add_data_len(frt_df_new(rb_intern("title")), (char *)"title", 5, enc);
+        df = frt_df_add_data_len(frt_df_new(rb_intern("title")), "title", 5, enc);
         frt_doc_add_field(doc, df);
     case FRT_EXCEPTION:
         exception_thrown = true;
@@ -147,8 +138,7 @@ void test_double_field_exception(TestCase *tc, void *data)
    frt_doc_destroy(doc);
 }
 
-TestSuite *ts_document(TestSuite *suite)
-{
+TestSuite *ts_document(TestSuite *suite) {
     suite = ADD_SUITE(suite);
 
     tst_run_test(suite, test_df_standard, NULL);

data/ext/isomorfeus_ferret_ext/test_except.c

@@ -9,8 +9,7 @@ static void raise_exception(void) {
     FRT_RAISE(FRT_EXCEPTION, "%s", msg1);
 }
 
-static void inner_try(TestCase *tc)
-{
+static void inner_try(TestCase *tc) {
     volatile bool exception_handled = false;
     volatile bool ioerror_called = false;
 
@@ -38,8 +37,7 @@ static void inner_try(TestCase *tc)
     FRT_ENDTRY
 }
 
-static void test_nested_except(TestCase *tc, void *data)
-{
+static void test_nested_except(TestCase *tc, void *data) {
     volatile bool ioerror_handled = false;
     bool finally_handled = false;
     (void)data;
@@ -68,8 +66,7 @@ static void test_nested_except(TestCase *tc, void *data)
     Assert(finally_handled, "Finally wasn't handled");
 }
 
-static void test_function_except(TestCase *tc, void *data)
-{
+static void test_function_except(TestCase *tc, void *data) {
     volatile bool exception_handled = false;
     bool finally_handled = false;
     (void)data; /* suppress warning */
@@ -97,8 +94,7 @@ static void test_function_except(TestCase *tc, void *data)
     Assert(finally_handled, "Finally wasn't handled");
 }
 
-static void test_simple_except(TestCase *tc, void *data)
-{
+static void test_simple_except(TestCase *tc, void *data) {
     volatile bool exception_handled = false;
     bool finally_handled = false;
     (void)data; /* suppress warning */
@@ -129,8 +125,7 @@ static void test_simple_except(TestCase *tc, void *data)
     Assert(finally_handled, "Finally wasn't handled");
 }
 
-static void try_xfinally1(TestCase *tc)
-{
+static void try_xfinally1(TestCase *tc) {
     bool finally_handled = false;
 
     FRT_TRY
@@ -143,8 +138,7 @@ static void try_xfinally1(TestCase *tc)
     Atrue(finally_handled);
 }
 
-static void try_xfinally2(TestCase *tc)
-{
+static void try_xfinally2(TestCase *tc) {
     bool finally_handled = false;
 
     FRT_TRY
@@ -158,8 +152,7 @@ static void try_xfinally2(TestCase *tc)
     Atrue(finally_handled);
 }
 
-static void try_xcatchall(TestCase *tc)
-{
+static void try_xcatchall(TestCase *tc) {
     bool catchall_handled = false;
 
     FRT_TRY
@@ -174,8 +167,7 @@ static void try_xcatchall(TestCase *tc)
     Atrue(catchall_handled);
 }
 
-static void test_xfinally(TestCase *tc, void *data)
-{
+static void test_xfinally(TestCase *tc, void *data) {
     volatile bool exception_handled = false;
     bool finally_handled = false;
     (void)data; /* suppress warning */
@@ -202,15 +194,13 @@ static void test_xfinally(TestCase *tc, void *data)
     Assert(finally_handled, "Finally wasn't handled");
 }
 
-static void test_uncaught_except(TestCase *tc, void *data)
-{
+static void test_uncaught_except(TestCase *tc, void *data) {
     bool old_abort_setting = frt_x_abort_on_exception;
     FILE *old_stream_setting = frt_x_exception_stream;
     int tfd = fio_tmpfile();
     FILE *exception_output = fdopen(tfd, "w+");
     (void)data, (void)tc; /* suppress warning */
 
-
     frt_x_abort_on_exception = false;
     frt_x_exception_stream = exception_output;
 
@@ -230,8 +220,7 @@ static void test_uncaught_except(TestCase *tc, void *data)
     fclose(exception_output);
 }
 
-TestSuite *ts_except(TestSuite *suite)
-{
+TestSuite *ts_except(TestSuite *suite) {
     suite = ADD_SUITE(suite);
 
     tst_run_test(suite, test_simple_except, NULL);

data/ext/isomorfeus_ferret_ext/test_fields.c

@@ -41,8 +41,7 @@ void field_prop_test(TestCase *tc,
  *
  ****************************************************************************/
 
-static void test_fi_new(TestCase *tc, void *data)
-{
+static void test_fi_new(TestCase *tc, void *data) {
     FrtFieldInfo *fi;
     (void)data; /* suppress unused argument warning */
     fi = frt_fi_new(rb_intern("name"), 0);
@@ -51,7 +50,7 @@ static void test_fi_new(TestCase *tc, void *data)
     fi = frt_fi_new(rb_intern("name"), 0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM | FRT_FI_STORE_TERM_VECTOR_BM);
     do_field_prop_test(tc, fi, rb_intern("name"), 1.0, T, F, T, T, F, T, F, F);
     frt_fi_deref(fi);
-    fi = frt_fi_new(rb_intern("name"), 0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_COMPRESSED_BM | FRT_FI_COMPRESSION_BROTLI_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_POSITIONS_BM);
+    fi = frt_fi_new(rb_intern("name"), 0 | FRT_FI_IS_STORED_BM | FRT_FI_COMPRESSION_BROTLI_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_POSITIONS_BM);
     do_field_prop_test(tc, fi, rb_intern("name"), 1.0, T, T, T, F, F, T, T, F);
     frt_fi_deref(fi);
     fi = frt_fi_new(rb_intern("name"), 0 | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM | FRT_FI_OMIT_NORMS_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_OFFSETS_BM);
@@ -69,8 +68,7 @@ static void test_fi_new(TestCase *tc, void *data)
  *
  ****************************************************************************/
 
-static void test_fis_basic(TestCase *tc, void *data)
-{
+static void test_fis_basic(TestCase *tc, void *data) {
     FrtFieldInfos *fis;
     FrtFieldInfo *fi;
     volatile bool arg_error = false;
@@ -79,7 +77,7 @@ static void test_fis_basic(TestCase *tc, void *data)
     fis = frt_fis_new(0);
     frt_fis_add_field(fis, frt_fi_new(rb_intern("FFFFFFFF"), 0));
     frt_fis_add_field(fis, frt_fi_new(rb_intern("TFTTFTFF"), 0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM | FRT_FI_STORE_TERM_VECTOR_BM));
-    frt_fis_add_field(fis, frt_fi_new(rb_intern("TTTFFTTF"), 0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_COMPRESSED_BM | FRT_FI_COMPRESSION_BROTLI_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_POSITIONS_BM));
+    frt_fis_add_field(fis, frt_fi_new(rb_intern("TTTFFTTF"), 0 | FRT_FI_IS_STORED_BM | FRT_FI_COMPRESSION_BROTLI_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_POSITIONS_BM));
     frt_fis_add_field(fis, frt_fi_new(rb_intern("FFTTTTFT"), 0 | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM | FRT_FI_OMIT_NORMS_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_OFFSETS_BM));
     frt_fis_add_field(fis, frt_fi_new(rb_intern("FFTFTTTT"), 0 | FRT_FI_IS_INDEXED_BM | FRT_FI_OMIT_NORMS_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_POSITIONS_BM | FRT_FI_STORE_OFFSETS_BM));
 
@@ -126,8 +124,7 @@ static void test_fis_basic(TestCase *tc, void *data)
     frt_fis_deref(fis);
 }
 
-static void test_fis_with_default(TestCase *tc, void *data)
-{
+static void test_fis_with_default(TestCase *tc, void *data) {
     FrtFieldInfos *fis;
     (void)data; /* suppress unused argument warning */
 
@@ -144,7 +141,7 @@ static void test_fis_with_default(TestCase *tc, void *data)
     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);
     do_field_prop_test(tc, frt_fis_get_or_add_field(fis, rb_intern("name")), rb_intern("name"), 1.0, T, F, T, T, F, T, F, F);
     frt_fis_deref(fis);
-    fis = frt_fis_new(0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_COMPRESSED_BM | FRT_FI_COMPRESSION_BROTLI_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_POSITIONS_BM);
+    fis = frt_fis_new(0 | FRT_FI_IS_STORED_BM | FRT_FI_COMPRESSION_BROTLI_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_POSITIONS_BM);
     do_field_prop_test(tc, frt_fis_get_or_add_field(fis, rb_intern("name")), rb_intern("name"), 1.0, T, T, T, F, F, T, T, F);
     frt_fis_deref(fis);
     fis = frt_fis_new(0 | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM | FRT_FI_OMIT_NORMS_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_OFFSETS_BM);
@@ -155,11 +152,11 @@ static void test_fis_with_default(TestCase *tc, void *data)
     frt_fis_deref(fis);
 }
 
-static void test_fis_rw(TestCase *tc, void *data)
-{
+static void test_fis_rw(TestCase *tc, void *data) {
     char *str;
     FrtFieldInfos *fis;
     FrtStore *store = frt_open_ram_store(NULL);
+    store->create_folder(store, segm_idx_name);
     FrtInStream *is;
     FrtOutStream *os;
     (void)data; /* suppress unused argument warning */
@@ -167,14 +164,14 @@ static void test_fis_rw(TestCase *tc, void *data)
     fis = frt_fis_new(0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_OMIT_NORMS_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_POSITIONS_BM | FRT_FI_STORE_OFFSETS_BM);
     frt_fis_add_field(fis, frt_fi_new(rb_intern("FFFFFFFF"), 0));
     frt_fis_add_field(fis, frt_fi_new(rb_intern("TFTTFTFF"), 0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM | FRT_FI_STORE_TERM_VECTOR_BM));
-    frt_fis_add_field(fis, frt_fi_new(rb_intern("TTTFFTTF"), 0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_COMPRESSED_BM | FRT_FI_COMPRESSION_BROTLI_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_POSITIONS_BM));
+    frt_fis_add_field(fis, frt_fi_new(rb_intern("TTTFFTTF"), 0 | FRT_FI_IS_STORED_BM | FRT_FI_COMPRESSION_BROTLI_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_POSITIONS_BM));
     frt_fis_add_field(fis, frt_fi_new(rb_intern("FFTTTTFT"), 0 | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM | FRT_FI_OMIT_NORMS_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_OFFSETS_BM));
     frt_fis_add_field(fis, frt_fi_new(rb_intern("FFTFTTTT"), 0 | FRT_FI_IS_INDEXED_BM | FRT_FI_OMIT_NORMS_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_POSITIONS_BM | FRT_FI_STORE_OFFSETS_BM));
     fis->fields[1]->boost = 2.0;
     fis->fields[2]->boost = 3.0;
     fis->fields[3]->boost = 4.0;
     fis->fields[4]->boost = 5.0;
-    os = store->new_output(store, "fields");
+    os = store->new_output(store, segm_idx_name, "fields");
     frt_fis_write(fis, os);
     frt_os_close(os);
 
@@ -187,7 +184,7 @@ static void test_fis_rw(TestCase *tc, void *data)
 
     frt_fis_deref(fis);
 
-    is = store->open_input(store, "fields");
+    is = store->open_input(store, segm_idx_name, "fields");
     fis = frt_fis_read(is);
     frt_is_close(is);
     Aiequal(true, bits_is_stored(fis->bits));
@@ -258,8 +255,7 @@ static void test_fis_rw(TestCase *tc, void *data)
 
 #define BIN_DATA_LEN 1234
 
-static char *prepare_bin_data(int len)
-{
+static char *prepare_bin_data(int len) {
   int i;
   char *bin_data = FRT_ALLOC_N(char, len);
   for (i = 0; i < len; i++) {
@@ -286,22 +282,20 @@ static FrtDocument *prepare_doc(void) {
     char *bin_data = prepare_bin_data(BIN_DATA_LEN);
     rb_encoding *enc = rb_enc_find("ASCII-8BIT");
 
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("ignored")), (char *)"this fld's ignored", enc));
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("unstored")), (char *)"unstored ignored", enc));
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("stored")), (char *)"Yay, a stored field", enc));
-    df = frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("stored_array")), (char *)"one", enc));
-    df->destroy_data = false;
-    frt_df_add_data(df, (char *)"two", enc);
-    frt_df_add_data(df, (char *)"three", enc);
-    frt_df_add_data(df, (char *)"four", enc);
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("ignored")), "this fld's ignored", enc));
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("unstored")), "unstored ignored", enc));
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("stored")), "Yay, a stored field", enc));
+    df = frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("stored_array")), "one ", enc));
+    frt_df_add_data(df, "two ", enc);
+    frt_df_add_data(df, "three ", enc);
+    frt_df_add_data(df, "four", enc);
     frt_df_add_data_len(df, bin_data, BIN_DATA_LEN, enc);
-    frt_doc_add_field(doc, frt_df_add_data_len(frt_df_new(rb_intern("binary")), bin_data,
-                                       BIN_DATA_LEN, enc))->destroy_data = true;
-    df = frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("array")), (char *)"ichi", enc));
-    frt_df_add_data(df, (char *)"ni", enc);
-    frt_df_add_data(df, (char *)"san", enc);
-    frt_df_add_data(df, (char *)"yon", enc);
-    frt_df_add_data(df, (char *)"go", enc);
+    frt_doc_add_field(doc, frt_df_add_data_len(frt_df_new(rb_intern("binary")), bin_data, BIN_DATA_LEN, enc));
+    df = frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("array")), "ichi ", enc));
+    frt_df_add_data(df, "ni ", enc);
+    frt_df_add_data(df, "san ", enc);
+    frt_df_add_data(df, "yon ", enc);
+    frt_df_add_data(df, "go", enc);
 
     return doc;
 }
@@ -311,13 +305,13 @@ static FrtFieldInfos *prepare_fis(void) {
     frt_fis_add_field(fis, frt_fi_new(rb_intern("ignored"), 0));
     frt_fis_add_field(fis, frt_fi_new(rb_intern("unstored"), 0 | 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));
     frt_fis_add_field(fis, frt_fi_new(rb_intern("stored"), 0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM | FRT_FI_STORE_TERM_VECTOR_BM));
-    frt_fis_add_field(fis, frt_fi_new(rb_intern("stored_array"), 0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_COMPRESSED_BM | FRT_FI_COMPRESSION_BROTLI_BM | FRT_FI_IS_INDEXED_BM));
+    frt_fis_add_field(fis, frt_fi_new(rb_intern("stored_array"), 0 | FRT_FI_IS_STORED_BM | FRT_FI_COMPRESSION_BROTLI_BM | FRT_FI_IS_INDEXED_BM));
     return fis;
 }
 
-static void test_fields_rw_single(TestCase *tc, void *data)
-{
+static void test_fields_rw_single(TestCase *tc, void *data) {
     FrtStore *store = frt_open_ram_store(NULL);
+    store->create_folder(store, segm_idx_name);
     char *bin_data = prepare_bin_data(BIN_DATA_LEN);
     FrtDocument *doc = prepare_doc();
     FrtFieldInfos *fis = prepare_fis();
@@ -327,13 +321,13 @@ static void test_fields_rw_single(TestCase *tc, void *data)
     (void)data;
 
     Aiequal(4, fis->size);
-    Aiequal(6, doc->size);
+    Aiequal(6, doc->field_count);
 
     fw = frt_fw_open(store, "_0", fis);
     frt_fw_add_doc(fw, doc);
     frt_fw_write_tv_index(fw);
     frt_fw_close(fw);
-   frt_doc_destroy(doc);
+    frt_doc_destroy(doc);
 
     Aiequal(6, fis->size);
     do_field_prop_test(tc, frt_fis_get_field(fis, rb_intern("binary")), rb_intern("binary"), 1.0, T, F, T, T, F, F, F, F);
@@ -343,7 +337,7 @@ static void test_fields_rw_single(TestCase *tc, void *data)
     doc = frt_fr_get_doc(fr, 0);
     frt_fr_close(fr);
 
-    Aiequal(4, doc->size);
+    Aiequal(4, doc->field_count);
 
     Apnull(frt_doc_get_field(doc, rb_intern("ignored")));
     Apnull(frt_doc_get_field(doc, rb_intern("unstored")));
@@ -354,9 +348,9 @@ static void test_fields_rw_single(TestCase *tc, void *data)
 
     df = frt_doc_get_field(doc, rb_intern("stored_array"));
     Aiequal(5, df->size);
-    check_df_data(df, 0, "one");
-    check_df_data(df, 1, "two");
-    check_df_data(df, 2, "three");
+    check_df_data(df, 0, "one ");
+    check_df_data(df, 1, "two ");
+    check_df_data(df, 2, "three ");
     check_df_data(df, 3, "four");
     check_df_bin_data(df, 4, bin_data, BIN_DATA_LEN);
 
@@ -366,10 +360,10 @@ static void test_fields_rw_single(TestCase *tc, void *data)
 
     df = frt_doc_get_field(doc, rb_intern("array"));
     Aiequal(5, df->size);
-    check_df_data(df, 0, "ichi");
-    check_df_data(df, 1, "ni");
-    check_df_data(df, 2, "san");
-    check_df_data(df, 3, "yon");
+    check_df_data(df, 0, "ichi ");
+    check_df_data(df, 1, "ni ");
+    check_df_data(df, 2, "san ");
+    check_df_data(df, 3, "yon ");
     check_df_data(df, 4, "go");
 
     free(bin_data);
@@ -378,10 +372,10 @@ static void test_fields_rw_single(TestCase *tc, void *data)
     frt_fis_deref(fis);
 }
 
-static void test_fields_rw_multi(TestCase *tc, void *data)
-{
+static void test_fields_rw_multi(TestCase *tc, void *data) {
     int i;
     FrtStore *store = frt_open_ram_store(NULL);
+    store->create_folder(store, segm_idx_name);
     char *bin_data = prepare_bin_data(BIN_DATA_LEN);
     FrtDocument *doc;
     FrtFieldInfos *fis = prepare_fis();
@@ -401,13 +395,13 @@ static void test_fields_rw_multi(TestCase *tc, void *data)
         frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern(bufc)), bufc, enc));
         frt_fw_add_doc(fw, doc);
         frt_fw_write_tv_index(fw);
-       frt_doc_destroy(doc);
+        frt_doc_destroy(doc);
     }
 
     doc = prepare_doc();
     frt_fw_add_doc(fw, doc);
     frt_fw_write_tv_index(fw);
-   frt_doc_destroy(doc);
+    frt_doc_destroy(doc);
     frt_fw_close(fw);
 
     Aiequal(106, fis->size);
@@ -423,7 +417,7 @@ static void test_fields_rw_multi(TestCase *tc, void *data)
     doc = frt_fr_get_doc(fr, 100);
     frt_fr_close(fr);
 
-    Aiequal(4, doc->size);
+    Aiequal(4, doc->field_count);
 
     Apnull(frt_doc_get_field(doc, rb_intern("ignored")));
     Apnull(frt_doc_get_field(doc, rb_intern("unstored")));
@@ -434,9 +428,9 @@ static void test_fields_rw_multi(TestCase *tc, void *data)
 
     df = frt_doc_get_field(doc, rb_intern("stored_array"));
     Aiequal(5, df->size);
-    check_df_data(df, 0, "one");
-    check_df_data(df, 1, "two");
-    check_df_data(df, 2, "three");
+    check_df_data(df, 0, "one ");
+    check_df_data(df, 1, "two ");
+    check_df_data(df, 2, "three ");
     check_df_data(df, 3, "four");
     check_df_bin_data(df, 4, bin_data, BIN_DATA_LEN);
 
@@ -446,10 +440,10 @@ static void test_fields_rw_multi(TestCase *tc, void *data)
 
     df = frt_doc_get_field(doc, rb_intern("array"));
     Aiequal(5, df->size);
-    check_df_data(df, 0, "ichi");
-    check_df_data(df, 1, "ni");
-    check_df_data(df, 2, "san");
-    check_df_data(df, 3, "yon");
+    check_df_data(df, 0, "ichi ");
+    check_df_data(df, 1, "ni ");
+    check_df_data(df, 2, "san ");
+    check_df_data(df, 3, "yon ");
     check_df_data(df, 4, "go");
 
     free(bin_data);
@@ -458,9 +452,9 @@ static void test_fields_rw_multi(TestCase *tc, void *data)
     frt_fis_deref(fis);
 }
 
-static void test_lazy_field_loading(TestCase *tc, void *data)
-{
+static void test_lazy_field_loading(TestCase *tc, void *data) {
     FrtStore *store = frt_open_ram_store(NULL);
+    store->create_folder(store, segm_idx_name);
     FrtDocument *doc;
     FrtFieldInfos *fis = prepare_fis();
     FrtFieldsWriter *fw;
@@ -468,18 +462,19 @@ static void test_lazy_field_loading(TestCase *tc, void *data)
     FrtDocField *df;
     FrtLazyDoc *lazy_doc;
     FrtLazyDocField *lazy_df;
-    char *text, buf[1000];
+    const char *text;
+    char buf[1000];
     (void)data;
     rb_encoding *enc = rb_enc_find("ASCII-8BIT");
 
     fw = frt_fw_open(store, "_as3", fis);
     doc = frt_doc_new();
     df = frt_df_new(rb_intern("stored"));
-    frt_df_add_data(df, (char *)"this is a stored field", enc);
-    frt_df_add_data(df, (char *)"to be or not to be", enc);
-    frt_df_add_data(df, (char *)"a stitch in time, saves nine", enc);
-    frt_df_add_data(df, (char *)"the quick brown fox jumped over the lazy dog", enc);
-    frt_df_add_data(df, (char *)"that's it folks", enc);
+    frt_df_add_data(df, "this is a stored field ", enc);
+    frt_df_add_data(df, "to be or not to be ", enc);
+    frt_df_add_data(df, "a stitch in time, saves nine ", enc);
+    frt_df_add_data(df, "the quick brown fox jumped over the lazy dog ", enc);
+    frt_df_add_data(df, "that's it folks", enc);
     frt_doc_add_field(doc, df);
     frt_fw_add_doc(fw, doc);
     frt_fw_write_tv_index(fw);
@@ -494,8 +489,8 @@ static void test_lazy_field_loading(TestCase *tc, void *data)
 
     lazy_df = frt_lazy_doc_get(lazy_doc, rb_intern("stored"));
     Apnull(lazy_doc->fields[0]->data[0].text);
-    Asequal("this is a stored field", text = frt_lazy_df_get_data(lazy_df, 0));
-    Asequal("this is a stored field", lazy_doc->fields[0]->data[0].text);
+    Asequal("this is a stored field ", text = frt_lazy_df_get_data(lazy_df, 0));
+    Asequal("this is a stored field ", lazy_doc->fields[0]->data[0].text);
     Apequal(text, frt_lazy_df_get_data(lazy_df, 0));
 
     Apnull(lazy_doc->fields[0]->data[4].text);
@@ -518,8 +513,7 @@ static void test_lazy_field_loading(TestCase *tc, void *data)
     frt_lazy_doc_close(lazy_doc);
 }
 
-TestSuite *ts_fields(TestSuite *suite)
-{
+TestSuite *ts_fields(TestSuite *suite) {
     suite = ADD_SUITE(suite);
     tst_run_test(suite, test_fi_new, NULL);
     tst_run_test(suite, test_fis_basic, NULL);