isomorfeus-ferret 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc82aa85a233a1eb67ae971fbd6e5704b1f6b14660ed5673f9292a3021f34837
-  data.tar.gz: dea91e29a2a3c14381067d05177c455d8953b74f0187e9b7610997c4a1bc68ae
+  metadata.gz: '0910e1e8d9cb68f71275b885c83ac427fd06163d19c9d3353a5eac3899bf91a8'
+  data.tar.gz: b057b640008ef4384a7d118bb97ad6644c51b2fef0986bb02bc3ac296a423f8e
 SHA512:
-  metadata.gz: '064940571edfbb380795a71031274f6489010cdc28da4c26a64c769eee924593df069d72939a4f6e5e56b8b94398108e6e039c00526a250dbb5f51068a10880e'
-  data.tar.gz: 76edc3b5f07bd779498fe92d8630ec5f651e05eae82982fcedc853b9086fd7af84e827407ee0b2316456dc07bb7f508b63ded855278ff4ca38af18398ee7cc1e
+  metadata.gz: 8437a6d16ff08ebc05f78169a0ca1bfa6627b3994ecae09b25a1373a7cfd41c8836ee21cf0485f0b1008d34488da8f4e781a50e92f9847527f5f6c2b8729d3df
+  data.tar.gz: 7742111e748ba8adb135d50a8d676eb57c63e2bd723b5099a000f01f6e17dd0e3d1bfdd9e47bf7a5af67ad7ead75b6241b660af094f6b7e673115dd07e0abe7b

data/ext/isomorfeus_ferret_ext/frb_index.c

@@ -291,7 +291,7 @@ static VALUE frb_fis_create_index(VALUE self, VALUE rdir) {
     } else {
         StringValue(rdir);
         frb_create_dir(rdir);
-        store = frt_open_fs_store(rs2s(rdir));
+        store = frt_open_mdbx_store(rs2s(rdir));
         frt_index_create(store, fis);
         frt_store_close(store);
     }
@@ -983,7 +983,7 @@ static VALUE frb_iw_close(VALUE self) {
  *    dir = RAMDirectory.new()
  *    iw = IndexWriter.new(:dir => dir)
  *
- *    dir = FSDirectory.new("/path/to/index")
+ *    dir = MDBXDirectory.new("/path/to/index")
  *    iw = IndexWriter.new(:dir => dir)
  *
  *    iw = IndexWriter.new(:path => "/path/to/index")
@@ -1039,7 +1039,7 @@ static VALUE frb_iw_init(int argc, VALUE *argv, VALUE self) {
             } else if ((rval = rb_hash_aref(roptions, sym_path)) != Qnil) {
                 StringValue(rval);
                 frb_create_dir(rval);
-                store = frt_open_fs_store(rs2s(rval));
+                store = frt_open_mdbx_store(rs2s(rval));
             }
             /* use_compound_file defaults to true */
             config.use_compound_file =
@@ -1112,10 +1112,25 @@ static VALUE frb_iw_init(int argc, VALUE *argv, VALUE self) {
  *  taken into account until the FrtIndexWriter has been committed.
  */
 static VALUE
-frb_iw_get_doc_count(VALUE self)
-{
+frb_iw_get_doc_count(VALUE self) {
+    int ex_code = 0;
+    const char *msg = NULL;
+    int cnt = 0;
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
-    return INT2FIX(frt_iw_doc_count(iw));
+
+    FRT_TRY
+        cnt = frt_iw_doc_count(iw);
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
+
+    return INT2FIX(cnt);
 }
 
 static int
@@ -1224,12 +1239,26 @@ frb_get_doc(VALUE rdoc)
  *  hash object.
  */
 static VALUE
-frb_iw_add_doc(VALUE self, VALUE rdoc)
-{
+frb_iw_add_doc(VALUE self, VALUE rdoc) {
+    int ex_code = 0;
+    const char *msg = NULL;
+
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
-    FrtDocument *doc = frb_get_doc(rdoc);
-    frt_iw_add_doc(iw, doc);
-    frt_doc_destroy(doc);
+
+    FRT_TRY
+        FrtDocument *doc = frb_get_doc(rdoc);
+        frt_iw_add_doc(iw, doc);
+        frt_doc_destroy(doc);
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
+
     return self;
 }
 
@@ -1246,10 +1275,24 @@ frb_iw_add_doc(VALUE self, VALUE rdoc)
  *  process).
  */
 static VALUE
-frb_iw_optimize(VALUE self)
-{
+frb_iw_optimize(VALUE self) {
+    int ex_code = 0;
+    const char *msg = NULL;
+
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
-    frt_iw_optimize(iw);
+
+    FRT_TRY
+        frt_iw_optimize(iw);
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
+
     return self;
 }
 
@@ -1262,10 +1305,24 @@ frb_iw_optimize(VALUE self)
  *  with an IndexWriter.
  */
 static VALUE
-frb_iw_commit(VALUE self)
-{
+frb_iw_commit(VALUE self) {
+    int ex_code = 0;
+    const char *msg = NULL;
+
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
-    frt_iw_commit(iw);
+
+    FRT_TRY
+        frt_iw_commit(iw);
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
+
     return self;
 }
 
@@ -1322,21 +1379,36 @@ const rb_data_type_t frb_index_reader_t = {
  *  index.
  */
 static VALUE frb_iw_add_readers(VALUE self, VALUE rreaders) {
+    int ex_code = 0;
+    const char *msg = NULL;
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
-    int i;
+    int i, l;
     FrtIndexReader **irs;
     Check_Type(rreaders, T_ARRAY);
 
     irs = FRT_ALLOC_N(FrtIndexReader *, RARRAY_LEN(rreaders));
-    i = RARRAY_LEN(rreaders);
+    i = l = RARRAY_LEN(rreaders);
     while (i-- > 0) {
         FrtIndexReader *ir;
         TypedData_Get_Struct(RARRAY_PTR(rreaders)[i], FrtIndexReader, &frb_index_reader_t, ir);
         FRT_REF(ir);
         irs[i] = ir;
     }
-    frt_iw_add_readers(iw, irs, RARRAY_LEN(rreaders));
+
+    FRT_TRY
+        frt_iw_add_readers(iw, irs, l);
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
     free(irs);
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
+
     return self;
 }
 
@@ -1352,21 +1424,35 @@ static VALUE frb_iw_add_readers(VALUE self, VALUE rreaders) {
  *  want to delete all documents with the term "viagra" when deleting spam.
  */
 static VALUE
-frb_iw_delete(VALUE self, VALUE rfield, VALUE rterm)
-{
+frb_iw_delete(VALUE self, VALUE rfield, VALUE rterm) {
+    int ex_code = 0;
+    const char *msg = NULL;
+
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
-    if (TYPE(rterm) == T_ARRAY) {
-        const int term_cnt = RARRAY_LEN(rterm);
-        int i;
-        char **terms = FRT_ALLOC_N(char *, term_cnt);
-        for (i = 0; i < term_cnt; i++) {
-            terms[i] = StringValuePtr(RARRAY_PTR(rterm)[i]);
+
+    FRT_TRY
+        if (TYPE(rterm) == T_ARRAY) {
+            const int term_cnt = RARRAY_LEN(rterm);
+            int i;
+            char **terms = FRT_ALLOC_N(char *, term_cnt);
+            for (i = 0; i < term_cnt; i++) {
+                terms[i] = StringValuePtr(RARRAY_PTR(rterm)[i]);
+            }
+            frt_iw_delete_terms(iw, frb_field(rfield), terms, term_cnt);
+            free(terms);
+        } else {
+            frt_iw_delete_term(iw, frb_field(rfield), StringValuePtr(rterm));
         }
-        frt_iw_delete_terms(iw, frb_field(rfield), terms, term_cnt);
-        free(terms);
-    } else {
-        frt_iw_delete_term(iw, frb_field(rfield), StringValuePtr(rterm));
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
     }
+
     return self;
 }
 
@@ -1688,7 +1774,7 @@ frb_iw_set_use_compound_file(VALUE self, VALUE rval)
  *    dir = RAMDirectory.new()
  *    iw = IndexReader.new(dir)
  *
- *    dir = FSDirectory.new("/path/to/index")
+ *    dir = MDBXDirectory.new("/path/to/index")
  *    iw = IndexReader.new(dir)
  *
  *    iw = IndexReader.new("/path/to/index")
@@ -1744,7 +1830,7 @@ static VALUE frb_ir_init(VALUE self, VALUE rdir) {
                         break;
                     case T_STRING:
                         frb_create_dir(rdir);
-                        store = frt_open_fs_store(rs2s(rdir));
+                        store = frt_open_mdbx_store(rs2s(rdir));
                         break;
                     default:
                         FRT_RAISE(FRT_ARG_ERROR, "%s isn't a valid directory "
@@ -1765,7 +1851,7 @@ static VALUE frb_ir_init(VALUE self, VALUE rdir) {
                     break;
                 case T_STRING:
                     frb_create_dir(rdir);
-                    store = frt_open_fs_store(rs2s(rdir));
+                    store = frt_open_mdbx_store(rs2s(rdir));
                     break;
                 default:
                     FRT_RAISE(FRT_ARG_ERROR, "%s isn't a valid directory argument. "
@@ -1810,10 +1896,23 @@ static VALUE frb_ir_init(VALUE self, VALUE rdir) {
  *  encoded float value.
  */
 static VALUE
-frb_ir_set_norm(VALUE self, VALUE rdoc_id, VALUE rfield, VALUE rval)
-{
+frb_ir_set_norm(VALUE self, VALUE rdoc_id, VALUE rfield, VALUE rval) {
+    int ex_code = 0;
+    const char *msg = NULL;
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
-    frt_ir_set_norm(ir, FIX2INT(rdoc_id), frb_field(rfield), (frt_uchar)NUM2CHR(rval));
+
+    FRT_TRY
+        frt_ir_set_norm(ir, FIX2INT(rdoc_id), frb_field(rfield), (frt_uchar)NUM2CHR(rval));
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
+
     return self;
 }
 
@@ -1871,10 +1970,22 @@ frb_ir_get_norms_into(VALUE self, VALUE rfield, VALUE rnorms, VALUE roffset)
  *  will use open a Commit lock.
  */
 static VALUE
-frb_ir_commit(VALUE self)
-{
+frb_ir_commit(VALUE self) {
+    int ex_code = 0;
+    const char *msg = NULL;
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
-    frt_ir_commit(ir);
+    FRT_TRY
+        frt_ir_commit(ir);
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
+
     return self;
 }
 
@@ -1922,10 +2033,23 @@ frb_ir_has_deletions(VALUE self)
  *  returned by search methods.
  */
 static VALUE
-frb_ir_delete(VALUE self, VALUE rdoc_id)
-{
+frb_ir_delete(VALUE self, VALUE rdoc_id) {
+    int ex_code = 0;
+    const char *msg = NULL;
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
-    frt_ir_delete_doc(ir, FIX2INT(rdoc_id));
+
+    FRT_TRY
+        frt_ir_delete_doc(ir, FIX2INT(rdoc_id));
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
+    }
+
     return self;
 }
 
@@ -2014,8 +2138,7 @@ frb_get_doc_range(FrtIndexReader *ir, int pos, int len, int max)
  *  which are returned by the Searchers search methods.
  */
 static VALUE
-frb_ir_get_doc(int argc, VALUE *argv, VALUE self)
-{
+frb_ir_get_doc(int argc, VALUE *argv, VALUE self) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     VALUE arg1, arg2;
     long pos, len;
@@ -2044,8 +2167,7 @@ frb_ir_get_doc(int argc, VALUE *argv, VALUE self)
             default:
                 return frb_get_doc_range(ir, pos, len, max);
         }
-    }
-    else {
+    } else {
         pos = FIX2LONG(arg1);
         len = FIX2LONG(arg2);
         return frb_get_doc_range(ir, pos, len, max);

data/ext/isomorfeus_ferret_ext/frb_search.c

@@ -3604,7 +3604,7 @@ static VALUE frb_sea_init(VALUE self, VALUE obj) {
     FrtSearcher *sea;
     if (TYPE(obj) == T_STRING) {
         frb_create_dir(obj);
-        store = frt_open_fs_store(rs2s(obj));
+        store = frt_open_mdbx_store(rs2s(obj));
         ir = frt_ir_open(NULL, store);
         ir->rir = TypedData_Wrap_Struct(cIndexReader, &frb_index_reader_t, ir);
     } else {