lmdb 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5673437b11f0c87befc6f0003aaa1c25f8c20ec3270147396d45c8af38fb0a78
-  data.tar.gz: 407eadc211c71c38cc8d1e4523f2639abb964e187452635af7b603ce5e3eb565
+  metadata.gz: 0eca18739acfd5adf30147b8d4d5561215aacb85efafdfa4b92a4669c919913f
+  data.tar.gz: 5e5c34291a740b95637f9f64a280e3171e9a977e7c4c24ef4f98b45441ac794e
 SHA512:
-  metadata.gz: '0596fdb966d1373d03a739901ca441fb3df42b7257566b07a8ee513c1b30ea7b9b8fcfa1ae6f5a1efcbae7a5b91c7983f6d83fc1e6ffa6d63fba6c9572623c39'
-  data.tar.gz: cbfd03a44df15275c6bf66d10501e5d86d6a6bf3bee949588ae7d9b89cd9e03bf57ddb7f3502f56d7128ddf500658d502ea0436bc4868c455a0d139c7525a74c
+  metadata.gz: 9523366f92b3f4a0835bd2786bb3438da3d5e5c94460afdf71cc4652fd4dd4f00dd431f553a8078ab8948eddf0d09bb2dbea78546ca87465f552db94249bbfcc
+  data.tar.gz: d5c548be5e79e730e62c408ac987fab8b59f44ba41bab54db69b032f1fccd8b632c483450db301058b8c07c69c88a0f8d8403cb39701380480ad810e69e5209e

data/CHANGES

@@ -1,3 +1,25 @@
+0.8.1
+
+  * added `env.transaction?` for conditional transactions
+  * removed private method `db.maybe_txn`
+
+0.8.0
+
+  * overhauled internals to use newer `TypedData` conventions
+  * made pseudo-transactions for behaviour parity ofr read-only transactions
+  * rewrote `with_transaction` and `transaction_finish` etc
+  * made `env.database(:symbol_for_a_name)` not segfault
+  * added `env['foo']` (or `env[:foo]`) accessor for existing databases
+  * added `env.reader_check` to wipe out stale readers
+  * added `env.reader_list` to list them
+  * added unit tests for GC torture
+  * added unit tests for nested pseudo-transactions
+
+0.7.5
+
+  * changed embedding regime for upstream lmdb
+  * added --vendor-lmdb build flag (`gem install lmdb -- --vendor-lmdb`)
+
 0.7.0
 
   * Nesting read-only transactions finally works, by making it a noop

data/lib/lmdb/database.rb

@@ -1,4 +1,22 @@
 module LMDB
+  class Environment
+
+    # Start a new transaction if there isn't already one going.
+    #
+    # @param readonly [false, true]
+    # @param block [Proc] the block to run
+    # @yieldparam [LMDB::Transaction] the transaction handle
+    # @yieldreturn [Object] your pick
+    # @return [Object] whatever the block returns
+    #
+    def transaction? readonly = false, &block
+      raise ArgumentError, 'no block for conditional transaction' unless block
+
+      t = active_txn
+      t ? block.call(t) : transaction(!!readonly, &block)
+    end
+  end
+
   class Database
     include Enumerable
 
@@ -10,9 +28,8 @@ module LMDB
     #      key, value = record
     #      puts "at #{key}: #{value}"
     #    end
-    def each
-      maybe_txn true do
-      # env.transaction do
+    def each &block
+      env.transaction? true do
         cursor do |c|
           while i = c.next
             yield(i)
@@ -55,12 +72,12 @@ module LMDB
     # @yield key [String] the next key in the database.
     # @return [Enumerator] in lieu of a block.
     def each_key(&block)
-      return enum_for :each_key unless block_given?
-      maybe_txn true do
-      #env.transaction do
+      return enum_for :each_key unless block
+
+      env.transaction? true do
         cursor do |c|
           while (rec = c.next true)
-            yield rec.first
+            block.call rec.first
           end
         end
       end
@@ -73,24 +90,25 @@ module LMDB
     # @yield value [String] the next value associated with the key.
     # @return [Enumerator] in lieu of a block.
     def each_value(key, &block)
-      return enum_for :each_value, key unless block_given?
+      return enum_for :each_value, key unless block
 
-      value = get(key) or return
-      unless dupsort?
-        yield value
-        return
-      end
+      op = -> txn do
+        value = get(key) or return
+        unless dupsort?
+          block.call value
+          return
+        end
 
-      maybe_txn true do
-      # env.transaction do
         cursor do |c|
           rec = c.set key
           while rec
-            yield rec.last
+            block.call rec.last
             rec = c.next_range key
           end
         end
       end
+
+      env.transaction? true, &op
     end
 
     # Return the cardinality (number of duplicates) of a given
@@ -99,8 +117,7 @@ module LMDB
     # @return [Integer] The number of entries under the key.
     def cardinality(key)
       ret = 0
-      maybe_txn true do
-      # env.transaction do
+      env.transaction? true do
         if get key
           if dupsort?
             cursor do |c|
@@ -118,18 +135,20 @@ module LMDB
     # Test if the database has a given key (or, if opened in
     # +:dupsort+, value)
     def has?(key, value = nil)
-      v = get(key) or return false
-      return true if value.nil? or value.to_s == v
-      return false unless dupsort?
-
-      # warn "checking dupsort value `#{value.inspect}` (#{value.class})"
-
-      ret = false
-      # read-only txn was having trouble being nested inside a read-write
-      # maybe_txn(true) { cursor { |c| ret = !!c.set(key, value) } }
-      env.transaction(true) { cursor { |c| ret = !!c.set(key, value) } }
+      env.transaction? true do
+        if v = get(key)
+          if value.nil? or value.to_s == v
+            true
+          elsif !dupsort?
+            false
+          else
+            ret = false
+            cursor { |c| ret = !!c.set(key, value) }
 
-      ret
+            ret
+          end
+        end
+      end
     end
 
     # Conditionally put a value into the database.
@@ -148,7 +167,7 @@ module LMDB
 
       flags = { (dupsort? ? :nodupdata : :nooverwrite) => true }
 
-      env.transaction do |txn|
+      env.transaction? do |txn|
         put(key, value, **options.merge(flags)) unless has?(key, value)
       end
     end
@@ -164,7 +183,7 @@ module LMDB
     # @return [void]
     #
     def delete?(key, value = nil)
-      env.transaction { |txn| delete(key, value) if has?(key, value) }
+      env.transaction? { |txn| delete(key, value) if has?(key, value) }
     end
 
     # Return how many records there are in this database.
@@ -179,26 +198,5 @@ module LMDB
     def empty?
       stat[:entries] == 0
     end
-
-    private
-
-    # having trouble with read-only transactions embedded in
-    # read-write for some reason; can't pin it down to test it yet so
-    # going to do this (djt; 2020-02-10)
-    #
-    # 2025-11-14: this miiiigght no longer be necessary?? like as of
-    # whenever i implemented that short-circuiting code
-    #
-    def maybe_txn(readonly, &block)
-      if t = env.active_txn
-        # warn "reusing #{t.readonly? ? 'read-only ' : ''}txn #{t.inspect}"
-        yield t
-      else
-        env.transaction !!readonly do |t|
-          # warn "new #{t.readonly? ? 'read-only ' : ''}txn #{t.inspect}"
-          yield t
-        end
-      end
-    end
   end
 end

data/lib/lmdb/version.rb

@@ -1,3 +1,3 @@
 module LMDB
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.8.1'.freeze
 end

data/spec/lmdb_spec.rb

@@ -200,6 +200,16 @@ describe LMDB do
         end
         expect(env2).to eq(env)
       end
+
+      it 'should do conditional transactions' do
+        subject.transaction? true do |t1|
+          # note this second one is not readonly which would be
+          # illegal if it was opening a transaction for real
+          subject.transaction? do |t2|
+            expect(t2).to eq(t1)
+          end
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lmdb
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Daniel Mendler