isomorfeus-ferret 0.15.0 → 0.16.0

data/ext/isomorfeus_ferret_ext/frt_mdbx_store.c

@@ -17,31 +17,59 @@ const char *lock_s = "lock";
 
 // txn
 
-static void mdbxs_begin_txn(FrtStore *store, MDBX_txn **txn) {
+static bool mdbxs_begin_txn(FrtStore *store, MDBX_txn **txn) {
+    MDBX_txn *env_txn = mdbx_env_get_userctx(store->dir.mdbx->env);
+    if (env_txn) {
+        *txn = env_txn;
+        return false;
+    }
     int res = mdbx_txn_begin(store->dir.mdbx->env, NULL, 0, txn);
     if (res != MDBX_SUCCESS) {
         FRT_RAISE(FRT_IO_ERROR, "failed to begin txn, error: %i\n", res);
     }
+    res = mdbx_env_set_userctx(store->dir.mdbx->env, *txn);
+    if (res != MDBX_SUCCESS) {
+        mdbx_txn_abort(*txn);
+        FRT_RAISE(FRT_IO_ERROR, "failed to begin txn, userctx, error: %i\n", res);
+    }
+    return true;
 }
 
-static void mdbxs_begin_ro_txn(FrtStore *store, MDBX_txn **txn) {
+static bool mdbxs_begin_ro_txn(FrtStore *store, MDBX_txn **txn) {
+    MDBX_txn *env_txn = mdbx_env_get_userctx(store->dir.mdbx->env);
+    if (env_txn) {
+        *txn = env_txn;
+        return false;
+    }
     int res = mdbx_txn_begin(store->dir.mdbx->env, NULL, 0 | MDBX_RDONLY, txn);
     if (res != MDBX_SUCCESS) {
         FRT_RAISE(FRT_IO_ERROR, "failed to begin read only txn, error: %i\n", res);
     }
+    res = mdbx_env_set_userctx(store->dir.mdbx->env, *txn);
+    if (res != MDBX_SUCCESS) {
+        mdbx_txn_abort(*txn);
+        FRT_RAISE(FRT_IO_ERROR, "failed to begin read only txn, userctx, error: %i\n", res);
+    }
+    return true;
 }
 
-static void mdbxs_commit_txn(MDBX_txn *txn) {
-    int res = mdbx_txn_commit(txn);
-    if (res != MDBX_SUCCESS) {
-        FRT_RAISE(FRT_IO_ERROR, "failed to commit txn, error: %i\n", res);
+static void mdbxs_commit_txn(FrtStore *store, MDBX_txn *txn, bool del_env_txn) {
+    if (del_env_txn) {
+        mdbx_env_set_userctx(store->dir.mdbx->env, NULL);
+        int res = mdbx_txn_commit(txn);
+        if (res != MDBX_SUCCESS) {
+            FRT_RAISE(FRT_IO_ERROR, "failed to commit txn, error: %i\n", res);
+        }
     }
 }
 
-static void mdbxs_abort_txn(MDBX_txn *txn) {
-    int res = mdbx_txn_abort(txn);
-    if (res != MDBX_SUCCESS) {
-        FRT_RAISE(FRT_IO_ERROR, "failed to abort txn, error: %i\n", res);
+static void mdbxs_abort_txn(FrtStore *store, MDBX_txn *txn, bool del_env_txn) {
+    if (del_env_txn) {
+        mdbx_env_set_userctx(store->dir.mdbx->env, NULL);
+        int res = mdbx_txn_abort(txn);
+        if (res != MDBX_SUCCESS) {
+            FRT_RAISE(FRT_IO_ERROR, "failed to abort txn, error: %i\n", res);
+        }
     }
 }
 
@@ -91,7 +119,7 @@ static void mdbxs_touch(FrtStore *store, const char *filename) {
     val.iov_base = NULL;
     val.iov_len  = 0;
 
-    mdbxs_begin_txn(store, &txn);
+    bool del_env_txn = mdbxs_begin_txn(store, &txn);
     mdbxs_open_dbi(txn, dbi_name, &dbi);
     res = mdbx_get(txn, dbi, &key, &val);
 
@@ -99,12 +127,12 @@ static void mdbxs_touch(FrtStore *store, const char *filename) {
         val.iov_base = NULL;
         val.iov_len = 0;
         mdbxs_put(txn, dbi, &key, &val);
-        mdbxs_commit_txn(txn);
-    } else if (res == MDBX_SUCCESS) {
-        mdbxs_abort_txn(txn);
+        mdbxs_commit_txn(store, txn, del_env_txn);
     } else {
-        mdbxs_abort_txn(txn);
-        FRT_RAISE(FRT_IO_ERROR, "failed to touch '%s', error: %i\n", filename, res);
+        mdbxs_abort_txn(store, txn, del_env_txn);
+        if (res != MDBX_SUCCESS) {
+            FRT_RAISE(FRT_IO_ERROR, "failed to touch '%s', error: %i\n", filename, res);
+        }
     }
 }
 
@@ -118,10 +146,10 @@ static int mdbxs_exists(FrtStore *store, const char *filename) {
     val.iov_base = NULL;
     val.iov_len  = 0;
 
-    mdbxs_begin_ro_txn(store, &txn);
+    bool del_env_txn = mdbxs_begin_ro_txn(store, &txn);
     mdbxs_open_dbi(txn, dbi_name, &dbi);
     int res = mdbx_get(txn, dbi, &key, &val);
-    mdbxs_abort_txn(txn);
+    mdbxs_abort_txn(store, txn, del_env_txn);
 
     if (res == MDBX_SUCCESS) { return true; }
     return false;
@@ -135,10 +163,10 @@ static int mdbxs_remove(FrtStore *store, const char *filename) {
     key.iov_base = (char *)filename;
     key.iov_len  = strlen(filename);
 
-    mdbxs_begin_txn(store, &txn);
+    bool del_env_txn = mdbxs_begin_txn(store, &txn);
     mdbxs_open_dbi(txn, dbi_name, &dbi);
     mdbxs_del(txn, dbi, &key, NULL);
-    mdbxs_commit_txn(txn);
+    mdbxs_commit_txn(store, txn, del_env_txn);
 
     return 0;
 }
@@ -154,7 +182,7 @@ static void mdbxs_rename(FrtStore *store, const char *from, const char *to) {
     val.iov_base      = NULL;
     val.iov_len       = 0;
 
-    mdbxs_begin_txn(store, &txn);
+    bool del_env_txn = mdbxs_begin_txn(store, &txn);
     mdbxs_open_dbi(txn, dbi_name, &dbi);
     res = mdbx_get(txn, dbi, &from_key, &val);
 
@@ -164,9 +192,9 @@ static void mdbxs_rename(FrtStore *store, const char *from, const char *to) {
 
         mdbxs_put(txn, dbi, &to_key, &val);
         mdbxs_del(txn, dbi, &from_key, NULL);
-        mdbxs_commit_txn(txn);
+        mdbxs_commit_txn(store, txn, del_env_txn);
     } else {
-        mdbxs_abort_txn(txn);
+        mdbxs_abort_txn(store, txn, del_env_txn);
         FRT_RAISE(FRT_FILE_NOT_FOUND_ERROR, "tried to open '%s' but its not accessible, error: %i", from, res);
     }
 }
@@ -178,11 +206,11 @@ static int mdbxs_count(FrtStore *store) {
     int res = 0;
     int cnt = 0;
 
-    mdbxs_begin_txn(store, &txn);
+    bool del_env_txn = mdbxs_begin_txn(store, &txn);
     mdbxs_open_dbi(txn, dbi_name, &dbi);
     res = mdbx_dbi_stat(txn, dbi, &stat, sizeof(MDBX_stat));
     cnt = stat.ms_entries;
-    mdbxs_abort_txn(txn);
+    mdbxs_abort_txn(store, txn, del_env_txn);
 
     if (res != MDBX_SUCCESS) {
         FRT_RAISE(FRT_FILE_NOT_FOUND_ERROR, "failed to stat dbi, error: %i", res);
@@ -201,16 +229,27 @@ static void mdbxs_each(FrtStore *store, void (*func)(const char *fname, void *ar
     val.iov_base = NULL;
     val.iov_len  = 0;
 
-    mdbxs_begin_txn(store, &txn);
+    bool del_env_txn = mdbxs_begin_txn(store, &txn);
     mdbxs_open_dbi(txn, dbi_name, &dbi);
     mdbxs_open_cursor(txn, dbi, &cursor);
 
     int op = MDBX_FIRST;
+    int buffer_size = FRT_MAX_WORD_SIZE;
+    char *name = FRT_ALLOC_N(char, buffer_size);
     while(mdbx_cursor_get(cursor, &key, &val, op) == MDBX_SUCCESS) {
         op = MDBX_NEXT;
-        func(key.iov_base, arg);
+        if (key.iov_len >= buffer_size) {
+            buffer_size = key.iov_len + 1;
+            FRT_REALLOC_N(name, char, buffer_size);
+        }
+        memcpy(name, key.iov_base, key.iov_len);
+        name[key.iov_len] = '\0';
+        func(name, arg);
     }
-    mdbxs_commit_txn(txn);
+    free(name);
+
+    mdbx_cursor_close(cursor);
+    mdbxs_commit_txn(store, txn, del_env_txn);
 }
 
 static void mdbxs_clear_locks(FrtStore *store) {
@@ -224,16 +263,32 @@ static void mdbxs_clear_locks(FrtStore *store) {
     val.iov_base = NULL;
     val.iov_len  = 0;
 
-    mdbxs_begin_txn(store, &txn);
+    bool del_env_txn = mdbxs_begin_txn(store, &txn);
     mdbxs_open_dbi(txn, dbi_name, &dbi);
     mdbxs_open_cursor(txn, dbi, &cursor);
 
     int op = MDBX_FIRST;
+    int buffer_size = FRT_MAX_WORD_SIZE;
+    char *name = FRT_ALLOC_N(char, buffer_size);
     while(mdbx_cursor_get(cursor, &key, &val, op) == MDBX_SUCCESS) {
         op = MDBX_NEXT;
-        mdbx_cursor_del(cursor, MDBX_ALLDUPS);
+        if (key.iov_len >= buffer_size) {
+            buffer_size = key.iov_len + 1;
+            FRT_REALLOC_N(name, char, buffer_size);
+        }
+        memcpy(name, key.iov_base, key.iov_len);
+        name[key.iov_len] = '\0';
+        if (key.iov_len > 11) { // "ferret-" + ".lck"
+            if ((strncmp(FRT_LOCK_PREFIX, name, strlen(FRT_LOCK_PREFIX)) == 0) &&
+                (strncmp(".lck", name + (key.iov_len - 4), 4) == 0)) {
+                mdbx_cursor_del(cursor, MDBX_ALLDUPS);
+            }
+        }
     }
-    mdbxs_commit_txn(txn);
+    free(name);
+
+    mdbx_cursor_close(cursor);
+    mdbxs_commit_txn(store, txn, del_env_txn);
 }
 
 static bool mdbxs_is_locked(FrtStore *store, MDBX_val *key, MDBX_txn *txn, MDBX_dbi dbi) {
@@ -259,7 +314,7 @@ static void mdbxs_clear(FrtStore *store) {
     val.iov_base = NULL;
     val.iov_len  = 0;
 
-    mdbxs_begin_txn(store, &txn);
+    bool del_env_txn = mdbxs_begin_txn(store, &txn);
     mdbxs_open_dbi(txn, dbi_name, &dbi);
     mdbxs_open_cursor(txn, dbi, &cursor);
 
@@ -270,7 +325,8 @@ static void mdbxs_clear(FrtStore *store) {
             mdbx_cursor_del(cursor, MDBX_ALLDUPS);
         }
     }
-    mdbxs_commit_txn(txn);
+    mdbx_cursor_close(cursor);
+    mdbxs_commit_txn(store, txn, del_env_txn);
 }
 
 /**
@@ -288,7 +344,7 @@ static void mdbxs_clear_all(FrtStore *store) {
     val.iov_base = NULL;
     val.iov_len  = 0;
 
-    mdbxs_begin_txn(store, &txn);
+    bool del_env_txn = mdbxs_begin_txn(store, &txn);
     mdbxs_open_dbi(txn, dbi_name, &dbi);
     mdbxs_open_cursor(txn, dbi, &cursor);
 
@@ -297,7 +353,9 @@ static void mdbxs_clear_all(FrtStore *store) {
         op = MDBX_NEXT;
         mdbx_cursor_del(cursor, MDBX_ALLDUPS);
     }
-    mdbxs_commit_txn(txn);
+
+    mdbx_cursor_close(cursor);
+    mdbxs_commit_txn(store, txn, del_env_txn);
 
     mdbxs_clear_locks(store);
 }
@@ -336,15 +394,15 @@ static frt_off_t mdbxs_length(FrtStore *store, const char *filename) {
     val.iov_base = NULL;
     val.iov_len  = 0;
 
-    mdbxs_begin_ro_txn(store, &txn);
+    bool del_env_txn = mdbxs_begin_ro_txn(store, &txn);
     mdbxs_open_dbi(txn, dbi_name, &dbi);
     int res = mdbx_get(txn, dbi, &key, &val);
     if (res != MDBX_SUCCESS) {
-        mdbxs_abort_txn(txn);
-        FRT_RAISE(FRT_FILE_NOT_FOUND_ERROR, "tried to open \"%s\" but it doesn't exist, error: %i", filename, res);
+        mdbxs_abort_txn(store, txn, del_env_txn);
+        FRT_RAISE(FRT_FILE_NOT_FOUND_ERROR, "tried to open '%s' but it doesn't exist, error: %i", filename, res);
     }
     len = val.iov_len;
-    mdbxs_abort_txn(txn);
+    mdbxs_abort_txn(store, txn, del_env_txn);
     return len;
 }
 
@@ -352,7 +410,7 @@ static void mdbxso_close_i(FrtOutStream *os) {
     MDBX_txn *txn = NULL;
     MDBX_dbi dbi;
 
-    mdbxs_begin_txn(os->store, &txn);
+    bool del_env_txn = mdbxs_begin_txn(os->store, &txn);
     mdbxs_open_dbi(txn, dbi_name, &dbi);
 
     FrtRAMFile *rf = os->file.rf;
@@ -388,7 +446,7 @@ static void mdbxso_close_i(FrtOutStream *os) {
     }
 
     mdbxs_put(txn, dbi, &key, &val);
-    mdbxs_commit_txn(txn);
+    mdbxs_commit_txn(os->store, txn, del_env_txn);
     free(val.iov_base);
     rf_close(os->file.rf);
 }
@@ -408,10 +466,10 @@ static FrtOutStream *mdbxs_new_output(FrtStore *store, const char *filename) {
     val.iov_base = NULL;
     val.iov_len  = 0;
 
-    mdbxs_begin_txn(store, &txn);
+    bool del_env_txn = mdbxs_begin_txn(store, &txn);
     mdbxs_open_dbi(txn, dbi_name, &dbi);
     mdbxs_put(txn, dbi, &key, &val);
-    mdbxs_commit_txn(txn);
+    mdbxs_commit_txn(store, txn, del_env_txn);
 
     FrtRAMFile *rf = rf_new(filename);
     FRT_REF(rf);
@@ -442,11 +500,11 @@ static FrtInStream *mdbxs_open_input(FrtStore *store, const char *filename) {
     FrtRAMFile *rf = NULL;
     FrtInStream *is;
 
-    mdbxs_begin_ro_txn(store, &txn);
+    bool del_env_txn = mdbxs_begin_ro_txn(store, &txn);
     mdbxs_open_dbi(txn, dbi_name, &dbi);
     if (mdbx_get(txn, dbi, &key, &val) != MDBX_SUCCESS) {
-        mdbxs_abort_txn(txn);
-        FRT_RAISE(FRT_FILE_NOT_FOUND_ERROR, "tried to open \"%s\" but it doesn't exist", filename);
+        mdbxs_abort_txn(store, txn, del_env_txn);
+        FRT_RAISE(FRT_FILE_NOT_FOUND_ERROR, "tried to open '%s' but it doesn't exist", filename);
     }
 
     rf = rf_new(filename);
@@ -478,7 +536,7 @@ static FrtInStream *mdbxs_open_input(FrtStore *store, const char *filename) {
         }
         rf->len = len;
     }
-    mdbxs_abort_txn(txn);
+    mdbxs_abort_txn(store, txn, del_env_txn);
 
     is = frt_is_new();
     is->f->file.rf = rf;
@@ -494,7 +552,7 @@ static FrtInStream *mdbxs_open_input(FrtStore *store, const char *filename) {
 static int mdbxs_lock_obtain(FrtLock *lock) {
     MDBX_txn *txn = NULL;
     MDBX_dbi dbi;
-    mdbxs_begin_txn(lock->store, &txn);
+    bool del_env_txn = mdbxs_begin_txn(lock->store, &txn);
     mdbxs_open_dbi(txn, dbi_name, &dbi);
 
     MDBX_val key, val;
@@ -503,25 +561,25 @@ static int mdbxs_lock_obtain(FrtLock *lock) {
     int trys = LOCK_OBTAIN_TIMEOUT;
     bool is_locked = mdbxs_is_locked(lock->store, &key, txn, dbi);
     while (is_locked && (trys > 0)) {
-        mdbxs_abort_txn(txn);
+        mdbxs_abort_txn(lock->store, txn, del_env_txn);
 
         trys--;
         /* sleep for 10 milliseconds */
         frt_micro_sleep(10000);
 
-        mdbxs_begin_txn(lock->store, &txn);
+        del_env_txn = mdbxs_begin_txn(lock->store, &txn);
         mdbxs_open_dbi(txn, dbi_name, &dbi);
 
         is_locked = mdbxs_is_locked(lock->store, &key, txn, dbi);
     }
     if (is_locked) {
-        mdbxs_abort_txn(txn);
+        mdbxs_abort_txn(lock->store, txn, del_env_txn);
         return false;
     } else {
         val.iov_base = (char *)lock_s; // could be a number to count locks
         val.iov_len  = 4;
         mdbxs_put(txn, dbi, &key, &val);
-        mdbxs_commit_txn(txn);
+        mdbxs_commit_txn(lock->store, txn, del_env_txn);
         return true;
     }
 }
@@ -535,10 +593,10 @@ static int mdbxs_lock_is_locked(FrtLock *lock) {
     key.iov_base = lock->name;
     key.iov_len  = strlen(lock->name);
 
-    mdbxs_begin_ro_txn(lock->store, &txn);
+    bool del_env_txn = mdbxs_begin_ro_txn(lock->store, &txn);
     mdbxs_open_dbi(txn, dbi_name, &dbi);
     res = mdbxs_is_locked(lock->store, &key, txn, dbi);
-    mdbxs_abort_txn(txn);
+    mdbxs_abort_txn(lock->store, txn, del_env_txn);
 
     return res;
 }
@@ -551,10 +609,10 @@ static void mdbxs_lock_release(FrtLock *lock) {
     key.iov_base = lock->name;
     key.iov_len  = strlen(lock->name);
 
-    mdbxs_begin_txn(lock->store, &txn);
+    bool del_env_txn = mdbxs_begin_txn(lock->store, &txn);
     mdbxs_open_dbi(txn, dbi_name, &dbi);
     mdbxs_del(txn, dbi, &key, NULL);
-    mdbxs_commit_txn(txn);
+    mdbxs_commit_txn(lock->store, txn, del_env_txn);
 }
 
 static FrtLock *mdbxs_open_lock_i(FrtStore *store, const char *lockname) {

data/ext/isomorfeus_ferret_ext/frt_store.h

@@ -330,15 +330,6 @@ struct FrtStore {
     VALUE rstore;
 };
 
-/**
- * Create a newly allocated file-system 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 file-system 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.

data/ext/isomorfeus_ferret_ext/isomorfeus_ferret.c

@@ -13,7 +13,7 @@ ID id_hash;
 ID id_capacity;
 ID id_less_than;
 ID id_lt;
-ID id_is_directory;
+ID id_exist;
 ID id_close;
 ID id_cclass;
 ID id_data;
@@ -256,7 +256,7 @@ void Init_isomorfeus_ferret_ext(void) {
     id_lt = rb_intern("<");
 
     id_mkdir_p = rb_intern("mkdir_p");
-    id_is_directory = rb_intern("directory?");
+    id_exist = rb_intern("exist?");
     id_close = rb_intern("close");
 
     id_cclass = rb_intern("cclass");

data/ext/isomorfeus_ferret_ext/isomorfeus_ferret.h

@@ -13,7 +13,7 @@ extern ID id_eql;
 extern ID id_capacity;
 extern ID id_less_than;
 extern ID id_lt;
-extern ID id_is_directory;
+extern ID id_exist;
 extern ID id_close;
 extern ID id_cclass;
 extern ID id_data;