isomorfeus-ferret 0.14.4 → 0.15.0

data/ext/isomorfeus_ferret_ext/frt_ram_store.c

@@ -1,7 +1,7 @@
 #include "frt_store.h"
 #include <string.h>
 
-static FrtRAMFile *rf_new(const char *name) {
+FrtRAMFile *rf_new(const char *name) {
     FrtRAMFile *rf = FRT_ALLOC(FrtRAMFile);
     rf->buffers = FRT_ALLOC(frt_uchar *);
     rf->buffers[0] = FRT_ALLOC_N(frt_uchar, FRT_BUFFER_SIZE);
@@ -12,14 +12,14 @@ static FrtRAMFile *rf_new(const char *name) {
     return rf;
 }
 
-static void rf_extend_if_necessary(FrtRAMFile *rf, int buf_num) {
+void rf_extend_if_necessary(FrtRAMFile *rf, int buf_num) {
     while (rf->bufcnt <= buf_num) {
         FRT_REALLOC_N(rf->buffers, frt_uchar *, (rf->bufcnt + 1));
         rf->buffers[rf->bufcnt++] = FRT_ALLOC_N(frt_uchar, FRT_BUFFER_SIZE);
     }
 }
 
-static void rf_close(void *p) {
+void rf_close(void *p) {
     FrtRAMFile *rf = (FrtRAMFile *)p;
     if (FRT_DEREF(rf) == 0) {
         int i;
@@ -145,7 +145,7 @@ static frt_off_t ram_length(FrtStore *store, const char *filename) {
     }
 }
 
-static void ramo_flush_i(FrtOutStream *os, const frt_uchar *src, int len) {
+void ramo_flush_i(FrtOutStream *os, const frt_uchar *src, int len) {
     if (len == 0) { return; }
     frt_uchar *buffer;
     FrtRAMFile *rf = os->file.rf;
@@ -179,7 +179,7 @@ static void ramo_flush_i(FrtOutStream *os, const frt_uchar *src, int len) {
     }
 }
 
-static void ramo_seek_i(FrtOutStream *os, frt_off_t pos) {
+void ramo_seek_i(FrtOutStream *os, frt_off_t pos) {
     os->pointer = pos;
 }
 
@@ -242,7 +242,7 @@ static FrtOutStream *ram_new_output(FrtStore *store, const char *filename) {
     return os;
 }
 
-static void rami_read_i(FrtInStream *is, frt_uchar *b, int len) {
+void rami_read_i(FrtInStream *is, frt_uchar *b, int len) {
     FrtRAMFile *rf = is->f->file.rf;
 
     int offset = 0;
@@ -271,15 +271,15 @@ static void rami_read_i(FrtInStream *is, frt_uchar *b, int len) {
     is->d.pointer += len;
 }
 
-static frt_off_t rami_length_i(FrtInStream *is) {
+frt_off_t rami_length_i(FrtInStream *is) {
     return is->f->file.rf->len;
 }
 
-static void rami_seek_i(FrtInStream *is, frt_off_t pos) {
+void rami_seek_i(FrtInStream *is, frt_off_t pos) {
     is->d.pointer = pos;
 }
 
-static void rami_close_i(FrtInStream *is) {
+void rami_close_i(FrtInStream *is) {
     FrtRAMFile *rf = is->f->file.rf;
     rf_close(rf);
 }

data/ext/isomorfeus_ferret_ext/frt_search.c

@@ -480,8 +480,6 @@ static int match_range_cmp(const void *p1, const void *p2)
     }
 }
 
-
-
 /* ** FrtMatchVector ** */
 FrtMatchVector *frt_matchv_new(void) {
     FrtMatchVector *matchv = FRT_ALLOC(FrtMatchVector);
@@ -559,7 +557,6 @@ FrtMatchVector *frt_matchv_compact_with_breaks(FrtMatchVector *self)
     return self;
 }
 
-
 static FrtMatchVector *matchv_set_offsets(FrtMatchVector *mv, FrtOffset *offsets)
 {
     int i;

data/ext/isomorfeus_ferret_ext/frt_search.h

@@ -890,7 +890,7 @@ typedef struct FrtFieldStack {
 } FrtFieldStack;
 
 typedef struct FrtQueryParser {
-    frt_mutex_t    mutex;
+    pthread_mutex_t mutex;
     int            def_slop;
     int            max_clauses;
     int            phq_pos_inc;

data/ext/isomorfeus_ferret_ext/frt_sort.c

@@ -372,9 +372,9 @@ static Comparator *sorter_get_comparator(FrtSortField *sf, FrtIndexReader *ir) {
                 te->close(te);
             }
         }
-        frt_mutex_lock(&ir->field_index_mutex);
+        pthread_mutex_lock(&ir->field_index_mutex);
         field_index = frt_field_index_get(ir, sf->field, sf->field_index_class);
-        frt_mutex_unlock(&ir->field_index_mutex);
+        pthread_mutex_unlock(&ir->field_index_mutex);
         index = field_index->index;
     }
     return comparator_new(index, sf->reverse, sf->compare);

data/ext/isomorfeus_ferret_ext/frt_store.c

@@ -54,8 +54,8 @@ FrtStore *frt_store_alloc(void) {
 
 FrtStore *frt_store_init(FrtStore *store) {
     store->ref_cnt = 1;
-    frt_mutex_init(&store->mutex_i, NULL);
-    frt_mutex_init(&store->mutex, NULL);
+    pthread_mutex_init(&store->mutex_i, NULL);
+    pthread_mutex_init(&store->mutex, NULL);
     store->locks = frt_hs_new_ptr((frt_free_ft)&frt_close_lock_i);
     store->rstore = Qnil;
     return store;
@@ -73,17 +73,16 @@ FrtStore *frt_store_new(void) {
  */
 void frt_store_close(FrtStore *store) {
     if (store->ref_cnt == 0) {
-        fprintf(stderr, "store ref_cnt to low\n");
         FRT_RAISE(FRT_STATE_ERROR, "store ref_cnt to low\n");
     }
 
     if (FRT_DEREF(store) == 0) {
-        frt_mutex_lock(&store->mutex_i);
+        pthread_mutex_lock(&store->mutex_i);
         store->close_i(store);
         frt_hs_destroy(store->locks);
-        frt_mutex_destroy(&store->mutex);
-        frt_mutex_unlock(&store->mutex_i);
-        frt_mutex_destroy(&store->mutex_i);
+        pthread_mutex_destroy(&store->mutex);
+        pthread_mutex_unlock(&store->mutex_i);
+        pthread_mutex_destroy(&store->mutex_i);
         free(store);
     }
 }
@@ -286,7 +285,6 @@ void frt_is_seek(FrtInStream *is, frt_off_t pos) {
 
 void frt_is_close(FrtInStream *is) {
     if (is->ref_cnt == 0) {
-        fprintf(stderr, "is ref_cnt to low\n");
         FRT_RAISE(FRT_STATE_ERROR, "is ref_cnt to low\n");
     }
 

data/ext/isomorfeus_ferret_ext/frt_store.h

@@ -6,18 +6,22 @@
 #include "frt_hash.h"
 #include "frt_hashset.h"
 #include "frt_threading.h"
+#if defined POSH_OS_WIN32 || defined POSH_OS_WIN64
+#define HAVE_STRUCT_IOVEC
+#endif
+#include "mdbx.h"
 
 #define FRT_LOCK_PREFIX "ferret-"
 #define FRT_LOCK_EXT ".lck"
 
-typedef struct FrtBuffer
-{
+typedef struct FrtBuffer {
     frt_uchar buf[FRT_BUFFER_SIZE];
     frt_off_t start;
     frt_off_t pos;
     frt_off_t len;
 } FrtBuffer;
 
+typedef struct FrtStore FrtStore;
 typedef struct FrtOutStream FrtOutStream;
 struct FrtOutStreamMethods {
     /* internal functions for the FrtInStream */
@@ -49,24 +53,22 @@ struct FrtOutStreamMethods {
     void (*close_i)(struct FrtOutStream *os);
 };
 
-typedef struct FrtRAMFile
-{
+typedef struct FrtRAMFile {
     char        *name;
     frt_uchar   **buffers;
     int         bufcnt;
-    frt_off_t       len;
+    frt_off_t   len;
     _Atomic unsigned int ref_cnt;
 } FrtRAMFile;
 
-struct FrtOutStream
-{
+struct FrtOutStream {
     FrtBuffer buf;
-    union
-    {
+    frt_off_t pointer;             /* only used by RAMOut */
+    FrtStore  *store;
+    union {
         int fd;
         FrtRAMFile *rf;
     } file;
-    frt_off_t  pointer;             /* only used by RAMOut */
     const struct FrtOutStreamMethods *m;
 };
 
@@ -74,8 +76,7 @@ typedef struct FrtCompoundInStream FrtCompoundInStream;
 
 typedef struct FrtInStream FrtInStream;
 
-struct FrtInStreamMethods
-{
+struct FrtInStreamMethods {
     /**
      * Read +len+ characters from the input stream into the +offset+ position in
      * +buf+, an array of unsigned characters.
@@ -134,8 +135,7 @@ struct FrtInStream {
     const struct FrtInStreamMethods *m;
 };
 
-struct FrtCompoundInStream
-{
+struct FrtCompoundInStream {
     FrtInStream *sub;
     frt_off_t offset;
     frt_off_t length;
@@ -143,10 +143,8 @@ struct FrtCompoundInStream
 
 #define frt_is_length(mis) mis->m->length_i(mis)
 
-typedef struct FrtStore FrtStore;
 typedef struct FrtLock FrtLock;
-struct FrtLock
-{
+struct FrtLock {
     char *name;
     FrtStore *store;
     int (*obtain)(FrtLock *lock);
@@ -155,22 +153,27 @@ struct FrtLock
     VALUE rlock;
 };
 
-typedef struct FrtCompoundStore
-{
+typedef struct FrtCompoundStore {
     FrtStore *store;
     const char *name;
     FrtHash *entries;
     FrtInStream *stream;
 } FrtCompoundStore;
 
+typedef struct MDBXInfo {
+    MDBX_env *env;
+    char     *path;
+} MDBXInfo;
+
 struct FrtStore {
     _Atomic unsigned int ref_cnt;
-    frt_mutex_t mutex_i;        /* for internal use only */
-    frt_mutex_t mutex;          /* external mutex for use outside */
+    pthread_mutex_t      mutex_i;        /* for internal use only */
+    pthread_mutex_t      mutex;          /* external mutex for use outside */
     union {
         char             *path; /* for fs_store only */
         FrtHash          *ht;   /* for ram_store only */
         FrtCompoundStore *cmpd; /* for compound_store only */
+        MDBXInfo         *mdbx;  /* for mdbx store only */
     } dir;
 #if defined POSH_OS_WIN32 || defined POSH_OS_WIN64
     int         file_mode;
@@ -336,6 +339,15 @@ struct FrtStore {
  */
 extern FrtStore *frt_open_fs_store(const char *pathname);
 
+/**
+ * Create a newly allocated MDBX FrtStore at the pathname designated. The
+ * pathname must be the name of an existing directory.
+ *
+ * @param pathname the pathname of the directory to be used by the index
+ * @return a newly allocated MDBX FrtStore.
+ */
+extern FrtStore *frt_open_mdbx_store(const char *pathname);
+
 /**
  * Create a newly allocated in-memory or RAM FrtStore.
  *
@@ -792,4 +804,14 @@ extern FrtInStream *frt_is_new();
 extern int frt_file_is_lock(const char *filename);
 extern bool frt_file_name_filter_is_index_file(const char *file_name, bool include_locks);
 
+extern void ramo_flush_i(FrtOutStream *os, const frt_uchar *src, int len);
+extern void ramo_seek_i(FrtOutStream *os, frt_off_t pos);
+extern void rami_read_i(FrtInStream *is, frt_uchar *b, int len);
+extern void rami_seek_i(FrtInStream *is, frt_off_t pos);
+extern void rami_close_i(FrtInStream *is);
+extern frt_off_t rami_length_i(FrtInStream *is);
+extern void rf_close(void *p);
+extern FrtRAMFile *rf_new(const char *name);
+extern void rf_extend_if_necessary(FrtRAMFile *rf, int buf_num);
+
 #endif

data/ext/isomorfeus_ferret_ext/frt_threading.h

@@ -3,27 +3,11 @@
 
 #include <pthread.h>
 
-typedef pthread_mutex_t frt_mutex_t;
 typedef struct FrtHash *frt_thread_key_t;
-typedef pthread_once_t frt_thread_once_t;
 
-// extern void frb_thread_once(int *once_control, void (*init_routine) (void));
 extern int frb_thread_key_create(frt_thread_key_t *key, void (*destr_function)(void *));
 extern void frb_thread_key_delete(frt_thread_key_t key);
 extern void frb_thread_setspecific(frt_thread_key_t key, const void *pointer);
 extern void *frb_thread_getspecific(frt_thread_key_t key);
 
-#define FRT_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
-#define FRT_THREAD_ONCE_INIT PTHREAD_ONCE_INIT
-#define frt_mutex_init(a, b) pthread_mutex_init(a, b)
-#define frt_mutex_lock(a) pthread_mutex_lock(a)
-#define frt_mutex_trylock(a) pthread_mutex_trylock(a)
-#define frt_mutex_unlock(a) pthread_mutex_unlock(a)
-#define frt_mutex_destroy(a) pthread_mutex_destroy(a)
-#define frt_thread_key_create(a, b) frb_thread_key_create(a, b)
-#define frt_thread_key_delete(a) frb_thread_key_delete(a)
-#define frt_thread_setspecific(a, b) frb_thread_setspecific(a, b)
-#define frt_thread_getspecific(a) frb_thread_getspecific(a)
-#define frt_thread_once(a, b) pthread_once(a, b)
-
 #endif

data/ext/isomorfeus_ferret_ext/isomorfeus_ferret.c

@@ -1,11 +1,9 @@
 #include <errno.h>
 #include "isomorfeus_ferret.h"
-#include "frt_global.h"
 #include "frt_except.h"
 #include "frt_hash.h"
 #include "frt_hashset.h"
 #include "frt_threading.h"
-#include "ruby.h"
 
 /* IDs */
 ID id_new;
@@ -55,13 +53,6 @@ int value_eq(const void *key1, const void *key2) {
     return key1 == key2;
 }
 
-void frb_thread_once(int *once_control, void (*init_routine) (void)) {
-    if (*once_control) {
-        init_routine();
-        *once_control = 0;
-    }
-}
-
 int frb_thread_key_create(frt_thread_key_t *key, void (*destr_function)(void *)) {
     *key = frt_h_new(&value_hash, &value_eq, NULL, destr_function);
     return 0;