lmdb 0.6.7 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79e94aae1eb049c37cc44abdde80712dd5c8fa900d1ec2b68c33b773862f4e1a
-  data.tar.gz: ccf377de1e2e910c81459fad2fe0bce8eb831ca40e3f95fc311ef7ccd3eb1e57
+  metadata.gz: c098384d91381d0f7c66a4794f88ea55c1c8a1e54d60480a75a379704407252d
+  data.tar.gz: 11c4e5b74f9b552ad9f89d5a189bf812340ab409b43b54361cb84f7d47dfd906
 SHA512:
-  metadata.gz: 0e3d55b2b4486caea098bb175b6ae4aeff87d770010ce4359c003e1707e6089da204a1f6f62fd0bf1e300170e0954b6245dc6fd3d9e951211d87f0b94cf958e8
-  data.tar.gz: 96e68bf724dfc2f47a5bfd72dbc5fcda8ede5e8b7edc69e1cb2e55f5c6230997bd319e04d47bbea8aaca39c5d0e322f70e37b2f9d0cb8f5e991b50ca7df51469
+  metadata.gz: da3b52d345951ad527b67ce32998c749b17267b7b0d075f695e841d1b2a0891df4e0064e021e7db9ac21f41c0b81a4fb590ff88a98250675e15ad14baf185680
+  data.tar.gz: 12ae851f60db43dec61730f8497a06bf952e56242bff2e8fe64153a852c34582441556320cb1627fa65b7c29dfe417ba312c929d242511c0ab9c3888b12075b4

data/CHANGES

@@ -1,3 +1,12 @@
+0.7.0
+
+  * Nesting read-only transactions finally works, by making it a noop
+    and using the parent transaction (djt)
+
+0.6.6
+
+  * added `put?` and `delete?` (djt)
+
 0.5.1
 
   * Move read-only operations to read-only transactions (djt)

data/ext/lmdb_ext/lmdb_ext.c

@@ -285,69 +285,87 @@ static void stop_txn_begin(void *arg)
  */
 
 static VALUE with_transaction(VALUE venv, VALUE(*fn)(VALUE), VALUE arg, int flags) {
-    ENVIRONMENT(venv, environment);
-
-    MDB_txn* txn;
-    TxnArgs txn_args;
-
-    VALUE thread  = rb_thread_current();
-    VALUE vparent = environment_active_txn(venv);
-
-    Transaction* tparent = NULL;
-    if (vparent && !NIL_P(vparent))
-        Data_Get_Struct(vparent, Transaction, tparent);
-
+  ENVIRONMENT(venv, environment);
+
+  MDB_txn* txn;
+  TxnArgs txn_args;
+
+  VALUE thread  = rb_thread_current();
+  VALUE vparent = environment_active_txn(venv);
+
+  //
+  Transaction* tparent = NULL;
+  if (vparent && !NIL_P(vparent))
+    Data_Get_Struct(vparent, Transaction, tparent);
+
+  /*
+   * If the requested transaction is read-only and there is a parent
+   * transaction (whether read-only or not), we need to use the
+   * parent transaction.
+   *
+   * XXX except conceivably you could do a transaction (RO or RW)
+   * that spawns a thread that opens another transaction.
+   *
+   * note we do *NOT* re-begin the parent transaction, nor do we
+   * want to commit it
+   *
+   */
+
+  if (tparent && flags & MDB_RDONLY) {
+    int exception;
+    VALUE ret = rb_protect(fn, NIL_P(arg) ? vparent : arg, &exception);
+    if (exception) {
+      if (vparent == environment_active_txn(venv))
+        transaction_abort(vparent);
+      rb_jump_tag(exception);
+    }
+    return ret;
+  }
+  else {
     // XXX note this is a cursed goto loop that could almost certainly
     // be rewritten as a do-while
- retry:
+  retry:
     txn = NULL;
 
     txn_args.env    = environment->env;
-    txn_args.parent = active_txn(venv);
+    txn_args.parent = active_txn(venv); // this returns an MDB_txn
     txn_args.flags  = flags;
     txn_args.htxn   = &txn;
     txn_args.result = 0;
     txn_args.stop   = 0;
 
-    if (flags & MDB_RDONLY) {
-        if (tparent && tparent->flags & MDB_RDONLY)
-            // this is a no-op: put the same actual transaction in a
-            // different wrapper struct
-            txn = txn_args.parent;
-        else
-            // this will return an error if the parent transaction is
-            // read-write, so we don't need to handle the case explicitly
-            call_txn_begin(&txn_args);
-    }
+    if (flags & MDB_RDONLY)
+      call_txn_begin(&txn_args);
     else {
-        if (tparent) {
-            // first we have to determine if we're on the same thread
-            // as the parent, which in turn must be the same as the
-            // environment's registry for which thread has the
-            // read-write transaction
-            if (thread != tparent->thread ||
-                thread != environment->rw_txn_thread)
-                rb_raise(cError,
-                         "Attempt to nest transaction on a different thread");
+      if (tparent) {
+        // first we have to determine if we're on the same thread
+        // as the parent, which in turn must be the same as the
+        // environment's registry for which thread has the
+        // read-write transaction
+        if (thread != tparent->thread ||
+            thread != environment->rw_txn_thread)
+          rb_raise(cError,
+                   "Attempt to nest transaction on a different thread");
+      }
+
+      // try to acquire the new transaction
+      CALL_WITHOUT_GVL(call_txn_begin, &txn_args, stop_txn_begin, &txn_args);
+
+      if (txn_args.stop || !txn) {
+        // !txn is when rb_thread_call_without_gvl2
+        // returns before calling txn_begin
+        if (txn) {
+          mdb_txn_abort(txn);
+          txn_args.result = 0;
         }
 
-        CALL_WITHOUT_GVL(call_txn_begin, &txn_args, stop_txn_begin, &txn_args);
+        //rb_warn("got here lol");
+        rb_thread_check_ints();
+        goto retry; // in what cases do we get here?
+      }
 
-        if (txn_args.stop || !txn) {
-            // !txn is when rb_thread_call_without_gvl2
-            // returns before calling txn_begin
-            if (txn) {
-                mdb_txn_abort(txn);
-                txn_args.result = 0;
-            }
-
-            //rb_warn("got here lol");
-            rb_thread_check_ints();
-            goto retry; // in what cases do we get here?
-        }
-
-        // set the thread
-        environment->rw_txn_thread = thread;
+      // set the thread
+      environment->rw_txn_thread = thread;
     }
 
     // this will raise unless result is zero
@@ -373,14 +391,15 @@ static VALUE with_transaction(VALUE venv, VALUE(*fn)(VALUE), VALUE arg, int flag
     VALUE ret = rb_protect(fn, NIL_P(arg) ? vtxn : arg, &exception);
 
     if (exception) {
-        // rb_warn("lol got exception");
-        if (vtxn == environment_active_txn(venv))
-            transaction_abort(vtxn);
-        rb_jump_tag(exception);
+      // rb_warn("lol got exception");
+      if (vtxn == environment_active_txn(venv))
+        transaction_abort(vtxn);
+      rb_jump_tag(exception);
     }
     if (vtxn == environment_active_txn(venv))
-        transaction_commit(vtxn);
+      transaction_commit(vtxn);
     return ret;
+  }
 }
 
 static void environment_check(Environment* environment) {
@@ -773,23 +792,24 @@ static void environment_set_active_txn(VALUE self, VALUE thread, VALUE txn) {
         }
 }
 
+static MDB_txn* extract_txn(VALUE vtxn) {
+  if (NIL_P(vtxn)) return NULL;
+  TRANSACTION(vtxn, transaction);
+  if (!transaction->txn) rb_raise(cError, "Transaction is already terminated");
+  if (transaction->thread != rb_thread_current())
+    rb_raise(cError, "Transaction is from another thread");
+  return transaction->txn;
+}
 
 static MDB_txn* active_txn(VALUE self) {
         VALUE vtxn = environment_active_txn(self);
-        if (NIL_P(vtxn))
-                return 0;
-        TRANSACTION(vtxn, transaction);
-        if (!transaction->txn)
-                rb_raise(cError, "Transaction is already terminated");
-        if (transaction->thread != rb_thread_current())
-                rb_raise(cError, "Wrong thread");
-        return transaction->txn;
+        return extract_txn(vtxn);
 }
 
 static MDB_txn* need_txn(VALUE self) {
         MDB_txn* txn = active_txn(self);
-        if (!txn)
-                rb_raise(cError, "No active transaction");
+
+        if (!txn) rb_raise(cError, "No active transaction");
         return txn;
 }
 

data/ext/lmdb_ext/lmdb_ext.h

@@ -104,12 +104,12 @@ typedef struct {
 } EnvironmentOptions;
 
 typedef struct {
-        MDB_env *env;
-        MDB_txn *parent;
-        unsigned int flags;
-        MDB_txn **htxn;
-        int result;
-        int stop;
+  MDB_env *env;
+  MDB_txn *parent;
+  unsigned int flags;
+  MDB_txn **htxn; // not sure why this is a pointer to a pointer
+  int result;
+  int stop;
 } TxnArgs;
 
 static VALUE cEnvironment, cDatabase, cTransaction, cCursor, cError;

data/lib/lmdb/database.rb

@@ -145,8 +145,7 @@ module LMDB
     # @return [void]
     #
     def put?(key, value = nil, **options)
-      flags = {}
-      flags[dupsort? ? :nodupdata : :nooverwrite] = true
+      flags = { (dupsort? ? :nodupdata : :nooverwrite) => true }
       begin
         put key, value, **options.merge(flags)
       rescue LMDB::Error::KEYEXIST

data/lib/lmdb/version.rb

@@ -1,3 +1,3 @@
 module LMDB
-  VERSION = '0.6.7'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lmdb
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - Daniel Mendler
 - Dorian Taylor
 bindir: bin
 cert_chain: []
-date: 2025-11-21 00:00:00.000000000 Z
+date: 2025-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake