isomorfeus-ferret 0.15.0 → 0.16.0

data/ext/isomorfeus_ferret_ext/frb_store.c

@@ -9,7 +9,6 @@ VALUE cLock;
 VALUE cLockError;
 VALUE cDirectory;
 VALUE cRAMDirectory;
-VALUE cFSDirectory;
 VALUE cMDBXDirectory;
 
 /****************************************************************************
@@ -79,6 +78,9 @@ const rb_data_type_t frb_lock_t = {
  *            Lock::LockError otherwise.
  */
 static VALUE frb_lock_obtain(int argc, VALUE *argv, VALUE self) {
+    int ex_code = 0;
+    const char *msg = NULL;
+
     VALUE rtimeout;
     int timeout = 1;
     FrtLock *lock;
@@ -91,17 +93,28 @@ static VALUE frb_lock_obtain(int argc, VALUE *argv, VALUE self) {
         timeout = FIX2INT(rtimeout);
     }
     end_t = time(NULL) + timeout;
-    if (lock->obtain(lock)) {
-        got_lock = true;
-    }
-    while (!got_lock && !got_timeout) {
-        frt_micro_sleep(10000);
+    FRT_TRY
         if (lock->obtain(lock)) {
             got_lock = true;
-        } else if (time(NULL) >= end_t) {
-            got_timeout = true;
         }
+        while (!got_lock && !got_timeout) {
+            frt_micro_sleep(10000);
+            if (lock->obtain(lock)) {
+                got_lock = true;
+            } else if (time(NULL) >= end_t) {
+                got_timeout = true;
+            }
+        }
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
     }
+
     if (!got_lock) {
         rb_raise(cLockError, "could not obtain lock: #%s", lock->name);
     }
@@ -123,6 +136,8 @@ static VALUE frb_lock_obtain(int argc, VALUE *argv, VALUE self) {
  *            Lock::LockError otherwise.
  */
 static VALUE frb_lock_while_locked(int argc, VALUE *argv, VALUE self) {
+    int ex_code = 0;
+    const char *msg = NULL;
     VALUE rtimeout;
     int timeout = 1;
     FrtLock *lock;
@@ -135,22 +150,45 @@ static VALUE frb_lock_while_locked(int argc, VALUE *argv, VALUE self) {
         timeout = FIX2INT(rtimeout);
     }
     end_t = time(NULL) + timeout;
-    if (lock->obtain(lock)) {
-        got_lock = true;
-    }
-    while (!got_lock && !got_timeout) {
-        frt_micro_sleep(10000);
+    FRT_TRY
         if (lock->obtain(lock)) {
             got_lock = true;
-        } else if (time(NULL) >= end_t) {
-            got_timeout = true;
         }
+        while (!got_lock && !got_timeout) {
+            frt_micro_sleep(10000);
+            if (lock->obtain(lock)) {
+                got_lock = true;
+            } else if (time(NULL) >= end_t) {
+                got_timeout = true;
+            }
+        }
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
     }
+
     if (!got_lock) {
         rb_raise(cLockError, "could not obtain lock: #%s", lock->name);
     }
+
     rb_yield(Qnil);
-    lock->release(lock);
+
+    FRT_TRY
+        lock->release(lock);
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
     return Qtrue;
 }
 
@@ -161,9 +199,24 @@ static VALUE frb_lock_while_locked(int argc, VALUE *argv, VALUE self) {
  *  Returns true if the lock has been obtained.
  */
 static VALUE frb_lock_is_locked(VALUE self) {
+    int ex_code = 0;
+    const char *msg = NULL;
     FrtLock *lock;
+    bool res;
     GET_LOCK(lock, self);
-    return lock->is_locked(lock) ? Qtrue : Qfalse;
+    FRT_TRY
+        res = lock->is_locked(lock);
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
+
+    return res ? Qtrue : Qfalse;
 }
 
 /*
@@ -174,9 +227,22 @@ static VALUE frb_lock_is_locked(VALUE self) {
  *  the lock.
  */
 static VALUE frb_lock_release(VALUE self) {
+    int ex_code = 0;
+    const char *msg = NULL;
+
     FrtLock *lock;
     GET_LOCK(lock, self);
-    lock->release(lock);
+    FRT_TRY
+        lock->release(lock);
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
     return self;
 }
 
@@ -246,9 +312,25 @@ static VALUE frb_dir_close(VALUE self) {
  *  Return true if a file with the name +file_name+ exists in the directory.
  */
 static VALUE frb_dir_exists(VALUE self, VALUE rfname) {
+    int ex_code = 0;
+    const char *msg = NULL;
     FrtStore *store = DATA_PTR(self);
     StringValue(rfname);
-    return store->exists(store, rs2s(rfname)) ? Qtrue : Qfalse;
+    bool res;
+
+    FRT_TRY
+        res = store->exists(store, rs2s(rfname));
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
+
+    return res ? Qtrue : Qfalse;
 }
 
 /*
@@ -258,9 +340,23 @@ static VALUE frb_dir_exists(VALUE self, VALUE rfname) {
  *  Create an empty file in the directory with the name +file_name+.
  */
 static VALUE frb_dir_touch(VALUE self, VALUE rfname) {
+    int ex_code = 0;
+    const char *msg = NULL;
     FrtStore *store = DATA_PTR(self);
     StringValue(rfname);
-    store->touch(store, rs2s(rfname));
+
+    FRT_TRY
+        store->touch(store, rs2s(rfname));
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
+
     return Qnil;
 }
 
@@ -271,9 +367,24 @@ static VALUE frb_dir_touch(VALUE self, VALUE rfname) {
  *  Remove file +file_name+ from the directory. Returns true if successful.
  */
 static VALUE frb_dir_delete(VALUE self, VALUE rfname) {
+    int ex_code = 0;
+    const char *msg = NULL;
     FrtStore *store = DATA_PTR(self);
     StringValue(rfname);
-    return (store->remove(store, rs2s(rfname)) == 0) ? Qtrue : Qfalse;
+    bool res;
+    FRT_TRY
+        res = (store->remove(store, rs2s(rfname)) == 0);
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
+
+    return res ? Qtrue : Qfalse;
 }
 
 /*
@@ -283,8 +394,23 @@ static VALUE frb_dir_delete(VALUE self, VALUE rfname) {
  *  Return a count of the number of files in the directory.
  */
 static VALUE frb_dir_file_count(VALUE self) {
+    int ex_code = 0;
+    const char *msg = NULL;
     FrtStore *store = DATA_PTR(self);
-    return INT2FIX(store->count(store));
+    int cnt = 0;
+    FRT_TRY
+        cnt = INT2FIX(store->count(store));
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
+
+    return cnt;
 }
 
 /*
@@ -294,8 +420,22 @@ static VALUE frb_dir_file_count(VALUE self) {
  *  Delete all files in the directory. It gives you a clean slate.
  */
 static VALUE frb_dir_refresh(VALUE self) {
+    int ex_code = 0;
+    const char *msg = NULL;
     FrtStore *store = DATA_PTR(self);
-    store->clear_all(store);
+
+    FRT_TRY
+        store->clear_all(store);
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
+
     return self;
 }
 
@@ -307,10 +447,24 @@ static VALUE frb_dir_refresh(VALUE self) {
  *  doesn't exist or there is some other type of IOError.
  */
 static VALUE frb_dir_rename(VALUE self, VALUE rfrom, VALUE rto) {
+    int ex_code = 0;
+    const char *msg = NULL;
+
     FrtStore *store = DATA_PTR(self);
     StringValue(rfrom);
     StringValue(rto);
-    store->rename(store, rs2s(rfrom), rs2s(rto));
+    FRT_TRY
+        store->rename(store, rs2s(rfrom), rs2s(rto));
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
+
     return self;
 }
 
@@ -324,11 +478,25 @@ static VALUE frb_dir_rename(VALUE self, VALUE rfrom, VALUE rto) {
  *  reserved for lock files
  */
 static VALUE frb_dir_make_lock(VALUE self, VALUE rlock_name) {
+    int ex_code = 0;
+    const char *msg = NULL;
+
     VALUE rlock;
     FrtLock *lock;
     FrtStore *store = DATA_PTR(self);
     StringValue(rlock_name);
-    lock = frt_open_lock(store, rs2s(rlock_name));
+    FRT_TRY
+        lock = frt_open_lock(store, rs2s(rlock_name));
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
+
     rlock = TypedData_Wrap_Struct(cLock, &frb_lock_t, lock);
     lock->rlock = rlock;
     return rlock;
@@ -346,7 +514,7 @@ static VALUE frb_dir_make_lock(VALUE self, VALUE rlock_name) {
  *
  *  Create a new RAMDirectory.
  *
- *  You can optionally load another Directory (usually a FSDirectory) into
+ *  You can optionally load another Directory (usually a MDBXDirectory) into
  *  memory. This may be useful to speed up search performance but usually the
  *  speedup won't be worth the trouble. Be sure to benchmark.
  *
@@ -371,55 +539,6 @@ static VALUE frb_ramdir_init(int argc, VALUE *argv, VALUE self) {
     return self;
 }
 
-/****************************************************************************
- *
- * FSDirectory Methods
- *
- ****************************************************************************/
-
-/*
- *  call-seq:
- *     FSDirectory.new(/path/to/index/, create = false)
- *
- *  Create a new FSDirectory at +/path/to/index/+ which must be a valid path
- *  on your file system. If it doesn't exist it will be created. You can also
- *  specify the +create+ parameter. If +create+ is true the FSDirectory will
- *  be refreshed as new. That is to say, any existing files in the directory
- *  will be deleted. The default value for +create+ is false.
- *
- *  path::   path to index directory. Must be a valid path on your system
- *  create:: set to true if you want any existing files in the directory to be
- *           deleted
- */
-static VALUE frb_fsdir_new(int argc, VALUE *argv, VALUE klass) {
-    VALUE self, rpath, rcreate;
-    FrtStore *store;
-    bool create;
-
-    rb_scan_args(argc, argv, "11", &rpath, &rcreate);
-    StringValue(rpath);
-    create = RTEST(rcreate);
-    if (create) {
-        frb_create_dir(rpath);
-    }
-    if (!rb_funcall(rb_cFile, id_is_directory, 1, rpath)) {
-        rb_raise(cFileNotFoundError, "No directory <%s> found. Use :create => true to create one.", rs2s(rpath));
-    }
-    store = frt_open_fs_store(rs2s(rpath));
-    if (create) store->clear_all(store);
-    self = store->rstore;
-    if (self == Qnil || DATA_PTR(self) == NULL) {
-        self = TypedData_Wrap_Struct(klass, &frb_store_t, store);
-        store->rstore = self;
-        rb_ivar_set(self, id_ref_cnt, INT2FIX(0));
-    } else {
-        int ref_cnt = FIX2INT(rb_ivar_get(self, id_ref_cnt)) + 1;
-        rb_ivar_set(self, id_ref_cnt, INT2FIX(ref_cnt));
-    }
-    return self;
-}
-
-
 /****************************************************************************
  *
  * MDBXDirectory Methods
@@ -432,7 +551,7 @@ static VALUE frb_fsdir_new(int argc, VALUE *argv, VALUE klass) {
  *
  *  Create a new MDBXDirectory at +/path/to/env/+ which must be a valid path
  *  on your file system. If it doesn't exist it will be created. You can also
- *  specify the +create+ parameter. If +create+ is true the FSDirectory will
+ *  specify the +create+ parameter. If +create+ is true the MDBXDirectory will
  *  be refreshed as new. That is to say, any existing files in the directory
  *  will be deleted. The default value for +create+ is false.
  *
@@ -441,30 +560,49 @@ static VALUE frb_fsdir_new(int argc, VALUE *argv, VALUE klass) {
  *           deleted
  */
 static VALUE frb_mdbxdir_new(int argc, VALUE *argv, VALUE klass) {
-    VALUE self, rpath, rcreate;
+    VALUE self, rpath, mdbx_rpath, rcreate;
     FrtStore *store;
     bool create;
 
+    int ex_code = 0;
+    const char *msg = NULL;
+
     rb_scan_args(argc, argv, "11", &rpath, &rcreate);
     StringValue(rpath);
+
     create = RTEST(rcreate);
     if (create) {
         frb_create_dir(rpath);
-    }
-    if (!rb_funcall(rb_cFile, id_is_directory, 1, rpath)) {
-        rb_raise(cFileNotFoundError, "No directory <%s> found. Use :create => true to create one.", rs2s(rpath));
-    }
-    store = frt_open_mdbx_store(rs2s(rpath));
-    if (create) store->clear_all(store);
-    self = store->rstore;
-    if (self == Qnil || DATA_PTR(self) == NULL) {
-        self = TypedData_Wrap_Struct(klass, &frb_store_t, store);
-        store->rstore = self;
-        rb_ivar_set(self, id_ref_cnt, INT2FIX(0));
     } else {
-        int ref_cnt = FIX2INT(rb_ivar_get(self, id_ref_cnt)) + 1;
-        rb_ivar_set(self, id_ref_cnt, INT2FIX(ref_cnt));
+        mdbx_rpath = rb_str_dup(rpath);
+        rb_str_cat_cstr(mdbx_rpath, "/mdbx.dat");
+        if (!rb_funcall(rb_cFile, id_exist, 1, mdbx_rpath)) {
+            rb_raise(cFileNotFoundError, "No database at <%s> found. Use :create => true to create one.", rs2s(rpath));
+        }
     }
+
+    FRT_TRY
+        store = frt_open_mdbx_store(rs2s(rpath));
+        if (create) store->clear_all(store);
+        self = store->rstore;
+        if (self == Qnil || DATA_PTR(self) == NULL) {
+            self = TypedData_Wrap_Struct(klass, &frb_store_t, store);
+            store->rstore = self;
+            rb_ivar_set(self, id_ref_cnt, INT2FIX(0));
+        } else {
+            int ref_cnt = FIX2INT(rb_ivar_get(self, id_ref_cnt)) + 1;
+            rb_ivar_set(self, id_ref_cnt, INT2FIX(ref_cnt));
+        }
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
+
     return self;
 }
 
@@ -481,7 +619,7 @@ static VALUE frb_mdbxdir_new(int argc, VALUE *argv, VALUE klass) {
  *  Ruby's IO API is not used so that we can use different storage
  *  mechanisms to store the index. Some examples are;
  *
- *  * File system based storage (currently implemented as FSDirectory)
+ *  * MDBX system based storage (currently implemented as MDBXDirectory)
  *  * RAM based storage (currently implemented as RAMDirectory)
  *  * Database based storage
  *
@@ -497,6 +635,7 @@ void Init_Directory(void) {
     rb_define_const(cDirectory, "LOCK_PREFIX", rb_str_new2(FRT_LOCK_PREFIX));
     rb_define_method(cDirectory, "close", frb_dir_close, 0);
     rb_define_method(cDirectory, "exists?", frb_dir_exists, 1);
+    rb_define_method(cDirectory, "exist?", frb_dir_exists, 1);
     rb_define_method(cDirectory, "touch", frb_dir_touch, 1);
     rb_define_method(cDirectory, "delete", frb_dir_delete, 1);
     rb_define_method(cDirectory, "file_count", frb_dir_file_count, 0);
@@ -542,7 +681,7 @@ void Init_Lock(void) {
  *  Document-class: Ferret::Store::RAMDirectory
  *
  *  Memory resident Directory implementation. You should use a RAMDirectory
- *  during testing but otherwise you should stick with FSDirectory. While
+ *  during testing but otherwise you should stick with MDBXDirectory. While
  *  loading an index into memory may slightly speed things up, on most
  *  operating systems there won't be much difference so it wouldn't be worth
  *  your trouble.
@@ -553,21 +692,6 @@ void Init_RAMDirectory(void) {
     rb_define_method(cRAMDirectory, "initialize", frb_ramdir_init, -1);
 }
 
-/*
- *  Document-class: Ferret::Store::FSDirectory
- *
- *  File-system resident Directory implementation. The FSDirectory will use a
- *  single directory to store all of it's files. You should not otherwise
- *  touch this directory. Modifying the files in the directory will corrupt
- *  the index. The one exception to this rule is you may need to delete stale
- *  lock files which have a ".lck" extension.
- */
-void Init_FSDirectory(void) {
-    cFSDirectory = rb_define_class_under(mStore, "FSDirectory", cDirectory);
-    rb_define_alloc_func(cFSDirectory, frb_store_alloc);
-    rb_define_singleton_method(cFSDirectory, "new", frb_fsdir_new, -1);
-}
-
 /*
  *  Document-class: Ferret::Store::MDBXDirectory
  *
@@ -599,6 +723,5 @@ void Init_Store(void) {
     Init_Directory();
     Init_Lock();
     Init_RAMDirectory();
-    Init_FSDirectory();
     Init_MDBXDirectory();
 }

data/ext/isomorfeus_ferret_ext/frt_compound_io.c

@@ -152,7 +152,7 @@ static FrtInStream *cmpd_open_input(FrtStore *store, const char *file_name) {
     entry = (FileEntry *)frt_h_get(cmpd->entries, file_name);
     if (entry == NULL) {
         pthread_mutex_unlock(&store->mutex);
-        FRT_RAISE(FRT_IO_ERROR, "File %s does not exist: ", file_name);
+        FRT_RAISE(FRT_IO_ERROR, "File '%s' does not exist: ", file_name);
     }
 
     is = cmpd_create_input(cmpd->stream, entry->offset, entry->length);

data/ext/isomorfeus_ferret_ext/frt_index.c

@@ -6048,8 +6048,7 @@ static void iw_maybe_merge_segments(FrtIndexWriter *iw)
     }
 }
 
-static void iw_flush_ram_segment(FrtIndexWriter *iw)
-{
+static void iw_flush_ram_segment(FrtIndexWriter *iw) {
     FrtSegmentInfos *sis = iw->sis;
     FrtSegmentInfo *si;
     si = sis->segs[sis->size - 1];
@@ -6474,8 +6473,7 @@ static void iw_cp_files(FrtIndexWriter *iw, FrtSegmentReader *sr, FrtSegmentInfo
     iw_cp_norms( iw, sr, si,       NULL);
 }
 
-static void iw_add_segment(FrtIndexWriter *iw, FrtSegmentReader *sr)
-{
+static void iw_add_segment(FrtIndexWriter *iw, FrtSegmentReader *sr) {
     FrtSegmentInfo *si = frt_sis_new_segment(iw->sis, 0, iw->store);
     FrtFieldInfos *fis = iw->fis;
     FrtFieldInfos *sub_fis = sr->ir.fis;
@@ -6500,18 +6498,15 @@ static void iw_add_segment(FrtIndexWriter *iw, FrtSegmentReader *sr)
 
     if (must_map_fields) {
         iw_cp_map_files(iw, sr, si);
-    }
-    else {
+    } else {
         iw_cp_files(iw, sr, si);
     }
 }
 
-static void iw_add_segments(FrtIndexWriter *iw, FrtIndexReader *ir)
-{
+static void iw_add_segments(FrtIndexWriter *iw, FrtIndexReader *ir) {
     if (ir->num_docs == sr_num_docs) {
         iw_add_segment(iw, SR(ir));
-    }
-    else {
+    } else {
         int i;
         const int r_cnt = MR(ir)->r_cnt;
         FrtIndexReader **readers = MR(ir)->sub_readers;
@@ -6521,8 +6516,7 @@ static void iw_add_segments(FrtIndexWriter *iw, FrtIndexReader *ir)
     }
 }
 
-void frt_iw_add_readers(FrtIndexWriter *iw, FrtIndexReader **readers, const int r_cnt)
-{
+void frt_iw_add_readers(FrtIndexWriter *iw, FrtIndexReader **readers, const int r_cnt) {
     int i;
     pthread_mutex_lock(&iw->mutex);
     iw_optimize_i(iw);