isomorfeus-ferret 0.17.2 → 0.17.4

data/ext/isomorfeus_ferret_ext/test_index.c

@@ -14,11 +14,9 @@ static FrtFieldInfos *prep_all_fis(void) {
     frt_fis_add_field(fis, frt_fi_new(rb_intern("tv+offsets"), 0 | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_OFFSETS_BM));
     frt_fis_add_field(fis, frt_fi_new(rb_intern("tv+offsets un-t"), 0 | FRT_FI_IS_INDEXED_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_OFFSETS_BM));
     return fis;
-
 }
 
-static void destroy_docs(FrtDocument **docs, int len)
-{
+static void destroy_docs(FrtDocument **docs, int len) {
   int i;
   for (i = 0; i < len; i++) {
    frt_doc_destroy(docs[i]);
@@ -30,19 +28,15 @@ static FrtFieldInfos *prep_book_fis(void) {
     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);
     frt_fis_add_field(fis, frt_fi_new(rb_intern("year"), 0 | FRT_FI_IS_STORED_BM));
     return fis;
-
 }
 
 FrtDocument *prep_book(void) {
     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(author),
-            frt_estrdup("P.H. Newby"), enc))->destroy_data = true;
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Something To Answer For"), enc))->destroy_data = true;
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1969"), enc))->destroy_data = true;
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(author), "P.H. Newby", enc));
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(title), "Something To Answer For", enc));
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(year), "1969", enc));
     return doc;
 }
 
@@ -51,285 +45,171 @@ FrtDocument **prep_book_list(void) {
     rb_encoding *enc = rb_enc_find("ASCII-8BIT");
     FrtDocument **docs = FRT_ALLOC_N(FrtDocument *, BOOK_LIST_LENGTH);
     docs[0] = frt_doc_new();
-    frt_doc_add_field(docs[0], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("P.H. Newby"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[0], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Something To Answer For"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[0], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1969"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[0], frt_df_add_data(frt_df_new(author), "P.H. Newby", enc));
+    frt_doc_add_field(docs[0], frt_df_add_data(frt_df_new(title), "Something To Answer For", enc));
+    frt_doc_add_field(docs[0], frt_df_add_data(frt_df_new(year), "1969", enc));
     docs[1] = frt_doc_new();
-    frt_doc_add_field(docs[1], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Bernice Rubens"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[1], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("The Elected Member"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[1], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1970"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[1], frt_df_add_data(frt_df_new(author), "Bernice Rubens", enc));
+    frt_doc_add_field(docs[1], frt_df_add_data(frt_df_new(title), "The Elected Member", enc));
+    frt_doc_add_field(docs[1], frt_df_add_data(frt_df_new(year), "1970", enc));
     docs[2] = frt_doc_new();
-    frt_doc_add_field(docs[2], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("V. S. Naipaul"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[2], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("In a Free State"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[2], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1971"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[2], frt_df_add_data(frt_df_new(author), "V. S. Naipaul", enc));
+    frt_doc_add_field(docs[2], frt_df_add_data(frt_df_new(title), "In a Free State", enc));
+    frt_doc_add_field(docs[2], frt_df_add_data(frt_df_new(year), "1971", enc));
     docs[3] = frt_doc_new();
-    frt_doc_add_field(docs[3], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("John Berger"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[3], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("G"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[3], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1972"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[3], frt_df_add_data(frt_df_new(author), "John Berger", enc));
+    frt_doc_add_field(docs[3], frt_df_add_data(frt_df_new(title), "G", enc));
+    frt_doc_add_field(docs[3], frt_df_add_data(frt_df_new(year), "1972", enc));
     docs[4] = frt_doc_new();
-    frt_doc_add_field(docs[4], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("J. G. Farrell"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[4], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("The Siege of Krishnapur"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[4], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1973"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[4], frt_df_add_data(frt_df_new(author), "J. G. Farrell", enc));
+    frt_doc_add_field(docs[4], frt_df_add_data(frt_df_new(title), "The Siege of Krishnapur", enc));
+    frt_doc_add_field(docs[4], frt_df_add_data(frt_df_new(year), "1973", enc));
     docs[5] = frt_doc_new();
-    frt_doc_add_field(docs[5], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Stanley Middleton"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[5], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Holiday"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[5], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1974"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[5], frt_df_add_data(frt_df_new(author), "Stanley Middleton", enc));
+    frt_doc_add_field(docs[5], frt_df_add_data(frt_df_new(title), "Holiday", enc));
+    frt_doc_add_field(docs[5], frt_df_add_data(frt_df_new(year), "1974", enc));
     docs[6] = frt_doc_new();
-    frt_doc_add_field(docs[6], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Nadine Gordimer"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[6], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("The Conservationist"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[6], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1974"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[6], frt_df_add_data(frt_df_new(author), "Nadine Gordimer", enc));
+    frt_doc_add_field(docs[6], frt_df_add_data(frt_df_new(title), "The Conservationist", enc));
+    frt_doc_add_field(docs[6], frt_df_add_data(frt_df_new(year), "1974", enc));
     docs[7] = frt_doc_new();
-    frt_doc_add_field(docs[7], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Ruth Prawer Jhabvala"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[7], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Heat and Dust"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[7], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1975"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[7], frt_df_add_data(frt_df_new(author), "Ruth Prawer Jhabvala", enc));
+    frt_doc_add_field(docs[7], frt_df_add_data(frt_df_new(title), "Heat and Dust", enc));
+    frt_doc_add_field(docs[7], frt_df_add_data(frt_df_new(year), "1975", enc));
     docs[8] = frt_doc_new();
-    frt_doc_add_field(docs[8], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("David Storey"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[8], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Saville"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[8], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1976"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[8], frt_df_add_data(frt_df_new(author), "David Storey", enc));
+    frt_doc_add_field(docs[8], frt_df_add_data(frt_df_new(title), "Saville", enc));
+    frt_doc_add_field(docs[8], frt_df_add_data(frt_df_new(year), "1976", enc));
     docs[9] = frt_doc_new();
-    frt_doc_add_field(docs[9], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Paul Scott"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[9], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Staying On"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[9], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1977"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[9], frt_df_add_data(frt_df_new(author), "Paul Scott", enc));
+    frt_doc_add_field(docs[9], frt_df_add_data(frt_df_new(title), "Staying On", enc));
+    frt_doc_add_field(docs[9], frt_df_add_data(frt_df_new(year), "1977", enc));
     docs[10] = frt_doc_new();
-    frt_doc_add_field(docs[10], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Iris Murdoch"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[10], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("The Sea"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[10], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1978"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[10], frt_df_add_data(frt_df_new(author), "Iris Murdoch", enc));
+    frt_doc_add_field(docs[10], frt_df_add_data(frt_df_new(title), "The Sea", enc));
+    frt_doc_add_field(docs[10], frt_df_add_data(frt_df_new(year), "1978", enc));
     docs[11] = frt_doc_new();
-    frt_doc_add_field(docs[11], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Penelope Fitzgerald"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[11], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Offshore"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[11], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1979"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[11], frt_df_add_data(frt_df_new(author), "Penelope Fitzgerald", enc));
+    frt_doc_add_field(docs[11], frt_df_add_data(frt_df_new(title), "Offshore", enc));
+    frt_doc_add_field(docs[11], frt_df_add_data(frt_df_new(year), "1979", enc));
     docs[12] = frt_doc_new();
-    frt_doc_add_field(docs[12], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("William Golding"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[12], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Rites of Passage"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[12], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1980"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[12], frt_df_add_data(frt_df_new(author), "William Golding", enc));
+    frt_doc_add_field(docs[12], frt_df_add_data(frt_df_new(title), "Rites of Passage", enc));
+    frt_doc_add_field(docs[12], frt_df_add_data(frt_df_new(year), "1980", enc));
     docs[13] = frt_doc_new();
-    frt_doc_add_field(docs[13], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Salman Rushdie"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[13], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Midnight's Children"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[13], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1981"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[13], frt_df_add_data(frt_df_new(author), "Salman Rushdie", enc));
+    frt_doc_add_field(docs[13], frt_df_add_data(frt_df_new(title), "Midnight's Children", enc));
+    frt_doc_add_field(docs[13], frt_df_add_data(frt_df_new(year), "1981", enc));
     docs[14] = frt_doc_new();
-    frt_doc_add_field(docs[14], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Thomas Keneally"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[14], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Schindler's Ark"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[14], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1982"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[14], frt_df_add_data(frt_df_new(author), "Thomas Keneally", enc));
+    frt_doc_add_field(docs[14], frt_df_add_data(frt_df_new(title), "Schindler's Ark", enc));
+    frt_doc_add_field(docs[14], frt_df_add_data(frt_df_new(year), "1982", enc));
     docs[15] = frt_doc_new();
-    frt_doc_add_field(docs[15], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("J. M. Coetzee"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[15], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Life and Times of Michael K"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[15], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1983"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[15], frt_df_add_data(frt_df_new(author), "J. M. Coetzee", enc));
+    frt_doc_add_field(docs[15], frt_df_add_data(frt_df_new(title), "Life and Times of Michael K", enc));
+    frt_doc_add_field(docs[15], frt_df_add_data(frt_df_new(year), "1983", enc));
     docs[16] = frt_doc_new();
-    frt_doc_add_field(docs[16], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Anita Brookner"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[16], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Hotel du Lac"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[16], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1984"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[16], frt_df_add_data(frt_df_new(author), "Anita Brookner", enc));
+    frt_doc_add_field(docs[16], frt_df_add_data(frt_df_new(title), "Hotel du Lac", enc));
+    frt_doc_add_field(docs[16], frt_df_add_data(frt_df_new(year), "1984", enc));
     docs[17] = frt_doc_new();
-    frt_doc_add_field(docs[17], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Keri Hulme"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[17], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("The Bone People"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[17], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1985"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[17], frt_df_add_data(frt_df_new(author), "Keri Hulme", enc));
+    frt_doc_add_field(docs[17], frt_df_add_data(frt_df_new(title), "The Bone People", enc));
+    frt_doc_add_field(docs[17], frt_df_add_data(frt_df_new(year), "1985", enc));
     docs[18] = frt_doc_new();
-    frt_doc_add_field(docs[18], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Kingsley Amis"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[18], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("The Old Devils"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[18], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1986"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[18], frt_df_add_data(frt_df_new(author), "Kingsley Amis", enc));
+    frt_doc_add_field(docs[18], frt_df_add_data(frt_df_new(title), "The Old Devils", enc));
+    frt_doc_add_field(docs[18], frt_df_add_data(frt_df_new(year), "1986", enc));
     docs[19] = frt_doc_new();
-    frt_doc_add_field(docs[19], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Penelope Lively"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[19], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Moon Tiger"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[19], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1987"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[19], frt_df_add_data(frt_df_new(author), "Penelope Lively", enc));
+    frt_doc_add_field(docs[19], frt_df_add_data(frt_df_new(title), "Moon Tiger", enc));
+    frt_doc_add_field(docs[19], frt_df_add_data(frt_df_new(year), "1987", enc));
     docs[20] = frt_doc_new();
-    frt_doc_add_field(docs[20], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Peter Carey"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[20], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Oscar and Lucinda"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[20], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1988"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[20], frt_df_add_data(frt_df_new(author), "Peter Carey", enc));
+    frt_doc_add_field(docs[20], frt_df_add_data(frt_df_new(title), "Oscar and Lucinda", enc));
+    frt_doc_add_field(docs[20], frt_df_add_data(frt_df_new(year), "1988", enc));
     docs[21] = frt_doc_new();
-    frt_doc_add_field(docs[21], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Kazuo Ishiguro"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[21], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("The Remains of the Day"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[21], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1989"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[21], frt_df_add_data(frt_df_new(author), "Kazuo Ishiguro", enc));
+    frt_doc_add_field(docs[21], frt_df_add_data(frt_df_new(title), "The Remains of the Day", enc));
+    frt_doc_add_field(docs[21], frt_df_add_data(frt_df_new(year), "1989", enc));
     docs[22] = frt_doc_new();
-    frt_doc_add_field(docs[22], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("A. S. Byatt"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[22], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Possession"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[22], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1990"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[22], frt_df_add_data(frt_df_new(author), "A. S. Byatt", enc));
+    frt_doc_add_field(docs[22], frt_df_add_data(frt_df_new(title), "Possession", enc));
+    frt_doc_add_field(docs[22], frt_df_add_data(frt_df_new(year), "1990", enc));
     docs[23] = frt_doc_new();
-    frt_doc_add_field(docs[23], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Ben Okri"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[23], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("The Famished Road"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[23], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1991"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[23], frt_df_add_data(frt_df_new(author), "Ben Okri", enc));
+    frt_doc_add_field(docs[23], frt_df_add_data(frt_df_new(title), "The Famished Road", enc));
+    frt_doc_add_field(docs[23], frt_df_add_data(frt_df_new(year), "1991", enc));
     docs[24] = frt_doc_new();
-    frt_doc_add_field(docs[24], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Michael Ondaatje"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[24], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("The English Patient"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[24], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1992"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[24], frt_df_add_data(frt_df_new(author), "Michael Ondaatje", enc));
+    frt_doc_add_field(docs[24], frt_df_add_data(frt_df_new(title), "The English Patient", enc));
+    frt_doc_add_field(docs[24], frt_df_add_data(frt_df_new(year), "1992", enc));
     docs[25] = frt_doc_new();
-    frt_doc_add_field(docs[25], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Barry Unsworth"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[25], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Sacred Hunger"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[25], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1992"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[25], frt_df_add_data(frt_df_new(author), "Barry Unsworth", enc));
+    frt_doc_add_field(docs[25], frt_df_add_data(frt_df_new(title), "Sacred Hunger", enc));
+    frt_doc_add_field(docs[25], frt_df_add_data(frt_df_new(year), "1992", enc));
     docs[26] = frt_doc_new();
-    frt_doc_add_field(docs[26], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Roddy Doyle"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[26], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Paddy Clarke Ha Ha Ha"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[26], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1993"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[26], frt_df_add_data(frt_df_new(author), "Roddy Doyle", enc));
+    frt_doc_add_field(docs[26], frt_df_add_data(frt_df_new(title), "Paddy Clarke Ha Ha Ha", enc));
+    frt_doc_add_field(docs[26], frt_df_add_data(frt_df_new(year), "1993", enc));
     docs[27] = frt_doc_new();
-    frt_doc_add_field(docs[27], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("James Kelman"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[27], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("How Late It Was, How Late"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[27], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1994"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[27], frt_df_add_data(frt_df_new(author), "James Kelman", enc));
+    frt_doc_add_field(docs[27], frt_df_add_data(frt_df_new(title), "How Late It Was, How Late", enc));
+    frt_doc_add_field(docs[27], frt_df_add_data(frt_df_new(year), "1994", enc));
     docs[28] = frt_doc_new();
-    frt_doc_add_field(docs[28], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Pat Barker"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[28], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("The Ghost Road"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[28], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1995"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[28], frt_df_add_data(frt_df_new(author), "Pat Barker", enc));
+    frt_doc_add_field(docs[28], frt_df_add_data(frt_df_new(title), "The Ghost Road", enc));
+    frt_doc_add_field(docs[28], frt_df_add_data(frt_df_new(year), "1995", enc));
     docs[29] = frt_doc_new();
-    frt_doc_add_field(docs[29], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Graham Swift"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[29], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Last Orders"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[29], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1996"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[29], frt_df_add_data(frt_df_new(author), "Graham Swift", enc));
+    frt_doc_add_field(docs[29], frt_df_add_data(frt_df_new(title), "Last Orders", enc));
+    frt_doc_add_field(docs[29], frt_df_add_data(frt_df_new(year), "1996", enc));
     docs[30] = frt_doc_new();
-    frt_doc_add_field(docs[30], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Arundati Roy"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[30], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("The God of Small Things"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[30], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1997"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[30], frt_df_add_data(frt_df_new(author), "Arundati Roy", enc));
+    frt_doc_add_field(docs[30], frt_df_add_data(frt_df_new(title), "The God of Small Things", enc));
+    frt_doc_add_field(docs[30], frt_df_add_data(frt_df_new(year), "1997", enc));
     docs[31] = frt_doc_new();
-    frt_doc_add_field(docs[31], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Ian McEwan"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[31], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Amsterdam"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[31], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1998"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[31], frt_df_add_data(frt_df_new(author), "Ian McEwan", enc));
+    frt_doc_add_field(docs[31], frt_df_add_data(frt_df_new(title), "Amsterdam", enc));
+    frt_doc_add_field(docs[31], frt_df_add_data(frt_df_new(year), "1998", enc));
     docs[32] = frt_doc_new();
-    frt_doc_add_field(docs[32], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("J. M. Coetzee"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[32], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Disgrace"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[32], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1999"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[32], frt_df_add_data(frt_df_new(author), "J. M. Coetzee", enc));
+    frt_doc_add_field(docs[32], frt_df_add_data(frt_df_new(title), "Disgrace", enc));
+    frt_doc_add_field(docs[32], frt_df_add_data(frt_df_new(year), "1999", enc));
     docs[33] = frt_doc_new();
-    frt_doc_add_field(docs[33], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Margaret Atwood"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[33], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("The Blind Assassin"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[33], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("2000"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[33], frt_df_add_data(frt_df_new(author), "Margaret Atwood", enc));
+    frt_doc_add_field(docs[33], frt_df_add_data(frt_df_new(title), "The Blind Assassin", enc));
+    frt_doc_add_field(docs[33], frt_df_add_data(frt_df_new(year), "2000", enc));
     docs[34] = frt_doc_new();
-    frt_doc_add_field(docs[34], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Peter Carey"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[34], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("True History of the Kelly Gang"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[34], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("2001"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[34], frt_df_add_data(frt_df_new(author), "Peter Carey", enc));
+    frt_doc_add_field(docs[34], frt_df_add_data(frt_df_new(title), "True History of the Kelly Gang", enc));
+    frt_doc_add_field(docs[34], frt_df_add_data(frt_df_new(year), "2001", enc));
     docs[35] = frt_doc_new();
-    frt_doc_add_field(docs[35], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Yann Martel"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[35], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("The Life of Pi"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[35], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("2002"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[35], frt_df_add_data(frt_df_new(author), "Yann Martel", enc));
+    frt_doc_add_field(docs[35], frt_df_add_data(frt_df_new(title), "The Life of Pi", enc));
+    frt_doc_add_field(docs[35], frt_df_add_data(frt_df_new(year), "2002", enc));
     docs[36] = frt_doc_new();
-    frt_doc_add_field(docs[36], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("DBC Pierre"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[36], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Vernon God Little"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[36], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("2003"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[36], frt_df_add_data(frt_df_new(author), "DBC Pierre", enc));
+    frt_doc_add_field(docs[36], frt_df_add_data(frt_df_new(title), "Vernon God Little", enc));
+    frt_doc_add_field(docs[36], frt_df_add_data(frt_df_new(year), "2003", enc));
 
     return docs;
 }
 
-static void add_document_with_fields(FrtIndexWriter *iw, int i)
-{
+static void add_document_with_fields(FrtIndexWriter *iw, int i) {
     FrtDocument **docs = prep_book_list();
     frt_iw_add_doc(iw, docs[i]);
     destroy_docs(docs, BOOK_LIST_LENGTH);
 }
 
-static FrtIndexWriter *create_book_iw_conf(FrtStore *store, const FrtConfig *config)
-{
+static FrtIndexWriter *create_book_iw_conf(FrtStore *store, const FrtConfig *config) {
     FrtFieldInfos *fis = prep_book_fis();
     frt_index_create(store, fis);
     frt_fis_deref(fis);
     return frt_iw_open(NULL, store, frt_whitespace_analyzer_new(false), config);
 }
 
-static FrtIndexWriter *create_book_iw(FrtStore *store)
-{
+static FrtIndexWriter *create_book_iw(FrtStore *store) {
     return create_book_iw_conf(store, &frt_default_config);
 }
 
@@ -343,146 +223,91 @@ FrtDocument **prep_ir_test_docs(void) {
     rb_encoding *enc = rb_enc_find("ASCII-8BIT");
 
     docs[0] = frt_doc_new();
-    frt_doc_add_field(docs[0], frt_df_add_data(frt_df_new(changing_field),
-            frt_estrdup("word3 word4 word1 word2 word1 word3 word4 word1 "
-                    "word3 word3"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[0], frt_df_add_data(frt_df_new(compressed_field_brotli),
-            frt_estrdup("word3 word4 word1 word2 word1 word3 word4 word1 "
-                    "word3 word3"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[0], frt_df_add_data(frt_df_new(compressed_field_bzip2),
-            frt_estrdup("word3 word4 word1 word2 word1 word3 word4 word1 "
-                    "word3 word3"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[0], frt_df_add_data(frt_df_new(compressed_field_lz4),
-           frt_estrdup("word3 word4 word1 word2 word1 word3 word4 word1 "
-                   "word3 word3"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[0], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Where is Wally"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[0], frt_df_add_data(frt_df_new(changing_field), "word3 word4 word1 word2 word1 word3 word4 word1 word3 word3", enc));
+    frt_doc_add_field(docs[0], frt_df_add_data(frt_df_new(compressed_field_brotli), "word3 word4 word1 word2 word1 word3 word4 word1 word3 word3", enc));
+    frt_doc_add_field(docs[0], frt_df_add_data(frt_df_new(compressed_field_bzip2), "word3 word4 word1 word2 word1 word3 word4 word1 word3 word3", enc));
+    frt_doc_add_field(docs[0], frt_df_add_data(frt_df_new(compressed_field_lz4), "word3 word4 word1 word2 word1 word3 word4 word1 word3 word3", enc));
+    frt_doc_add_field(docs[0], frt_df_add_data(frt_df_new(body), "Where is Wally", enc));
     docs[1] = frt_doc_new();
-    frt_doc_add_field(docs[1], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Some Random Sentence read"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[1], frt_df_add_data(frt_df_new(tag),
-            frt_estrdup("id_test"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[1], frt_df_add_data(frt_df_new(body), "Some Random Sentence read", enc));
+    frt_doc_add_field(docs[1], frt_df_add_data(frt_df_new(tag), "id_test", enc));
     docs[2] = frt_doc_new();
-    frt_doc_add_field(docs[2], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Some read Random Sentence read"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[2], frt_df_add_data(frt_df_new(body), "Some read Random Sentence read", enc));
     df = frt_df_new(tag);
-    frt_df_add_data(df, frt_estrdup("one"), enc);
-    frt_df_add_data(df, frt_estrdup("two"), enc);
-    frt_df_add_data(df, frt_estrdup("three"), enc);
-    frt_df_add_data(df, frt_estrdup("four"), enc);
-    frt_doc_add_field(docs[2], df)->destroy_data = true;
+    frt_df_add_data(df, "one ", enc);
+    frt_df_add_data(df, "two ", enc);
+    frt_df_add_data(df, "three ", enc);
+    frt_df_add_data(df, "four", enc);
+    frt_doc_add_field(docs[2], df);
     df = frt_df_new(compressed_field_brotli);
-    frt_df_add_data(df, frt_estrdup("one"), enc);
-    frt_df_add_data(df, frt_estrdup("two"), enc);
-    frt_df_add_data(df, frt_estrdup("three"), enc);
-    frt_df_add_data(df, frt_estrdup("four"), enc);
-    frt_doc_add_field(docs[2], df)->destroy_data = true;
+    frt_df_add_data(df, "one ", enc);
+    frt_df_add_data(df, "two ", enc);
+    frt_df_add_data(df, "three ", enc);
+    frt_df_add_data(df, "four", enc);
+    frt_doc_add_field(docs[2], df);
     df = frt_df_new(compressed_field_bzip2);
-    frt_df_add_data(df, frt_estrdup("one"), enc);
-    frt_df_add_data(df, frt_estrdup("two"), enc);
-    frt_df_add_data(df, frt_estrdup("three"), enc);
-    frt_df_add_data(df, frt_estrdup("four"), enc);
-    frt_doc_add_field(docs[2], df)->destroy_data = true;
+    frt_df_add_data(df, "one ", enc);
+    frt_df_add_data(df, "two ", enc);
+    frt_df_add_data(df, "three ", enc);
+    frt_df_add_data(df, "four", enc);
+    frt_doc_add_field(docs[2], df);
     df = frt_df_new(compressed_field_lz4);
-    frt_df_add_data(df, frt_estrdup("one"), enc);
-    frt_df_add_data(df, frt_estrdup("two"), enc);
-    frt_df_add_data(df, frt_estrdup("three"), enc);
-    frt_df_add_data(df, frt_estrdup("four"), enc);
-    frt_doc_add_field(docs[2], df)->destroy_data = true;
+    frt_df_add_data(df, "one ", enc);
+    frt_df_add_data(df, "two ", enc);
+    frt_df_add_data(df, "three ", enc);
+    frt_df_add_data(df, "four", enc);
+    frt_doc_add_field(docs[2], df);
     docs[3] = frt_doc_new();
-    frt_doc_add_field(docs[3], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("War And Peace"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[3], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("word3 word4 word1 word2 word1 "
-                    "word3 word4 word1 word3 word3"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[3], frt_df_add_data(frt_df_new(author),
-            frt_estrdup("Leo Tolstoy"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[3], frt_df_add_data(frt_df_new(year),
-            frt_estrdup("1865"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[3], frt_df_add_data(frt_df_new(text),
-            frt_estrdup("more text which is not stored"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[3], frt_df_add_data(frt_df_new(title), "War And Peace", enc));
+    frt_doc_add_field(docs[3], frt_df_add_data(frt_df_new(body), "word3 word4 word1 word2 word1 word3 word4 word1 word3 word3", enc));
+    frt_doc_add_field(docs[3], frt_df_add_data(frt_df_new(author), "Leo Tolstoy", enc));
+    frt_doc_add_field(docs[3], frt_df_add_data(frt_df_new(year), "1865", enc));
+    frt_doc_add_field(docs[3], frt_df_add_data(frt_df_new(text), "more text which is not stored", enc));
     docs[4] = frt_doc_new();
-    frt_doc_add_field(docs[4], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Some Random Sentence"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[4], frt_df_add_data(frt_df_new(body), "Some Random Sentence", enc));
     docs[5] = frt_doc_new();
-    frt_doc_add_field(docs[5], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Here's Wally"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[5], frt_df_add_data(frt_df_new(text),
-            frt_estrdup("so_that_norm_can_be_set"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[5], frt_df_add_data(frt_df_new(body), "Here's Wally", enc));
+    frt_doc_add_field(docs[5], frt_df_add_data(frt_df_new(text), "so_that_norm_can_be_set", enc));
     docs[6] = frt_doc_new();
-    frt_doc_add_field(docs[6], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Some Random Sentence read read read read"
-                    ), enc))->destroy_data = true;
+    frt_doc_add_field(docs[6], frt_df_add_data(frt_df_new(body), "Some Random Sentence read read read read", enc));
     docs[7] = frt_doc_new();
-    frt_doc_add_field(docs[7], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Some Random Sentence"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[7], frt_df_add_data(frt_df_new(body), "Some Random Sentence", enc));
     docs[8] = frt_doc_new();
-    frt_doc_add_field(docs[8], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Some Random Sentence"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[8], frt_df_add_data(frt_df_new(body), "Some Random Sentence", enc));
     docs[9] = frt_doc_new();
-    frt_doc_add_field(docs[9], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("read Some Random Sentence read this will be used after "
-                    "unfinished next position read"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[9], frt_df_add_data(frt_df_new(body), "read Some Random Sentence read this will be used after unfinished next position read", enc));
     docs[10] = frt_doc_new();
-    frt_doc_add_field(docs[10], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Some read Random Sentence"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[10], frt_df_add_data(frt_df_new(changing_field),
-            frt_estrdup("word3 word4 word1 word2 word1 word3 word4 word1 word3 "
-                    "word3"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[10], frt_df_add_data(frt_df_new(body), "Some read Random Sentence", enc));
+    frt_doc_add_field(docs[10], frt_df_add_data(frt_df_new(changing_field), "word3 word4 word1 word2 word1 word3 word4 word1 word3 word3", enc));
     docs[11] = frt_doc_new();
-    frt_doc_add_field(docs[11], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("And here too. Well, maybe Not"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[11], frt_df_add_data(frt_df_new(body), "And here too. Well, maybe Not", enc));
     docs[12] = frt_doc_new();
-    frt_doc_add_field(docs[12], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("Shawshank Redemption"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[12], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Some Random Sentence"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[12], frt_df_add_data(frt_df_new(title), "Shawshank Redemption", enc));
+    frt_doc_add_field(docs[12], frt_df_add_data(frt_df_new(body), "Some Random Sentence", enc));
     docs[13] = frt_doc_new();
-    frt_doc_add_field(docs[13], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Some Random Sentence"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[13], frt_df_add_data(frt_df_new(body), "Some Random Sentence", enc));
     docs[14] = frt_doc_new();
-    frt_doc_add_field(docs[14], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Some Random Sentence"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[14], frt_df_add_data(frt_df_new(body), "Some Random Sentence", enc));
     docs[15] = frt_doc_new();
-    frt_doc_add_field(docs[15], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Some read Random Sentence"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[15], frt_df_add_data(frt_df_new(body), "Some read Random Sentence", enc));
     docs[16] = frt_doc_new();
-    frt_doc_add_field(docs[16], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Some Random read read Sentence"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[16], frt_df_add_data(frt_df_new(body), "Some Random read read Sentence", enc));
     docs[17] = frt_doc_new();
-    frt_doc_add_field(docs[17], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Some Random read Sentence"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[17], frt_df_add_data(frt_df_new(changing_field),
-            frt_estrdup("word3 word4 word1 word2 word1 word3 word4 word1 word3 "
-                    "word3"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[17], frt_df_add_data(frt_df_new(body), "Some Random read Sentence", enc));
+    frt_doc_add_field(docs[17], frt_df_add_data(frt_df_new(changing_field), "word3 word4 word1 word2 word1 word3 word4 word1 word3 word3", enc));
     docs[18] = frt_doc_new();
-    frt_doc_add_field(docs[18], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Wally Wally Wally"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[18], frt_df_add_data(frt_df_new(body), "Wally Wally Wally", enc));
     docs[19] = frt_doc_new();
-    frt_doc_add_field(docs[19], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Some Random Sentence"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[19], frt_df_add_data(frt_df_new(changing_field),
-            frt_estrdup("word3 word4 word1 word2 word1 word3 word4 word1 word3 "
-                    "word3"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[19], frt_df_add_data(frt_df_new(body), "Some Random Sentence", enc));
+    frt_doc_add_field(docs[19], frt_df_add_data(frt_df_new(changing_field), "word3 word4 word1 word2 word1 word3 word4 word1 word3 word3", enc));
     docs[20] = frt_doc_new();
-    frt_doc_add_field(docs[20], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Wally is where Wally usually likes to go. Wally Mart! "
-                    "Wally likes shopping there for Where's Wally books. "
-                    "Wally likes to read"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[20], frt_df_add_data(frt_df_new(changing_field),
-            frt_estrdup("word3 word4 word1 word2 word1 word3 word4 word1 word3 "
-                    "word3"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[20], frt_df_add_data(frt_df_new(body), "Wally is where Wally usually likes to go. Wally Mart! Wally likes shopping there for Where's Wally books. Wally likes to read", enc));
+    frt_doc_add_field(docs[20], frt_df_add_data(frt_df_new(changing_field), "word3 word4 word1 word2 word1 word3 word4 word1 word3 word3", enc));
     docs[21] = frt_doc_new();
-    frt_doc_add_field(docs[21], frt_df_add_data(frt_df_new(body),
-            frt_estrdup("Some Random Sentence read read read and more read read "
-                    "read"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[21], frt_df_add_data(frt_df_new(changing_field),
-            frt_estrdup("word3 word4 word1 word2 word1 word3 word4 word1 word3 "
-                    "word3"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[21], frt_df_add_data(frt_df_new(rb_intern("new field")),
-            frt_estrdup("zdata znot zto zbe zfound"), enc))->destroy_data = true;
-    frt_doc_add_field(docs[21], frt_df_add_data(frt_df_new(title),
-            frt_estrdup("title_too_long_for_max_word_lengthxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"), enc))->destroy_data = true;
+    frt_doc_add_field(docs[21], frt_df_add_data(frt_df_new(body), "Some Random Sentence read read read and more read read read", enc));
+    frt_doc_add_field(docs[21], frt_df_add_data(frt_df_new(changing_field), "word3 word4 word1 word2 word1 word3 word4 word1 word3 word3", enc));
+    frt_doc_add_field(docs[21], frt_df_add_data(frt_df_new(rb_intern("new field")), "zdata znot zto zbe zfound", enc));
+    frt_doc_add_field(docs[21], frt_df_add_data(frt_df_new(title), "title_too_long_for_max_word_lengthxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", enc));
 
     for (i = 1; i < 22; i++) {
         strcat(buf, "skip ");
@@ -491,7 +316,7 @@ FrtDocument **prep_ir_test_docs(void) {
         strcat(buf, "skip ");
         docs[i] = frt_doc_new();
         frt_doc_add_field(docs[i], frt_df_add_data(frt_df_new(text),
-            frt_estrdup(buf), enc))->destroy_data = true;
+            buf, enc));
     }
     return docs;
 }
@@ -500,8 +325,7 @@ FrtDocument **prep_ir_test_docs(void) {
 #define MAX_TEST_WORDS 1000
 
 static void prep_stde_test_docs(FrtDocument **docs, int doc_cnt, int num_words,
-                            FrtFieldInfos *fis)
-{
+                            FrtFieldInfos *fis) {
     int i, j;
     char *buf = FRT_ALLOC_N(char, num_words * (TEST_WORD_LIST_MAX_LEN + 1));
     rb_encoding *enc = rb_enc_find("ASCII-8BIT");
@@ -511,8 +335,7 @@ static void prep_stde_test_docs(FrtDocument **docs, int doc_cnt, int num_words,
         for (j = 0; j < fis->size; j++) {
             if ((rand() % 2) == 0) {
                 FrtDocField *df = frt_df_new(fis->fields[j]->name);
-                frt_df_add_data(df, frt_estrdup(make_random_string(buf, num_words)), enc);
-                df->destroy_data = true;
+                frt_df_add_data(df, make_random_string(buf, num_words), enc);
                 frt_doc_add_field(docs[i], df);
             }
         }
@@ -521,8 +344,7 @@ static void prep_stde_test_docs(FrtDocument **docs, int doc_cnt, int num_words,
 }
 
 static void prep_test_1seg_index(FrtStore *store, FrtDocument **docs,
-                                 int doc_cnt, FrtFieldInfos *fis)
-{
+                                 int doc_cnt, FrtFieldInfos *fis) {
     int i;
     FrtDocWriter *dw;
     FrtIndexWriter *iw;
@@ -548,8 +370,7 @@ static void prep_test_1seg_index(FrtStore *store, FrtDocument **docs,
  *
  ****************************************************************************/
 
-static void test_segment_term_doc_enum(TestCase *tc, void *data)
-{
+static void test_segment_term_doc_enum(TestCase *tc, void *data) {
     int i, j;
     FrtStore *store = (FrtStore *)data;
     FrtFieldInfos *fis = prep_all_fis();
@@ -570,8 +391,8 @@ static void test_segment_term_doc_enum(TestCase *tc, void *data)
     sfi = frt_sfi_open(store, "_0");
     tir = frt_tir_open(store, sfi, "_0");
     skip_interval = ((FrtSegmentTermEnum *)tir->orig_te)->skip_interval;
-    frq_in = store->open_input(store, "_0.frq");
-    prx_in = store->open_input(store, "_0.prx");
+    frq_in = store->open_input(store, segm_idx_name, "_0.frq");
+    prx_in = store->open_input(store, segm_idx_name, "_0.prx");
     tde = frt_stde_new(tir, frq_in, bv, skip_interval);
     tde_reader = frt_stde_new(tir, frq_in, bv, skip_interval);
     tde_skip_to = frt_stde_new(tir, frq_in, bv, skip_interval);
@@ -614,7 +435,6 @@ static void test_segment_term_doc_enum(TestCase *tc, void *data)
     tde_reader->close(tde_reader);
     tde_skip_to->close(tde_skip_to);
 
-
     tde = frt_stpe_new(tir, frq_in, prx_in, bv, skip_interval);
     tde_skip_to = frt_stpe_new(tir, frq_in, prx_in, bv, skip_interval);
 
@@ -645,7 +465,6 @@ static void test_segment_term_doc_enum(TestCase *tc, void *data)
         Atrue(! tde->next(tde));
         Atrue(! tde->skip_to(tde, 0));
         Atrue(! tde->skip_to(tde, 1000000));
-
     }
     tde->close(tde);
     tde_skip_to->close(tde_skip_to);
@@ -663,8 +482,7 @@ static void test_segment_term_doc_enum(TestCase *tc, void *data)
 const char *double_word = "word word";
 const char *triple_word = "word word word";
 
-static void test_segment_tde_deleted_docs(TestCase *tc, void *data)
-{
+static void test_segment_tde_deleted_docs(TestCase *tc, void *data) {
     int i, doc_num_expected, skip_interval;
     FrtStore *store = (FrtStore *)data;
     FrtDocWriter *dw;
@@ -686,8 +504,7 @@ static void test_segment_tde_deleted_docs(TestCase *tc, void *data)
             frt_bv_set(bv, i);
             Aiequal(1, frt_bv_get(bv, i));
             frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("f")), (char *)double_word, enc));
-        }
-        else {
+        } else {
             frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("f")), (char *)triple_word, enc));
         }
         frt_dw_add_doc(dw, doc);
@@ -699,8 +516,8 @@ static void test_segment_tde_deleted_docs(TestCase *tc, void *data)
 
     sfi = frt_sfi_open(store, "_0");
     tir = frt_tir_open(store, sfi, "_0");
-    frq_in = store->open_input(store, "_0.frq");
-    prx_in = store->open_input(store, "_0.prx");
+    frq_in = store->open_input(store, segm_idx_name, "_0.frq");
+    prx_in = store->open_input(store, segm_idx_name, "_0.prx");
     skip_interval = sfi->skip_interval;
     tde = frt_stpe_new(tir, frq_in, prx_in, bv, skip_interval);
 
@@ -734,21 +551,19 @@ static void test_segment_tde_deleted_docs(TestCase *tc, void *data)
  *
  ****************************************************************************/
 
-static void test_index_create(TestCase *tc, void *data)
-{
+static void test_index_create(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
     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);
     (void)tc;
 
-    store->clear_all(store);
-    Assert(!store->exists(store, "segments"), "segments shouldn't exist yet");
+    store->clear_all(store, segm_idx_name);
+    Assert(!store->exists(store, segm_idx_name, "segments"), "segments shouldn't exist yet");
     frt_index_create(store, fis);
-    Assert(store->exists(store, "segments"), "segments should now exist");
+    Assert(store->exists(store, segm_idx_name, "segments"), "segments should now exist");
     frt_fis_deref(fis);
 }
 
-static void test_index_version(TestCase *tc, void *data)
-{
+static void test_index_version(TestCase *tc, void *data) {
     frt_u64 version;
     FrtStore *store = (FrtStore *)data;
     FrtIndexWriter *iw = create_book_iw(store);
@@ -773,8 +588,7 @@ static void test_index_version(TestCase *tc, void *data)
     frt_ir_close(ir);
 }
 
-static void test_index_undelete_all_after_close(TestCase *tc, void *data)
-{
+static void test_index_undelete_all_after_close(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
     FrtIndexWriter *iw = create_book_iw(store);
     FrtIndexReader *ir;
@@ -801,8 +615,7 @@ static void test_index_undelete_all_after_close(TestCase *tc, void *data)
  *
  ****************************************************************************/
 
-static void test_fld_inverter(TestCase *tc, void *data)
-{
+static void test_fld_inverter(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
     FrtHash *plists;
     FrtHash *curr_plists;
@@ -816,9 +629,9 @@ static void test_fld_inverter(TestCase *tc, void *data)
     dw = frt_dw_open(iw, frt_sis_new_segment(iw->sis, 0, iw->store));
 
     df = frt_df_new(rb_intern("no tv"));
-    frt_df_add_data(df, (char *)"one two three four five two three four five three four five four five", enc);
-    frt_df_add_data(df, (char *)"ichi ni san yon go ni san yon go san yon go yon go go", enc);
-    frt_df_add_data(df, (char *)"The quick brown fox jumped over five lazy dogs", enc);
+    frt_df_add_data(df, "one two three four five two three four five three four five four five", enc);
+    frt_df_add_data(df, "ichi ni san yon go ni san yon go san yon go yon go go", enc);
+    frt_df_add_data(df, "The quick brown fox jumped over five lazy dogs", enc);
 
     curr_plists = frt_dw_invert_field(
         dw,
@@ -830,7 +643,6 @@ static void test_fld_inverter(TestCase *tc, void *data)
     plists = ((FrtFieldInverter *)frt_h_get_int(
             dw->fields, frt_fis_get_field(dw->fis, df->name)->number))->plists;
 
-
     pl = (FrtPostingList *)frt_h_get(curr_plists, "one");
     if (Apnotnull(pl)) {
         Asequal("one", pl->term);
@@ -862,8 +674,8 @@ static void test_fld_inverter(TestCase *tc, void *data)
     frt_df_destroy(df);
 
     df = frt_df_new(rb_intern("no tv"));
-    frt_df_add_data(df, (char *)"seven new words and six old ones", enc);
-    frt_df_add_data(df, (char *)"ichi ni one two quick dogs", enc);
+    frt_df_add_data(df, "seven new words and six old ones", enc);
+    frt_df_add_data(df, "ichi ni one two quick dogs", enc);
 
     dw->doc_num++;
     frt_dw_reset_postings(dw->curr_plists);
@@ -900,8 +712,7 @@ static void test_fld_inverter(TestCase *tc, void *data)
 }
 
 #define NUM_POSTINGS TEST_WORD_LIST_SIZE
-static void test_postings_sorter(TestCase *tc, void *data)
-{
+static void test_postings_sorter(TestCase *tc, void *data) {
     int i;
     FrtPostingList plists[NUM_POSTINGS], *p_ptr[NUM_POSTINGS];
     (void)data, (void)tc;
@@ -919,8 +730,7 @@ static void test_postings_sorter(TestCase *tc, void *data)
     }
 }
 
-static void test_iw_add_doc(TestCase *tc, void *data)
-{
+static void test_iw_add_doc(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
     FrtIndexWriter *iw = create_book_iw(store);
     FrtDocument **docs = prep_book_list();
@@ -929,20 +739,20 @@ static void test_iw_add_doc(TestCase *tc, void *data)
     Aiequal(1, frt_iw_doc_count(iw));
     // Assert(!store->exists(store, "_0.fdx"), "data shouldn't have been written yet");
     frt_iw_commit(iw);
-    Assert(store->exists(store, "_0.fdx"), "data should now be written");
+    Assert(store->exists(store, segm_idx_name, "_0.fdx"), "data should now be written");
     frt_iw_close(iw);
-    Assert(store->exists(store, "_0.fdx"), "data should still be there");
+    Assert(store->exists(store, segm_idx_name, "_0.fdx"), "data should still be there");
 
     iw = frt_iw_open(NULL, store, frt_whitespace_analyzer_new(false), &frt_default_config);
     frt_iw_add_doc(iw, docs[1]);
     Aiequal(2, frt_iw_doc_count(iw));
     // Assert(!store->exists(store, "_1.fdx"), "data shouldn't have been written yet");
-    Assert(store->exists(store, "_0.fdx"), "data should still be there");
+    Assert(store->exists(store, segm_idx_name, "_0.fdx"), "data should still be there");
     frt_iw_commit(iw);
-    Assert(store->exists(store, "_1.fdx"), "data should now be written");
+    Assert(store->exists(store, segm_idx_name, "_1.fdx"), "data should now be written");
     frt_iw_close(iw);
-    Assert(store->exists(store, "_1.fdx"), "data should still be there");
-    Assert(store->exists(store, "_0.fdx"), "data should still be there");
+    Assert(store->exists(store, segm_idx_name, "_1.fdx"), "data should still be there");
+    Assert(store->exists(store, segm_idx_name, "_0.fdx"), "data should still be there");
 
     destroy_docs(docs, BOOK_LIST_LENGTH);
 }
@@ -952,14 +762,14 @@ static void test_iw_add_doc(TestCase *tc, void *data)
  * reader holds it open (this fails pre lock-less
  * commits on windows):
  */
-static void test_create_with_reader(TestCase *tc, void *data)
-{
+static void test_create_with_reader(TestCase *tc, void *data) {
     FrtStore *store = frt_open_mdbx_store(TEST_DIR);
+    store->create_folder(store, segm_idx_name);
     (void)data;
     FrtIndexWriter *iw;
     FrtIndexReader *ir, *ir2;
     FrtDocument *doc = prep_book();
-    store->clear_all(store);
+    store->clear_all(store, segm_idx_name);
 
     /* add one document & close writer */
     iw = create_book_iw(store);
@@ -981,7 +791,7 @@ static void test_create_with_reader(TestCase *tc, void *data)
     Aiequal(1, ir2->num_docs(ir));
     frt_ir_close(ir);
     frt_ir_close(ir2);
-    store->clear_all(store);
+    store->clear_all(store, segm_idx_name);
     frt_store_close(store);
    frt_doc_destroy(doc);
 }
@@ -992,8 +802,7 @@ static void test_create_with_reader(TestCase *tc, void *data)
  * gracefully fallback to the previous segments file),
  * and that we can add to the index:
  */
-static void test_simulated_crashed_writer(TestCase *tc, void *data)
-{
+static void test_simulated_crashed_writer(TestCase *tc, void *data) {
     int i;
     long gen;
     frt_off_t length;
@@ -1025,8 +834,8 @@ static void test_simulated_crashed_writer(TestCase *tc, void *data)
      * writing segments file: */
     frt_sis_curr_seg_file_name(file_name_in, store);
     frt_fn_for_generation(file_name_out, FRT_SEGMENTS_FILE_NAME, NULL, 1 + gen);
-    is = store->open_input(store, file_name_in);
-    os = store->new_output(store, file_name_out);
+    is = store->open_input(store, segm_idx_name, file_name_in);
+    os = store->new_output(store, segm_idx_name, file_name_out);
     length = frt_is_length(is);
     for(i = 0; i < length - 1; i++) {
         frt_os_write_byte(os, frt_is_read_byte(is));
@@ -1053,8 +862,7 @@ static void test_simulated_crashed_writer(TestCase *tc, void *data)
  * latest segments file and make sure we get an
  * IOException trying to open the index:
  */
-static void test_simulated_corrupt_index1(TestCase *tc, void *data)
-{
+static void test_simulated_corrupt_index1(TestCase *tc, void *data) {
     int i;
     long gen;
     frt_off_t length;
@@ -1086,15 +894,15 @@ static void test_simulated_corrupt_index1(TestCase *tc, void *data)
      * writing segments file: */
     frt_sis_curr_seg_file_name(file_name_in, store);
     frt_fn_for_generation(file_name_out, FRT_SEGMENTS_FILE_NAME, "", 1 + gen);
-    is = store->open_input(store, file_name_in);
-    os = store->new_output(store, file_name_out);
+    is = store->open_input(store, segm_idx_name, file_name_in);
+    os = store->new_output(store, segm_idx_name, file_name_out);
     length = frt_is_length(is);
     for(i = 0; i < length - 1; i++) {
         frt_os_write_byte(os, frt_is_read_byte(is));
     }
     frt_is_close(is);
     frt_os_close(os);
-    store->remove(store, file_name_in);
+    store->remove(store, segm_idx_name, file_name_in);
 
     FRT_TRY
         ir = frt_ir_open(NULL, store);
@@ -1116,8 +924,7 @@ static void test_simulated_corrupt_index1(TestCase *tc, void *data)
  * files and make sure we get an IOException trying to
  * open the index:
  */
-static void test_simulated_corrupt_index2(TestCase *tc, void *data)
-{
+static void test_simulated_corrupt_index2(TestCase *tc, void *data) {
     int i;
     long gen;
     FrtStore *store = (FrtStore *)data;
@@ -1139,8 +946,8 @@ static void test_simulated_corrupt_index2(TestCase *tc, void *data)
     /* segment generation should be > 1 */
     Atrue(gen > 1);
 
-    Atrue(store->exists(store, "_0.fdx"));
-    store->remove(store, "_0.fdx");
+    Atrue(store->exists(store, segm_idx_name, "_0.fdx"));
+    store->remove(store, segm_idx_name, "_0.fdx");
 
     FRT_TRY
         ir = frt_ir_open(NULL, store);
@@ -1156,8 +963,7 @@ static void test_simulated_corrupt_index2(TestCase *tc, void *data)
     destroy_docs(docs, BOOK_LIST_LENGTH);
 }
 
-static void test_iw_add_docs(TestCase *tc, void *data)
-{
+static void test_iw_add_docs(TestCase *tc, void *data) {
     int i;
     FrtConfig config = frt_default_config;
     FrtStore *store = (FrtStore *)data;
@@ -1174,15 +980,14 @@ static void test_iw_add_docs(TestCase *tc, void *data)
 
     frt_iw_close(iw);
     destroy_docs(docs, BOOK_LIST_LENGTH);
-    if (!Aiequal(11, store->count(store))) {
-        char *buf = frt_store_to_s(store);
+    if (!Aiequal(11, store->count(store, segm_idx_name))) {
+        char *buf = frt_store_folder_to_s(store, segm_idx_name);
         Tmsg("To many files: %s\n", buf);
         free(buf);
     }
 }
 
-void test_iw_add_empty_tv(TestCase *tc, void *data)
-{
+void test_iw_add_empty_tv(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
     FrtIndexWriter *iw;
     FrtDocument *doc;
@@ -1195,9 +1000,9 @@ void test_iw_add_empty_tv(TestCase *tc, void *data)
 
     iw = frt_iw_open(NULL, store, frt_whitespace_analyzer_new(false), &frt_default_config);
     doc = frt_doc_new();
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("tv1")), (char *)"", enc));
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("tv2")), (char *)"", enc));
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("no_tv")), (char *)"one two three", enc));
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("tv1")), "", enc));
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("tv2")), "", enc));
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("no_tv")), "one two three", enc));
 
     frt_iw_add_doc(iw, doc);
     frt_iw_commit(iw);
@@ -1206,8 +1011,7 @@ void test_iw_add_empty_tv(TestCase *tc, void *data)
    frt_doc_destroy(doc);
 }
 
-static void test_iw_del_terms(TestCase *tc, void *data)
-{
+static void test_iw_del_terms(TestCase *tc, void *data) {
     int i;
     FrtConfig config = frt_default_config;
     FrtStore *store = (FrtStore *)data;
@@ -1228,7 +1032,7 @@ static void test_iw_del_terms(TestCase *tc, void *data)
 
     ir = frt_ir_open(NULL, store);
     Aiequal(BOOK_LIST_LENGTH, ir->num_docs(ir));
-    Aiequal(BOOK_LIST_LENGTH, ir->max_doc(ir));
+    Aiequal(BOOK_LIST_LENGTH, ir->max_doc_num(ir));
     frt_ir_close(ir);
 
     iw = frt_iw_open(NULL, store, frt_whitespace_analyzer_new(false), &config);
@@ -1237,7 +1041,7 @@ static void test_iw_del_terms(TestCase *tc, void *data)
 
     ir = frt_ir_open(NULL, store);
     Aiequal(BOOK_LIST_LENGTH - 1, ir->num_docs(ir));
-    Aiequal(BOOK_LIST_LENGTH, ir->max_doc(ir));
+    Aiequal(BOOK_LIST_LENGTH, ir->max_doc_num(ir));
     frt_ir_close(ir);
 
     /* test deleting multiple Terms */
@@ -1252,7 +1056,7 @@ static void test_iw_del_terms(TestCase *tc, void *data)
 
     ir = frt_ir_open(NULL, store);
     Aiequal(BOOK_LIST_LENGTH - 17, ir->num_docs(ir));
-    Aiequal(BOOK_LIST_LENGTH, ir->max_doc(ir));
+    Aiequal(BOOK_LIST_LENGTH, ir->max_doc_num(ir));
     Atrue(!ir->is_deleted(ir, 0));
     Atrue(ir->is_deleted(ir, 1));
     Atrue(ir->is_deleted(ir, 2));
@@ -1284,7 +1088,7 @@ static void test_iw_del_terms(TestCase *tc, void *data)
 
     ir = frt_ir_open(NULL, store);
     Aiequal(BOOK_LIST_LENGTH - 17, ir->num_docs(ir));
-    Aiequal(BOOK_LIST_LENGTH - 17, ir->max_doc(ir));
+    Aiequal(BOOK_LIST_LENGTH - 17, ir->max_doc_num(ir));
     frt_ir_close(ir);
 }
 
@@ -1304,8 +1108,7 @@ typedef struct ReaderTestEnvironment {
     int store_cnt;
 } ReaderTestEnvironment;
 
-static void reader_test_env_destroy(ReaderTestEnvironment *rte)
-{
+static void reader_test_env_destroy(ReaderTestEnvironment *rte) {
     int i;
     for (i = 0; i < rte->store_cnt; i++) {
         frt_store_close(rte->stores[i]);
@@ -1314,12 +1117,10 @@ static void reader_test_env_destroy(ReaderTestEnvironment *rte)
     free(rte);
 }
 
-static FrtIndexReader *reader_test_env_ir_open(ReaderTestEnvironment *rte)
-{
+static FrtIndexReader *reader_test_env_ir_open(ReaderTestEnvironment *rte) {
     if (rte->store_cnt == 1) {
         return frt_ir_open(NULL, rte->stores[0]);
-    }
-    else {
+    } else {
         FrtIndexReader **sub_readers = FRT_ALLOC_N(FrtIndexReader *, rte->store_cnt);
         int i;
         for (i = 0; i < rte->store_cnt; i++) {
@@ -1330,8 +1131,7 @@ static FrtIndexReader *reader_test_env_ir_open(ReaderTestEnvironment *rte)
     }
 }
 
-static ReaderTestEnvironment *reader_test_env_new(int type)
-{
+static ReaderTestEnvironment *reader_test_env_new(int type) {
     int i, j;
     FrtConfig config = frt_default_config;
     FrtIndexWriter *iw;
@@ -1344,6 +1144,7 @@ static ReaderTestEnvironment *reader_test_env_new(int type)
     rte->stores = FRT_ALLOC_N(FrtStore *, store_cnt);
     for (i = 0; i < store_cnt; i++) {
         FrtStore *store = rte->stores[i] = frt_open_ram_store(NULL);
+        store->create_folder(store, segm_idx_name);
         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);
         int start_doc = i * doc_cnt;
         int end_doc = (i + 1) * doc_cnt;
@@ -1361,7 +1162,7 @@ static ReaderTestEnvironment *reader_test_env_new(int type)
             FrtDocument *doc = docs[j];
             /* add fields when needed. This is to make the FrtFieldInfos objects
              * different for multi_external_reader */
-            for (k = 0; k < doc->size; k++) {
+            for (k = 0; k < doc->field_count; k++) {
                 FrtDocField *df = doc->fields[k];
                 fis = iw->fis;
                 if (NULL == frt_fis_get_field(fis, df->name)) {
@@ -1374,11 +1175,11 @@ static ReaderTestEnvironment *reader_test_env_new(int type)
                     } else if (text == df->name) {
                         frt_fis_add_field(fis, frt_fi_new(text, 0 | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM));
                     } else if (compressed_field_brotli == df->name) {
-                        frt_fis_add_field(fis, frt_fi_new(compressed_field_brotli, 0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_COMPRESSED_BM | FRT_FI_COMPRESSION_BROTLI_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM));
+                        frt_fis_add_field(fis, frt_fi_new(compressed_field_brotli, 0 | FRT_FI_IS_STORED_BM | FRT_FI_COMPRESSION_BROTLI_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM));
                     } else if (compressed_field_bzip2 == df->name) {
-                        frt_fis_add_field(fis, frt_fi_new(compressed_field_bzip2, 0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_COMPRESSED_BM | FRT_FI_COMPRESSION_BZ2_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM));
+                        frt_fis_add_field(fis, frt_fi_new(compressed_field_bzip2, 0 | FRT_FI_IS_STORED_BM | FRT_FI_COMPRESSION_BZ2_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM));
                     } else if (compressed_field_lz4 == df->name) {
-                       frt_fis_add_field(fis, frt_fi_new(compressed_field_lz4, 0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_COMPRESSED_BM | FRT_FI_COMPRESSION_LZ4_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM));
+                       frt_fis_add_field(fis, frt_fi_new(compressed_field_lz4, 0 | FRT_FI_IS_STORED_BM | FRT_FI_COMPRESSION_LZ4_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM));
                     }
                 }
             }
@@ -1391,6 +1192,7 @@ static ReaderTestEnvironment *reader_test_env_new(int type)
     if (type == add_indexes_reader_type) {
         /* Prepare store for Add Indexes test */
         FrtStore *store = frt_open_ram_store(NULL);
+        store->create_folder(store, segm_idx_name);
         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);
         FrtIndexReader **readers = FRT_ALLOC_N(FrtIndexReader *, rte->store_cnt);
         int i;
@@ -1418,8 +1220,7 @@ static ReaderTestEnvironment *reader_test_env_new(int type)
     return rte;
 }
 
-static void write_ir_test_docs(FrtStore *store)
-{
+static void write_ir_test_docs(FrtStore *store) {
     int i;
     FrtConfig config = frt_default_config;
     FrtIndexWriter *iw;
@@ -1430,9 +1231,9 @@ static void write_ir_test_docs(FrtStore *store)
     frt_fis_add_field(fis, frt_fi_new(title, 0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_STORE_TERM_VECTOR_BM | FRT_FI_STORE_OFFSETS_BM));
     frt_fis_add_field(fis, frt_fi_new(year, 0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_INDEXED_BM));
     frt_fis_add_field(fis, frt_fi_new(text, 0 | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM));
-    frt_fis_add_field(fis, frt_fi_new(compressed_field_brotli, 0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_COMPRESSED_BM | FRT_FI_COMPRESSION_BROTLI_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM));
-    frt_fis_add_field(fis, frt_fi_new(compressed_field_bzip2, 0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_COMPRESSED_BM | FRT_FI_COMPRESSION_BZ2_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM));
-    frt_fis_add_field(fis, frt_fi_new(compressed_field_lz4, 0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_COMPRESSED_BM | FRT_FI_COMPRESSION_LZ4_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM));
+    frt_fis_add_field(fis, frt_fi_new(compressed_field_brotli, 0 | FRT_FI_IS_STORED_BM | FRT_FI_COMPRESSION_BROTLI_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM));
+    frt_fis_add_field(fis, frt_fi_new(compressed_field_bzip2, 0 | FRT_FI_IS_STORED_BM | FRT_FI_COMPRESSION_BZ2_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM));
+    frt_fis_add_field(fis, frt_fi_new(compressed_field_lz4, 0 | FRT_FI_IS_STORED_BM | FRT_FI_COMPRESSION_LZ4_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM));
     frt_index_create(store, fis);
     frt_fis_deref(fis);
     config.max_buffered_docs = 5;
@@ -1447,10 +1248,9 @@ static void write_ir_test_docs(FrtStore *store)
     destroy_docs(docs, IR_TEST_DOC_CNT);
 }
 
-static void test_ir_open_empty_index(TestCase *tc, void *data)
-{
+static void test_ir_open_empty_index(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
-    store->clear_all(store);
+    store->clear_all(store, segm_idx_name);
     FRT_TRY
         frt_ir_close(frt_ir_open(NULL, store));
         Afail("IndexReader should have failed when opening empty index");
@@ -1464,18 +1264,16 @@ static void test_ir_open_empty_index(TestCase *tc, void *data)
     FRT_XENDTRY
 }
 
-static void test_ir_basic_ops(TestCase *tc, void *data)
-{
+static void test_ir_basic_ops(TestCase *tc, void *data) {
     FrtIndexReader *ir = (FrtIndexReader *)data;
     Aiequal(IR_TEST_DOC_CNT, ir->num_docs(ir));
-    Aiequal(IR_TEST_DOC_CNT, ir->max_doc(ir));
+    Aiequal(IR_TEST_DOC_CNT, ir->max_doc_num(ir));
 
     Aiequal(4, ir->doc_freq(ir, frt_fis_get_field(ir->fis, body)->number, "Wally"));
     Atrue(frt_ir_is_latest(ir));
 }
 
-static void test_ir_term_docpos_enum_skip_to(TestCase *tc, FrtTermDocEnum *tde, int field_num)
-{
+static void test_ir_term_docpos_enum_skip_to(TestCase *tc, FrtTermDocEnum *tde, int field_num) {
     /* test skip_to working skip interval */
     tde->seek(tde, field_num, "skip");
 
@@ -1509,8 +1307,7 @@ static void test_ir_term_docpos_enum_skip_to(TestCase *tc, FrtTermDocEnum *tde,
 
 #define AA3(x, a, b, c) x[0] = a; x[1] = b; x[2] = c;
 
-static void test_ir_term_enum(TestCase *tc, void *data)
-{
+static void test_ir_term_enum(TestCase *tc, void *data) {
     FrtIndexReader *ir = (FrtIndexReader *)data;
     FrtTermEnum *te = frt_ir_terms(ir, author);
 
@@ -1558,13 +1355,12 @@ static void test_ir_term_enum(TestCase *tc, void *data)
     te->close(te);
 }
 
-static void test_ir_term_doc_enum(TestCase *tc, void *data)
-{
+static void test_ir_term_doc_enum(TestCase *tc, void *data) {
     FrtIndexReader *ir = (FrtIndexReader *)data;
 
     FrtTermDocEnum *tde;
     FrtDocument *doc = frt_ir_get_doc_with_term(ir, tag, "id_test");
-    int docs[3], expected_docs[3];
+    int doc_nums[3], expected_doc_nums[3];
     int freqs[3], expected_freqs[3];
 
     Apnotnull(doc);
@@ -1594,34 +1390,33 @@ static void test_ir_term_doc_enum(TestCase *tc, void *data)
 
     /* test fast read. Use a small array to exercise repeat read */
     tde->seek(tde, frt_fis_get_field(ir->fis, body)->number, "read");
-    Aiequal(3, tde->read(tde, docs, freqs, 3));
+    Aiequal(3, tde->read(tde, doc_nums, freqs, 3));
     AA3(expected_freqs, 1, 2, 4);
-    AA3(expected_docs, 1, 2, 6);
-    Aaiequal(expected_docs, docs, 3);
+    AA3(expected_doc_nums, 1, 2, 6);
+    Aaiequal(expected_doc_nums, doc_nums, 3);
     Aaiequal(expected_freqs, freqs, 3);
 
-    Aiequal(3, tde->read(tde, docs, freqs, 3));
-    AA3(expected_docs, 9, 10, 15);
+    Aiequal(3, tde->read(tde, doc_nums, freqs, 3));
+    AA3(expected_doc_nums, 9, 10, 15);
     AA3(expected_freqs, 3, 1, 1);
-    Aaiequal(expected_docs, docs, 3);
+    Aaiequal(expected_doc_nums, doc_nums, 3);
     Aaiequal(expected_freqs, freqs, 3);
 
-    Aiequal(3, tde->read(tde, docs, freqs, 3));
-    AA3(expected_docs, 16, 17, 20);
+    Aiequal(3, tde->read(tde, doc_nums, freqs, 3));
+    AA3(expected_doc_nums, 16, 17, 20);
     AA3(expected_freqs, 2, 1, 1);
-    Aaiequal(expected_docs, docs, 3);
+    Aaiequal(expected_doc_nums, doc_nums, 3);
     Aaiequal(expected_freqs, freqs, 3);
 
-    Aiequal(1, tde->read(tde, docs, freqs, 3));
-    expected_docs[0] = 21;
+    Aiequal(1, tde->read(tde, doc_nums, freqs, 3));
+    expected_doc_nums[0] = 21;
     expected_freqs[0] = 6;
-    Aaiequal(expected_docs, docs, 1);
+    Aaiequal(expected_doc_nums, doc_nums, 1);
     Aaiequal(expected_freqs, freqs, 1);
 
-    Aiequal(0, tde->read(tde, docs, freqs, 3));
+    Aiequal(0, tde->read(tde, doc_nums, freqs, 3));
 
-    test_ir_term_docpos_enum_skip_to(tc, tde,
-                                     frt_fis_get_field(ir->fis, text)->number);
+    test_ir_term_docpos_enum_skip_to(tc, tde, frt_fis_get_field(ir->fis, text)->number);
     tde->close(tde);
 
     /* test term positions */
@@ -1674,8 +1469,7 @@ static void test_ir_term_doc_enum(TestCase *tc, void *data)
     tde->close(tde);
 }
 
-static void test_ir_term_vectors(TestCase *tc, void *data)
-{
+static void test_ir_term_vectors(TestCase *tc, void *data) {
     FrtIndexReader *ir = (FrtIndexReader *)data;
     FrtHash *tvs;
     FrtTermVector *tv = ir->term_vector(ir, 3, rb_intern("body"));
@@ -1754,12 +1548,11 @@ static void test_ir_term_vectors(TestCase *tc, void *data)
     frt_h_destroy(tvs);
 }
 
-static void test_ir_get_doc(TestCase *tc, void *data)
-{
+static void test_ir_get_doc(TestCase *tc, void *data) {
     FrtIndexReader *ir = (FrtIndexReader *)data;
     FrtDocument *doc = ir->get_doc(ir, 3);
     FrtDocField *df;
-    Aiequal(4, doc->size);
+    Aiequal(4, doc->field_count);
 
     df = frt_doc_get_field(doc, author);
     Asequal(rb_id2name(author), rb_id2name(df->name));
@@ -1768,8 +1561,7 @@ static void test_ir_get_doc(TestCase *tc, void *data)
 
     df = frt_doc_get_field(doc, body);
     Asequal(rb_id2name(body), rb_id2name(df->name));
-    Asequal("word3 word4 word1 word2 word1 "
-            "word3 word4 word1 word3 word3", df->data[0]);
+    Asequal("word3 word4 word1 word2 word1 word3 word4 word1 word3 word3", df->data[0]);
     Afequal(df->boost, 1.0);
     df = frt_doc_get_field(doc, title);
     Asequal(rb_id2name(title), rb_id2name(df->name));
@@ -1787,8 +1579,7 @@ static void test_ir_get_doc(TestCase *tc, void *data)
    frt_doc_destroy(doc);
 }
 
-static void test_ir_compression(TestCase *tc, void *data)
-{
+static void test_ir_compression(TestCase *tc, void *data) {
     int i;
     FrtIndexReader *ir = (FrtIndexReader *)data;
     FrtLazyDoc *lz_doc;
@@ -1796,7 +1587,7 @@ static void test_ir_compression(TestCase *tc, void *data)
     FrtDocument *doc = ir->get_doc(ir, 0);
     FrtDocField *df1, *df2, *df3, *df4;
     char buf1[20], buf2[20];
-    Aiequal(5, doc->size);
+    Aiequal(5, doc->field_count);
 
     df1 = frt_doc_get_field(doc, changing_field);
     df2 = frt_doc_get_field(doc, compressed_field_brotli);
@@ -1865,8 +1656,7 @@ static void test_ir_compression(TestCase *tc, void *data)
     frt_lazy_doc_close(lz_doc);
 }
 
-static void test_ir_mtdpe(TestCase *tc, void *data)
-{
+static void test_ir_mtdpe(TestCase *tc, void *data) {
     FrtIndexReader *ir = (FrtIndexReader *)data;
     const char *terms[3] = {"Where", "is", "books."};
 
@@ -1886,8 +1676,7 @@ static void test_ir_mtdpe(TestCase *tc, void *data)
     tde->close(tde);
 }
 
-static void test_ir_norms(TestCase *tc, void *data)
-{
+static void test_ir_norms(TestCase *tc, void *data) {
     int i;
     frt_uchar *norms;
     FrtIndexReader *ir, *ir2;
@@ -1982,10 +1771,10 @@ static void test_ir_norms(TestCase *tc, void *data)
     free(norms);
 }
 
-static void test_ir_delete(TestCase *tc, void *data)
-{
+static void test_ir_delete(TestCase *tc, void *data) {
     int i;
     FrtStore *store = frt_open_ram_store(NULL);
+    store->create_folder(store, segm_idx_name);
     FrtIndexReader *ir, *ir2;
     FrtIndexWriter *iw;
     int type = *((int *)data);
@@ -1996,37 +1785,37 @@ static void test_ir_delete(TestCase *tc, void *data)
     ir2 = reader_test_env_ir_open(rte);
 
     Aiequal(false, ir->has_deletions(ir));
-    Aiequal(IR_TEST_DOC_CNT, ir->max_doc(ir));
+    Aiequal(IR_TEST_DOC_CNT, ir->max_doc_num(ir));
     Aiequal(IR_TEST_DOC_CNT, ir->num_docs(ir));
     Aiequal(false, ir->is_deleted(ir, 10));
 
     frt_ir_delete_doc(ir, 10);
     Aiequal(true, ir->has_deletions(ir));
-    Aiequal(IR_TEST_DOC_CNT, ir->max_doc(ir));
+    Aiequal(IR_TEST_DOC_CNT, ir->max_doc_num(ir));
     Aiequal(IR_TEST_DOC_CNT - 1, ir->num_docs(ir));
     Aiequal(true, ir->is_deleted(ir, 10));
 
     frt_ir_delete_doc(ir, 10);
     Aiequal(true, ir->has_deletions(ir));
-    Aiequal(IR_TEST_DOC_CNT, ir->max_doc(ir));
+    Aiequal(IR_TEST_DOC_CNT, ir->max_doc_num(ir));
     Aiequal(IR_TEST_DOC_CNT - 1, ir->num_docs(ir));
     Aiequal(true, ir->is_deleted(ir, 10));
 
     frt_ir_delete_doc(ir, IR_TEST_DOC_CNT - 1);
     Aiequal(true, ir->has_deletions(ir));
-    Aiequal(IR_TEST_DOC_CNT, ir->max_doc(ir));
+    Aiequal(IR_TEST_DOC_CNT, ir->max_doc_num(ir));
     Aiequal(IR_TEST_DOC_CNT - 2, ir->num_docs(ir));
     Aiequal(true, ir->is_deleted(ir, IR_TEST_DOC_CNT - 1));
 
     frt_ir_delete_doc(ir, IR_TEST_DOC_CNT - 2);
     Aiequal(true, ir->has_deletions(ir));
-    Aiequal(IR_TEST_DOC_CNT, ir->max_doc(ir));
+    Aiequal(IR_TEST_DOC_CNT, ir->max_doc_num(ir));
     Aiequal(IR_TEST_DOC_CNT - 3, ir->num_docs(ir));
     Aiequal(true, ir->is_deleted(ir, IR_TEST_DOC_CNT - 2));
 
     frt_ir_undelete_all(ir);
     Aiequal(false, ir->has_deletions(ir));
-    Aiequal(IR_TEST_DOC_CNT, ir->max_doc(ir));
+    Aiequal(IR_TEST_DOC_CNT, ir->max_doc_num(ir));
     Aiequal(IR_TEST_DOC_CNT, ir->num_docs(ir));
     Aiequal(false, ir->is_deleted(ir, 10));
     Aiequal(false, ir->is_deleted(ir, IR_TEST_DOC_CNT - 2));
@@ -2039,7 +1828,7 @@ static void test_ir_delete(TestCase *tc, void *data)
     frt_ir_delete_doc(ir, 50);
     frt_ir_delete_doc(ir, IR_TEST_DOC_CNT - 1);
     Aiequal(true, ir->has_deletions(ir));
-    Aiequal(IR_TEST_DOC_CNT, ir->max_doc(ir));
+    Aiequal(IR_TEST_DOC_CNT, ir->max_doc_num(ir));
     Aiequal(IR_TEST_DOC_CNT - 6, ir->num_docs(ir));
 
     frt_ir_close(ir);
@@ -2047,7 +1836,7 @@ static void test_ir_delete(TestCase *tc, void *data)
     ir = reader_test_env_ir_open(rte);
 
     Aiequal(true, ir->has_deletions(ir));
-    Aiequal(IR_TEST_DOC_CNT, ir->max_doc(ir));
+    Aiequal(IR_TEST_DOC_CNT, ir->max_doc_num(ir));
     Aiequal(IR_TEST_DOC_CNT - 6, ir->num_docs(ir));
     Aiequal(true, ir->is_deleted(ir, 10));
     Aiequal(true, ir->is_deleted(ir, 20));
@@ -2058,7 +1847,7 @@ static void test_ir_delete(TestCase *tc, void *data)
 
     frt_ir_undelete_all(ir);
     Aiequal(false, ir->has_deletions(ir));
-    Aiequal(IR_TEST_DOC_CNT, ir->max_doc(ir));
+    Aiequal(IR_TEST_DOC_CNT, ir->max_doc_num(ir));
     Aiequal(IR_TEST_DOC_CNT, ir->num_docs(ir));
     Aiequal(false, ir->is_deleted(ir, 10));
     Aiequal(false, ir->is_deleted(ir, 20));
@@ -2085,7 +1874,7 @@ static void test_ir_delete(TestCase *tc, void *data)
     ir = reader_test_env_ir_open(rte);
 
     Aiequal(false, ir->has_deletions(ir));
-    Aiequal(IR_TEST_DOC_CNT - 6, ir->max_doc(ir));
+    Aiequal(IR_TEST_DOC_CNT - 6, ir->max_doc_num(ir));
     Aiequal(IR_TEST_DOC_CNT - 6, ir->num_docs(ir));
 
     Atrue(frt_ir_is_latest(ir));
@@ -2097,8 +1886,7 @@ static void test_ir_delete(TestCase *tc, void *data)
     frt_store_close(store);
 }
 
-static void test_ir_read_while_optimizing(TestCase *tc, void *data)
-{
+static void test_ir_read_while_optimizing(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
     FrtIndexReader *ir;
     FrtIndexWriter *iw;
@@ -2117,8 +1905,7 @@ static void test_ir_read_while_optimizing(TestCase *tc, void *data)
     frt_ir_close(ir);
 }
 
-static void test_ir_multivalue_fields(TestCase *tc, void *data)
-{
+static void test_ir_multivalue_fields(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
     FrtIndexReader *ir;
     FrtFieldInfo *fi;
@@ -2135,13 +1922,13 @@ static void test_ir_multivalue_fields(TestCase *tc, void *data)
     frt_fis_deref(fis);
     iw = frt_iw_open(NULL, store, frt_whitespace_analyzer_new(false), NULL);
 
-    df = frt_doc_add_field(doc, frt_df_add_data(frt_df_new(tag), (char *)"Ruby", enc));
-    frt_df_add_data(df, (char *)"C", enc);
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(body), (char *)body_text, enc));
-    frt_df_add_data(df, (char *)"Lucene", enc);
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(title), (char *)title_text, enc));
-    frt_df_add_data(df, (char *)"Ferret", enc);
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(author), (char *)author_text, enc));
+    df = frt_doc_add_field(doc, frt_df_add_data(frt_df_new(tag), "Ruby", enc));
+    frt_df_add_data(df, "C", enc);
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(body), body_text, enc));
+    frt_df_add_data(df, "Lucene", enc);
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(title), title_text, enc));
+    frt_df_add_data(df, "Ferret", enc);
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(author), author_text, enc));
 
     Aiequal(0, iw->fis->size);
 
@@ -2163,7 +1950,7 @@ static void test_ir_multivalue_fields(TestCase *tc, void *data)
     ir = frt_ir_open(NULL, store);
 
     doc = ir->get_doc(ir, 0);
-    Aiequal(4, doc->size);
+    Aiequal(4, doc->field_count);
     df = frt_doc_get_field(doc, tag);
     Aiequal(4, df->size);
     Asequal("Ruby",   df->data[0]);
@@ -2193,12 +1980,12 @@ static void test_ir_multivalue_fields(TestCase *tc, void *data)
  * IndexSuite
  *
  ***************************************************************************/
-TestSuite *ts_index(TestSuite *suite)
-{
+TestSuite *ts_index(TestSuite *suite) {
     FrtIndexReader *ir;
-    FrtStore *fs_store, *store = frt_open_ram_store(NULL);
+    FrtStore *fs_store;
     ReaderTestEnvironment *rte = NULL;
-    /* FrtStore *store = frt_open_mdbx_store(TEST_DIR); */
+    FrtStore *store = frt_open_mdbx_store(TEST_DIR);
+    store->create_folder(store, segm_idx_name);
 
     /* initialize IDs */
     body             = rb_intern("body");
@@ -2312,8 +2099,9 @@ TestSuite *ts_index(TestSuite *suite)
     tst_run_test_with_name(suite, test_ir_read_while_optimizing, store, "test_ir_read_while_optimizing_in_ram");
 
     fs_store = frt_open_mdbx_store(TEST_DIR);
+    fs_store->create_folder(fs_store, segm_idx_name);
     tst_run_test_with_name(suite, test_ir_read_while_optimizing, fs_store, "test_ir_read_while_optimizing_on_disk");
-    fs_store->clear_all(fs_store);
+    fs_store->clear_all(fs_store, segm_idx_name);
     frt_store_close(fs_store);
 
     tst_run_test(suite, test_ir_multivalue_fields, store);