isomorfeus-ferret 0.13.7 → 0.13.10

data/ext/isomorfeus_ferret_ext/frt_compound_io.c

@@ -1,7 +1,7 @@
 #include "frt_index.h"
 #include "frt_array.h"
 
-extern void frt_store_destroy(FrtStore *store);
+extern void frt_store_close(FrtStore *store);
 extern FrtInStream *frt_is_new();
 extern FrtStore *frt_store_new();
 
@@ -12,49 +12,41 @@ extern FrtStore *frt_store_new();
  ****************************************************************************/
 
 typedef struct FileEntry {
-    off_t offset;
-    off_t length;
+    frt_off_t offset;
+    frt_off_t length;
 } FileEntry;
 
-static void cmpd_touch(FrtStore *store, const char *file_name)
-{
+static void cmpd_touch(FrtStore *store, const char *file_name) {
     store->dir.cmpd->store->touch(store->dir.cmpd->store, file_name);
 }
 
-static int cmpd_exists(FrtStore *store, const char *file_name)
-{
+static int cmpd_exists(FrtStore *store, const char *file_name) {
     if (frt_h_get(store->dir.cmpd->entries, file_name) != NULL) {
         return true;
-    }
-    else {
+    } else {
         return false;
     }
 }
 
-static int cmpd_remove(FrtStore *store, const char *file_name)
-{
+static int cmpd_remove(FrtStore *store, const char *file_name) {
     (void)store;
     (void)file_name;
     FRT_RAISE(FRT_UNSUPPORTED_ERROR, "%s", FRT_UNSUPPORTED_ERROR_MSG);
     return 0;
 }
 
-static void cmpd_rename(FrtStore *store, const char *from, const char *to)
-{
+static void cmpd_rename(FrtStore *store, const char *from, const char *to) {
     (void)store;
     (void)from;
     (void)to;
     FRT_RAISE(FRT_UNSUPPORTED_ERROR, "%s", FRT_UNSUPPORTED_ERROR_MSG);
 }
 
-static int cmpd_count(FrtStore *store)
-{
+static int cmpd_count(FrtStore *store) {
     return store->dir.cmpd->entries->size;
 }
 
-static void cmpd_each(FrtStore *store,
-                     void (*func)(const char *fname, void *arg), void *arg)
-{
+static void cmpd_each(FrtStore *store, void (*func)(const char *fname, void *arg), void *arg) {
     FrtHash *ht = store->dir.cmpd->entries;
     int i;
     for (i = 0; i <= ht->mask; i++) {
@@ -65,15 +57,12 @@ static void cmpd_each(FrtStore *store,
     }
 }
 
-
-static void cmpd_clear(FrtStore *store)
-{
+static void cmpd_clear(FrtStore *store) {
     (void)store;
     FRT_RAISE(FRT_UNSUPPORTED_ERROR, "%s", FRT_UNSUPPORTED_ERROR_MSG);
 }
 
-static void cmpd_close_i(FrtStore *store)
-{
+static void cmpd_close_i(FrtStore *store) {
     FrtCompoundStore *cmpd = store->dir.cmpd;
     if (cmpd->stream == NULL) {
         FRT_RAISE(FRT_IO_ERROR, "Tried to close already closed compound store");
@@ -83,44 +72,39 @@ static void cmpd_close_i(FrtStore *store)
 
     frt_is_close(cmpd->stream);
     cmpd->stream = NULL;
+    frt_store_close(cmpd->store);
     free(store->dir.cmpd);
-    frt_store_destroy(store);
 }
 
-static off_t cmpd_length(FrtStore *store, const char *file_name)
-{
+static frt_off_t cmpd_length(FrtStore *store, const char *file_name) {
     FileEntry *fe = (FileEntry *)frt_h_get(store->dir.cmpd->entries, file_name);
     if (fe != NULL) {
         return fe->length;
-    }
-    else {
+    } else {
         return 0;
     }
 }
 
-static void cmpdi_seek_i(FrtInStream *is, off_t pos)
-{
+static void cmpdi_seek_i(FrtInStream *is, frt_off_t pos) {
     (void)is;
     (void)pos;
 }
 
-static void cmpdi_close_i(FrtInStream *is)
-{
+static void cmpdi_close_i(FrtInStream *is) {
+    frt_is_close(is->d.cis->sub);
     free(is->d.cis);
 }
 
-static off_t cmpdi_length_i(FrtInStream *is)
-{
+static frt_off_t cmpdi_length_i(FrtInStream *is) {
     return (is->d.cis->length);
 }
 
 /*
  * raises: FRT_EOF_ERROR
  */
-static void cmpdi_read_i(FrtInStream *is, frt_uchar *b, int len)
-{
+static void cmpdi_read_i(FrtInStream *is, frt_uchar *b, int len) {
     FrtCompoundInStream *cis = is->d.cis;
-    off_t start = frt_is_pos(is);
+    frt_off_t start = frt_is_pos(is);
 
     if ((start + len) > cis->length) {
         FRT_RAISE(FRT_EOF_ERROR, "Tried to read past end of file. File length is "
@@ -139,12 +123,12 @@ static const struct FrtInStreamMethods CMPD_IN_STREAM_METHODS = {
     cmpdi_close_i
 };
 
-static FrtInStream *cmpd_create_input(FrtInStream *sub_is, off_t offset, off_t length)
-{
+static FrtInStream *cmpd_create_input(FrtInStream *sub_is, frt_off_t offset, frt_off_t length) {
     FrtInStream *is = frt_is_new();
     FrtCompoundInStream *cis = FRT_ALLOC(FrtCompoundInStream);
 
     cis->sub = sub_is;
+    FRT_REF(sub_is);
     cis->offset = offset;
     cis->length = length;
     is->d.cis = cis;
@@ -153,8 +137,7 @@ static FrtInStream *cmpd_create_input(FrtInStream *sub_is, off_t offset, off_t l
     return is;
 }
 
-static FrtInStream *cmpd_open_input(FrtStore *store, const char *file_name)
-{
+static FrtInStream *cmpd_open_input(FrtStore *store, const char *file_name) {
     FileEntry *entry;
     FrtCompoundStore *cmpd = store->dir.cmpd;
     FrtInStream *is;
@@ -178,32 +161,28 @@ static FrtInStream *cmpd_open_input(FrtStore *store, const char *file_name)
     return is;
 }
 
-static FrtOutStream *cmpd_new_output(FrtStore *store, const char *file_name)
-{
+static FrtOutStream *cmpd_new_output(FrtStore *store, const char *file_name) {
     (void)store;
     (void)file_name;
     FRT_RAISE(FRT_UNSUPPORTED_ERROR, "%s", FRT_UNSUPPORTED_ERROR_MSG);
     return NULL;
 }
 
-static FrtLock *cmpd_open_lock_i(FrtStore *store, const char *lock_name)
-{
+static FrtLock *cmpd_open_lock_i(FrtStore *store, const char *lock_name) {
     (void)store;
     (void)lock_name;
     FRT_RAISE(FRT_UNSUPPORTED_ERROR, "%s", FRT_UNSUPPORTED_ERROR_MSG);
     return NULL;
 }
 
-static void cmpd_close_lock_i(FrtLock *lock)
-{
+static void cmpd_close_lock_i(FrtLock *lock) {
     (void)lock;
     FRT_RAISE(FRT_UNSUPPORTED_ERROR, "%s", FRT_UNSUPPORTED_ERROR_MSG);
 }
 
-FrtStore *frt_open_cmpd_store(FrtStore *store, const char *name)
-{
+FrtStore *frt_open_cmpd_store(FrtStore *store, const char *name) {
     int count, i;
-    off_t offset;
+    frt_off_t offset;
     char *fname;
     FileEntry *volatile entry = NULL;
     FrtStore *new_store = NULL;
@@ -214,6 +193,7 @@ FrtStore *frt_open_cmpd_store(FrtStore *store, const char *name)
         cmpd = FRT_ALLOC_AND_ZERO(FrtCompoundStore);
 
         cmpd->store       = store;
+        FRT_REF(store);
         cmpd->name        = name;
         cmpd->entries     = frt_h_new_str(&free, &free);
         is = cmpd->stream = store->open_input(store, cmpd->name);
@@ -235,6 +215,7 @@ FrtStore *frt_open_cmpd_store(FrtStore *store, const char *name)
             frt_h_set(cmpd->entries, fname, entry);
         }
     FRT_XCATCHALL
+        frt_store_close(store);
         if (is) frt_is_close(is);
         if (cmpd->entries) frt_h_destroy(cmpd->entries);
         free(cmpd);
@@ -270,18 +251,17 @@ FrtStore *frt_open_cmpd_store(FrtStore *store, const char *name)
  *
  ****************************************************************************/
 
-FrtCompoundWriter *frt_open_cw(FrtStore *store, char *name)
-{
+FrtCompoundWriter *frt_open_cw(FrtStore *store, char *name) {
     FrtCompoundWriter *cw = FRT_ALLOC(FrtCompoundWriter);
     cw->store = store;
+    FRT_REF(store);
     cw->name = name;
     cw->ids = frt_hs_new_str(&free);
     cw->file_entries = frt_ary_new_type_capa(FrtCWFileEntry, FRT_CW_INIT_CAPA);
     return cw;
 }
 
-void frt_cw_add_file(FrtCompoundWriter *cw, char *id)
-{
+void frt_cw_add_file(FrtCompoundWriter *cw, char *id) {
     id = frt_estrdup(id);
     if (frt_hs_add(cw->ids, id) != FRT_HASH_KEY_DOES_NOT_EXIST) {
         FRT_RAISE(FRT_IO_ERROR, "Tried to add file \"%s\" which has already been "
@@ -292,11 +272,10 @@ void frt_cw_add_file(FrtCompoundWriter *cw, char *id)
     frt_ary_last(cw->file_entries).name = id;
 }
 
-static void cw_copy_file(FrtCompoundWriter *cw, FrtCWFileEntry *src, FrtOutStream *os)
-{
-    off_t start_ptr = frt_os_pos(os);
-    off_t end_ptr;
-    off_t remainder, length, len;
+static void cw_copy_file(FrtCompoundWriter *cw, FrtCWFileEntry *src, FrtOutStream *os) {
+    frt_off_t start_ptr = frt_os_pos(os);
+    frt_off_t end_ptr;
+    frt_off_t remainder, length, len;
     frt_uchar buffer[FRT_BUFFER_SIZE];
 
     FrtInStream *is = cw->store->open_input(cw->store, src->name);
@@ -329,8 +308,7 @@ static void cw_copy_file(FrtCompoundWriter *cw, FrtCWFileEntry *src, FrtOutStrea
     frt_is_close(is);
 }
 
-void frt_cw_close(FrtCompoundWriter *cw, FrtDeleter *dlr)
-{
+void frt_cw_close(FrtCompoundWriter *cw, FrtDeleter *dlr) {
     FrtOutStream *os = NULL;
     int i;
 
@@ -366,12 +344,9 @@ void frt_cw_close(FrtCompoundWriter *cw, FrtDeleter *dlr)
         frt_os_seek(os, cw->file_entries[i].dir_offset);
         frt_os_write_u64(os, cw->file_entries[i].data_offset);
     }
-
-    if (os) {
-        frt_os_close(os);
-    }
-
+    frt_os_close(os);
     frt_hs_destroy(cw->ids);
     frt_ary_free(cw->file_entries);
+    frt_store_close(cw->store);
     free(cw);
 }

data/ext/isomorfeus_ferret_ext/frt_config.h

@@ -1,6 +1,8 @@
 #ifndef FRT_DEFINES_H
 #define FRT_DEFINES_H
 
+#define _FILE_OFFSET_BITS 64
+
 #include <sys/types.h>
 #include <limits.h>
 #include "frt_posh.h"
@@ -24,6 +26,12 @@ typedef posh_i32_t frt_i32;
 typedef posh_u64_t frt_u64;
 typedef posh_i64_t frt_i64;
 
+#if defined POSH_OS_WIN64
+typedef off64_t frt_off_t;
+#else
+typedef off_t frt_off_t;
+#endif
+
 #if ( LONG_MAX == 2147483647 ) && defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
 #define FRT_OFF_T_PFX "ll"
 #else

data/ext/isomorfeus_ferret_ext/frt_except.c

@@ -33,6 +33,7 @@ static frt_thread_once_t exception_stack_key_once = FRT_THREAD_ONCE_INIT;
 
 static void exception_stack_alloc(void) {
     frt_thread_key_create(&exception_stack_key, NULL);
+    frt_thread_setspecific(exception_stack_key, NULL);
 }
 
 void frt_xpush_context(frt_xcontext_t *context) {

data/ext/isomorfeus_ferret_ext/frt_field_index.c

@@ -1,7 +1,7 @@
 #include <string.h>
 #include "frt_field_index.h"
 
-#undef close
+// #undef close
 
 /***************************************************************************
  *

data/ext/isomorfeus_ferret_ext/frt_filter.c

@@ -14,9 +14,7 @@ void frt_filt_destroy_i(FrtFilter *filt) {
 }
 
 void frt_filt_deref(FrtFilter *filt) {
-    if (--(filt->ref_cnt) == 0) {
-        filt->destroy_i(filt);
-    }
+    if (FRT_DEREF(filt) == 0) filt->destroy_i(filt);
 }
 
 FrtBitVector *frt_filt_get_bv(FrtFilter *filt, FrtIndexReader *ir) {
@@ -97,7 +95,7 @@ static FrtBitVector *qfilt_get_bv_i(FrtFilter *filt, FrtIndexReader *ir) {
         scorer->destroy(scorer);
     }
     weight->destroy(weight);
-    free(sea);
+    frt_searcher_close(sea);
     return bv;
 }
 

data/ext/isomorfeus_ferret_ext/frt_fs_store.c

@@ -223,10 +223,9 @@ static void fs_destroy(FrtStore *store)
         FRT_HANDLED();
     FRT_XENDTRY
     free(store->dir.path);
-    frt_store_destroy(store);
 }
 
-static off_t fs_length(FrtStore *store, const char *filename)
+static frt_off_t fs_length(FrtStore *store, const char *filename)
 {
     char path[FRT_MAX_FILE_PATH];
     struct stat stt;
@@ -248,9 +247,12 @@ static void fso_flush_i(FrtOutStream *os, const frt_uchar *src, int len)
     }
 }
 
-static void fso_seek_i(FrtOutStream *os, off_t pos)
-{
+static void fso_seek_i(FrtOutStream *os, frt_off_t pos) {
+#if (defined POSH_OS_WIN32 || defined POSH_OS_WIN64)
+    if (_lseeki64(os->file.fd, pos, SEEK_SET) < 0) {
+#else
     if (lseek(os->file.fd, pos, SEEK_SET) < 0) {
+#endif
         FRT_RAISE(FRT_IO_ERROR, "seeking position %"FRT_OFF_T_PFX"d: <%s>",
               pos, strerror(errno));
     }
@@ -286,8 +288,8 @@ static FrtOutStream *fs_new_output(FrtStore *store, const char *filename)
 
 static void fsi_read_i(FrtInStream *is, frt_uchar *path, int len)
 {
-    int fd = is->file.fd;
-    off_t pos = frt_is_pos(is);
+    int fd = is->f->file.fd;
+    frt_off_t pos = frt_is_pos(is);
     if (pos != lseek(fd, 0, SEEK_CUR)) {
         lseek(fd, pos, SEEK_SET);
     }
@@ -300,9 +302,12 @@ static void fsi_read_i(FrtInStream *is, frt_uchar *path, int len)
     }
 }
 
-static void fsi_seek_i(FrtInStream *is, off_t pos)
-{
-    if (lseek(is->file.fd, pos, SEEK_SET) < 0) {
+static void fsi_seek_i(FrtInStream *is, frt_off_t pos) {
+#if (defined POSH_OS_WIN32 || defined POSH_OS_WIN64)
+    if (_lseeki64(is->f->file.fd, pos, SEEK_SET) < 0) {
+#else
+    if (lseek(is->f->file.fd, pos, SEEK_SET) < 0) {
+#endif
         FRT_RAISE(FRT_IO_ERROR, "seeking pos %"FRT_OFF_T_PFX"d: <%s>",
               pos, strerror(errno));
     }
@@ -310,16 +315,16 @@ static void fsi_seek_i(FrtInStream *is, off_t pos)
 
 static void fsi_close_i(FrtInStream *is)
 {
-    if (close(is->file.fd)) {
+    if (close(is->f->file.fd)) {
         FRT_RAISE(FRT_IO_ERROR, "%s", strerror(errno));
     }
-    free(is->d.path);
+    if (is->d.path) free(is->d.path);
 }
 
-static off_t fsi_length_i(FrtInStream *is)
+static frt_off_t fsi_length_i(FrtInStream *is)
 {
     struct stat stt;
-    if (fstat(is->file.fd, &stt)) {
+    if (fstat(is->f->file.fd, &stt)) {
         FRT_RAISE(FRT_IO_ERROR, "fstat failed: <%s>", strerror(errno));
     }
     return stt.st_size;
@@ -343,7 +348,8 @@ static FrtInStream *fs_open_input(FrtStore *store, const char *filename)
               path, strerror(errno));
     }
     is = frt_is_new();
-    is->file.fd = fd;
+    is->f->file.fd = fd;
+    is->f->ref_cnt = 1;
     is->d.path = frt_estrdup(path);
     is->m = &FS_IN_STREAM_METHODS;
     return is;
@@ -400,6 +406,7 @@ static FrtLock *fs_open_lock_i(FrtStore *store, const char *lockname)
     snprintf(lname, 100, "%s%s.lck", FRT_LOCK_PREFIX, lockname);
     lock->name = frt_estrdup(join_path(path, store->dir.path, lname));
     lock->store = store;
+    FRT_REF(store);
     lock->obtain = &fs_lock_obtain;
     lock->release = &fs_lock_release;
     lock->is_locked = &fs_lock_is_locked;
@@ -409,6 +416,7 @@ static FrtLock *fs_open_lock_i(FrtStore *store, const char *lockname)
 
 static void fs_close_lock_i(FrtLock *lock)
 {
+    frt_store_close(lock->store);
     remove(lock->name);
     free(lock->name);
     free(lock);
@@ -486,11 +494,8 @@ FrtStore *frt_open_fs_store(const char *pathname)
     frt_mutex_lock(&stores_mutex);
     store = (FrtStore *)frt_h_get(stores, pathname);
     if (store) {
-        frt_mutex_lock(&store->mutex);
-        store->ref_cnt++;
-        frt_mutex_unlock(&store->mutex);
-    }
-    else {
+        FRT_REF(store);
+    } else {
         store = fs_store_new(pathname);
         frt_h_set(stores, store->dir.path, store);
     }

data/ext/isomorfeus_ferret_ext/frt_global.c

@@ -116,13 +116,15 @@ char *frt_estrdup(const char *s) {
 char *frt_dbl_to_s(char *buf, double num) {
     char *p, *e;
 
-#ifdef FRT_IS_C99
     if (isinf(num)) {
-        return frt_estrdup(num < 0 ? "-Infinity" : "Infinity");
+        if (num < 0) {
+            return strcpy(buf, "-Infinity");
+        } else {
+            return strcpy(buf, "Infinity");
+        }
     } else if (isnan(num)) {
-        return frt_estrdup("NaN");
+        return strcpy(buf, "NaN");
     }
-#endif
 
     sprintf(buf, FRT_DBL2S, num);
     if (!(e = strchr(buf, 'e'))) {

data/ext/isomorfeus_ferret_ext/frt_global.h

@@ -49,7 +49,7 @@ typedef void (*frt_free_ft)(void *key);
 #define FRT_ALLOC_AND_ZERO_N(type,n) (type*)frt_ecalloc(sizeof(type)*(n))
 
 #define FRT_REF(a) (a)->ref_cnt++
-#define FRT_DEREF(a) (a)->ref_cnt--
+#define FRT_DEREF(a) --((a)->ref_cnt)
 
 #define FRT_NEXT_NUM(index, size) (((index) + 1) % (size))
 #define FRT_PREV_NUM(index, size) (((index) + (size) - 1) % (size))