isomorfeus-ferret 0.13.8 → 0.13.11

data/ext/isomorfeus_ferret_ext/frt_index.c

@@ -116,7 +116,7 @@ char *frt_fn_for_generation(char *buf, const char *base, const char *ext, frt_i6
     } else {
         char b[FRT_SEGMENT_NAME_MAX_LENGTH];
         char *u = u64_to_str36(b, FRT_SEGMENT_NAME_MAX_LENGTH, (frt_u64)gen);
-        if (ext == NULL) {
+        if (ext == NULL || (strcmp(ext, "") == 0)) {
             sprintf(buf, "%s_%s", base, u);
         } else {
             sprintf(buf, "%s_%s.%s", base, u, ext);
@@ -303,6 +303,7 @@ FrtFieldInfo *frt_fi_init(FrtFieldInfo *fi, ID name, FrtStoreValue store, FrtCom
     fi_set_compression(fi, compression);
     fi_set_index(fi, index);
     fi_set_term_vector(fi, term_vector);
+    fi->number = 0;
     fi->ref_cnt = 1;
     fi->rfi = Qnil;
     return fi;
@@ -313,11 +314,8 @@ FrtFieldInfo *frt_fi_new(ID name, FrtStoreValue store, FrtCompressionType compre
     return frt_fi_init(fi, name, store, compression, index, term_vector);
 }
 
-void frt_fi_deref(FrtFieldInfo *fi)
-{
-    if (0 == --(fi->ref_cnt)) {
-        free(fi);
-    }
+void frt_fi_deref(FrtFieldInfo *fi) {
+    if (FRT_DEREF(fi) == 0) free(fi);
 }
 
 FrtCompressionType frt_fi_get_compression(FrtFieldInfo *fi) {
@@ -369,13 +367,13 @@ FrtFieldInfos *frt_fis_alloc(void) {
     return FRT_ALLOC(FrtFieldInfos);
 }
 
-FrtFieldInfos *frt_fis_init(FrtFieldInfos *fis, FrtStoreValue store, FrtCompressionType compression, FrtIndexValue index, FrtTermVectorValue term_vector) {
-    fi_check_params(store, compression, index, term_vector);
+FrtFieldInfos *frt_fis_init(FrtFieldInfos *fis, FrtStoreValue store_val, FrtCompressionType compression, FrtIndexValue index, FrtTermVectorValue term_vector) {
+    fi_check_params(store_val, compression, index, term_vector);
     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->store = store;
+    fis->store_val = store_val;
     fis->compression = compression;
     fis->index = index;
     fis->term_vector = term_vector;
@@ -397,6 +395,7 @@ FrtFieldInfo *frt_fis_add_field(FrtFieldInfos *fis, FrtFieldInfo *fi) {
     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++;
@@ -416,7 +415,7 @@ int frt_fis_get_field_num(FrtFieldInfos *fis, ID name) {
 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->store, fis->compression, fis->index, fis->term_vector);
+        fi = (FrtFieldInfo*)frt_fi_new(name, fis->store_val, fis->compression, fis->index, fis->term_vector);
         frt_fis_add_field(fis, fi);
     }
     return fi;
@@ -465,7 +464,7 @@ void frt_fis_write(FrtFieldInfos *fis, FrtOutStream *os)
     FrtFieldInfo *fi;
     const int fis_size = fis->size;
 
-    frt_os_write_vint(os, fis->store);
+    frt_os_write_vint(os, fis->store_val);
     frt_os_write_vint(os, fis->index);
     frt_os_write_vint(os, fis->term_vector);
     frt_os_write_vint(os, fis->size);
@@ -537,7 +536,7 @@ char *frt_fis_to_s(FrtFieldInfos *fis)
                   "  index: %s\n"
                   "  term_vector: %s\n"
                   "fields:\n",
-                  store_str[fis->store],
+                  store_str[fis->store_val],
                   index_str[fis->index],
                   term_vector_str[fis->term_vector]);
     for (i = 0; i < fis_size; i++) {
@@ -555,9 +554,8 @@ char *frt_fis_to_s(FrtFieldInfos *fis)
     return buf;
 }
 
-void frt_fis_deref(FrtFieldInfos *fis)
-{
-    if (0 == --(fis->ref_cnt)) {
+void frt_fis_deref(FrtFieldInfos *fis) {
+    if (FRT_DEREF(fis) == 0) {
         frt_h_destroy(fis->field_dict);
         free(fis->fields);
         free(fis);
@@ -589,6 +587,7 @@ FrtSegmentInfo *frt_si_new(char *name, int doc_cnt, FrtStore *store)
     si->name = name;
     si->doc_cnt = doc_cnt;
     si->store = store;
+    FRT_REF(store);
     si->del_gen = -1;
     si->norm_gens = NULL;
     si->norm_gens_size = 0;
@@ -602,6 +601,7 @@ static FrtSegmentInfo *si_read(FrtStore *store, FrtInStream *is)
     FrtSegmentInfo *volatile si = FRT_ALLOC_AND_ZERO(FrtSegmentInfo);
     FRT_TRY
         si->store = store;
+        FRT_REF(store);
         si->name = frt_is_read_string_safe(is);
         si->doc_cnt = frt_is_read_vint(is);
         si->del_gen = frt_is_read_vint(is);
@@ -616,6 +616,7 @@ static FrtSegmentInfo *si_read(FrtStore *store, FrtInStream *is)
         }
         si->use_compound_file = (bool)frt_is_read_byte(is);
     FRT_XCATCHALL
+        frt_store_close(si->store);
         free(si->name);
         free(si);
     FRT_XENDTRY
@@ -637,9 +638,9 @@ static void si_write(FrtSegmentInfo *si, FrtOutStream *os)
     frt_os_write_byte(os, (frt_uchar)si->use_compound_file);
 }
 
-void frt_si_deref(FrtSegmentInfo *si)
-{
-    if (--si->ref_cnt <= 0) {
+void frt_si_close(FrtSegmentInfo *si) {
+    if (FRT_DEREF(si) == 0) {
+        frt_store_close(si->store);
         free(si->name);
         free(si->norm_gens);
         free(si);
@@ -760,8 +761,7 @@ static void which_gen_i(const char *file_name, void *arg)
     }
 }
 
-static void si_put(FrtSegmentInfo *si, FILE *stream)
-{
+static void si_put(FrtSegmentInfo *si, FILE *stream) {
     int i;
     fprintf(stream, "\tSegmentInfo {\n");
     fprintf(stream, "\t\tname = %s\n", si->name);
@@ -777,8 +777,7 @@ static void si_put(FrtSegmentInfo *si, FILE *stream)
     fprintf(stream, "\t}\n");
 }
 
-void frt_sis_put(FrtSegmentInfos *sis, FILE *stream)
-{
+void frt_sis_put(FrtSegmentInfos *sis, FILE *stream) {
     int i;
     fprintf(stream, "SegmentInfos {\n");
     fprintf(stream, "\tcounter = %"POSH_I64_PRINTF_PREFIX"d\n", sis->counter);
@@ -860,7 +859,6 @@ static void sis_find_segments_file(FrtStore *store, FindSegmentsFile *fsf, void
         if (0 == method) {
             gen = frt_sis_current_segment_generation(store);
             if (gen == -1) {
-                // fprintf(stderr, ">>\n%s\n>>\n", frt_store_to_s(store));
                 FRT_RAISE(FRT_FILE_NOT_FOUND_ERROR, "couldn't find segments file");
             }
         }
@@ -946,32 +944,6 @@ static void sis_find_segments_file(FrtStore *store, FindSegmentsFile *fsf, void
             return;
         case FRT_IO_ERROR: case FRT_FILE_NOT_FOUND_ERROR: case FRT_EOF_ERROR:
             FRT_HANDLED();
-            /*
-            if (gen != frt_sis_current_segment_generation(store)) {
-                fprintf(stderr, "%lld != %lld\n",
-                        gen, frt_sis_current_segment_generation(store));
-                fprintf(stderr, "%s\n", xcontext.msg);
-            }
-            else {
-                char *sl = frt_store_to_s(store);
-                bool done = false;
-                fprintf(stderr, "%s\n>>>\n%s", xcontext.msg, sl);
-                free(sl);
-                while (!done) {
-                    FRT_TRY
-                        frt_sis_put(frt_sis_read(store), stderr);
-                        done = true;
-                    FRT_XCATCHALL
-                        FRT_HANDLED();
-                    FRT_XENDTRY
-                }
-            }
-
-            char *sl = frt_store_to_s(store);
-            fprintf(stderr, "%s\n>>>\n%s", xcontext.msg, sl);
-            free(sl);
-            */
-
             /* Save the original root cause: */
             /* TODO:LOG "primary Exception on '" + segmentFileName + "': " +
              * err + "'; will retry: retry=" + retry + "; gen = " + gen */
@@ -1031,8 +1003,9 @@ void frt_sis_destroy(FrtSegmentInfos *sis)
     int i;
     const int sis_size = sis->size;
     for (i = 0; i < sis_size; i++) {
-        frt_si_deref(sis->segs[i]);
+        frt_si_close(sis->segs[i]);
     }
+    if (sis->store) frt_store_close(sis->store);
     if (sis->fis) frt_fis_deref(sis->fis);
     free(sis->segs);
     free(sis);
@@ -1052,7 +1025,7 @@ void frt_sis_del_at(FrtSegmentInfos *sis, int at)
 {
     int i;
     const int sis_size = --(sis->size);
-    frt_si_deref(sis->segs[at]);
+    frt_si_close(sis->segs[at]);
     for (i = at; i < sis_size; i++) {
         sis->segs[i] = sis->segs[i+1];
     }
@@ -1063,7 +1036,7 @@ 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++) {
-        frt_si_deref(sis->segs[i]);
+        frt_si_close(sis->segs[i]);
     }
     for (i = from; i < sis_size; i++) {
         sis->segs[i] = sis->segs[i+num_to_del];
@@ -1083,6 +1056,7 @@ static void frt_sis_read_i(FrtStore *store, FindSegmentsFile *fsf, FrtIndexReade
     FRT_TRY
         is = store->open_input(store, seg_file_name);
         sis->store = store;
+        FRT_REF(store);
         sis->generation = fsf->generation;
         sis->format = frt_is_read_u32(is); /* do nothing. it's the first version */
         sis->version = frt_is_read_u64(is);
@@ -1530,7 +1504,6 @@ FrtLazyDocField *frt_lazy_doc_get(FrtLazyDoc *self, ID field) {
 
 FrtFieldsReader *frt_fr_open(FrtStore *store, const char *segment, FrtFieldInfos *fis) {
     FrtFieldsReader *fr = FRT_ALLOC(FrtFieldsReader);
-    FrtInStream *fdx_in;
     char file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
     size_t segment_len = strlen(segment);
 
@@ -1541,9 +1514,10 @@ FrtFieldsReader *frt_fr_open(FrtStore *store, const char *segment, FrtFieldInfos
     strcpy(file_name + segment_len, ".fdt");
     fr->fdt_in = store->open_input(store, file_name);
     strcpy(file_name + segment_len, ".fdx");
-    fdx_in = fr->fdx_in = store->open_input(store, file_name);
-    fr->size = frt_is_length(fdx_in) / FIELDS_IDX_PTR_SIZE;
+    fr->fdx_in = store->open_input(store, file_name);
+    fr->size = frt_is_length(fr->fdx_in) / FIELDS_IDX_PTR_SIZE;
     fr->store = store;
+    FRT_REF(store);
 
     return fr;
 }
@@ -1552,6 +1526,7 @@ FrtFieldsReader *frt_fr_clone(FrtFieldsReader *orig) {
     FrtFieldsReader *fr = FRT_ALLOC(FrtFieldsReader);
 
     memcpy(fr, orig, sizeof(FrtFieldsReader));
+    FRT_REF(fr->store);
     fr->fdx_in = frt_is_clone(orig->fdx_in);
     fr->fdt_in = frt_is_clone(orig->fdt_in);
 
@@ -1561,6 +1536,7 @@ FrtFieldsReader *frt_fr_clone(FrtFieldsReader *orig) {
 void frt_fr_close(FrtFieldsReader *fr) {
     frt_is_close(fr->fdt_in);
     frt_is_close(fr->fdx_in);
+    frt_store_close(fr->store);
     free(fr);
 }
 
@@ -1591,7 +1567,7 @@ static void frt_fr_read_compressed_fields(FrtFieldsReader *fr, FrtDocField *df,
 FrtDocument *frt_fr_get_doc(FrtFieldsReader *fr, int doc_num)
 {
     int i, j;
-    off_t pos;
+    frt_off_t pos;
     int stored_cnt;
     FrtDocument *doc = frt_doc_new();
     FrtInStream *fdx_in = fr->fdx_in;
@@ -1638,7 +1614,7 @@ FrtLazyDoc *frt_fr_get_lazy_doc(FrtFieldsReader *fr, int doc_num)
 {
     int start = 0;
     int i, j;
-    off_t pos;
+    frt_off_t pos;
     int stored_cnt;
     FrtLazyDoc *lazy_doc;
     FrtInStream *fdx_in = fr->fdx_in;
@@ -1668,7 +1644,7 @@ FrtLazyDoc *frt_fr_get_lazy_doc(FrtFieldsReader *fr, int doc_num)
         lazy_doc_add_field(lazy_doc, lazy_df, i);
     }
     /* correct the starts to their correct absolute positions */
-    const off_t abs_start = frt_is_pos(fdt_in);
+    const frt_off_t abs_start = frt_is_pos(fdt_in);
     for (i = 0; i < stored_cnt; i++) {
         FrtLazyDocField *lazy_df = lazy_doc->fields[i];
         const int df_size = lazy_df->size;
@@ -1745,7 +1721,7 @@ FrtHash *frt_fr_get_tv(FrtFieldsReader *fr, int doc_num)
     int i;
     FrtInStream *fdx_in = fr->fdx_in;
     FrtInStream *fdt_in = fr->fdt_in;
-    off_t data_ptr, field_index_ptr;
+    frt_off_t data_ptr, field_index_ptr;
     int field_cnt;
     int *field_nums;
 
@@ -1778,13 +1754,12 @@ FrtHash *frt_fr_get_tv(FrtFieldsReader *fr, int doc_num)
     return term_vectors;
 }
 
-FrtTermVector *frt_fr_get_field_tv(FrtFieldsReader *fr, int doc_num, int field_num)
-{
+FrtTermVector *frt_fr_get_field_tv(FrtFieldsReader *fr, int doc_num, int field_num) {
     FrtTermVector *tv = NULL;
 
     if (doc_num >= 0 && doc_num < fr->size) {
         int i, fnum = -1;
-        off_t field_index_ptr;
+        frt_off_t field_index_ptr;
         int field_cnt;
         int offset = 0;
         FrtInStream *fdx_in = fr->fdx_in;
@@ -2065,7 +2040,7 @@ void frt_fw_add_postings(FrtFieldsWriter *fw,
     int i, delta_start, delta_length;
     const char *last_term = FRT_EMPTY_STRING;
     FrtOutStream *fdt_out = fw->fdt_out;
-    off_t fdt_start_pos = frt_os_pos(fdt_out);
+    frt_off_t fdt_start_pos = frt_os_pos(fdt_out);
     FrtPostingList *plist;
     FrtPosting *posting;
     FrtOccurence *occ;
@@ -2175,13 +2150,11 @@ static void sti_destroy(FrtSegmentTermIndex *sti)
     free(sti);
 }
 
-static void sti_ensure_index_is_read(FrtSegmentTermIndex *sti,
-                                     FrtTermEnum *index_te)
-{
+static void sti_ensure_index_is_read(FrtSegmentTermIndex *sti, FrtTermEnum *index_te) {
     if (NULL == sti->index_terms) {
         int i;
         int index_cnt = sti->index_cnt;
-        off_t index_ptr = 0;
+        frt_off_t index_ptr = 0;
         ste_reset(index_te);
         frt_is_seek(STE(index_te)->is, sti->index_ptr);
         STE(index_te)->size = sti->index_cnt;
@@ -2241,8 +2214,7 @@ static int sti_get_index_offset(FrtSegmentTermIndex *sti, const char *term)
     }\
 } while (0)
 
-FrtSegmentFieldIndex *frt_sfi_open(FrtStore *store, const char *segment)
-{
+FrtSegmentFieldIndex *frt_sfi_open(FrtStore *store, const char *segment) {
     int field_count;
     FrtSegmentFieldIndex *sfi = FRT_ALLOC(FrtSegmentFieldIndex);
     char file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
@@ -2271,12 +2243,12 @@ FrtSegmentFieldIndex *frt_sfi_open(FrtStore *store, const char *segment)
 
     sprintf(file_name, "%s.tix", segment);
     is = store->open_input(store, file_name);
+    FRT_DEREF(is);
     sfi->index_te = frt_ste_new(is, sfi);
     return sfi;
 }
 
-void frt_sfi_close(FrtSegmentFieldIndex *sfi)
-{
+void frt_sfi_close(FrtSegmentFieldIndex *sfi) {
     frt_mutex_destroy(&sfi->mutex);
     frt_ste_close(sfi->index_te);
     frt_h_destroy(sfi->field_dict);
@@ -2287,8 +2259,7 @@ void frt_sfi_close(FrtSegmentFieldIndex *sfi)
  * SegmentTermEnum
  ****************************************************************************/
 
-static int term_read(char *buf, FrtInStream *is)
-{
+static int term_read(char *buf, FrtInStream *is) {
     int start = (int)frt_is_read_vint(is);
     int length = (int)frt_is_read_vint(is);
     int total_length = start + length;
@@ -2297,8 +2268,7 @@ static int term_read(char *buf, FrtInStream *is)
     return total_length;
 }
 
-static char *ste_next(FrtTermEnum *te)
-{
+static char *ste_next(FrtTermEnum *te) {
     FrtTermInfo *ti;
     FrtInStream *is = STE(te)->is;
 
@@ -2323,32 +2293,27 @@ static char *ste_next(FrtTermEnum *te)
     return te->curr_term;
 }
 
-static void ste_reset(FrtTermEnum *te)
-{
+static void ste_reset(FrtTermEnum *te) {
     STE(te)->pos = -1;
     te->curr_term[0] = '\0';
     te->curr_term_len = 0;
     FRT_ZEROSET(&(te->curr_ti), FrtTermInfo);
 }
 
-static FrtTermEnum *ste_set_field(FrtTermEnum *te, int field_num)
-{
-    FrtSegmentTermIndex *sti
-        = (FrtSegmentTermIndex *)frt_h_get_int(STE(te)->sfi->field_dict, field_num);
+static FrtTermEnum *ste_set_field(FrtTermEnum *te, int field_num) {
+    FrtSegmentTermIndex *sti = (FrtSegmentTermIndex *)frt_h_get_int(STE(te)->sfi->field_dict, field_num);
     ste_reset(te);
     te->field_num = field_num;
     if (sti) {
         STE(te)->size = sti->size;
         frt_is_seek(STE(te)->is, sti->ptr);
-    }
-    else {
+    } else {
         STE(te)->size = 0;
     }
     return te;
 }
 
-static void frt_ste_index_seek(FrtTermEnum *te, FrtSegmentTermIndex *sti, int idx_offset)
-{
+static void frt_ste_index_seek(FrtTermEnum *te, FrtSegmentTermIndex *sti, int idx_offset) {
     int term_len = sti->index_term_lens[idx_offset];
     frt_is_seek(STE(te)->is, sti->index_ptrs[idx_offset]);
     STE(te)->pos = STE(te)->sfi->index_interval * idx_offset - 1;
@@ -2359,11 +2324,9 @@ static void frt_ste_index_seek(FrtTermEnum *te, FrtSegmentTermIndex *sti, int id
     te->curr_ti = sti->index_term_infos[idx_offset];
 }
 
-static char *ste_scan_to(FrtTermEnum *te, const char *term)
-{
+static char *ste_scan_to(FrtTermEnum *te, const char *term) {
     FrtSegmentFieldIndex *sfi = STE(te)->sfi;
-    FrtSegmentTermIndex *sti
-        = (FrtSegmentTermIndex *)frt_h_get_int(sfi->field_dict, te->field_num);
+    FrtSegmentTermIndex *sti = (FrtSegmentTermIndex *)frt_h_get_int(sfi->field_dict, te->field_num);
     if (sti && sti->size > 0) {
         SFI_ENSURE_INDEX_IS_READ(sfi, sti);
         if (term[0] == '\0') {
@@ -2383,9 +2346,7 @@ static char *ste_scan_to(FrtTermEnum *te, const char *term)
         frt_ste_index_seek(te, sti, sti_get_index_offset(sti, term));
         return te_skip_to(te, term);
     }
-    else {
-        return NULL;
-    }
+    return NULL;
 }
 
 static FrtSegmentTermEnum *ste_allocate(void) {
@@ -2398,8 +2359,7 @@ static FrtSegmentTermEnum *ste_allocate(void) {
     return ste;
 }
 
-FrtTermEnum *frt_ste_clone(FrtTermEnum *other_te)
-{
+FrtTermEnum *frt_ste_clone(FrtTermEnum *other_te) {
     FrtSegmentTermEnum *ste = ste_allocate();
 
     memcpy(ste, other_te, sizeof(FrtSegmentTermEnum));
@@ -2407,8 +2367,7 @@ FrtTermEnum *frt_ste_clone(FrtTermEnum *other_te)
     return TE(ste);
 }
 
-void frt_ste_close(FrtTermEnum *te)
-{
+void frt_ste_close(FrtTermEnum *te) {
     frt_is_close(STE(te)->is);
     free(te);
 }
@@ -2422,8 +2381,7 @@ static char *frt_ste_get_term(FrtTermEnum *te, int 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);
+            FrtSegmentTermIndex *sti = (FrtSegmentTermIndex *)frt_h_get_int(ste->sfi->field_dict, te->field_num);
             SFI_ENSURE_INDEX_IS_READ(ste->sfi, sti);
             frt_ste_index_seek(te, sti, pos / idx_int);
         }
@@ -2443,6 +2401,7 @@ FrtTermEnum *frt_ste_new(FrtInStream *is, FrtSegmentFieldIndex *sfi)
 
     TE(ste)->field_num = -1;
     ste->is = is;
+    FRT_REF(is);
     ste->size = 0;
     ste->pos = -1;
     ste->sfi = sfi;
@@ -2490,25 +2449,6 @@ static bool tew_lt(const TermEnumWrapper *tew1, const TermEnumWrapper *tew2)
     }
 }
 
-/*
-static void tew_load_doc_map(TermEnumWrapper *tew)
-{
-    int j = 0, i;
-    FrtIndexReader *ir = tew->ir;
-    int max_doc = ir->max_doc(ir);
-    int *doc_map = tew->doc_map = FRT_ALLOC_N(int, max_doc);
-
-    for (i = 0; i < max_doc; i++) {
-        if (ir->is_deleted(ir, i)) {
-            doc_map[i] = -1;
-        }
-        else {
-            doc_map[i] = j++;
-        }
-    }
-}
-*/
-
 static char *tew_next(TermEnumWrapper *tew)
 {
     return (tew->term = tew->te->next(tew->te));
@@ -2521,6 +2461,7 @@ static char *tew_skip_to(TermEnumWrapper *tew, const char *term)
 
 static void tew_destroy(TermEnumWrapper *tew)
 {
+    frt_ir_close(tew->ir);
     if (tew->doc_map) {
         free(tew->doc_map);
     }
@@ -2530,6 +2471,7 @@ static void tew_destroy(TermEnumWrapper *tew)
 static TermEnumWrapper *tew_setup(TermEnumWrapper *tew, int index, FrtTermEnum *te, FrtIndexReader *ir) {
     tew->index = index;
     tew->ir = ir;
+    FRT_REF(ir);
     tew->te = te;
     tew->term = te->curr_term;
     tew->doc_map = NULL;
@@ -2689,11 +2631,13 @@ FrtTermInfosReader *frt_tir_open(FrtStore *store, FrtSegmentFieldIndex *sfi, con
     char file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
 
     sprintf(file_name, "%s.tis", segment);
-    tir->orig_te = frt_ste_new(store->open_input(store, file_name), sfi);
+    FrtInStream *is = store->open_input(store, file_name);
+    FRT_DEREF(is);
+    tir->orig_te = frt_ste_new(is, sfi);
+    tir->thread_te = 0;
     frt_thread_key_create(&tir->thread_te, NULL);
     tir->te_bucket = frt_ary_new();
     tir->field_num = -1;
-
     return tir;
 }
 
@@ -2751,14 +2695,9 @@ char *frt_tir_get_term(FrtTermInfosReader *tir, int pos) {
     }
 }
 
-
 void frt_tir_close(FrtTermInfosReader *tir) {
     frt_ary_destroy(tir->te_bucket, (frt_free_ft)&frt_ste_close);
     frt_ste_close(tir->orig_te);
-
-    /* fix for some dodgy old versions of pthread */
-    frt_thread_setspecific(tir->thread_te, NULL);
-
     frt_thread_key_delete(tir->thread_te);
     free(tir);
 }
@@ -2852,7 +2791,7 @@ static void tw_add(FrtTermWriter *tw, const char *term, int term_len, FrtTermInf
 }
 
 void frt_tiw_add(FrtTermInfosWriter *tiw, const char *term, int term_len, FrtTermInfo *ti) {
-    off_t tis_pos;
+    frt_off_t tis_pos;
 
     if (0 == (tiw->tis_writer->counter % tiw->index_interval)) {
         /* add an index term */
@@ -3025,8 +2964,8 @@ 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;
-        off_t last_frq_ptr;
-        off_t last_prx_ptr;
+        frt_off_t last_frq_ptr;
+        frt_off_t last_prx_ptr;
         int num_skipped;
 
         if (NULL == stde->skip_in) {
@@ -3097,7 +3036,7 @@ static void stde_skip_prox(FrtSegmentTermDocEnum *stde) {
     (void)stde;
 }
 
-static void stde_seek_prox(FrtSegmentTermDocEnum *stde, off_t prx_ptr) {
+static void stde_seek_prox(FrtSegmentTermDocEnum *stde, frt_off_t prx_ptr) {
     (void)stde;
     (void)prx_ptr;
 }
@@ -3193,7 +3132,7 @@ static void stpe_skip_prox(FrtSegmentTermDocEnum *stde)
     frt_is_skip_vints(stde->prx_in, stde->freq);
 }
 
-static void stpe_seek_prox(FrtSegmentTermDocEnum *stde, 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;
@@ -3696,11 +3635,13 @@ FrtDeleter *frt_deleter_new(FrtSegmentInfos *sis, FrtStore *store) {
     FrtDeleter *dlr = FRT_ALLOC(FrtDeleter);
     dlr->sis = sis;
     dlr->store = store;
+    FRT_REF(store);
     dlr->pending = frt_hs_new_str(&free);
     return dlr;
 }
 
 void frt_deleter_destroy(FrtDeleter *dlr) {
+    frt_store_close(dlr->store);
     frt_hs_destroy(dlr->pending);
     free(dlr);
 }
@@ -3821,7 +3762,7 @@ void frt_deleter_find_deletable_files(FrtDeleter *dlr) {
     FrtStore *store = dlr->store;
     struct DelFilesArg dfa;
     FrtHash *current = dfa.current
-                       = frt_h_new_str((frt_free_ft)NULL, (frt_free_ft)frt_si_deref);
+                       = frt_h_new_str((frt_free_ft)NULL, (frt_free_ft)frt_si_close);
     dfa.dlr = dlr;
 
     for(i = 0; i < sis->size; i++) {
@@ -4096,37 +4037,28 @@ void frt_ir_commit(FrtIndexReader *ir)
     frt_mutex_unlock(&ir->mutex);
 }
 
-void frt_ir_close(FrtIndexReader *ir)
-{
-    frt_mutex_lock(&ir->mutex);
-    if (0 == --(ir->ref_cnt)) {
+void frt_ir_close(FrtIndexReader *ir) {
+    if (ir->ref_cnt == 0) {
+        fprintf(stderr, "ir ref_cnt to low\n");
+        FRT_RAISE(FRT_STATE_ERROR, "ir ref_cnt to low\n");
+    }
+
+    if (FRT_DEREF(ir) == 0) {
+        frt_mutex_lock(&ir->mutex);
         ir_commit_i(ir);
         ir->close_i(ir);
-        if (ir->store) {
-            frt_store_deref(ir->store);
-        }
-        if (ir->is_owner && ir->sis) {
-            frt_sis_destroy(ir->sis);
-        }
-        if (ir->cache) {
-            frt_h_destroy(ir->cache);
-        }
-        if (ir->field_index_cache) {
-            frt_h_destroy(ir->field_index_cache);
-        }
-        if (ir->deleter && ir->is_owner) {
-            frt_deleter_destroy(ir->deleter);
-        }
+        if (ir->store) frt_store_close(ir->store);
+        if (ir->is_owner && ir->sis) frt_sis_destroy(ir->sis);
+        if (ir->cache) frt_h_destroy(ir->cache);
+        if (ir->field_index_cache) frt_h_destroy(ir->field_index_cache);
+        if (ir->deleter && ir->is_owner) frt_deleter_destroy(ir->deleter);
         free(ir->fake_norms);
 
-        frt_mutex_destroy(&ir->mutex);
         frt_mutex_destroy(&ir->field_index_mutex);
-        free(ir);
-    }
-    else {
         frt_mutex_unlock(&ir->mutex);
+        frt_mutex_destroy(&ir->mutex);
+        free(ir);
     }
-
 }
 
 /**
@@ -4160,6 +4092,7 @@ static Norm *norm_create(FrtInStream *is, int field_num)
     Norm *norm = FRT_ALLOC(Norm);
 
     norm->is = is;
+    FRT_REF(is);
     norm->field_num = field_num;
     norm->bytes = NULL;
     norm->is_dirty = false;
@@ -4202,10 +4135,8 @@ static void norm_rewrite(Norm *norm, FrtStore *store, FrtDeleter *dlr,
 #define SR(ir) ((FrtSegmentReader *)(ir))
 #define SR_SIZE(ir) (SR(ir)->fr->size)
 
-static FrtFieldsReader *sr_fr(FrtSegmentReader *sr)
-{
+static FrtFieldsReader *sr_fr(FrtSegmentReader *sr) {
     FrtFieldsReader *fr;
-
     if (NULL == (fr = (FrtFieldsReader *)frt_thread_getspecific(sr->thread_fr))) {
         fr = frt_fr_clone(sr->fr);
         frt_ary_push(sr->fr_bucket, fr);
@@ -4219,17 +4150,13 @@ static bool sr_is_deleted_i(FrtSegmentReader *sr, int doc_num)
     return (NULL != sr->deleted_docs && frt_bv_get(sr->deleted_docs, doc_num));
 }
 
-static void sr_get_norms_into_i(FrtSegmentReader *sr, int field_num,
-                                       frt_uchar *buf)
-{
+static void sr_get_norms_into_i(FrtSegmentReader *sr, int field_num, frt_uchar *buf) {
     Norm *norm = (Norm *)frt_h_get_int(sr->norms, field_num);
     if (NULL == norm) {
         memset(buf, 0, SR_SIZE(sr));
-    }
-    else if (NULL != norm->bytes) { /* can copy from cache */
+    } else if (NULL != norm->bytes) { /* can copy from cache */
         memcpy(buf, norm->bytes, SR_SIZE(sr));
-    }
-    else {
+    } else {
         FrtInStream *norm_in = frt_is_clone(norm->is);
         /* read from disk */
         frt_is_seek(norm_in, 0);
@@ -4238,8 +4165,7 @@ static void sr_get_norms_into_i(FrtSegmentReader *sr, int field_num,
     }
 }
 
-static frt_uchar *sr_get_norms_i(FrtSegmentReader *sr, int field_num)
-{
+static frt_uchar *sr_get_norms_i(FrtSegmentReader *sr, int field_num) {
     Norm *norm = (Norm *)frt_h_get_int(sr->norms, field_num);
     if (NULL == norm) {                           /* not an indexed field */
         return NULL;
@@ -4253,8 +4179,7 @@ static frt_uchar *sr_get_norms_i(FrtSegmentReader *sr, int field_num)
     return norm->bytes;
 }
 
-static void sr_set_norm_i(FrtIndexReader *ir, int doc_num, int field_num, frt_uchar b)
-{
+static void sr_set_norm_i(FrtIndexReader *ir, int doc_num, int field_num, frt_uchar b) {
     Norm *norm = (Norm *)frt_h_get_int(SR(ir)->norms, field_num);
     if (NULL != norm) { /* has_norms */
         ir->has_changes = true;
@@ -4264,8 +4189,7 @@ static void sr_set_norm_i(FrtIndexReader *ir, int doc_num, int field_num, frt_uc
     }
 }
 
-static void sr_delete_doc_i(FrtIndexReader *ir, int doc_num)
-{
+static void sr_delete_doc_i(FrtIndexReader *ir, int doc_num) {
     if (NULL == SR(ir)->deleted_docs) {
         SR(ir)->deleted_docs = frt_bv_new();
     }
@@ -4276,8 +4200,7 @@ static void sr_delete_doc_i(FrtIndexReader *ir, int doc_num)
     frt_bv_set(SR(ir)->deleted_docs, doc_num);
 }
 
-static void sr_undelete_all_i(FrtIndexReader *ir)
-{
+static void sr_undelete_all_i(FrtIndexReader *ir) {
     SR(ir)->undelete_all = true;
     SR(ir)->deleted_docs_dirty = false;
     ir->has_changes = true;
@@ -4287,8 +4210,7 @@ static void sr_undelete_all_i(FrtIndexReader *ir)
     SR(ir)->deleted_docs = NULL;
 }
 
-static void sr_set_deleter_i(FrtIndexReader *ir, FrtDeleter *deleter)
-{
+static void sr_set_deleter_i(FrtIndexReader *ir, FrtDeleter *deleter) {
   ir->deleter = deleter;
 }
 
@@ -4372,8 +4294,7 @@ static void sr_commit_i(FrtIndexReader *ir)
     }
 }
 
-static void sr_close_i(FrtIndexReader *ir)
-{
+static void sr_close_i(FrtIndexReader *ir) {
     FrtSegmentReader *sr = SR(ir);
 
     if (sr->fr)           frt_fr_close(sr->fr);
@@ -4383,9 +4304,8 @@ static void sr_close_i(FrtIndexReader *ir)
     if (sr->prx_in)       frt_is_close(sr->prx_in);
     if (sr->norms)        frt_h_destroy(sr->norms);
     if (sr->deleted_docs) frt_bv_destroy(sr->deleted_docs);
-    if (sr->cfs_store)    frt_store_deref(sr->cfs_store);
+    if (sr->cfs_store)    frt_store_close(sr->cfs_store);
     if (sr->fr_bucket) {
-        frt_thread_setspecific(sr->thread_fr, NULL);
         frt_thread_key_delete(sr->thread_fr);
         frt_ary_destroy(sr->fr_bucket, (frt_free_ft)&frt_fr_close);
     }
@@ -4492,8 +4412,7 @@ static FrtTermVector *sr_term_vector(FrtIndexReader *ir, int doc_num, ID field)
     FrtFieldInfo *fi = (FrtFieldInfo *)frt_h_get(ir->fis->field_dict, (void *)field);
     FrtFieldsReader *fr;
 
-    if (!fi || !fi_store_term_vector(fi) || !SR(ir)->fr ||
-        !(fr = sr_fr(SR(ir)))) {
+    if (!fi || !fi_store_term_vector(fi) || !SR(ir)->fr || !(fr = sr_fr(SR(ir)))) {
         return NULL;
     }
 
@@ -4536,8 +4455,9 @@ static void sr_open_norms(FrtIndexReader *ir, FrtStore *cfs_store)
         FrtStore *store = (si->use_compound_file && si->norm_gens[i] == 0) ?
             cfs_store : ir->store;
         if (si_norm_file_name(si, file_name, i)) {
-            frt_h_set_int(SR(ir)->norms, i,
-                      norm_create(store->open_input(store, file_name), i));
+            FrtInStream *is = store->open_input(store, file_name);
+            FRT_DEREF(is);
+            frt_h_set_int(SR(ir)->norms, i, norm_create(is, i));
         }
     }
     SR(ir)->norms_dirty = false;
@@ -4576,6 +4496,7 @@ static FrtIndexReader *sr_setup_i(FrtSegmentReader *sr)
 
     ir->type                = FRT_SEGMENT_READER;
 
+    sr->thread_fr   = 0;
     sr->cfs_store   = NULL;
 
     FRT_TRY
@@ -4909,11 +4830,11 @@ FrtMultiReader *frt_mr_init(FrtMultiReader *mr, FrtIndexReader **sub_readers, co
     mr->max_doc             = 0;
     mr->num_docs_cache      = -1;
     mr->has_deletions       = false;
-
     mr->starts              = FRT_ALLOC_N(int, (r_cnt+1));
 
     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 */
 
@@ -5029,7 +4950,6 @@ FrtIndexReader *frt_mr_open(FrtIndexReader *ir, FrtIndexReader **sub_readers, co
 
 static void ir_open_i(FrtStore *store, FindSegmentsFile *fsf, FrtIndexReader *ir) {
     volatile bool success = false;
-    // FrtIndexReader *volatile ir = NULL;
     FrtSegmentInfos *volatile sis = NULL;
     FRT_TRY
     do {
@@ -5040,21 +4960,24 @@ static void ir_open_i(FrtStore *store, FindSegmentsFile *fsf, FrtIndexReader *ir
         fis = sis->fis;
         if (sis->size == 1) {
             ir = sr_open(sis, fis, 0, true, (FrtSegmentReader *)ir);
-        }
-        else {
+        }  else {
             volatile int i;
-            FrtIndexReader **readers = FRT_ALLOC_N(FrtIndexReader *, sis->size);
+            FrtIndexReader **readers = FRT_ALLOC_AND_ZERO_N(FrtIndexReader *, sis->size);
             int num_segments = sis->size;
-            for (i = num_segments - 1; i >= 0; i--) {
-                FRT_TRY
+            FRT_TRY
+                for (i = num_segments - 1; i >= 0; i--) {
                     readers[i] = sr_open(sis, fis, i, false, NULL);
-                FRT_XCATCHALL
-                    for (i++; i < num_segments; i++) {
+                    FRT_DEREF(readers[i]);
+                }
+            FRT_XCATCHALL
+                for (i++; i < num_segments; i++) {
+                    if (readers[i]) {
+                        FRT_REF(readers[i]);
                         frt_ir_close(readers[i]);
                     }
-                    free(readers);
-                FRT_XENDTRY
-            }
+                }
+                free(readers);
+            FRT_XENDTRY
             ir = frt_mr_open_i(store, sis, fis, readers, sis->size, ir);
         }
         fsf->ret.ir = ir;
@@ -5187,8 +5110,8 @@ typedef struct SkipBuffer
     FrtOutStream *frq_out;
     FrtOutStream *prx_out;
     int last_doc;
-    off_t last_frq_ptr;
-    off_t last_prx_ptr;
+    frt_off_t last_frq_ptr;
+    frt_off_t last_prx_ptr;
 } SkipBuffer;
 
 static void skip_buf_reset(SkipBuffer *skip_buf)
@@ -5210,8 +5133,8 @@ static SkipBuffer *skip_buf_new(FrtOutStream *frq_out, FrtOutStream *prx_out)
 
 static void skip_buf_add(SkipBuffer *skip_buf, int doc)
 {
-    off_t frq_ptr = frt_os_pos(skip_buf->frq_out);
-    off_t prx_ptr = frt_os_pos(skip_buf->prx_out);
+    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, frq_ptr - skip_buf->last_frq_ptr);
@@ -5222,9 +5145,9 @@ static void skip_buf_add(SkipBuffer *skip_buf, int doc)
     skip_buf->last_prx_ptr = prx_ptr;
 }
 
-static off_t skip_buf_write(SkipBuffer *skip_buf)
+static frt_off_t skip_buf_write(SkipBuffer *skip_buf)
 {
-  off_t skip_ptr = frt_os_pos(skip_buf->frq_out);
+  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;
 }
@@ -5294,8 +5217,7 @@ static void dw_flush(FrtDocWriter *dw)
     FrtPosting *p;
     FrtOccurence *occ;
     FrtStore *store = dw->store;
-    FrtTermInfosWriter *tiw = frt_tiw_open(store, dw->si->name,
-                                    dw->index_interval, skip_interval);
+    FrtTermInfosWriter *tiw = frt_tiw_open(store, dw->si->name, dw->index_interval, skip_interval);
     FrtTermInfo ti;
     char file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
     FrtOutStream *frq_out, *prx_out;
@@ -5374,6 +5296,7 @@ FrtDocWriter *frt_dw_open(FrtIndexWriter *iw, FrtSegmentInfo *si)
     dw->analyzer    = iw->analyzer;
     dw->fis         = iw->fis;
     dw->store       = store;
+    FRT_REF(store);
     dw->fw          = frt_fw_open(store, si->name, iw->fis);
     dw->si          = si;
 
@@ -5408,6 +5331,7 @@ void frt_dw_close(FrtDocWriter *dw)
     if (dw->fw) {
         frt_fw_close(dw->fw);
     }
+    frt_store_close(dw->store);
     frt_h_destroy(dw->curr_plists);
     frt_h_destroy(dw->fields);
     frt_mp_destroy(dw->mp);
@@ -5456,7 +5380,7 @@ static void dw_add_posting(FrtMemoryPool *mp,
     }
 }
 
-static void dw_add_offsets(FrtDocWriter *dw, int pos, off_t start, 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;
@@ -5480,7 +5404,7 @@ FrtHash *frt_dw_invert_field(FrtDocWriter *dw, FrtFieldInverter *fld_inv, FrtDoc
     int doc_num = dw->doc_num;
     int i;
     const int df_size = df->size;
-    off_t start_offset = 0;
+    frt_off_t start_offset = 0;
 
     if (fld_inv->is_tokenized) {
         FrtToken *tk;
@@ -5659,6 +5583,7 @@ static SegmentMergeInfo *smi_new(int base, FrtStore *store, FrtSegmentInfo *si)
     smi->base = base;
     smi->si = si;
     smi->orig_store = smi->store = store;
+    FRT_REF(smi->orig_store);
     sprintf(file_name, "%s.cfs", segment);
     if (store->exists(store, file_name)) {
         smi->store = frt_open_cmpd_store(store, file_name);
@@ -5683,7 +5608,9 @@ static void smi_load_term_input(SegmentMergeInfo *smi)
     char file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
     smi->sfi = frt_sfi_open(store, segment);
     sprintf(file_name, "%s.tis", segment);
-    smi->te = TE(frt_ste_new(store->open_input(store, file_name), smi->sfi));
+    FrtInStream *is = store->open_input(store, file_name);
+    FRT_DEREF(is);
+    smi->te = TE(frt_ste_new(is, smi->sfi));
     sprintf(file_name, "%s.frq", segment);
     smi->frq_in = store->open_input(store, file_name);
     sprintf(file_name, "%s.prx", segment);
@@ -5704,8 +5631,9 @@ static void smi_close_term_input(SegmentMergeInfo *smi)
 static void smi_destroy(SegmentMergeInfo *smi)
 {
     if (smi->store != smi->orig_store) {
-        frt_store_deref(smi->store);
+        frt_store_close(smi->store);
     }
+    frt_store_close(smi->orig_store);
     if (smi->deleted_docs) {
         frt_bv_destroy(smi->deleted_docs);
         free(smi->doc_map);
@@ -5741,19 +5669,18 @@ typedef struct SegmentMerger {
     FrtOutStream *prx_out;
 } SegmentMerger;
 
-static SegmentMerger *sm_create(FrtIndexWriter *iw, FrtSegmentInfo *si,
-                                FrtSegmentInfo **seg_infos, const int seg_cnt)
+static SegmentMerger *sm_create(FrtIndexWriter *iw, FrtSegmentInfo *si, FrtSegmentInfo **seg_infos, const int seg_cnt)
 {
     int i;
     SegmentMerger *sm = FRT_ALLOC_AND_ZERO_N(SegmentMerger, seg_cnt);
     sm->store = iw->store;
+    FRT_REF(sm->store);
     sm->fis = iw->fis;
     sm->si = si;
     sm->doc_cnt = 0;
     sm->smis = FRT_ALLOC_N(SegmentMergeInfo *, seg_cnt);
     for (i = 0; i < seg_cnt; i++) {
-        sm->smis[i] = smi_new(sm->doc_cnt, seg_infos[i]->store,
-                              seg_infos[i]);
+        sm->smis[i] = smi_new(sm->doc_cnt, seg_infos[i]->store, seg_infos[i]);
         sm->doc_cnt += sm->smis[i]->doc_cnt;
     }
     sm->seg_cnt = seg_cnt;
@@ -5768,6 +5695,7 @@ static void sm_destroy(SegmentMerger *sm)
     for (i = 0; i < seg_cnt; i++) {
         smi_destroy(sm->smis[i]);
     }
+    frt_store_close(sm->store);
     free(sm->smis);
     free(sm);
 }
@@ -5775,7 +5703,7 @@ static void sm_destroy(SegmentMerger *sm)
 static void sm_merge_fields(SegmentMerger *sm)
 {
     int i, j;
-    off_t start, end = 0;
+    frt_off_t start, end = 0;
     char file_name[FRT_SEGMENT_NAME_MAX_LENGTH];
     FrtOutStream *fdt_out, *fdx_out;
     FrtStore *store = sm->store;
@@ -5892,12 +5820,12 @@ static char *sm_cache_term(SegmentMerger *sm, char *term, int term_len)
 static void sm_merge_term_info(SegmentMerger *sm, SegmentMergeInfo **matches,
                                int match_size)
 {
-    off_t frq_ptr = frt_os_pos(sm->frq_out);
-    off_t prx_ptr = frt_os_pos(sm->prx_out);
+    frt_off_t frq_ptr = frt_os_pos(sm->frq_out);
+    frt_off_t prx_ptr = frt_os_pos(sm->prx_out);
 
     int df = sm_append_postings(sm, matches, match_size); /* append posting data */
 
-    off_t skip_ptr = skip_buf_write(sm->skip_buf);
+    frt_off_t skip_ptr = skip_buf_write(sm->skip_buf);
 
     if (df > 0) {
         /* add an entry to the dictionary with ptrs to prox and freq files */
@@ -6352,8 +6280,9 @@ void frt_iw_close(FrtIndexWriter *iw)
     iw->write_lock->release(iw->write_lock);
     frt_close_lock(iw->write_lock);
     iw->write_lock = NULL;
-    frt_store_deref(iw->store);
+    frt_store_close(iw->store);
     frt_deleter_destroy(iw->deleter);
+    frt_mutex_unlock(&iw->mutex);
     frt_mutex_destroy(&iw->mutex);
     free(iw);
 }
@@ -6367,6 +6296,7 @@ FrtIndexWriter *frt_iw_open(FrtIndexWriter *iw, FrtStore *store, FrtAnalyzer *vo
         iw = frt_iw_alloc();
     frt_mutex_init(&iw->mutex, NULL);
     iw->store = store;
+    FRT_REF(store);
     if (!config) {
         config = &frt_default_config;
     }
@@ -6375,14 +6305,14 @@ FrtIndexWriter *frt_iw_open(FrtIndexWriter *iw, FrtStore *store, FrtAnalyzer *vo
     FRT_TRY
         iw->write_lock = frt_open_lock(store, 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");
+            FRT_RAISE(FRT_LOCK_ERROR, "Couldn't obtain write lock when opening IndexWriter");
         }
 
         iw->sis = frt_sis_read(store);
         iw->fis = iw->sis->fis;
         FRT_REF(iw->fis);
     FRT_XCATCHALL
+        frt_store_close(iw->store);
         if (iw->write_lock) {
             iw->write_lock->release(iw->write_lock);
             frt_close_lock(iw->write_lock);
@@ -6400,7 +6330,6 @@ FrtIndexWriter *frt_iw_open(FrtIndexWriter *iw, FrtStore *store, FrtAnalyzer *vo
     iw->deleter = frt_deleter_new(iw->sis, store);
     deleter_delete_deletable_files(iw->deleter);
 
-    FRT_REF(store);
     return iw;
 }
 
@@ -6443,7 +6372,7 @@ static void iw_cp_fields(FrtIndexWriter *iw, FrtSegmentReader *sr, const char *s
             int j, data_len = 0;
             const int field_cnt = frt_is_read_vint(fdt_in);
             int tv_cnt;
-            off_t doc_start_ptr = frt_os_pos(fdt_out);
+            frt_off_t doc_start_ptr = frt_os_pos(fdt_out);
 
             frt_os_write_u64(fdx_out, doc_start_ptr);
             frt_os_write_vint(fdt_out, field_cnt);