isomorfeus-ferret 0.17.2 → 0.17.4

data/ext/isomorfeus_ferret_ext/frt_index.c

@@ -44,13 +44,12 @@ static char *ste_next(FrtTermEnum *te);
 
 /* *** Must be three characters *** */
 static const char *INDEX_EXTENSIONS[] = {
-    "frq", "prx", "fdx", "fdt", "tfx", "tix", "tis", "del", "gen", "cfs"
+    "frq", "prx", "fdx", "fdt", "tfx", "tix", "tis", "del", "gen"
 };
 
 static const char BASE36_DIGITMAP[] = "0123456789abcdefghijklmnopqrstuvwxyz";
 
-static char *u64_to_str36(char *buf, int buf_size, frt_u64 u)
-{
+static char *u64_to_str36(char *buf, int buf_size, frt_u64 u) {
     int i = buf_size - 1;
     buf[i] = '\0';
     for (i--; i >= 0; i--) {
@@ -67,17 +66,14 @@ static char *u64_to_str36(char *buf, int buf_size, frt_u64 u)
     return buf + i;
 }
 
-static frt_u64 str36_to_u64(char *p)
-{
+static frt_u64 str36_to_u64(char *p) {
     frt_u64 u = 0;
     while (true) {
         if ('0' <= *p && '9' >= *p) {
             u = u * 36 + *p - '0';
-        }
-        else if ('a' <= *p && 'z' >= *p) {
+        } else if ('a' <= *p && 'z' >= *p) {
             u = u * 36 + *p - 'a' + 10;
-        }
-        else {
+        } else {
             break;
         }
         p++;
@@ -134,12 +130,10 @@ static char *fn_for_gen_field(char *buf,
                               const char *base,
                               const char *ext,
                               frt_i64 gen,
-                              int field_num)
-{
+                              int field_num) {
     if (-1 == gen) {
         return NULL;
-    }
-    else {
+    } else {
         char b[FRT_SEGMENT_NAME_MAX_LENGTH];
         sprintf(buf, "%s_%s.%s%d",
                 base,
@@ -156,18 +150,15 @@ static char *fn_for_gen_field(char *buf,
  *
  ***************************************************************************/
 
-static unsigned long co_hash(const void *key)
-{
-    return (unsigned long)key;
+static unsigned long co_hash(const void *key) {
+    return (unsigned long)(uintptr_t)key;
 }
 
-static int co_eq(const void *key1, const void *key2)
-{
+static int co_eq(const void *key1, const void *key2) {
     return (key1 == key2);
 }
 
-static void co_destroy(FrtCacheObject *self)
-{
+static void co_destroy(FrtCacheObject *self) {
     frt_h_rem(self->ref_tab1, self->ref2, false);
     frt_h_rem(self->ref_tab2, self->ref1, false);
     self->destroy(self->obj);
@@ -175,8 +166,7 @@ static void co_destroy(FrtCacheObject *self)
 }
 
 FrtCacheObject *frt_co_create(FrtHash *ref_tab1, FrtHash *ref_tab2,
-                       void *ref1, void *ref2, frt_free_ft destroy, void *obj)
-{
+                       void *ref1, void *ref2, frt_free_ft destroy, void *obj) {
     FrtCacheObject *self = FRT_ALLOC(FrtCacheObject);
     frt_h_set(ref_tab1, ref2, self);
     frt_h_set(ref_tab2, ref1, self);
@@ -193,302 +183,13 @@ FrtHash *frt_co_hash_create(void) {
     return frt_h_new(&co_hash, &co_eq, (frt_free_ft)NULL, (frt_free_ft)&co_destroy);
 }
 
-/****************************************************************************
- *
- * FieldInfo
- *
- ****************************************************************************/
-
-static void fi_check_params(unsigned int bits) {
-    if (!bits_is_indexed(bits) && bits_store_term_vector(bits)) {
-        FRT_RAISE(FRT_ARG_ERROR, "You can't store the term vectors of an unindexed field.");
-    }
-    if (bits_is_compressed(bits) && !bits_is_stored(bits)) {
-        FRT_RAISE(FRT_ARG_ERROR, "Field must be stored for compression to be useful.");
-    }
-}
-
-FrtFieldInfo *frt_fi_alloc(void) {
-    return FRT_ALLOC(FrtFieldInfo);
-}
-
-FrtFieldInfo *frt_fi_init(FrtFieldInfo *fi, ID name, unsigned int bits) {
-    assert(NULL != name);
-    fi_check_params(bits);
-    fi->name = name;
-    fi->boost = 1.0f;
-    fi->bits = bits;
-    fi->number = 0;
-    fi->ref_cnt = 1;
-    fi->rfi = Qnil;
-    return fi;
-}
-
-FrtFieldInfo *frt_fi_new(ID name, unsigned int bits) {
-    FrtFieldInfo *fi = frt_fi_alloc();
-    return frt_fi_init(fi, name, bits);
-}
-
-void frt_fi_deref(FrtFieldInfo *fi) {
-    if (FRT_DEREF(fi) == 0) free(fi);
-}
-
-FrtCompressionType frt_fi_get_compression(FrtFieldInfo *fi) {
-    if (bits_is_compressed(fi->bits)) {
-        if (bits_is_compressed_brotli(fi->bits)) {
-            return FRT_COMPRESSION_BROTLI;
-        } else if (bits_is_compressed_bz2(fi->bits)) {
-            return FRT_COMPRESSION_BZ2;
-        } else if (bits_is_compressed_lz4(fi->bits)) {
-            return FRT_COMPRESSION_LZ4;
-        } else {
-            return FRT_COMPRESSION_BROTLI;
-        }
-    } else {
-        return FRT_COMPRESSION_NONE;
-    }
-}
-
-char *frt_fi_to_s(FrtFieldInfo *fi)
-{
-    const char *fi_name = rb_id2name(fi->name);
-    char *str = FRT_ALLOC_N(char, strlen(fi_name) + 200);
-    char *s = str;
-    s += sprintf(str, "[\"%s\":(%s%s%s%s%s%s%s%s", fi_name,
-                 bits_is_stored(fi->bits) ? "is_stored, " : "",
-                 bits_is_compressed(fi->bits) ? "is_compressed, " : "",
-                 bits_is_indexed(fi->bits) ? "is_indexed, " : "",
-                 bits_is_tokenized(fi->bits) ? "is_tokenized, " : "",
-                 bits_omit_norms(fi->bits) ? "omit_norms, " : "",
-                 bits_store_term_vector(fi->bits) ? "store_term_vector, " : "",
-                 bits_store_positions(fi->bits) ? "store_positions, " : "",
-                 bits_store_offsets(fi->bits) ? "store_offsets, " : "");
-    s -= 2;
-    if (*s != ',') {
-        s += 2;
-    }
-
-    sprintf(s, ")]");
-    return str;
-}
-
-/****************************************************************************
- *
- * FieldInfos
- *
- ****************************************************************************/
-
-FrtFieldInfos *frt_fis_alloc(void) {
-    return FRT_ALLOC(FrtFieldInfos);
-}
-
-FrtFieldInfos *frt_fis_init(FrtFieldInfos *fis, unsigned int bits) {
-    fi_check_params(bits);
-    fis->field_dict = frt_h_new_ptr((frt_free_ft)&frt_fi_deref);
-    fis->size = 0;
-    fis->capa = FIELD_INFOS_INIT_CAPA;
-    fis->fields = FRT_ALLOC_N(FrtFieldInfo *, fis->capa);
-    fis->bits = bits;
-    fis->ref_cnt = 1;
-    fis->rfis = Qnil;
-    return fis;
-}
-
-FrtFieldInfos *frt_fis_new(unsigned int bits) {
-    FrtFieldInfos *fis = frt_fis_alloc();
-    return frt_fis_init(fis, bits);
-}
-
-FrtFieldInfo *frt_fis_add_field(FrtFieldInfos *fis, FrtFieldInfo *fi) {
-    if (fis->size == fis->capa) {
-        fis->capa <<= 1;
-        FRT_REALLOC_N(fis->fields, FrtFieldInfo *, fis->capa);
-    }
-    if (!frt_h_set_safe(fis->field_dict, (void *)fi->name, fi)) {
-        FRT_RAISE(FRT_ARG_ERROR, "Field :%s already exists", rb_id2name(fi->name));
-    }
-    FRT_REF(fi);
-    fi->number = fis->size;
-    fis->fields[fis->size] = fi;
-    fis->size++;
-    return fi;
-}
-
-FrtFieldInfo *frt_fis_get_field(FrtFieldInfos *fis, ID name) {
-    return (FrtFieldInfo *)frt_h_get(fis->field_dict, (void *)name);
-}
-
-int frt_fis_get_field_num(FrtFieldInfos *fis, ID name) {
-    FrtFieldInfo *fi = (FrtFieldInfo *)frt_h_get(fis->field_dict, (void *)name);
-    if (fi) { return fi->number; }
-    else { return -1; }
-}
-
-FrtFieldInfo *frt_fis_get_or_add_field(FrtFieldInfos *fis, ID name) {
-    FrtFieldInfo *fi = (FrtFieldInfo *)frt_h_get(fis->field_dict, (void *)name);
-    if (!fi) {
-        fi = (FrtFieldInfo*)frt_fi_new(name, fis->bits);
-        frt_fis_add_field(fis, fi);
-    }
-    return fi;
-}
-
-FrtFieldInfos *frt_fis_read(FrtInStream *is)
-{
-    FrtFieldInfos *volatile fis = NULL;
-    char *field_name;
-    FRT_TRY
-        do {
-            volatile int i;
-            union { frt_u32 i; float f; } tmp;
-            FrtFieldInfo *volatile fi;
-            fis = frt_fis_new(frt_is_read_vint(is));
-            for (i = frt_is_read_vint(is); i > 0; i--) {
-                fi = FRT_ALLOC_AND_ZERO(FrtFieldInfo);
-                FRT_TRY
-                    field_name = frt_is_read_string_safe(is);
-                    fi->name = rb_intern(field_name);
-                    free(field_name);
-                    tmp.i = frt_is_read_u32(is);
-                    fi->boost = tmp.f;
-                    fi->bits = frt_is_read_vint(is);
-                FRT_XCATCHALL
-                    free(fi);
-                FRT_XENDTRY
-                frt_fis_add_field(fis, fi);
-                fi->ref_cnt = 1;
-            }
-        } while (0);
-    FRT_XCATCHALL
-        frt_fis_deref(fis);
-    FRT_XENDTRY
-    return fis;
-}
-
-void frt_fis_write(FrtFieldInfos *fis, FrtOutStream *os)
-{
-    int i;
-    union { frt_u32 i; float f; } tmp;
-    FrtFieldInfo *fi;
-    const int fis_size = fis->size;
-
-    frt_os_write_vint(os, fis->bits);
-    frt_os_write_vint(os, fis->size);
-
-    for (i = 0; i < fis_size; i++) {
-        fi = fis->fields[i];
-
-        frt_os_write_string(os, rb_id2name(fi->name));
-        tmp.f = fi->boost;
-        frt_os_write_u32(os, tmp.i);
-        frt_os_write_vint(os, fi->bits);
-    }
-}
-
-static const char *store_str[] = {
-    ":no",
-    ":yes",
-    "",
-    ":compressed"
-};
-
-static const char *fi_store_str(FrtFieldInfo *fi)
-{
-    return store_str[fi->bits & 0x3];
-}
-
-static const char *index_str[] = {
-    ":no",
-    ":untokenized",
-    "",
-    ":yes",
-    "",
-    ":untokenized_omit_norms",
-    "",
-    ":omit_norms"
-};
-
-static const char *fi_index_str(FrtFieldInfo *fi)
-{
-    return index_str[(fi->bits >> 2) & 0x7];
-}
-
-static const char *term_vector_str[] = {
-    ":no",
-    ":yes",
-    "",
-    ":with_positions",
-    "",
-    ":with_offsets",
-    "",
-    ":with_positions_offsets"
-};
-
-static const char *fi_term_vector_str(FrtFieldInfo *fi)
-{
-    return term_vector_str[(fi->bits >> 5) & 0x7];
-}
-
-char *frt_fis_to_s(FrtFieldInfos *fis)
-{
-    int i, pos, capa = 200 + fis->size * 120;
-    char *buf = FRT_ALLOC_N(char, capa);
-    FrtFieldInfo *fi;
-    const int fis_size = fis->size;
-
-    pos = sprintf(buf,
-                  "default:\n"
-                  "  store: %s\n"
-                  "  index: %s\n"
-                  "  term_vector: %s\n"
-                  "fields:\n",
-                  store_str[fis->bits & 0x3],
-                  index_str[(fis->bits >> 2) & 0x7],
-                  term_vector_str[(fis->bits >> 5) & 0x7]);
-    for (i = 0; i < fis_size; i++) {
-        fi = fis->fields[i];
-        pos += sprintf(buf + pos,
-                       "  %s:\n"
-                       "    boost: %f\n"
-                       "    store: %s\n"
-                       "    index: %s\n"
-                       "    term_vector: %s\n",
-                       rb_id2name(fi->name), fi->boost, fi_store_str(fi),
-                       fi_index_str(fi), fi_term_vector_str(fi));
-    }
-
-    return buf;
-}
-
-void frt_fis_deref(FrtFieldInfos *fis) {
-    if (FRT_DEREF(fis) == 0) {
-        frt_h_destroy(fis->field_dict);
-        free(fis->fields);
-        free(fis);
-    }
-}
-
-static bool fis_has_vectors(FrtFieldInfos *fis)
-{
-    int i;
-    const int fis_size = fis->size;
-
-    for (i = 0; i < fis_size; i++) {
-        if (bits_store_term_vector(fis->fields[i]->bits)) {
-            return true;
-        }
-    }
-    return false;
-}
-
 /****************************************************************************
  *
  * SegmentInfo
  *
  ****************************************************************************/
 
-FrtSegmentInfo *frt_si_new(char *name, int doc_cnt, FrtStore *store)
-{
+FrtSegmentInfo *frt_si_new(char *name, int doc_cnt, FrtStore *store) {
     FrtSegmentInfo *si = FRT_ALLOC(FrtSegmentInfo);
     si->name = name;
     si->doc_cnt = doc_cnt;
@@ -501,8 +202,7 @@ FrtSegmentInfo *frt_si_new(char *name, int doc_cnt, FrtStore *store)
     return si;
 }
 
-static FrtSegmentInfo *si_read(FrtStore *store, FrtInStream *is)
-{
+static FrtSegmentInfo *si_read(FrtStore *store, FrtInStream *is) {
     FrtSegmentInfo *volatile si = FRT_ALLOC_AND_ZERO(FrtSegmentInfo);
     FRT_TRY
         si->store = store;
@@ -527,8 +227,7 @@ static FrtSegmentInfo *si_read(FrtStore *store, FrtInStream *is)
     return si;
 }
 
-static void si_write(FrtSegmentInfo *si, FrtOutStream *os)
-{
+static void si_write(FrtSegmentInfo *si, FrtOutStream *os) {
     frt_os_write_string(os, si->name);
     frt_os_write_vint(os, si->doc_cnt);
     frt_os_write_vint(os, si->del_gen);
@@ -550,13 +249,11 @@ void frt_si_close(FrtSegmentInfo *si) {
     }
 }
 
-bool frt_si_has_deletions(FrtSegmentInfo *si)
-{
+bool frt_si_has_deletions(FrtSegmentInfo *si) {
     return si->del_gen >= 0;
 }
 
-void frt_si_advance_norm_gen(FrtSegmentInfo *si, int field_num)
-{
+void frt_si_advance_norm_gen(FrtSegmentInfo *si, int field_num) {
     if (field_num >= si->norm_gens_size) {
         int i;
         FRT_REALLOC_N(si->norm_gens, int, field_num + 1);
@@ -568,8 +265,7 @@ void frt_si_advance_norm_gen(FrtSegmentInfo *si, int field_num)
     si->norm_gens[field_num]++;
 }
 
-static char *si_norm_file_name(FrtSegmentInfo *si, char *buf, int field_num)
-{
+static char *si_norm_file_name(FrtSegmentInfo *si, char *buf, int field_num) {
     int norm_gen;
     if (field_num >= si->norm_gens_size
         || 0 > (norm_gen = si->norm_gens[field_num])) {
@@ -588,9 +284,7 @@ void frt_deleter_queue_file(FrtDeleter *dlr, const char *file_name);
  *
  ****************************************************************************/
 
-#include <time.h>
-static char *new_segment(frt_i64 generation)
-{
+static char *new_segment(frt_i64 generation) {
     char buf[FRT_SEGMENT_NAME_MAX_LENGTH];
     char *fn_p = u64_to_str36(buf, FRT_SEGMENT_NAME_MAX_LENGTH - 1,
                               (frt_u64)generation);
@@ -611,8 +305,7 @@ typedef struct FindSegmentsFile {
     } ret;
 } FindSegmentsFile;
 
-static void which_gen_i(const char *file_name, void *arg)
-{
+static void which_gen_i(const char *file_name, void *arg) {
     frt_i64 *max_generation = (frt_i64 *)arg;
     if (0 == strncmp(FRT_SEGMENTS_FILE_NAME"_", file_name,
                      sizeof(FRT_SEGMENTS_FILE_NAME))) {
@@ -658,10 +351,9 @@ void frt_sis_put(FrtSegmentInfos *sis, FILE *stream) {
  *
  * @param store - the Store to look in
  */
-frt_i64 frt_sis_current_segment_generation(FrtStore *store)
-{
+frt_i64 frt_sis_current_segment_generation(FrtStore *store) {
     frt_i64 current_generation = -1;
-    store->each(store, &which_gen_i, &current_generation);
+    store->each(store, segm_idx_name, &which_gen_i, &current_generation);
     return current_generation;
 }
 
@@ -672,8 +364,7 @@ frt_i64 frt_sis_current_segment_generation(FrtStore *store)
  * @param store - the Store to look in
  * @return segments_N where N is the current generation
  */
-char *frt_sis_curr_seg_file_name(char *buf, FrtStore *store)
-{
+char *frt_sis_curr_seg_file_name(char *buf, FrtStore *store) {
     return segfn_for_generation(buf, frt_sis_current_segment_generation(store));
 }
 
@@ -686,16 +377,14 @@ char *frt_sis_curr_seg_file_name(char *buf, FrtStore *store)
  */
 /*
 FIXME: not used
-static char *sis_next_seg_file_name(char *buf, FrtStore *store)
-{
+static char *sis_next_seg_file_name(char *buf, FrtStore *store) {
     return segfn_for_generation(buf, frt_sis_current_segment_generation(store) + 1);
 }
 */
 
 #define GEN_FILE_RETRY_COUNT 10
 #define GEN_LOOK_AHEAD_COUNT 10
-static void sis_find_segments_file(FrtStore *store, FindSegmentsFile *fsf, void (*run)(FrtStore *store, FindSegmentsFile *fsf, FrtIndexReader *ir), FrtIndexReader *ir)
-{
+static void sis_find_segments_file(FrtStore *store, FindSegmentsFile *fsf, void (*run)(FrtStore *store, FindSegmentsFile *fsf, FrtIndexReader *ir), FrtIndexReader *ir) {
     volatile int i;
     volatile int gen_look_ahead_count = 0;
     volatile bool retry = false;
@@ -732,7 +421,7 @@ static void sis_find_segments_file(FrtStore *store, FindSegmentsFile *fsf, void
                 FrtInStream *gen_is;
                 gen_is = NULL;
                 FRT_TRY
-                    gen_is = store->open_input(store, SEGMENTS_GEN_FILE_NAME);
+                    gen_is = store->open_input(store, segm_idx_name, SEGMENTS_GEN_FILE_NAME);
                 FRT_XCATCHALL
                     FRT_HANDLED();
                     /* TODO:LOG "segments open: FRT_IO_ERROR"*/
@@ -782,7 +471,7 @@ static void sis_find_segments_file(FrtStore *store, FindSegmentsFile *fsf, void
                  * this must be a real error.  We throw the original exception
                  * we got. */
                 char *listing, listing_buffer[1024];
-                listing = frt_store_to_s(store);
+                listing = frt_store_folder_to_s(store, segm_idx_name);
                 strncpy(listing_buffer, listing, 1023);
                 listing_buffer[1023] = '\0';
                 free(listing);
@@ -815,7 +504,7 @@ static void sis_find_segments_file(FrtStore *store, FindSegmentsFile *fsf, void
                  * and try it if so: */
                 char prev_seg_file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
                 segfn_for_generation(prev_seg_file_name, gen - 1);
-                if (store->exists(store, prev_seg_file_name)) {
+                if (store->exists(store, segm_idx_name, prev_seg_file_name)) {
                     /* TODO:LOG "fallback to prior segment file '" +
                      * prevSegmentFileName + "'" */
                     FRT_TRY
@@ -839,8 +528,7 @@ static void sis_find_segments_file(FrtStore *store, FindSegmentsFile *fsf, void
     }
 }
 
-FrtSegmentInfos *frt_sis_new(FrtFieldInfos *fis)
-{
+FrtSegmentInfos *frt_sis_new(FrtFieldInfos *fis) {
     FrtSegmentInfos *sis = FRT_ALLOC_AND_ZERO(FrtSegmentInfos);
     FRT_REF(fis);
     sis->fis = fis;
@@ -854,13 +542,11 @@ FrtSegmentInfos *frt_sis_new(FrtFieldInfos *fis)
     return sis;
 }
 
-FrtSegmentInfo *frt_sis_new_segment(FrtSegmentInfos *sis, int doc_cnt, FrtStore *store)
-{
+FrtSegmentInfo *frt_sis_new_segment(FrtSegmentInfos *sis, int doc_cnt, FrtStore *store) {
     return frt_sis_add_si(sis, frt_si_new(new_segment(sis->counter++), doc_cnt, store));
 }
 
-void frt_sis_destroy(FrtSegmentInfos *sis)
-{
+void frt_sis_destroy(FrtSegmentInfos *sis) {
     int i;
     const int sis_size = sis->size;
     for (i = 0; i < sis_size; i++) {
@@ -872,8 +558,7 @@ void frt_sis_destroy(FrtSegmentInfos *sis)
     free(sis);
 }
 
-FrtSegmentInfo *frt_sis_add_si(FrtSegmentInfos *sis, FrtSegmentInfo *si)
-{
+FrtSegmentInfo *frt_sis_add_si(FrtSegmentInfos *sis, FrtSegmentInfo *si) {
     if (sis->size >= sis->capa) {
         sis->capa <<= 1;
         FRT_REALLOC_N(sis->segs, FrtSegmentInfo *, sis->capa);
@@ -882,8 +567,7 @@ FrtSegmentInfo *frt_sis_add_si(FrtSegmentInfos *sis, FrtSegmentInfo *si)
     return si;
 }
 
-void frt_sis_del_at(FrtSegmentInfos *sis, int at)
-{
+void frt_sis_del_at(FrtSegmentInfos *sis, int at) {
     int i;
     const int sis_size = --(sis->size);
     frt_si_close(sis->segs[at]);
@@ -892,8 +576,7 @@ void frt_sis_del_at(FrtSegmentInfos *sis, int at)
     }
 }
 
-void frt_sis_del_from_to(FrtSegmentInfos *sis, int from, int to)
-{
+void frt_sis_del_from_to(FrtSegmentInfos *sis, int from, int to) {
     int i, num_to_del = to - from;
     const int sis_size = sis->size -= num_to_del;
     for (i = from; i < to; i++) {
@@ -904,8 +587,7 @@ void frt_sis_del_from_to(FrtSegmentInfos *sis, int from, int to)
     }
 }
 
-static void frt_sis_read_i(FrtStore *store, FindSegmentsFile *fsf, FrtIndexReader *ir_)
-{
+static void frt_sis_read_i(FrtStore *store, FindSegmentsFile *fsf, FrtIndexReader *ir_) {
     int seg_cnt;
     int i;
     frt_u32 format = 0;
@@ -916,7 +598,7 @@ static void frt_sis_read_i(FrtStore *store, FindSegmentsFile *fsf, FrtIndexReade
     segfn_for_generation(seg_file_name, fsf->generation);
     fsf->ret.sis = NULL;
     FRT_TRY
-        is = store->open_input(store, seg_file_name);
+        is = store->open_input(store, segm_idx_name, seg_file_name);
         sis->store = store;
         FRT_REF(store);
         sis->generation = fsf->generation;
@@ -942,22 +624,20 @@ static void frt_sis_read_i(FrtStore *store, FindSegmentsFile *fsf, FrtIndexReade
     fsf->ret.sis = sis;
 }
 
-FrtSegmentInfos *frt_sis_read(FrtStore *store)
-{
+FrtSegmentInfos *frt_sis_read(FrtStore *store) {
     FindSegmentsFile fsf;
     sis_find_segments_file(store, &fsf, &frt_sis_read_i, NULL);
     return fsf.ret.sis;
 }
 
-void frt_sis_write(FrtSegmentInfos *sis, FrtStore *store, FrtDeleter *deleter)
-{
+void frt_sis_write(FrtSegmentInfos *sis, FrtStore *store, FrtDeleter *deleter) {
     int i;
     FrtOutStream *volatile os = NULL;
     const int sis_size = sis->size;
     char buf[FRT_SEGMENT_NAME_MAX_LENGTH];
     sis->generation++;
     FRT_TRY
-        os = store->new_output(store, segfn_for_generation(buf, sis->generation));
+        os = store->new_output(store, segm_idx_name, segfn_for_generation(buf, sis->generation));
         frt_os_write_u32(os, FORMAT);
         frt_os_write_u64(os, ++(sis->version)); /* every write changes the index */
         frt_os_write_u64(os, sis->counter);
@@ -971,7 +651,7 @@ void frt_sis_write(FrtSegmentInfos *sis, FrtStore *store, FrtDeleter *deleter)
     FRT_XENDTRY
 
     FRT_TRY
-        os = store->new_output(store, SEGMENTS_GEN_FILE_NAME);
+        os = store->new_output(store, segm_idx_name, SEGMENTS_GEN_FILE_NAME);
         frt_os_write_u64(os, sis->generation);
         frt_os_write_u64(os, sis->generation);
     FRT_XFINALLY
@@ -985,15 +665,14 @@ void frt_sis_write(FrtSegmentInfos *sis, FrtStore *store, FrtDeleter *deleter)
     }
 }
 
-static void frt_sis_read_ver_i(FrtStore *store, FindSegmentsFile *fsf, FrtIndexReader *ir_)
-{
+static void frt_sis_read_ver_i(FrtStore *store, FindSegmentsFile *fsf, FrtIndexReader *ir_) {
     FrtInStream *is;
     frt_u32 format = 0;
     frt_u64 version = 0;
     char seg_file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
 
     segfn_for_generation(seg_file_name, (frt_u64)fsf->generation);
-    is = store->open_input(store, seg_file_name);
+    is = store->open_input(store, segm_idx_name, seg_file_name);
 
     FRT_TRY
         format = frt_is_read_u32(is); // format
@@ -1006,8 +685,7 @@ static void frt_sis_read_ver_i(FrtStore *store, FindSegmentsFile *fsf, FrtIndexR
     fsf->ret.uint64 = version;
 }
 
-frt_u64 frt_sis_read_current_version(FrtStore *store)
-{
+frt_u64 frt_sis_read_current_version(FrtStore *store) {
     FindSegmentsFile fsf;
     sis_find_segments_file(store, &fsf, &frt_sis_read_ver_i, NULL);
     return fsf.ret.uint64;
@@ -1029,9 +707,9 @@ FrtFieldsReader *frt_fr_open(FrtStore *store, const char *segment, FrtFieldInfos
     fr->fis = fis;
 
     strcpy(file_name + segment_len, ".fdt");
-    fr->fdt_in = store->open_input(store, file_name);
+    fr->fdt_in = store->open_input(store, segm_idx_name, file_name);
     strcpy(file_name + segment_len, ".fdx");
-    fr->fdx_in = store->open_input(store, file_name);
+    fr->fdx_in = store->open_input(store, segm_idx_name, file_name);
     fr->size = frt_is_length(fr->fdx_in) / FIELDS_IDX_PTR_SIZE;
     fr->store = store;
     FRT_REF(store);
@@ -1057,32 +735,30 @@ void frt_fr_close(FrtFieldsReader *fr) {
     free(fr);
 }
 
-static FrtDocField *frt_fr_df_new(ID name, int size, FrtCompressionType compression) {
+static FrtDocField *frt_fr_df_new(ID name, int size, FrtCompressionType compression_type) {
     FrtDocField *df = FRT_ALLOC(FrtDocField);
     df->name = name;
     df->capa = df->size = size;
-    df->data = FRT_ALLOC_N(char *, df->capa);
+    df->data = FRT_ALLOC_N(const char *, df->capa);
     df->lengths = FRT_ALLOC_N(int, df->capa);
     df->encodings = FRT_ALLOC_N(rb_encoding *, df->capa);
-    df->destroy_data = true;
     df->boost = 1.0f;
-    df->compression = compression;
+    df->compression_type = compression_type;
     return df;
 }
 
-static void frt_fr_read_compressed_fields(FrtFieldsReader *fr, FrtDocField *df, FrtCompressionType compression) {
+static void frt_fr_read_compressed_fields(FrtFieldsReader *fr, FrtDocField *df, FrtCompressionType compression_type) {
     int i;
     const int df_size = df->size;
     FrtInStream *fdt_in = fr->fdt_in;
 
     for (i = 0; i < df_size; i++) {
-        const int compressed_len = df->lengths[i] + 1;
-        df->data[i] = frt_is_read_compressed_bytes(fdt_in, compressed_len, &(df->lengths[i]), compression);
+        const int compressed_len = df->lengths[i];
+        df->data[i] = frt_is_read_compressed_bytes(fdt_in, compressed_len, &(df->lengths[i]), compression_type);
     }
 }
 
-FrtDocument *frt_fr_get_doc(FrtFieldsReader *fr, int doc_num)
-{
+FrtDocument *frt_fr_get_doc(FrtFieldsReader *fr, int doc_num) {
     int i, j;
     frt_off_t pos;
     int stored_cnt;
@@ -1098,28 +774,29 @@ FrtDocument *frt_fr_get_doc(FrtFieldsReader *fr, int doc_num)
     for (i = 0; i < stored_cnt; i++) {
         const int field_num = frt_is_read_vint(fdt_in);
         FrtFieldInfo *fi = fr->fis->fields[field_num];
-        const int df_size = frt_is_read_vint(fdt_in);
-        FrtDocField *df = frt_fr_df_new(fi->name, df_size, frt_fi_get_compression(fi));
+        const int df_field_count = frt_is_read_vint(fdt_in);
+        FrtDocField *df = frt_fr_df_new(fi->name, df_field_count, bits_get_compression_type(fi->bits));
 
-        for (j = 0; j < df_size; j++) {
+        for (j = 0; j < df_field_count; j++) {
             df->lengths[j] = frt_is_read_vint(fdt_in);
             df->encodings[j] = rb_enc_from_index(frt_is_read_vint(fdt_in));
-            df->compression = frt_is_read_vint(fdt_in);
+            df->compression_type = frt_is_read_vint(fdt_in);
         }
 
         frt_doc_add_field(doc, df);
     }
     for (i = 0; i < stored_cnt; i++) {
         FrtDocField *df = doc->fields[i];
-        if (df->compression != FRT_COMPRESSION_NONE) {
-            frt_fr_read_compressed_fields(fr, df, df->compression);
+        if (df->compression_type != FRT_COMPRESSION_NONE) {
+            frt_fr_read_compressed_fields(fr, df, df->compression_type);
         } else {
             const int df_size = df->size;
             for (j = 0; j < df_size; j++) {
-                const int read_len = df->lengths[j] + 1;
-                df->data[j] = FRT_ALLOC_N(char, read_len);
-                frt_is_read_bytes(fdt_in, (frt_uchar *)df->data[j], read_len);
-                df->data[j][read_len - 1] = '\0';
+                const int read_len = df->lengths[j];
+                char *d = FRT_ALLOC_N(char, read_len + 1);
+                frt_is_read_bytes(fdt_in, (frt_uchar *)d, read_len);
+                d[read_len] = '\0';
+                df->data[j] = d;
             }
         }
     }
@@ -1127,8 +804,7 @@ FrtDocument *frt_fr_get_doc(FrtFieldsReader *fr, int doc_num)
     return doc;
 }
 
-FrtLazyDoc *frt_fr_get_lazy_doc(FrtFieldsReader *fr, int doc_num)
-{
+FrtLazyDoc *frt_fr_get_lazy_doc(FrtFieldsReader *fr, int doc_num) {
     int start = 0;
     int i, j;
     frt_off_t pos;
@@ -1146,18 +822,18 @@ FrtLazyDoc *frt_fr_get_lazy_doc(FrtFieldsReader *fr, int doc_num)
     for (i = 0; i < stored_cnt; i++) {
         FrtFieldInfo *fi = fr->fis->fields[frt_is_read_vint(fdt_in)];
         const int df_size = frt_is_read_vint(fdt_in);
-        FrtLazyDocField *lazy_df = frt_lazy_df_new(fi->name, df_size, frt_fi_get_compression(fi));
+        FrtLazyDocField *lazy_df = frt_lazy_df_new(fi->name, df_size, bits_get_compression_type(fi->bits));
         const int field_start = start;
         /* get the starts relative positions this time around */
 
         for (j = 0; j < df_size; j++) {
             lazy_df->data[j].start = start;
-            start += 1 + (lazy_df->data[j].length = frt_is_read_vint(fdt_in));
+            start += (lazy_df->data[j].length = frt_is_read_vint(fdt_in));
             lazy_df->data[j].encoding = rb_enc_from_index(frt_is_read_vint(fdt_in));
-            lazy_df->data[j].compression = frt_is_read_vint(fdt_in);
+            lazy_df->data[j].compression_type = frt_is_read_vint(fdt_in);
         }
 
-        lazy_df->len = start - field_start - 1;
+        lazy_df->len = start - field_start;
         frt_lazy_doc_add_field(lazy_doc, lazy_df, i);
     }
     /* correct the starts to their correct absolute positions */
@@ -1173,8 +849,7 @@ FrtLazyDoc *frt_fr_get_lazy_doc(FrtFieldsReader *fr, int doc_num)
     return lazy_doc;
 }
 
-static FrtTermVector *frt_fr_read_term_vector(FrtFieldsReader *fr, int field_num)
-{
+static FrtTermVector *frt_fr_read_term_vector(FrtFieldsReader *fr, int field_num) {
     FrtTermVector *tv = FRT_ALLOC_AND_ZERO(FrtTermVector);
     FrtInStream *fdt_in = fr->fdt_in;
     FrtFieldInfo *fi = fr->fis->fields[field_num];
@@ -1232,8 +907,7 @@ static FrtTermVector *frt_fr_read_term_vector(FrtFieldsReader *fr, int field_num
     return tv;
 }
 
-FrtHash *frt_fr_get_tv(FrtFieldsReader *fr, int doc_num)
-{
+FrtHash *frt_fr_get_tv(FrtFieldsReader *fr, int doc_num) {
     FrtHash *term_vectors = frt_h_new_ptr((frt_free_ft)&frt_tv_destroy);
     int i;
     FrtInStream *fdx_in = fr->fdx_in;
@@ -1319,10 +993,10 @@ FrtFieldsWriter *frt_fw_open(FrtStore *store, const char *segment, FrtFieldInfos
     memcpy(file_name, segment, segment_len);
 
     strcpy(file_name + segment_len, ".fdt");
-    fw->fdt_out = store->new_output(store, file_name);
+    fw->fdt_out = store->new_output(store, segm_idx_name, file_name);
 
     strcpy(file_name + segment_len, ".fdx");
-    fw->fdx_out = store->new_output(store, file_name);
+    fw->fdx_out = store->new_output(store, segm_idx_name, file_name);
 
     fw->buffer = frt_ram_new_buffer();
 
@@ -1344,9 +1018,9 @@ void frt_fw_add_doc(FrtFieldsWriter *fw, FrtDocument *doc) {
     int i, j, stored_cnt = 0;
     FrtDocField *df;
     FrtFieldInfo *fi;
-    FrtCompressionType compression;
+    FrtCompressionType compression_type;
     FrtOutStream *fdt_out = fw->fdt_out, *fdx_out = fw->fdx_out;
-    const int doc_size = doc->size;
+    const int doc_size = doc->field_count;
 
     for (i = 0; i < doc_size; i++) {
         df = doc->fields[i];
@@ -1370,23 +1044,20 @@ void frt_fw_add_doc(FrtFieldsWriter *fw, FrtDocument *doc) {
             frt_os_write_vint(fdt_out, df_size);
 
             if (bits_is_compressed(fi->bits)) {
-                compression = frt_fi_get_compression(fi);
+                compression_type = bits_get_compression_type(fi->bits);
                 for (j = 0; j < df_size; j++) {
-                    const int length = df->lengths[j];
-                    int compressed_len = frt_os_write_compressed_bytes(fw->buffer, (frt_uchar*)df->data[j], length, compression);
-                    frt_os_write_vint(fdt_out, compressed_len - 1);
+                    int compressed_len = frt_os_write_compressed_bytes(fw->buffer, (frt_uchar*)df->data[j], df->lengths[j], compression_type);
+                    frt_os_write_vint(fdt_out, compressed_len);
                     frt_os_write_vint(fdt_out, rb_enc_to_index(df->encodings[j]));
-                    frt_os_write_vint(fdt_out, compression);
+                    frt_os_write_vint(fdt_out, compression_type);
                 }
             } else {
                 for (j = 0; j < df_size; j++) {
                     const int length = df->lengths[j];
+                    frt_os_write_bytes(fw->buffer, (frt_uchar*)df->data[j], length);
                     frt_os_write_vint(fdt_out, length);
                     frt_os_write_vint(fdt_out, rb_enc_to_index(df->encodings[j]));
-                    frt_os_write_vint(fdt_out, FRT_COMPRESSION_NONE);
-                    frt_os_write_bytes(fw->buffer, (frt_uchar*)df->data[j], length);
-                    /* leave a space between fields as that is how they are analyzed */
-                    frt_os_write_byte(fw->buffer, ' ');
+                    frt_os_write_vint(fdt_out, FRT_COMPRESSION_NONE);     
                 }
             }
         }
@@ -1413,8 +1084,7 @@ void frt_fw_add_postings(FrtFieldsWriter *fw,
                      FrtPostingList **plists,
                      int posting_count,
                      FrtOffset *offsets,
-                     int offset_count)
-{
+                     int offset_count) {
     int i, delta_start, delta_length;
     const char *last_term = FRT_EMPTY_STRING;
     FrtOutStream *fdt_out = fw->fdt_out;
@@ -1478,19 +1148,16 @@ void frt_fw_add_postings(FrtFieldsWriter *fw,
 
 #define TE(ste) ((FrtTermEnum *)ste)
 
-char *frt_te_get_term(FrtTermEnum *te)
-{
+char *frt_te_get_term(FrtTermEnum *te) {
     return (char *)memcpy(FRT_ALLOC_N(char, te->curr_term_len + 1),
                           te->curr_term, te->curr_term_len + 1);
 }
 
-FrtTermInfo *frt_te_get_ti(FrtTermEnum *te)
-{
+FrtTermInfo *frt_te_get_ti(FrtTermEnum *te) {
     return (FrtTermInfo*)memcpy(FRT_ALLOC(FrtTermInfo), &(te->curr_ti), sizeof(FrtTermInfo));
 }
 
-static char *te_skip_to(FrtTermEnum *te, const char *term)
-{
+static char *te_skip_to(FrtTermEnum *te, const char *term) {
     char *curr_term = te->curr_term;
     if (strcmp(curr_term, term) < 0) {
         while (NULL != ((curr_term = te->next(te)))
@@ -1512,8 +1179,7 @@ static char *te_skip_to(FrtTermEnum *te, const char *term)
  * SegmentTermIndex
  ****************************************************************************/
 
-static void sti_destroy(FrtSegmentTermIndex *sti)
-{
+static void sti_destroy(FrtSegmentTermIndex *sti) {
     if (sti->index_terms) {
         int i;
         const int sti_index_cnt = sti->index_cnt;
@@ -1557,8 +1223,7 @@ static void sti_ensure_index_is_read(FrtSegmentTermIndex *sti, FrtTermEnum *inde
     }
 }
 
-static int sti_get_index_offset(FrtSegmentTermIndex *sti, const char *term)
-{
+static int sti_get_index_offset(FrtSegmentTermIndex *sti, const char *term) {
     int lo = 0;
     int hi = sti->index_cnt - 1;
     int mid, delta;
@@ -1569,11 +1234,9 @@ static int sti_get_index_offset(FrtSegmentTermIndex *sti, const char *term)
         delta = strcmp(term, index_terms[mid]);
         if (delta < 0) {
             hi = mid - 1;
-        }
-        else if (delta > 0) {
+        } else if (delta > 0) {
             lo = mid + 1;
-        }
-        else {
+        } else {
             return mid;
         }
     }
@@ -1601,7 +1264,7 @@ FrtSegmentFieldIndex *frt_sfi_open(FrtStore *store, const char *segment) {
     pthread_mutex_init(&sfi->mutex, NULL);
 
     sprintf(file_name, "%s.tfx", segment);
-    is = store->open_input(store, file_name);
+    is = store->open_input(store, segm_idx_name, file_name);
     field_count = (int)frt_is_read_u32(is);
     sfi->index_interval = frt_is_read_vint(is);
     sfi->skip_interval = frt_is_read_vint(is);
@@ -1620,7 +1283,7 @@ FrtSegmentFieldIndex *frt_sfi_open(FrtStore *store, const char *segment) {
     frt_is_close(is);
 
     sprintf(file_name, "%s.tix", segment);
-    is = store->open_input(store, file_name);
+    is = store->open_input(store, segm_idx_name, file_name);
     FRT_DEREF(is);
     sfi->index_te = frt_ste_new(is, sfi);
     return sfi;
@@ -1750,13 +1413,11 @@ void frt_ste_close(FrtTermEnum *te) {
     free(te);
 }
 
-static char *frt_ste_get_term(FrtTermEnum *te, int pos)
-{
+static char *frt_ste_get_term(FrtTermEnum *te, int pos) {
     FrtSegmentTermEnum *ste = STE(te);
     if (pos >= ste->size) {
         return NULL;
-    }
-    else if (pos != ste->pos) {
+    } else if (pos != ste->pos) {
         int idx_int = ste->sfi->index_interval;
         if ((pos < ste->pos) || pos > (1 + ste->pos / idx_int) * idx_int) {
             FrtSegmentTermIndex *sti = (FrtSegmentTermIndex *)frt_h_get_int(ste->sfi->field_dict, te->field_num);
@@ -1773,8 +1434,7 @@ static char *frt_ste_get_term(FrtTermEnum *te, int pos)
     return te->curr_term;
 }
 
-FrtTermEnum *frt_ste_new(FrtInStream *is, FrtSegmentFieldIndex *sfi)
-{
+FrtTermEnum *frt_ste_new(FrtInStream *is, FrtSegmentFieldIndex *sfi) {
     FrtSegmentTermEnum *ste = ste_allocate();
 
     TE(ste)->field_num = -1;
@@ -1794,8 +1454,7 @@ FrtTermEnum *frt_ste_new(FrtInStream *is, FrtSegmentFieldIndex *sfi)
 
 #define MTE(te) ((MultiTermEnum *)(te))
 
-typedef struct TermEnumWrapper
-{
+typedef struct TermEnumWrapper {
     int index;
     FrtTermEnum *te;
     int *doc_map;
@@ -1803,8 +1462,7 @@ typedef struct TermEnumWrapper
     char *term;
 } TermEnumWrapper;
 
-typedef struct MultiTermEnum
-{
+typedef struct MultiTermEnum {
     FrtTermEnum te;
     int doc_freq;
     FrtPriorityQueue *tew_queue;
@@ -1816,29 +1474,24 @@ typedef struct MultiTermEnum
     int *ti_indexes;
 } MultiTermEnum;
 
-static bool tew_lt(const TermEnumWrapper *tew1, const TermEnumWrapper *tew2)
-{
+static bool tew_lt(const TermEnumWrapper *tew1, const TermEnumWrapper *tew2) {
     int cmpres = strcmp(tew1->term, tew2->term);
     if (0 == cmpres) {
         return tew1->index < tew2->index;
-    }
-    else {
+    } else {
         return cmpres < 0;
     }
 }
 
-static char *tew_next(TermEnumWrapper *tew)
-{
+static char *tew_next(TermEnumWrapper *tew) {
     return (tew->term = tew->te->next(tew->te));
 }
 
-static char *tew_skip_to(TermEnumWrapper *tew, const char *term)
-{
+static char *tew_skip_to(TermEnumWrapper *tew, const char *term) {
     return (tew->term = tew->te->skip_to(tew->te, term));
 }
 
-static void tew_destroy(TermEnumWrapper *tew)
-{
+static void tew_destroy(TermEnumWrapper *tew) {
     frt_ir_close(tew->ir);
     if (tew->doc_map) {
         free(tew->doc_map);
@@ -1905,8 +1558,7 @@ static FrtTermEnum *mte_set_field(FrtTermEnum *te, int field_num) {
             if (tew_next(tew)) {
                 frt_pq_push(mte->tew_queue, tew); /* initialize queue */
             }
-        }
-        else {
+        } else {
             sub_te->field_num = -1;
         }
 
@@ -2009,7 +1661,7 @@ FrtTermInfosReader *frt_tir_open(FrtStore *store, FrtSegmentFieldIndex *sfi, con
     char file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
 
     sprintf(file_name, "%s.tis", segment);
-    FrtInStream *is = store->open_input(store, file_name);
+    FrtInStream *is = store->open_input(store, segm_idx_name, file_name);
     FRT_DEREF(is);
     tir->orig_te = frt_ste_new(is, sfi);
     tir->thread_te = 0;
@@ -2088,7 +1740,7 @@ void frt_tir_close(FrtTermInfosReader *tir) {
 
 static FrtTermWriter *frt_tw_new(FrtStore *store, char *file_name) {
     FrtTermWriter *tw = FRT_ALLOC_AND_ZERO(FrtTermWriter);
-    tw->os = store->new_output(store, file_name);
+    tw->os = store->new_output(store, segm_idx_name, file_name);
     tw->last_term = FRT_EMPTY_STRING;
     return tw;
 }
@@ -2115,7 +1767,7 @@ FrtTermInfosWriter *frt_tiw_open(FrtStore *store, const char *segment, int index
     strcpy(file_name + segment_len, ".tis");
     tiw->tis_writer = frt_tw_new(store, file_name);
     strcpy(file_name + segment_len, ".tfx");
-    tiw->tfx_out = store->new_output(store, file_name);
+    tiw->tfx_out = store->new_output(store, segm_idx_name, file_name);
     frt_os_write_u32(tiw->tfx_out, 0); /* make space for field_count */
 
     /* The following two numbers are the first numbers written to the field
@@ -2246,7 +1898,7 @@ static void stde_seek_ti(FrtSegmentTermDocEnum *stde, FrtTermInfo *ti) {
         stde->count = 0;
         stde->doc_freq = ti->doc_freq;
         stde->doc_num = 0;
-        stde->skip_doc = 0;
+        stde->skip_doc_num = 0;
         stde->skip_count = 0;
         stde->num_skips = stde->doc_freq / stde->skip_interval;
         stde->frq_ptr = ti->frq_ptr;
@@ -2282,7 +1934,6 @@ static int stde_freq(FrtTermDocEnum *tde) {
 }
 
 static bool stde_next(FrtTermDocEnum *tde) {
-    int doc_code;
     FrtSegmentTermDocEnum *stde = STDE(tde);
 
     while (true) {
@@ -2290,13 +1941,8 @@ static bool stde_next(FrtTermDocEnum *tde) {
             return false;
         }
 
-        doc_code = frt_is_read_vint(stde->frq_in);
-        stde->doc_num += doc_code >> 1;    /* shift off low bit */
-        if (0 != (doc_code & 1)) {         /* if low bit is set */
-            stde->freq = 1;                /* freq is one */
-        } else {
-            stde->freq = (int)frt_is_read_vint(stde->frq_in); /* read freq */
-        }
+        stde->doc_num += frt_is_read_vint(stde->frq_in);
+        stde->freq = frt_is_read_vint(stde->frq_in);
 
         stde->count++;
 
@@ -2312,17 +1958,11 @@ static bool stde_next(FrtTermDocEnum *tde) {
 static int stde_read(FrtTermDocEnum *tde, int *docs, int *freqs, int req_num) {
     FrtSegmentTermDocEnum *stde = STDE(tde);
     int i = 0;
-    int doc_code;
 
     while (i < req_num && stde->count < stde->doc_freq) {
         /* manually inlined call to next() for speed */
-        doc_code = frt_is_read_vint(stde->frq_in);
-        stde->doc_num += (doc_code >> 1);            /* shift off low bit */
-        if (0 != (doc_code & 1)) {                   /* if low bit is set */
-            stde->freq = 1;                            /* freq is one */
-        } else {
-            stde->freq = frt_is_read_vint(stde->frq_in);  /* else read freq */
-        }
+        stde->doc_num += frt_is_read_vint(stde->frq_in);
+        stde->freq = frt_is_read_vint(stde->frq_in);
 
         stde->count++;
 
@@ -2341,7 +1981,7 @@ static bool stde_skip_to(FrtTermDocEnum *tde, int target_doc_num) {
 
     if (stde->doc_freq >= stde->skip_interval
         && target_doc_num > stde->doc_num) {       /* optimized case */
-        int last_skip_doc;
+        int last_skip_doc_num;
         frt_off_t last_frq_ptr;
         frt_off_t last_prx_ptr;
         int num_skipped;
@@ -2356,17 +1996,17 @@ static bool stde_skip_to(FrtTermDocEnum *tde, int target_doc_num) {
         }
 
         /* scan skip data */
-        last_skip_doc = stde->skip_doc;
+        last_skip_doc_num = stde->skip_doc_num;
         last_frq_ptr = frt_is_pos(stde->frq_in);
         last_prx_ptr = -1;
         num_skipped = -1 - (stde->count % stde->skip_interval);
 
-        while (target_doc_num > stde->skip_doc) {
-            last_skip_doc = stde->skip_doc;
+        while (target_doc_num > stde->skip_doc_num) {
+            last_skip_doc_num = stde->skip_doc_num;
             last_frq_ptr = stde->frq_ptr;
             last_prx_ptr = stde->prx_ptr;
 
-            if (0 != stde->skip_doc && stde->skip_doc >= stde->doc_num) {
+            if (0 != stde->skip_doc_num && stde->skip_doc_num >= stde->doc_num) {
                 num_skipped += stde->skip_interval;
             }
 
@@ -2374,9 +2014,9 @@ static bool stde_skip_to(FrtTermDocEnum *tde, int target_doc_num) {
                 break;
             }
 
-            stde->skip_doc += frt_is_read_vint(stde->skip_in);
-            stde->frq_ptr  += frt_is_read_vint(stde->skip_in);
-            stde->prx_ptr  += frt_is_read_vint(stde->skip_in);
+            stde->skip_doc_num += frt_is_read_vint(stde->skip_in);
+            stde->frq_ptr      += frt_is_read_vint(stde->skip_in);
+            stde->prx_ptr      += frt_is_read_vint(stde->skip_in);
 
             stde->skip_count++;
         }
@@ -2386,7 +2026,7 @@ static bool stde_skip_to(FrtTermDocEnum *tde, int target_doc_num) {
             frt_is_seek(stde->frq_in, last_frq_ptr);
             stde->seek_prox(stde, last_prx_ptr);
 
-            stde->doc_num = last_skip_doc;
+            stde->doc_num = last_skip_doc_num;
             stde->count += num_skipped;
         }
     }
@@ -2483,35 +2123,30 @@ static bool stpe_next(FrtTermDocEnum *tde) {
     }
 }
 
-static int stpe_read(FrtTermDocEnum *tde, int *docs, int *freqs, int req_num)
-{
+static int stpe_read(FrtTermDocEnum *tde, int *docs, int *freqs, int req_num) {
     (void)tde; (void)docs; (void)freqs; (void)req_num;
     FRT_RAISE(FRT_ARG_ERROR, "TermPosEnum does not handle processing multiple documents"
                      " in one call. Use TermDocEnum instead.");
     return -1;
 }
 
-static int stpe_next_position(FrtTermDocEnum *tde)
-{
+static int stpe_next_position(FrtTermDocEnum *tde) {
     FrtSegmentTermDocEnum *stde = STDE(tde);
     return (stde->prx_cnt-- > 0) ? stde->position += frt_is_read_vint(stde->prx_in)
                                  : -1;
 }
 
-static void stpe_close(FrtTermDocEnum *tde)
-{
+static void stpe_close(FrtTermDocEnum *tde) {
     frt_is_close(STDE(tde)->prx_in);
     STDE(tde)->prx_in = NULL;
     stde_close(tde);
 }
 
-static void stpe_skip_prox(FrtSegmentTermDocEnum *stde)
-{
+static void stpe_skip_prox(FrtSegmentTermDocEnum *stde) {
     frt_is_skip_vints(stde->prx_in, stde->freq);
 }
 
-static void stpe_seek_prox(FrtSegmentTermDocEnum *stde, frt_off_t prx_ptr)
-{
+static void stpe_seek_prox(FrtSegmentTermDocEnum *stde, frt_off_t prx_ptr) {
     frt_is_seek(stde->prx_in, prx_ptr);
     stde->prx_cnt = 0;
 }
@@ -2520,8 +2155,7 @@ FrtTermDocEnum *frt_stpe_new(FrtTermInfosReader *tir,
                       FrtInStream *frq_in,
                       FrtInStream *prx_in,
                       FrtBitVector *del_docs,
-                      int skip_interval)
-{
+                      int skip_interval) {
     FrtTermDocEnum *tde         = frt_stde_new(tir, frq_in, del_docs, skip_interval);
     FrtSegmentTermDocEnum *stde = STDE(tde);
 
@@ -2550,8 +2184,7 @@ FrtTermDocEnum *frt_stpe_new(FrtTermInfosReader *tir,
 
 #define MTDE(tde) ((MultiTermDocEnum *)(tde))
 
-typedef struct MultiTermDocEnum
-{
+typedef struct MultiTermDocEnum {
     FrtTermDocEnum tde;
     int *starts;
     int base;
@@ -2564,16 +2197,14 @@ typedef struct MultiTermDocEnum
     FrtTermDocEnum *curr_tde;
 } MultiTermDocEnum;
 
-static FrtTermDocEnum *mtde_next_tde(MultiTermDocEnum *mtde)
-{
+static FrtTermDocEnum *mtde_next_tde(MultiTermDocEnum *mtde) {
     mtde->ptr++;
     while (mtde->ptr < mtde->ir_cnt && !mtde->state[mtde->ptr]) {
         mtde->ptr++;
     }
     if (mtde->ptr >= mtde->ir_cnt) {
         return mtde->curr_tde = NULL;
-    }
-    else {
+    } else {
         FrtTermDocEnum *tde = mtde->irs_tde[mtde->ptr];
         mtde->base = mtde->starts[mtde->ptr];
         return mtde->curr_tde = tde;
@@ -2587,8 +2218,7 @@ static FrtTermDocEnum *mtde_next_tde(MultiTermDocEnum *mtde)
     }\
 } while (0)
 
-static void mtde_seek_te(FrtTermDocEnum *tde, FrtTermEnum *te)
-{
+static void mtde_seek_te(FrtTermDocEnum *tde, FrtTermEnum *te) {
     int i;
     MultiTermDocEnum *mtde = MTDE(tde);
     memset(mtde->state, 0, mtde->ir_cnt);
@@ -2598,11 +2228,9 @@ static void mtde_seek_te(FrtTermDocEnum *tde, FrtTermEnum *te)
         mtde->state[index] = 1;
         if (tde->close == stde_close) {
             stde_seek_ti(STDE(tde), MTE(te)->tis + i);
-        }
-        else if (tde->close == stpe_close) {
+        } else if (tde->close == stpe_close) {
             stpe_seek_ti(STDE(tde), MTE(te)->tis + i);
-        }
-        else {
+        } else {
             tde->seek(tde, MTE(te)->tews[index].te->field_num, te->curr_term);
         }
     }
@@ -2611,48 +2239,40 @@ static void mtde_seek_te(FrtTermDocEnum *tde, FrtTermEnum *te)
     mtde_next_tde(mtde);
 }
 
-static void mtde_seek(FrtTermDocEnum *tde, int field_num, const char *term)
-{
+static void mtde_seek(FrtTermDocEnum *tde, int field_num, const char *term) {
     MultiTermDocEnum *mtde = MTDE(tde);
     FrtTermEnum *te = mtde->te;
     char *t;
     te->set_field(te, field_num);
     if (NULL != (t = te->skip_to(te, term)) && 0 == strcmp(term, t)) {
         mtde_seek_te(tde, te);
-    }
-    else {
+    } else {
         memset(mtde->state, 0, mtde->ir_cnt);
     }
 }
 
-static int mtde_doc_num(FrtTermDocEnum *tde)
-{
+static int mtde_doc_num(FrtTermDocEnum *tde) {
     CHECK_CURR_TDE("doc_num");
     return MTDE(tde)->base + MTDE(tde)->curr_tde->doc_num(MTDE(tde)->curr_tde);
 }
 
-static int mtde_freq(FrtTermDocEnum *tde)
-{
+static int mtde_freq(FrtTermDocEnum *tde) {
     CHECK_CURR_TDE("freq");
     return MTDE(tde)->curr_tde->freq(MTDE(tde)->curr_tde);
 }
 
-static bool mtde_next(FrtTermDocEnum *tde)
-{
+static bool mtde_next(FrtTermDocEnum *tde) {
     MultiTermDocEnum *mtde = MTDE(tde);
     if (NULL != mtde->curr_tde && mtde->curr_tde->next(mtde->curr_tde)) {
         return true;
-    }
-    else if (mtde_next_tde(mtde)) {
+    } else if (mtde_next_tde(mtde)) {
         return mtde_next(tde);
-    }
-    else {
+    } else {
         return false;
     }
 }
 
-static int mtde_read(FrtTermDocEnum *tde, int *docs, int *freqs, int req_num)
-{
+static int mtde_read(FrtTermDocEnum *tde, int *docs, int *freqs, int req_num) {
     int i, end = 0, last_end = 0, b;
     MultiTermDocEnum *mtde = MTDE(tde);
     while (true) {
@@ -2661,24 +2281,21 @@ static int mtde_read(FrtTermDocEnum *tde, int *docs, int *freqs, int req_num)
                                     freqs + last_end, req_num - last_end);
         if (end == last_end) {              /* none left in segment */
             if (!mtde_next_tde(mtde)) return end;
-        }
-        else {                            /* got some */
+        } else {                            /* got some */
             b = mtde->base;                 /* adjust doc numbers */
             for (i = last_end; i < end; i++) {
                 docs[i] += b;
             }
             if (end == req_num) {
                 return end;
-            }
-            else {
+            } else {
                 last_end = end;
             }
         }
     }
 }
 
-static bool mtde_skip_to(FrtTermDocEnum *tde, int target_doc_num)
-{
+static bool mtde_skip_to(FrtTermDocEnum *tde, int target_doc_num) {
     MultiTermDocEnum *mtde = MTDE(tde);
     FrtTermDocEnum *curr_tde;
     while (NULL != (curr_tde = mtde->curr_tde)) {
@@ -2692,8 +2309,7 @@ static bool mtde_skip_to(FrtTermDocEnum *tde, int target_doc_num)
     return false;
 }
 
-static void mtde_close(FrtTermDocEnum *tde)
-{
+static void mtde_close(FrtTermDocEnum *tde) {
     MultiTermDocEnum *mtde = MTDE(tde);
     FrtTermDocEnum *tmp_tde;
     int i = mtde->ir_cnt;
@@ -2708,8 +2324,7 @@ static void mtde_close(FrtTermDocEnum *tde)
     free(tde);
 }
 
-static FrtTermDocEnum *mtxe_new(FrtMultiReader *mr)
-{
+static FrtTermDocEnum *mtxe_new(FrtMultiReader *mr) {
     MultiTermDocEnum *mtde  = FRT_ALLOC_AND_ZERO(MultiTermDocEnum);
     FrtTermDocEnum *tde        = TDE(mtde);
     tde->seek               = &mtde_seek;
@@ -2731,8 +2346,7 @@ static FrtTermDocEnum *mtxe_new(FrtMultiReader *mr)
     return tde;
 }
 
-static FrtTermDocEnum *mtde_new(FrtMultiReader *mr)
-{
+static FrtTermDocEnum *mtde_new(FrtMultiReader *mr) {
     int i;
     FrtTermDocEnum *tde        = mtxe_new(mr);
     tde->next_position      = NULL;
@@ -2747,14 +2361,12 @@ static FrtTermDocEnum *mtde_new(FrtMultiReader *mr)
  * MultiTermPosEnum
  ****************************************************************************/
 
-static int mtpe_next_position(FrtTermDocEnum *tde)
-{
+static int mtpe_next_position(FrtTermDocEnum *tde) {
     CHECK_CURR_TDE("next_position");
     return MTDE(tde)->curr_tde->next_position(MTDE(tde)->curr_tde);
 }
 
-static FrtTermDocEnum *mtpe_new(FrtMultiReader *mr)
-{
+static FrtTermDocEnum *mtpe_new(FrtMultiReader *mr) {
     int i;
     FrtTermDocEnum *tde        = mtxe_new(mr);
     tde->next_position      = &mtpe_next_position;
@@ -2774,8 +2386,7 @@ static FrtTermDocEnum *mtpe_new(FrtMultiReader *mr)
 #define MTDPE(tde) ((MultipleTermDocPosEnum *)(tde))
 #define  MTDPE_POS_QUEUE_INIT_CAPA 8
 
-typedef struct
-{
+typedef struct {
     FrtTermDocEnum tde;
     int doc_num;
     int freq;
@@ -2790,8 +2401,7 @@ static void tde_destroy(FrtTermDocEnum *tde) {
     tde->close(tde);
 }
 
-static void mtdpe_seek(FrtTermDocEnum *tde, int field_num, const char *term)
-{
+static void mtdpe_seek(FrtTermDocEnum *tde, int field_num, const char *term) {
     (void)tde;
     (void)field_num;
     (void)term;
@@ -2799,21 +2409,18 @@ static void mtdpe_seek(FrtTermDocEnum *tde, int field_num, const char *term)
           " the #seek operation");
 }
 
-static int mtdpe_doc_num(FrtTermDocEnum *tde)
-{
+static int mtdpe_doc_num(FrtTermDocEnum *tde) {
     return MTDPE(tde)->doc_num;
 }
 
-static int mtdpe_freq(FrtTermDocEnum *tde)
-{
+static int mtdpe_freq(FrtTermDocEnum *tde) {
     return MTDPE(tde)->freq;
 }
 
-static bool mtdpe_next(FrtTermDocEnum *tde)
-{
+static bool mtdpe_next(FrtTermDocEnum *tde) {
     FrtTermDocEnum *sub_tde;
     int pos = 0, freq = 0;
-    int doc;
+    int doc_num;
     MultipleTermDocPosEnum *mtdpe = MTDPE(tde);
 
     if (0 == mtdpe->pq->size) {
@@ -2821,7 +2428,7 @@ static bool mtdpe_next(FrtTermDocEnum *tde)
     }
 
     sub_tde = (FrtTermDocEnum *)frt_pq_top(mtdpe->pq);
-    doc = sub_tde->doc_num(sub_tde);
+    doc_num = sub_tde->doc_num(sub_tde);
 
     do {
         freq += sub_tde->freq(sub_tde);
@@ -2839,30 +2446,27 @@ static bool mtdpe_next(FrtTermDocEnum *tde)
 
         if (sub_tde->next(sub_tde)) {
             frt_pq_down(mtdpe->pq);
-        }
-        else {
+        } else {
             sub_tde = (FrtTermDocEnum *)frt_pq_pop(mtdpe->pq);
             sub_tde->close(sub_tde);
         }
         sub_tde = (FrtTermDocEnum *)frt_pq_top(mtdpe->pq);
-    } while ((mtdpe->pq->size > 0) && (sub_tde->doc_num(sub_tde) == doc));
+    } while ((mtdpe->pq->size > 0) && (sub_tde->doc_num(sub_tde) == doc_num));
 
     qsort(mtdpe->pos_queue, freq, sizeof(int), &frt_icmp_risky);
 
     mtdpe->pos_queue_index = 0;
     mtdpe->freq = freq;
-    mtdpe->doc_num = doc;
+    mtdpe->doc_num = doc_num;
 
     return true;
 }
 
-static bool tdpe_less_than(FrtTermDocEnum *p1, FrtTermDocEnum *p2)
-{
+static bool tdpe_less_than(FrtTermDocEnum *p1, FrtTermDocEnum *p2) {
     return p1->doc_num(p1) < p2->doc_num(p2);
 }
 
-static bool mtdpe_skip_to(FrtTermDocEnum *tde, int target_doc_num)
-{
+static bool mtdpe_skip_to(FrtTermDocEnum *tde, int target_doc_num) {
     FrtTermDocEnum *sub_tde;
     FrtPriorityQueue *mtdpe_pq = MTDPE(tde)->pq;
 
@@ -2870,8 +2474,7 @@ static bool mtdpe_skip_to(FrtTermDocEnum *tde, int target_doc_num)
            && (target_doc_num > sub_tde->doc_num(sub_tde))) {
         if (sub_tde->skip_to(sub_tde, target_doc_num)) {
             frt_pq_down(mtdpe_pq);
-        }
-        else {
+        } else {
             sub_tde = (FrtTermDocEnum *)frt_pq_pop(mtdpe_pq);
             sub_tde->close(sub_tde);
         }
@@ -2879,8 +2482,7 @@ static bool mtdpe_skip_to(FrtTermDocEnum *tde, int target_doc_num)
     return tde->next(tde);
 }
 
-static int mtdpe_read(FrtTermDocEnum *tde, int *docs, int *freqs, int req_num)
-{
+static int mtdpe_read(FrtTermDocEnum *tde, int *docs, int *freqs, int req_num) {
     (void)tde;
     (void)docs;
     (void)freqs;
@@ -2889,21 +2491,18 @@ static int mtdpe_read(FrtTermDocEnum *tde, int *docs, int *freqs, int req_num)
     return req_num;
 }
 
-static int mtdpe_next_position(FrtTermDocEnum *tde)
-{
+static int mtdpe_next_position(FrtTermDocEnum *tde) {
     return MTDPE(tde)->pos_queue[MTDPE(tde)->pos_queue_index++];
 }
 
-static void mtdpe_close(FrtTermDocEnum *tde)
-{
+static void mtdpe_close(FrtTermDocEnum *tde) {
     frt_pq_clear(MTDPE(tde)->pq);
     frt_pq_destroy(MTDPE(tde)->pq);
     free(MTDPE(tde)->pos_queue);
     free(tde);
 }
 
-FrtTermDocEnum *frt_mtdpe_new(FrtIndexReader *ir, int field_num, char **terms, int t_cnt)
-{
+FrtTermDocEnum *frt_mtdpe_new(FrtIndexReader *ir, int field_num, char **terms, int t_cnt) {
     int i;
     MultipleTermDocPosEnum *mtdpe = FRT_ALLOC_AND_ZERO(MultipleTermDocPosEnum);
     FrtTermDocEnum *tde = TDE(mtdpe);
@@ -2918,8 +2517,7 @@ FrtTermDocEnum *frt_mtdpe_new(FrtIndexReader *ir, int field_num, char **terms, i
         tpe->seek(tpe, field_num, terms[i]);
         if (tpe->next(tpe)) {
             frt_pq_push(pq, tpe);
-        }
-        else {
+        } else {
             tpe->close(tpe);
         }
     }
@@ -2952,26 +2550,22 @@ static void file_name_filter_init(void) {
     frt_register_for_cleanup(fn_extensions, (frt_free_ft)&frt_h_destroy);
 }
 
-bool frt_file_name_filter_is_index_file(const char *file_name, bool include_locks)
-{
+bool frt_file_name_filter_is_index_file(const char *file_name, bool include_locks) {
     char *p = strrchr(file_name, '.');
     if (NULL == fn_extensions) file_name_filter_init();
     if (NULL != p) {
         char *extension = p + 1;
         if (NULL != frt_h_get(fn_extensions, extension)) {
             return true;
-        }
-        else if ((*extension == 'f' || *extension == 's')
+        } else if ((*extension == 'f' || *extension == 's')
                  && *(extension + 1) >= '0'
                  && *(extension + 1) <= '9') {
             return true;
-        }
-        else if (include_locks && (strcmp(extension, "lck") == 0)
+        } else if (include_locks && (strcmp(extension, "lck") == 0)
                                && (strncmp(file_name, "ferret", 6) == 0)) {
             return true;
         }
-    }
-    else if (0 == strncmp(FRT_SEGMENTS_FILE_NAME, file_name,
+    } else if (0 == strncmp(FRT_SEGMENTS_FILE_NAME, file_name,
                           sizeof(FRT_SEGMENTS_FILE_NAME) - 1)) {
         return true;
     }
@@ -3007,8 +2601,8 @@ void frt_deleter_queue_file(FrtDeleter *dlr, const char *file_name) {
 void frt_deleter_delete_file(FrtDeleter *dlr, char *file_name) {
     FrtStore *store = dlr->store;
     FRT_TRY
-        if (store->exists(store, file_name)) {
-            store->remove(store, file_name);
+        if (store->exists(store, segm_idx_name, file_name)) {
+            store->remove(store, segm_idx_name, file_name);
         }
         frt_hs_del(dlr->pending, file_name);
     FRT_XCATCHALL
@@ -3123,20 +2717,18 @@ void frt_deleter_find_deletable_files(FrtDeleter *dlr) {
      * info: */
     frt_sis_curr_seg_file_name(dfa.curr_seg_file_name, store);
 
-    store->each(store, &frt_deleter_find_deletable_files_i, &dfa);
+    store->each(store, segm_idx_name, &frt_deleter_find_deletable_files_i, &dfa);
     frt_h_destroy(dfa.current);
 }
 
-static void deleter_delete_deletable_files(FrtDeleter *dlr)
-{
+static void deleter_delete_deletable_files(FrtDeleter *dlr) {
     frt_deleter_find_deletable_files(dlr);
     deleter_commit_pending_deletions(dlr);
 }
 
 /*
 TODO: currently not used. Why not?
-static void deleter_clear_pending_deletions(FrtDeleter *dlr)
-{
+static void deleter_clear_pending_deletions(FrtDeleter *dlr) {
     frt_hs_clear(dlr->pending);
 }
 */
@@ -3147,14 +2739,12 @@ static void deleter_clear_pending_deletions(FrtDeleter *dlr)
  *
  ****************************************************************************/
 
-static void ir_acquire_not_necessary(FrtIndexReader *ir)
-{
+static void ir_acquire_not_necessary(FrtIndexReader *ir) {
     (void)ir;
 }
 
 #define I64_PFX POSH_I64_PRINTF_PREFIX
-static void ir_acquire_write_lock(FrtIndexReader *ir)
-{
+static void ir_acquire_write_lock(FrtIndexReader *ir) {
     if (ir->is_stale) {
         FRT_RAISE(FRT_STATE_ERROR, "IndexReader out of date and no longer valid for "
                            "delete, undelete, or set_norm operations. To "
@@ -3163,7 +2753,7 @@ static void ir_acquire_write_lock(FrtIndexReader *ir)
     }
 
     if (NULL == ir->write_lock) {
-        ir->write_lock = frt_open_lock(ir->store, FRT_WRITE_LOCK_NAME);
+        ir->write_lock = frt_open_lock(ir->store, segm_idx_name, FRT_WRITE_LOCK_NAME);
         if (!ir->write_lock->obtain(ir->write_lock)) {/* obtain write lock */
             FRT_RAISE(FRT_LOCK_ERROR, "Could not obtain write lock when trying to "
                               "write changes to the index. Check that there "
@@ -3209,8 +2799,7 @@ static FrtIndexReader *ir_setup(FrtIndexReader *ir, FrtStore *store, FrtSegmentI
     ir->is_owner = is_owner;
     if (is_owner) {
         ir->acquire_write_lock = &ir_acquire_write_lock;
-    }
-    else {
+    } else {
         ir->acquire_write_lock = &ir_acquire_not_necessary;
     }
 
@@ -3221,8 +2810,7 @@ int frt_ir_doc_freq(FrtIndexReader *ir, ID field, const char *term) {
     int field_num = frt_fis_get_field_num(ir->fis, field);
     if (field_num >= 0) {
         return ir->doc_freq(ir, field_num, term);
-    }
-    else {
+    } else {
         return 0;
     }
 }
@@ -3242,15 +2830,14 @@ void frt_ir_set_norm(FrtIndexReader *ir, int doc_num, ID field, frt_uchar val) {
     }
 }
 
-frt_uchar *frt_ir_get_norms_i(FrtIndexReader *ir, int field_num)
-{
+frt_uchar *frt_ir_get_norms_i(FrtIndexReader *ir, int field_num) {
     frt_uchar *norms = NULL;
     if (field_num >= 0) {
         norms = ir->get_norms(ir, field_num);
     }
     if (!norms) {
         if (NULL == ir->fake_norms) {
-            ir->fake_norms = FRT_ALLOC_AND_ZERO_N(frt_uchar, ir->max_doc(ir));
+            ir->fake_norms = FRT_ALLOC_AND_ZERO_N(frt_uchar, ir->max_doc_num(ir));
         }
         norms = ir->fake_norms;
     }
@@ -3266,15 +2853,13 @@ frt_uchar *frt_ir_get_norms_into(FrtIndexReader *ir, ID field, frt_uchar *buf) {
     int field_num = frt_fis_get_field_num(ir->fis, field);
     if (field_num >= 0) {
         ir->get_norms_into(ir, field_num, buf);
-    }
-    else {
-        memset(buf, 0, ir->max_doc(ir));
+    } else {
+        memset(buf, 0, ir->max_doc_num(ir));
     }
     return buf;
 }
 
-void frt_ir_undelete_all(FrtIndexReader *ir)
-{
+void frt_ir_undelete_all(FrtIndexReader *ir) {
     pthread_mutex_lock(&ir->mutex);
     ir->acquire_write_lock(ir);
     ir->undelete_all_i(ir);
@@ -3282,9 +2867,8 @@ void frt_ir_undelete_all(FrtIndexReader *ir)
     pthread_mutex_unlock(&ir->mutex);
 }
 
-void frt_ir_delete_doc(FrtIndexReader *ir, int doc_num)
-{
-    if (doc_num >= 0 && doc_num < ir->max_doc(ir)) {
+void frt_ir_delete_doc(FrtIndexReader *ir, int doc_num) {
+    if (doc_num >= 0 && doc_num < ir->max_doc_num(ir)) {
         pthread_mutex_lock(&ir->mutex);
         ir->acquire_write_lock(ir);
         ir->delete_doc_i(ir, doc_num);
@@ -3342,8 +2926,7 @@ FrtTermDocEnum *frt_ir_term_positions_for(FrtIndexReader *ir, ID field, const ch
     return tde;
 }
 
-static void ir_commit_i(FrtIndexReader *ir)
-{
+static void ir_commit_i(FrtIndexReader *ir) {
     if (ir->has_changes) {
         if (NULL == ir->deleter && NULL != ir->store) {
             /* In the MultiReader case, we share this deleter across all
@@ -3369,16 +2952,14 @@ static void ir_commit_i(FrtIndexReader *ir)
                 frt_close_lock(ir->write_lock);
                 ir->write_lock = NULL;
             }
-        }
-        else {
+        } else {
             ir->commit_i(ir);
         }
     }
     ir->has_changes = false;
 }
 
-void frt_ir_commit(FrtIndexReader *ir)
-{
+void frt_ir_commit(FrtIndexReader *ir) {
     pthread_mutex_lock(&ir->mutex);
     ir_commit_i(ir);
     pthread_mutex_unlock(&ir->mutex);
@@ -3411,15 +2992,13 @@ void frt_ir_close(FrtIndexReader *ir) {
 /**
  * Don't call this method if the cache already exists
  **/
-void frt_ir_add_cache(FrtIndexReader *ir)
-{
+void frt_ir_add_cache(FrtIndexReader *ir) {
     if (NULL == ir->cache) {
         ir->cache = frt_co_hash_create();
     }
 }
 
-bool frt_ir_is_latest(FrtIndexReader *ir)
-{
+bool frt_ir_is_latest(FrtIndexReader *ir) {
     return ir->is_latest_i(ir);
 }
 
@@ -3434,8 +3013,7 @@ typedef struct Norm {
     bool is_dirty : 1;
 } Norm;
 
-static Norm *norm_create(FrtInStream *is, int field_num)
-{
+static Norm *norm_create(FrtInStream *is, int field_num) {
     Norm *norm = FRT_ALLOC(Norm);
 
     norm->is = is;
@@ -3447,8 +3025,7 @@ static Norm *norm_create(FrtInStream *is, int field_num)
     return norm;
 }
 
-static void norm_destroy(Norm *norm)
-{
+static void norm_destroy(Norm *norm) {
     frt_is_close(norm->is);
     if (NULL != norm->bytes) {
         free(norm->bytes);
@@ -3457,8 +3034,7 @@ static void norm_destroy(Norm *norm)
 }
 
 static void norm_rewrite(Norm *norm, FrtStore *store, FrtDeleter *dlr,
-                         FrtSegmentInfo *si, int doc_count)
-{
+                         FrtSegmentInfo *si, int doc_count) {
     FrtOutStream *os;
     char norm_file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
     const int field_num = norm->field_num;
@@ -3468,7 +3044,7 @@ static void norm_rewrite(Norm *norm, FrtStore *store, FrtDeleter *dlr,
     }
     frt_si_advance_norm_gen(si, field_num);
     si_norm_file_name(si, norm_file_name, field_num);
-    os = store->new_output(store, norm_file_name);
+    os = store->new_output(store, segm_idx_name, norm_file_name);
     frt_os_write_bytes(os, norm->bytes, doc_count);
     frt_os_close(os);
     norm->is_dirty = false;
@@ -3492,8 +3068,7 @@ static FrtFieldsReader *sr_fr(FrtSegmentReader *sr) {
     return fr;
 }
 
-static bool sr_is_deleted_i(FrtSegmentReader *sr, int doc_num)
-{
+static bool sr_is_deleted_i(FrtSegmentReader *sr, int doc_num) {
     return (NULL != sr->deleted_docs && frt_bv_get(sr->deleted_docs, doc_num));
 }
 
@@ -3561,10 +3136,9 @@ static void sr_set_deleter_i(FrtIndexReader *ir, FrtDeleter *deleter) {
   ir->deleter = deleter;
 }
 
-static void bv_write(FrtBitVector *bv, FrtStore *store, char *name)
-{
+static void bv_write(FrtBitVector *bv, FrtStore *store, char *name) {
     int i;
-    FrtOutStream *os = store->new_output(store, name);
+    FrtOutStream *os = store->new_output(store, segm_idx_name, name);
     frt_os_write_vint(os, bv->size);
     for (i = ((bv->size-1) >> 5); i >= 0; i--) {
         frt_os_write_u32(os, bv->bits[i]);
@@ -3572,11 +3146,10 @@ static void bv_write(FrtBitVector *bv, FrtStore *store, char *name)
     frt_os_close(os);
 }
 
-static FrtBitVector *bv_read(FrtStore *store, char *name)
-{
+static FrtBitVector *bv_read(FrtStore *store, char *name) {
     int i;
     volatile bool success = false;
-    FrtInStream *volatile is = store->open_input(store, name);
+    FrtInStream *volatile is = store->open_input(store, segm_idx_name, name);
     FrtBitVector *volatile bv = FRT_ALLOC_AND_ZERO(FrtBitVector);
     bv->size = (int)frt_is_read_vint(is);
     bv->capa = (bv->size >> 5) + 1;
@@ -3595,13 +3168,11 @@ static FrtBitVector *bv_read(FrtStore *store, char *name)
     return bv;
 }
 
-static bool sr_is_latest_i(FrtIndexReader *ir)
-{
+static bool sr_is_latest_i(FrtIndexReader *ir) {
     return (frt_sis_read_current_version(ir->store) == ir->sis->version);
 }
 
-static void sr_commit_i(FrtIndexReader *ir)
-{
+static void sr_commit_i(FrtIndexReader *ir) {
     FrtSegmentInfo *si = SR(ir)->si;
     char *segment = SR(ir)->si->name;
     char tmp_file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
@@ -3614,8 +3185,7 @@ static void sr_commit_i(FrtIndexReader *ir)
         if (SR(ir)->undelete_all) {
             si->del_gen = -1;
             SR(ir)->undelete_all = false;
-        }
-        else {
+        } else {
             /* (SR(ir)->deleted_docs_dirty) re-write deleted */
             si->del_gen++;
             frt_fn_for_generation(tmp_file_name, segment, "del", si->del_gen);
@@ -3658,8 +3228,7 @@ static void sr_close_i(FrtIndexReader *ir) {
     }
 }
 
-static int sr_num_docs(FrtIndexReader *ir)
-{
+static int sr_num_docs(FrtIndexReader *ir) {
     int num_docs;
 
     pthread_mutex_lock(&ir->mutex);
@@ -3671,13 +3240,11 @@ static int sr_num_docs(FrtIndexReader *ir)
     return num_docs;
 }
 
-static int sr_max_doc(FrtIndexReader *ir)
-{
+static int sr_max_doc_num(FrtIndexReader *ir) {
     return SR(ir)->fr->size;
 }
 
-static FrtDocument *sr_get_doc(FrtIndexReader *ir, int doc_num)
-{
+static FrtDocument *sr_get_doc(FrtIndexReader *ir, int doc_num) {
     FrtDocument *doc;
     pthread_mutex_lock(&ir->mutex);
     if (sr_is_deleted_i(SR(ir), doc_num)) {
@@ -3689,8 +3256,7 @@ static FrtDocument *sr_get_doc(FrtIndexReader *ir, int doc_num)
     return doc;
 }
 
-static FrtLazyDoc *sr_get_lazy_doc(FrtIndexReader *ir, int doc_num)
-{
+static FrtLazyDoc *sr_get_lazy_doc(FrtIndexReader *ir, int doc_num) {
     FrtLazyDoc *lazy_doc;
     pthread_mutex_lock(&ir->mutex);
     if (sr_is_deleted_i(SR(ir), doc_num)) {
@@ -3702,8 +3268,7 @@ static FrtLazyDoc *sr_get_lazy_doc(FrtIndexReader *ir, int doc_num)
     return lazy_doc;
 }
 
-static frt_uchar *sr_get_norms(FrtIndexReader *ir, int field_num)
-{
+static frt_uchar *sr_get_norms(FrtIndexReader *ir, int field_num) {
     frt_uchar *norms;
     pthread_mutex_lock(&ir->mutex);
     norms = sr_get_norms_i(SR(ir), field_num);
@@ -3712,23 +3277,20 @@ static frt_uchar *sr_get_norms(FrtIndexReader *ir, int field_num)
 }
 
 static frt_uchar *sr_get_norms_into(FrtIndexReader *ir, int field_num,
-                              frt_uchar *buf)
-{
+                              frt_uchar *buf) {
     pthread_mutex_lock(&ir->mutex);
     sr_get_norms_into_i(SR(ir), field_num, buf);
     pthread_mutex_unlock(&ir->mutex);
     return buf;
 }
 
-static FrtTermEnum *sr_terms(FrtIndexReader *ir, int field_num)
-{
+static FrtTermEnum *sr_terms(FrtIndexReader *ir, int field_num) {
     FrtTermEnum *te = SR(ir)->tir->orig_te;
     te = frt_ste_clone(te);
     return ste_set_field(te, field_num);
 }
 
-static FrtTermEnum *sr_terms_from(FrtIndexReader *ir, int field_num, const char *term)
-{
+static FrtTermEnum *sr_terms_from(FrtIndexReader *ir, int field_num, const char *term) {
     FrtTermEnum *te = SR(ir)->tir->orig_te;
     te = frt_ste_clone(te);
     ste_set_field(te, field_num);
@@ -3736,20 +3298,17 @@ static FrtTermEnum *sr_terms_from(FrtIndexReader *ir, int field_num, const char
     return te;
 }
 
-static int sr_doc_freq(FrtIndexReader *ir, int field_num, const char *term)
-{
+static int sr_doc_freq(FrtIndexReader *ir, int field_num, const char *term) {
     FrtTermInfo *ti = frt_tir_get_ti(frt_tir_set_field(SR(ir)->tir, field_num), term);
     return ti ? ti->doc_freq : 0;
 }
 
-static FrtTermDocEnum *sr_term_docs(FrtIndexReader *ir)
-{
+static FrtTermDocEnum *sr_term_docs(FrtIndexReader *ir) {
     return frt_stde_new(SR(ir)->tir, SR(ir)->frq_in, SR(ir)->deleted_docs,
                     STE(SR(ir)->tir->orig_te)->skip_interval);
 }
 
-static FrtTermDocEnum *sr_term_positions(FrtIndexReader *ir)
-{
+static FrtTermDocEnum *sr_term_positions(FrtIndexReader *ir) {
     FrtSegmentReader *sr = SR(ir);
     return frt_stpe_new(sr->tir, sr->frq_in, sr->prx_in, sr->deleted_docs,
                     STE(sr->tir->orig_te)->skip_interval);
@@ -3766,8 +3325,7 @@ static FrtTermVector *sr_term_vector(FrtIndexReader *ir, int doc_num, ID field)
     return frt_fr_get_field_tv(fr, doc_num, fi->number);
 }
 
-static FrtHash *sr_term_vectors(FrtIndexReader *ir, int doc_num)
-{
+static FrtHash *sr_term_vectors(FrtIndexReader *ir, int doc_num) {
     FrtFieldsReader *fr;
     if (!SR(ir)->fr || NULL == (fr = sr_fr(SR(ir)))) {
         return NULL;
@@ -3776,8 +3334,7 @@ static FrtHash *sr_term_vectors(FrtIndexReader *ir, int doc_num)
     return frt_fr_get_tv(fr, doc_num);
 }
 
-static bool sr_is_deleted(FrtIndexReader *ir, int doc_num)
-{
+static bool sr_is_deleted(FrtIndexReader *ir, int doc_num) {
     bool is_del;
 
     pthread_mutex_lock(&ir->mutex);
@@ -3787,13 +3344,11 @@ static bool sr_is_deleted(FrtIndexReader *ir, int doc_num)
     return is_del;
 }
 
-static bool sr_has_deletions(FrtIndexReader *ir)
-{
+static bool sr_has_deletions(FrtIndexReader *ir) {
     return NULL != SR(ir)->deleted_docs;
 }
 
-static void sr_open_norms(FrtIndexReader *ir, FrtStore *cfs_store)
-{
+static void sr_open_norms(FrtIndexReader *ir, FrtStore *cfs_store) {
     int i;
     FrtSegmentInfo *si = SR(ir)->si;
     char file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
@@ -3801,7 +3356,7 @@ static void sr_open_norms(FrtIndexReader *ir, FrtStore *cfs_store)
     for (i = si->norm_gens_size - 1; i >= 0; i--) {
         FrtStore *store = ir->store;
         if (si_norm_file_name(si, file_name, i)) {
-            FrtInStream *is = store->open_input(store, file_name);
+            FrtInStream *is = store->open_input(store, segm_idx_name, file_name);
             FRT_DEREF(is);
             frt_h_set_int(SR(ir)->norms, i, norm_create(is, i));
         }
@@ -3809,15 +3364,14 @@ static void sr_open_norms(FrtIndexReader *ir, FrtStore *cfs_store)
     SR(ir)->norms_dirty = false;
 }
 
-static FrtIndexReader *sr_setup_i(FrtSegmentReader *sr)
-{
+static FrtIndexReader *sr_setup_i(FrtSegmentReader *sr) {
     FrtStore *volatile store = sr->si->store;
     FrtIndexReader *ir = IR(sr);
     char file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
     char *sr_segment = sr->si->name;
 
     ir->num_docs            = &sr_num_docs;
-    ir->max_doc             = &sr_max_doc;
+    ir->max_doc_num         = &sr_max_doc_num;
     ir->get_doc             = &sr_get_doc;
     ir->get_lazy_doc        = &sr_get_lazy_doc;
     ir->get_norms           = &sr_get_norms;
@@ -3859,12 +3413,12 @@ static FrtIndexReader *sr_setup_i(FrtSegmentReader *sr)
         }
 
         sprintf(file_name, "%s.frq", sr_segment);
-        sr->frq_in = store->open_input(store, file_name);
+        sr->frq_in = store->open_input(store, segm_idx_name, file_name);
         sprintf(file_name, "%s.prx", sr_segment);
-        sr->prx_in = store->open_input(store, file_name);
+        sr->prx_in = store->open_input(store, segm_idx_name, file_name);
         sr->norms = frt_h_new_int((frt_free_ft)&norm_destroy);
         sr_open_norms(ir, store);
-        if (fis_has_vectors(ir->fis)) {
+        if (frt_fis_has_vectors(ir->fis)) {
             frb_thread_key_create(&sr->thread_fr, NULL);
             sr->fr_bucket = frt_ary_new();
         }
@@ -3894,8 +3448,7 @@ static FrtIndexReader *sr_open(FrtSegmentInfos *sis, FrtFieldInfos *fis, int si_
 
 #define MR(ir) ((FrtMultiReader *)(ir))
 
-static int mr_reader_index_i(FrtMultiReader *mr, int doc_num)
-{
+static int mr_reader_index_i(FrtMultiReader *mr, int doc_num) {
     int lo = 0;                       /* search @starts array */
     int hi = mr->r_cnt - 1;            /* for first element less */
     int mid;
@@ -3906,11 +3459,9 @@ static int mr_reader_index_i(FrtMultiReader *mr, int doc_num)
         mid_value = mr->starts[mid];
         if (doc_num < mid_value) {
             hi = mid - 1;
-        }
-        else if (doc_num > mid_value) {
+        } else if (doc_num > mid_value) {
             lo = mid + 1;
-        }
-        else { /* found a match */
+        } else { /* found a match */
             while ((mid+1 < mr->r_cnt) && (mr->starts[mid+1] == mid_value)) {
                 mid += 1; /* scan to last match in case we have empty segments */
             }
@@ -3920,8 +3471,7 @@ static int mr_reader_index_i(FrtMultiReader *mr, int doc_num)
     return hi;
 }
 
-static int mr_num_docs(FrtIndexReader *ir)
-{
+static int mr_num_docs(FrtIndexReader *ir) {
     int i, num_docs;
     pthread_mutex_lock(&ir->mutex);
     if (MR(ir)->num_docs_cache == -1) {
@@ -3938,39 +3488,33 @@ static int mr_num_docs(FrtIndexReader *ir)
     return num_docs;
 }
 
-static int mr_max_doc(FrtIndexReader *ir)
-{
-    return MR(ir)->max_doc;
+static int mr_max_doc_num(FrtIndexReader *ir) {
+    return MR(ir)->max_doc_num;
 }
 
 #define GET_READER()\
     int i = mr_reader_index_i(MR(ir), doc_num);\
     FrtIndexReader *reader = MR(ir)->sub_readers[i]
 
-static FrtDocument *mr_get_doc(FrtIndexReader *ir, int doc_num)
-{
+static FrtDocument *mr_get_doc(FrtIndexReader *ir, int doc_num) {
     GET_READER();
     return reader->get_doc(reader, doc_num - MR(ir)->starts[i]);
 }
 
-static FrtLazyDoc *mr_get_lazy_doc(FrtIndexReader *ir, int doc_num)
-{
+static FrtLazyDoc *mr_get_lazy_doc(FrtIndexReader *ir, int doc_num) {
     GET_READER();
     return reader->get_lazy_doc(reader, doc_num - MR(ir)->starts[i]);
 }
 
-int frt_mr_get_field_num(FrtMultiReader *mr, int ir_num, int f_num)
-{
+int frt_mr_get_field_num(FrtMultiReader *mr, int ir_num, int f_num) {
     if (mr->field_num_map) {
         return mr->field_num_map[ir_num][f_num];
-    }
-    else {
+    } else {
         return f_num;
     }
 }
 
-static frt_uchar *mr_get_norms(FrtIndexReader *ir, int field_num)
-{
+static frt_uchar *mr_get_norms(FrtIndexReader *ir, int field_num) {
     frt_uchar *bytes;
 
     pthread_mutex_lock(&ir->mutex);
@@ -3979,7 +3523,7 @@ static frt_uchar *mr_get_norms(FrtIndexReader *ir, int field_num)
         int i;
         const int mr_reader_cnt = MR(ir)->r_cnt;
 
-        bytes = FRT_ALLOC_AND_ZERO_N(frt_uchar, MR(ir)->max_doc);
+        bytes = FRT_ALLOC_AND_ZERO_N(frt_uchar, MR(ir)->max_doc_num);
 
         for (i = 0; i < mr_reader_cnt; i++) {
             int fnum = frt_mr_get_field_num(MR(ir), i, field_num);
@@ -3995,16 +3539,14 @@ static frt_uchar *mr_get_norms(FrtIndexReader *ir, int field_num)
     return bytes;
 }
 
-static frt_uchar *mr_get_norms_into(FrtIndexReader *ir, int field_num, frt_uchar *buf)
-{
+static frt_uchar *mr_get_norms_into(FrtIndexReader *ir, int field_num, frt_uchar *buf) {
     frt_uchar *bytes;
 
     pthread_mutex_lock(&ir->mutex);
     bytes = (frt_uchar *)frt_h_get_int(MR(ir)->norms_cache, field_num);
     if (NULL != bytes) {
-        memcpy(buf, bytes, MR(ir)->max_doc);
-    }
-    else {
+        memcpy(buf, bytes, MR(ir)->max_doc_num);
+    } else {
         int i;
         const int mr_reader_cnt = MR(ir)->r_cnt;
         for (i = 0; i < mr_reader_cnt; i++) {
@@ -4019,18 +3561,15 @@ static frt_uchar *mr_get_norms_into(FrtIndexReader *ir, int field_num, frt_uchar
     return buf;
 }
 
-static FrtTermEnum *mr_terms(FrtIndexReader *ir, int field_num)
-{
+static FrtTermEnum *mr_terms(FrtIndexReader *ir, int field_num) {
     return frt_mte_new(MR(ir), field_num, NULL);
 }
 
-static FrtTermEnum *mr_terms_from(FrtIndexReader *ir, int field_num, const char *term)
-{
+static FrtTermEnum *mr_terms_from(FrtIndexReader *ir, int field_num, const char *term) {
     return frt_mte_new(MR(ir), field_num, term);
 }
 
-static int mr_doc_freq(FrtIndexReader *ir, int field_num, const char *t)
-{
+static int mr_doc_freq(FrtIndexReader *ir, int field_num, const char *t) {
     int total = 0;          /* sum freqs in segments */
     int i = MR(ir)->r_cnt;
     for (i = MR(ir)->r_cnt - 1; i >= 0; i--) {
@@ -4043,13 +3582,11 @@ static int mr_doc_freq(FrtIndexReader *ir, int field_num, const char *t)
     return total;
 }
 
-static FrtTermDocEnum *mr_term_docs(FrtIndexReader *ir)
-{
+static FrtTermDocEnum *mr_term_docs(FrtIndexReader *ir) {
     return mtde_new(MR(ir));
 }
 
-static FrtTermDocEnum *mr_term_positions(FrtIndexReader *ir)
-{
+static FrtTermDocEnum *mr_term_positions(FrtIndexReader *ir) {
     return mtpe_new(MR(ir));
 }
 
@@ -4058,25 +3595,21 @@ static FrtTermVector *mr_term_vector(FrtIndexReader *ir, int doc_num, ID field)
     return reader->term_vector(reader, doc_num - MR(ir)->starts[i], field);
 }
 
-static FrtHash *mr_term_vectors(FrtIndexReader *ir, int doc_num)
-{
+static FrtHash *mr_term_vectors(FrtIndexReader *ir, int doc_num) {
     GET_READER();
     return reader->term_vectors(reader, doc_num - MR(ir)->starts[i]);
 }
 
-static bool mr_is_deleted(FrtIndexReader *ir, int doc_num)
-{
+static bool mr_is_deleted(FrtIndexReader *ir, int doc_num) {
     GET_READER();
     return reader->is_deleted(reader, doc_num - MR(ir)->starts[i]);
 }
 
-static bool mr_has_deletions(FrtIndexReader *ir)
-{
+static bool mr_has_deletions(FrtIndexReader *ir) {
     return MR(ir)->has_deletions;
 }
 
-static void mr_set_norm_i(FrtIndexReader *ir, int doc_num, int field_num, frt_uchar val)
-{
+static void mr_set_norm_i(FrtIndexReader *ir, int doc_num, int field_num, frt_uchar val) {
     int i = mr_reader_index_i(MR(ir), doc_num);
     int fnum = frt_mr_get_field_num(MR(ir), i, field_num);
     if (fnum >= 0) {
@@ -4087,8 +3620,7 @@ static void mr_set_norm_i(FrtIndexReader *ir, int doc_num, int field_num, frt_uc
     }
 }
 
-static void mr_delete_doc_i(FrtIndexReader *ir, int doc_num)
-{
+static void mr_delete_doc_i(FrtIndexReader *ir, int doc_num) {
     GET_READER();
     MR(ir)->num_docs_cache = -1; /* invalidate cache */
 
@@ -4098,8 +3630,7 @@ static void mr_delete_doc_i(FrtIndexReader *ir, int doc_num)
     ir->has_changes = true;
 }
 
-static void mr_undelete_all_i(FrtIndexReader *ir)
-{
+static void mr_undelete_all_i(FrtIndexReader *ir) {
     int i;
     const int mr_reader_cnt = MR(ir)->r_cnt;
 
@@ -4112,8 +3643,7 @@ static void mr_undelete_all_i(FrtIndexReader *ir)
     ir->has_changes = true;
 }
 
-static void mr_set_deleter_i(FrtIndexReader *ir, FrtDeleter *deleter)
-{
+static void mr_set_deleter_i(FrtIndexReader *ir, FrtDeleter *deleter) {
     int i;
     ir->deleter = deleter;
     for (i = MR(ir)->r_cnt - 1; i >= 0; i--) {
@@ -4122,8 +3652,7 @@ static void mr_set_deleter_i(FrtIndexReader *ir, FrtDeleter *deleter)
     }
 }
 
-static bool mr_is_latest_i(FrtIndexReader *ir)
-{
+static bool mr_is_latest_i(FrtIndexReader *ir) {
     int i;
     const int mr_reader_cnt = MR(ir)->r_cnt;
     for (i = 0; i < mr_reader_cnt; i++) {
@@ -4134,8 +3663,7 @@ static bool mr_is_latest_i(FrtIndexReader *ir)
     return true;
 }
 
-static void mr_commit_i(FrtIndexReader *ir)
-{
+static void mr_commit_i(FrtIndexReader *ir) {
     int i;
     const int mr_reader_cnt = MR(ir)->r_cnt;
     for (i = 0; i < mr_reader_cnt; i++) {
@@ -4144,8 +3672,7 @@ static void mr_commit_i(FrtIndexReader *ir)
     }
 }
 
-static void mr_close_i(FrtIndexReader *ir)
-{
+static void mr_close_i(FrtIndexReader *ir) {
     int i;
     const int mr_reader_cnt = MR(ir)->r_cnt;
     for (i = 0; i < mr_reader_cnt; i++) {
@@ -4167,7 +3694,7 @@ FrtMultiReader *frt_mr_init(FrtMultiReader *mr, FrtIndexReader **sub_readers, co
 
     mr->sub_readers         = sub_readers;
     mr->r_cnt               = r_cnt;
-    mr->max_doc             = 0;
+    mr->max_doc_num         = 0;
     mr->num_docs_cache      = -1;
     mr->has_deletions       = false;
     mr->starts              = FRT_ALLOC_N(int, (r_cnt+1));
@@ -4175,18 +3702,18 @@ FrtMultiReader *frt_mr_init(FrtMultiReader *mr, FrtIndexReader **sub_readers, co
     for (i = 0; i < r_cnt; i++) {
         FrtIndexReader *sub_reader = sub_readers[i];
         FRT_REF(sub_reader);
-        mr->starts[i] = mr->max_doc;
-        mr->max_doc += sub_reader->max_doc(sub_reader); /* compute max_docs */
+        mr->starts[i] = mr->max_doc_num;
+        mr->max_doc_num += sub_reader->max_doc_num(sub_reader); /* compute max_docs */
 
         if (sub_reader->has_deletions(sub_reader)) {
             mr->has_deletions = true;
         }
     }
-    mr->starts[r_cnt]       = mr->max_doc;
+    mr->starts[r_cnt]       = mr->max_doc_num;
     mr->norms_cache         = frt_h_new_int(&free);
 
     ir->num_docs            = &mr_num_docs;
-    ir->max_doc             = &mr_max_doc;
+    ir->max_doc_num         = &mr_max_doc_num;
     ir->get_doc             = &mr_get_doc;
     ir->get_lazy_doc        = &mr_get_lazy_doc;
     ir->get_norms           = &mr_get_norms;
@@ -4351,8 +3878,7 @@ FrtIndexReader *frt_ir_open(FrtIndexReader *ir, FrtStore *store) {
  *
  ****************************************************************************/
 
-static FrtOccurence *occ_new(FrtMemoryPool *mp, int pos)
-{
+static FrtOccurence *occ_new(FrtMemoryPool *mp, int pos) {
     FrtOccurence *occ = FRT_MP_ALLOC(mp, FrtOccurence);
     occ->pos = pos;
     occ->next = NULL;
@@ -4365,8 +3891,7 @@ static FrtOccurence *occ_new(FrtMemoryPool *mp, int pos)
  *
  ****************************************************************************/
 
-FrtPosting *frt_p_new(FrtMemoryPool *mp, int doc_num, int pos)
-{
+FrtPosting *frt_p_new(FrtMemoryPool *mp, int doc_num, int pos) {
     FrtPosting *p = FRT_MP_ALLOC(mp, FrtPosting);
     p->doc_num = doc_num;
     p->first_occ = occ_new(mp, pos);
@@ -4382,8 +3907,7 @@ FrtPosting *frt_p_new(FrtMemoryPool *mp, int doc_num, int pos)
  ****************************************************************************/
 
 FrtPostingList *frt_pl_new(FrtMemoryPool *mp, const char *term,
-                           int term_len, FrtPosting *p)
-{
+                           int term_len, FrtPosting *p) {
     // TODO account for term_len as measured in the original text vs utf8 term_len of term
     FrtPostingList *pl = FRT_MP_ALLOC(mp, FrtPostingList);
     pl->term = (char *)frt_mp_memdup(mp, term, term_len + 1);
@@ -4393,20 +3917,17 @@ FrtPostingList *frt_pl_new(FrtMemoryPool *mp, const char *term,
     return pl;
 }
 
-void frt_pl_add_occ(FrtMemoryPool *mp, FrtPostingList *pl, int pos)
-{
+void frt_pl_add_occ(FrtMemoryPool *mp, FrtPostingList *pl, int pos) {
     pl->last_occ = pl->last_occ->next = occ_new(mp, pos);
     pl->last->freq++;
 }
 
-static void pl_add_posting(FrtPostingList *pl, FrtPosting *p)
-{
+static void pl_add_posting(FrtPostingList *pl, FrtPosting *p) {
     pl->last = pl->last->next = p;
     pl->last_occ = p->first_occ;
 }
 
-int frt_pl_cmp(const FrtPostingList **pl1, const FrtPostingList **pl2)
-{
+int frt_pl_cmp(const FrtPostingList **pl1, const FrtPostingList **pl2) {
     return strcmp((*pl1)->term, (*pl2)->term);
 }
 
@@ -4416,8 +3937,7 @@ int frt_pl_cmp(const FrtPostingList **pl1, const FrtPostingList **pl2)
  *
  ****************************************************************************/
 
-static FrtFieldInverter *fld_inv_new(FrtDocWriter *dw, FrtFieldInfo *fi)
-{
+static FrtFieldInverter *fld_inv_new(FrtDocWriter *dw, FrtFieldInfo *fi) {
     FrtFieldInverter *fld_inv = FRT_MP_ALLOC(dw->mp, FrtFieldInverter);
     fld_inv->is_tokenized = bits_is_tokenized(fi->bits);
     fld_inv->store_term_vector = bits_store_term_vector(fi->bits);
@@ -4434,8 +3954,7 @@ static FrtFieldInverter *fld_inv_new(FrtDocWriter *dw, FrtFieldInfo *fi)
     return fld_inv;
 }
 
-static void fld_inv_destroy(FrtFieldInverter *fld_inv)
-{
+static void fld_inv_destroy(FrtFieldInverter *fld_inv) {
     frt_h_destroy(fld_inv->plists);
 }
 
@@ -4445,26 +3964,23 @@ static void fld_inv_destroy(FrtFieldInverter *fld_inv)
  *
  ****************************************************************************/
 
-typedef struct SkipBuffer
-{
+typedef struct SkipBuffer {
     FrtOutStream *buf;
     FrtOutStream *frq_out;
     FrtOutStream *prx_out;
-    int last_doc;
-    frt_off_t last_frq_ptr;
-    frt_off_t last_prx_ptr;
+    int          last_doc_num;
+    frt_off_t    last_frq_ptr;
+    frt_off_t    last_prx_ptr;
 } SkipBuffer;
 
-static void skip_buf_reset(SkipBuffer *skip_buf)
-{
+static void skip_buf_reset(SkipBuffer *skip_buf) {
     frt_ramo_reset(skip_buf->buf);
-    skip_buf->last_doc = 0;
+    skip_buf->last_doc_num = 0;
     skip_buf->last_frq_ptr = frt_os_pos(skip_buf->frq_out);
     skip_buf->last_prx_ptr = frt_os_pos(skip_buf->prx_out);
 }
 
-static SkipBuffer *skip_buf_new(FrtOutStream *frq_out, FrtOutStream *prx_out)
-{
+static SkipBuffer *skip_buf_new(FrtOutStream *frq_out, FrtOutStream *prx_out) {
     SkipBuffer *skip_buf = FRT_ALLOC(SkipBuffer);
     skip_buf->buf = frt_ram_new_buffer();
     skip_buf->frq_out = frq_out;
@@ -4472,29 +3988,26 @@ static SkipBuffer *skip_buf_new(FrtOutStream *frq_out, FrtOutStream *prx_out)
     return skip_buf;
 }
 
-static void skip_buf_add(SkipBuffer *skip_buf, int doc)
-{
+static void skip_buf_add(SkipBuffer *skip_buf, int doc_num) {
     frt_off_t frq_ptr = frt_os_pos(skip_buf->frq_out);
     frt_off_t prx_ptr = frt_os_pos(skip_buf->prx_out);
 
-    frt_os_write_vint(skip_buf->buf, doc - skip_buf->last_doc);
+    frt_os_write_vint(skip_buf->buf, doc_num - skip_buf->last_doc_num);
     frt_os_write_vint(skip_buf->buf, frq_ptr - skip_buf->last_frq_ptr);
     frt_os_write_vint(skip_buf->buf, prx_ptr - skip_buf->last_prx_ptr);
 
-    skip_buf->last_doc = doc;
+    skip_buf->last_doc_num = doc_num;
     skip_buf->last_frq_ptr = frq_ptr;
     skip_buf->last_prx_ptr = prx_ptr;
 }
 
-static frt_off_t skip_buf_write(SkipBuffer *skip_buf)
-{
+static frt_off_t skip_buf_write(SkipBuffer *skip_buf) {
   frt_off_t skip_ptr = frt_os_pos(skip_buf->frq_out);
   frt_ramo_write_to(skip_buf->buf, skip_buf->frq_out);
   return skip_ptr;
 }
 
-static void skip_buf_destroy(SkipBuffer *skip_buf)
-{
+static void skip_buf_destroy(SkipBuffer *skip_buf) {
     frt_ram_destroy_buffer(skip_buf->buf);
     free(skip_buf);
 }
@@ -4505,21 +4018,19 @@ static void skip_buf_destroy(SkipBuffer *skip_buf)
  *
  ****************************************************************************/
 
-static void dw_write_norms(FrtDocWriter *dw, FrtFieldInverter *fld_inv)
-{
+static void dw_write_norms(FrtDocWriter *dw, FrtFieldInverter *fld_inv) {
     char file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
     FrtOutStream *norms_out;
     frt_si_advance_norm_gen(dw->si, fld_inv->fi->number);
     si_norm_file_name(dw->si, file_name, fld_inv->fi->number);
-    norms_out = dw->store->new_output(dw->store, file_name);
+    norms_out = dw->store->new_output(dw->store, segm_idx_name, file_name);
     frt_os_write_bytes(norms_out, fld_inv->norms, dw->doc_num);
     frt_os_close(norms_out);
 }
 
 /* we'll use the postings Hash's table area to sort the postings as it is
  * going to be zeroset soon anyway */
-static FrtPostingList **dw_sort_postings(FrtHash *plists_ht)
-{
+static FrtPostingList **dw_sort_postings(FrtHash *plists_ht) {
     int i, j;
     FrtHashEntry *he;
     FrtPostingList **plists = (FrtPostingList **)plists_ht->table;
@@ -4537,8 +4048,7 @@ static FrtPostingList **dw_sort_postings(FrtHash *plists_ht)
     return plists;
 }
 
-static void dw_flush_streams(FrtDocWriter *dw)
-{
+static void dw_flush_streams(FrtDocWriter *dw) {
     frt_mp_reset(dw->mp);
     frt_fw_close(dw->fw);
     dw->fw = NULL;
@@ -4546,9 +4056,8 @@ static void dw_flush_streams(FrtDocWriter *dw)
     dw->doc_num = 0;
 }
 
-static void dw_flush(FrtDocWriter *dw)
-{
-    int i, j, last_doc, doc_code, doc_freq, last_pos, posting_count;
+static void dw_flush(FrtDocWriter *dw) {
+    int i, j, last_doc, doc_num, doc_freq, last_pos, posting_count;
     int skip_interval = dw->skip_interval;
     FrtFieldInfos *fis = dw->fis;
     const int fields_count = fis->size;
@@ -4565,9 +4074,9 @@ static void dw_flush(FrtDocWriter *dw)
     SkipBuffer *skip_buf;
 
     sprintf(file_name, "%s.frq", dw->si->name);
-    frq_out = store->new_output(store, file_name);
+    frq_out = store->new_output(store, segm_idx_name, file_name);
     sprintf(file_name, "%s.prx", dw->si->name);
-    prx_out = store->new_output(store, file_name);
+    prx_out = store->new_output(store, segm_idx_name, file_name);
     skip_buf = skip_buf_new(frq_out, prx_out);
 
     for (i = 0; i < fields_count; i++) {
@@ -4596,16 +4105,11 @@ static void dw_flush(FrtDocWriter *dw)
                     skip_buf_add(skip_buf, last_doc);
                 }
 
-                doc_code = (p->doc_num - last_doc) << 1;
+                doc_num = (p->doc_num - last_doc);
                 last_doc = p->doc_num;
 
-                if (p->freq == 1) {
-                    frt_os_write_vint(frq_out, 1|doc_code);
-                }
-                else {
-                    frt_os_write_vint(frq_out, doc_code);
-                    frt_os_write_vint(frq_out, p->freq);
-                }
+                frt_os_write_vint(frq_out, doc_num);
+                frt_os_write_vint(frq_out, p->freq);
 
                 last_pos = 0;
                 for (occ = p->first_occ; NULL != occ; occ = occ->next) {
@@ -4625,8 +4129,7 @@ static void dw_flush(FrtDocWriter *dw)
     dw_flush_streams(dw);
 }
 
-FrtDocWriter *frt_dw_open(FrtIndexWriter *iw, FrtSegmentInfo *si)
-{
+FrtDocWriter *frt_dw_open(FrtIndexWriter *iw, FrtSegmentInfo *si) {
     FrtStore *store = iw->store;
     FrtMemoryPool *mp = frt_mp_new_capa(iw->config.chunk_size,
         iw->config.max_buffer_memory/iw->config.chunk_size);
@@ -4658,14 +4161,12 @@ FrtDocWriter *frt_dw_open(FrtIndexWriter *iw, FrtSegmentInfo *si)
     return dw;
 }
 
-void frt_dw_new_segment(FrtDocWriter *dw, FrtSegmentInfo *si)
-{
+void frt_dw_new_segment(FrtDocWriter *dw, FrtSegmentInfo *si) {
     dw->fw = frt_fw_open(dw->store, si->name, dw->fis);
     dw->si = si;
 }
 
-void frt_dw_close(FrtDocWriter *dw)
-{
+void frt_dw_close(FrtDocWriter *dw) {
     if (dw->doc_num) {
         dw_flush(dw);
     }
@@ -4680,8 +4181,7 @@ void frt_dw_close(FrtDocWriter *dw)
     free(dw);
 }
 
-FrtFieldInverter *frt_dw_get_fld_inv(FrtDocWriter *dw, FrtFieldInfo *fi)
-{
+FrtFieldInverter *frt_dw_get_fld_inv(FrtDocWriter *dw, FrtFieldInfo *fi) {
     FrtFieldInverter *fld_inv = (FrtFieldInverter*)frt_h_get_int(dw->fields, fi->number);
 
     if (!fld_inv) {
@@ -4697,8 +4197,7 @@ static void dw_add_posting(FrtMemoryPool *mp,
                            int doc_num,
                            const char *text,
                            int len,
-                           int pos)
-{
+                           int pos) {
     FrtHashEntry *pl_he;
     if (frt_h_set_ext(curr_plists, text, &pl_he)) {
         FrtPosting *p =  frt_p_new(mp, doc_num, pos);
@@ -4708,21 +4207,18 @@ static void dw_add_posting(FrtMemoryPool *mp,
         if (frt_h_set_ext(fld_plists, text, &fld_pl_he)) {
             fld_pl_he->value = pl = frt_pl_new(mp, text, len, p);
             pl_he->key = fld_pl_he->key = (char *)pl->term;
-        }
-        else {
+        } else {
             pl = (FrtPostingList *)fld_pl_he->value;
             pl_add_posting(pl, p);
             pl_he->key = (char *)pl->term;
         }
         pl_he->value = pl;
-    }
-    else {
+    } else {
         frt_pl_add_occ(mp, (FrtPostingList *)pl_he->value, pos);
     }
 }
 
-static void dw_add_offsets(FrtDocWriter *dw, int pos, frt_off_t start, frt_off_t end)
-{
+static void dw_add_offsets(FrtDocWriter *dw, int pos, frt_off_t start, frt_off_t end) {
     if (pos >= dw->offsets_capa) {
         int old_capa = dw->offsets_capa;
         while (pos >= dw->offsets_capa) {
@@ -4786,7 +4282,7 @@ FrtHash *frt_dw_invert_field(FrtDocWriter *dw, FrtFieldInverter *fld_inv, FrtDoc
         buf[FRT_MAX_WORD_SIZE - 1] = '\0';
         for (i = 0; i < df_size; i++) {
             int len = df->lengths[i];
-            char *data_ptr = df->data[i];
+            const char *data_ptr = df->data[i];
             if (len >= FRT_MAX_WORD_SIZE) {
                 char *head_last = rb_enc_left_char_head(data_ptr, data_ptr + FRT_MAX_WORD_SIZE - 1, data_ptr + len, df->encodings[i]);
                 len = head_last - data_ptr;
@@ -4828,7 +4324,7 @@ void frt_dw_add_doc(FrtDocWriter *dw, FrtDocument *doc) {
     FrtFieldInverter *fld_inv;
     FrtHash *postings;
     FrtFieldInfo *fi;
-    const int doc_size = doc->size;
+    const int doc_size = doc->field_count;
 
     /* frt_fw_add_doc will add new fields as necessary */
     frt_fw_add_doc(dw->fw, doc);
@@ -4867,23 +4363,21 @@ void frt_dw_add_doc(FrtDocWriter *dw, FrtDocument *doc) {
  ****************************************************************************/
 
 /* prepare an index ready for writing */
-void frt_index_create(FrtStore *store, FrtFieldInfos *fis)
-{
+void frt_index_create(FrtStore *store, FrtFieldInfos *fis) {
     FrtSegmentInfos *sis = frt_sis_new(fis);
-    store->clear_all(store);
+    store->clear_all(store, segm_idx_name);
     frt_sis_write(sis, store, NULL);
     frt_sis_destroy(sis);
 }
 
 bool frt_index_is_locked(FrtStore *store) {
-    FrtLock *write_lock = frt_open_lock(store, FRT_WRITE_LOCK_NAME);
+    FrtLock *write_lock = frt_open_lock(store, segm_idx_name, FRT_WRITE_LOCK_NAME);
     bool is_locked = write_lock->is_locked(write_lock);
     frt_close_lock(write_lock);
     return is_locked;
 }
 
-int frt_iw_doc_count(FrtIndexWriter *iw)
-{
+int frt_iw_doc_count(FrtIndexWriter *iw) {
     int i, doc_cnt = 0;
     pthread_mutex_lock(&iw->mutex);
     for (i = iw->sis->size - 1; i >= 0; i--) {
@@ -4909,13 +4403,11 @@ static void iw_flush_ram_segment(FrtIndexWriter *iw) {
     pthread_mutex_unlock(&iw->store->mutex);
 }
 
-void frt_iw_add_doc(FrtIndexWriter *iw, FrtDocument *doc)
-{
+void frt_iw_add_doc(FrtIndexWriter *iw, FrtDocument *doc) {
     pthread_mutex_lock(&iw->mutex);
     if (NULL == iw->dw) {
         iw->dw = frt_dw_open(iw, frt_sis_new_segment(iw->sis, 0, iw->store));
-    }
-    else if (NULL == iw->dw->fw) {
+    } else if (NULL == iw->dw->fw) {
         frt_dw_new_segment(iw->dw, frt_sis_new_segment(iw->sis, 0, iw->store));
     }
     frt_dw_add_doc(iw->dw, doc);
@@ -4926,15 +4418,13 @@ void frt_iw_add_doc(FrtIndexWriter *iw, FrtDocument *doc)
     pthread_mutex_unlock(&iw->mutex);
 }
 
-static void iw_commit_i(FrtIndexWriter *iw)
-{
+static void iw_commit_i(FrtIndexWriter *iw) {
     if (iw->dw && iw->dw->doc_num > 0) {
         iw_flush_ram_segment(iw);
     }
 }
 
-void frt_iw_commit(FrtIndexWriter *iw)
-{
+void frt_iw_commit(FrtIndexWriter *iw) {
     pthread_mutex_lock(&iw->mutex);
     iw_commit_i(iw);
     pthread_mutex_unlock(&iw->mutex);
@@ -5010,8 +4500,7 @@ void frt_iw_delete_terms(FrtIndexWriter *iw, ID field, char **terms, const int t
     }
 }
 
-void frt_iw_close(FrtIndexWriter *iw)
-{
+void frt_iw_close(FrtIndexWriter *iw) {
     pthread_mutex_lock(&iw->mutex);
     iw_commit_i(iw);
     if (iw->dw) {
@@ -5047,7 +4536,7 @@ FrtIndexWriter *frt_iw_open(FrtIndexWriter *iw, FrtStore *store, FrtAnalyzer *vo
     iw->config = *config;
 
     FRT_TRY
-        iw->write_lock = frt_open_lock(store, FRT_WRITE_LOCK_NAME);
+        iw->write_lock = frt_open_lock(store, segm_idx_name, FRT_WRITE_LOCK_NAME);
         if (!iw->write_lock->obtain(iw->write_lock)) {
             FRT_RAISE(FRT_LOCK_ERROR, "Couldn't obtain write lock when opening IndexWriter");
         }
@@ -5089,21 +4578,21 @@ static void iw_cp_fields(FrtIndexWriter *iw, FrtSegmentReader *sr, const char *s
     char *sr_segment = sr->si->name;
 
     sprintf(file_name, "%s.fdt", segment);
-    fdt_out = store_out->new_output(store_out, file_name);
+    fdt_out = store_out->new_output(store_out, segm_idx_name, file_name);
     sprintf(file_name, "%s.fdx", segment);
-    fdx_out = store_out->new_output(store_out, file_name);
+    fdx_out = store_out->new_output(store_out, segm_idx_name, file_name);
 
     sprintf(file_name, "%s.fdt", sr_segment);
-    fdt_in = store_in->open_input(store_in, file_name);
+    fdt_in = store_in->open_input(store_in, segm_idx_name, file_name);
     sprintf(file_name, "%s.fdx", sr_segment);
-    fdx_in = store_in->open_input(store_in, file_name);
+    fdx_in = store_in->open_input(store_in, segm_idx_name, file_name);
 
     sprintf(file_name, "%s.del", sr_segment);
-    if (store_in->exists(store_in, file_name)) {
+    if (store_in->exists(store_in, segm_idx_name, file_name)) {
         FrtOutStream *del_out;
-        FrtInStream *del_in = store_in->open_input(store_in, file_name);
+        FrtInStream *del_in = store_in->open_input(store_in, segm_idx_name, file_name);
         sprintf(file_name, "%s.del", segment);
-        del_out = store_out->new_output(store_out, file_name);
+        del_out = store_out->new_output(store_out, segm_idx_name, file_name);
         frt_is2os_copy_bytes(del_in, del_out, frt_is_length(del_in));
         frt_os_close(del_out);
         frt_is_close(del_in);
@@ -5111,8 +4600,8 @@ static void iw_cp_fields(FrtIndexWriter *iw, FrtSegmentReader *sr, const char *s
 
     if (map) {
         int i;
-        const int max_doc = sr_max_doc(IR(sr));
-        for (i = 0; i < max_doc; i++) {
+        const int max_doc_num = sr_max_doc_num(IR(sr));
+        for (i = 0; i < max_doc_num; i++) {
             int j, data_len = 0;
             const int field_cnt = frt_is_read_vint(fdt_in);
             int tv_cnt;
@@ -5170,8 +4659,7 @@ static void iw_cp_fields(FrtIndexWriter *iw, FrtSegmentReader *sr, const char *s
 }
 
 static void iw_cp_terms(FrtIndexWriter *iw, FrtSegmentReader *sr,
-                        const char *segment, int *map)
-{
+                        const char *segment, int *map) {
     char file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
     FrtOutStream *tix_out, *tis_out, *tfx_out, *frq_out, *prx_out;
     FrtInStream *tix_in, *tis_in, *tfx_in, *frq_in, *prx_in;
@@ -5180,29 +4668,29 @@ static void iw_cp_terms(FrtIndexWriter *iw, FrtSegmentReader *sr,
     char *sr_segment = sr->si->name;
 
     sprintf(file_name, "%s.tix", segment);
-    tix_out = store_out->new_output(store_out, file_name);
+    tix_out = store_out->new_output(store_out, segm_idx_name, file_name);
     sprintf(file_name, "%s.tix", sr_segment);
-    tix_in = store_in->open_input(store_in, file_name);
+    tix_in = store_in->open_input(store_in, segm_idx_name, file_name);
 
     sprintf(file_name, "%s.tis", segment);
-    tis_out = store_out->new_output(store_out, file_name);
+    tis_out = store_out->new_output(store_out, segm_idx_name, file_name);
     sprintf(file_name, "%s.tis", sr_segment);
-    tis_in = store_in->open_input(store_in, file_name);
+    tis_in = store_in->open_input(store_in, segm_idx_name, file_name);
 
     sprintf(file_name, "%s.tfx", segment);
-    tfx_out = store_out->new_output(store_out, file_name);
+    tfx_out = store_out->new_output(store_out, segm_idx_name, file_name);
     sprintf(file_name, "%s.tfx", sr_segment);
-    tfx_in = store_in->open_input(store_in, file_name);
+    tfx_in = store_in->open_input(store_in, segm_idx_name, file_name);
 
     sprintf(file_name, "%s.frq", segment);
-    frq_out = store_out->new_output(store_out, file_name);
+    frq_out = store_out->new_output(store_out, segm_idx_name, file_name);
     sprintf(file_name, "%s.frq", sr_segment);
-    frq_in = store_in->open_input(store_in, file_name);
+    frq_in = store_in->open_input(store_in, segm_idx_name, file_name);
 
     sprintf(file_name, "%s.prx", segment);
-    prx_out = store_out->new_output(store_out, file_name);
+    prx_out = store_out->new_output(store_out, segm_idx_name, file_name);
     sprintf(file_name, "%s.prx", sr_segment);
-    prx_in = store_in->open_input(store_in, file_name);
+    prx_in = store_in->open_input(store_in, segm_idx_name, file_name);
 
     if (map) {
         int field_cnt = frt_is_read_u32(tfx_in);
@@ -5217,8 +4705,7 @@ static void iw_cp_terms(FrtIndexWriter *iw, FrtSegmentReader *sr,
             frt_os_write_vint(tfx_out, frt_is_read_vint(tfx_in));     /* index size */
             frt_os_write_vint(tfx_out, frt_is_read_vint(tfx_in));     /* dict size */
         }
-    }
-    else {
+    } else {
         frt_is2os_copy_bytes(tfx_in, tfx_out, frt_is_length(tfx_in));
     }
     frt_is2os_copy_bytes(tix_in, tix_out, frt_is_length(tix_in));
@@ -5239,8 +4726,7 @@ static void iw_cp_terms(FrtIndexWriter *iw, FrtSegmentReader *sr,
 }
 
 static void iw_cp_norms(FrtIndexWriter *iw, FrtSegmentReader *sr,
-                        FrtSegmentInfo *si, int *map)
-{
+                        FrtSegmentInfo *si, int *map) {
     int i;
     FrtFieldInfos *fis = IR(sr)->fis;
     const int field_cnt = fis->size;
@@ -5256,10 +4742,10 @@ static void iw_cp_norms(FrtIndexWriter *iw, FrtSegmentReader *sr,
             FrtStore *store = IR(sr)->store;
             int field_num = map ? map[i] : i;
 
-            norms_in = store->open_input(store, file_name_in);
+            norms_in = store->open_input(store, segm_idx_name, file_name_in);
             frt_si_advance_norm_gen(si, field_num);
             si_norm_file_name(si, file_name_out, field_num);
-            norms_out = store_out->new_output(store_out, file_name_out);
+            norms_out = store_out->new_output(store_out, segm_idx_name, file_name_out);
             frt_is2os_copy_bytes(norms_in, norms_out, frt_is_length(norms_in));
             frt_os_close(norms_out);
             frt_is_close(norms_in);
@@ -5299,7 +4785,7 @@ static void iw_add_segment(FrtIndexWriter *iw, FrtSegmentReader *sr) {
     const int fis_size = sub_fis->size;
     bool must_map_fields = false;
 
-    si->doc_cnt = IR(sr)->max_doc(IR(sr));
+    si->doc_cnt = IR(sr)->max_doc_num(IR(sr));
     /* Merge FrtFieldInfos */
     for (j = 0; j < fis_size; j++) {
         FrtFieldInfo *fi = sub_fis->fields[j];