Move utility conditional transactions to a helper wrapper.

FossilOrigin-Name: ae7078a55b83a71f41a6e5d076a6a5ad1483aafac10be5d77afcd4a537a6f663

ext/mdbx_ext/stats.c

@@ -148,7 +148,7 @@ rmdbx_gather_reader_stats(
 {
 	VALUE readers = rb_ary_new();
 
-    mdbx_reader_list( db->env, reader_list_callback, (void*)readers );
+	mdbx_reader_list( db->env, reader_list_callback, (void*)readers );
 	rb_hash_aset( stat, ID2SYM(rb_intern("readers")), readers );
 
 	return;

lib/mdbx/database.rb

@@ -201,24 +201,18 @@ class MDBX::Database
 	### pairs.
 	###
 	def to_a
-		in_txn = self.in_transaction?
+		return self.conditional_snapshot do
-		self.snapshot unless in_txn
+			self.each_pair.to_a
-
+		end
-		return self.each_pair.to_a
-	ensure
-		self.abort unless in_txn
 	end
 
 
 	### Return the entirety of database contents as a Hash.
 	###
 	def to_h
-		in_txn = self.in_transaction?
+		return self.conditional_snapshot do
-		self.snapshot unless in_txn
+			self.each_pair.to_h
-
+		end
-		return self.each_pair.to_h
-	ensure
-		self.abort unless in_txn
 	end
 
 
@@ -267,12 +261,9 @@ class MDBX::Database
 	### Returns a new Array containing all keys in the collection.
 	###
 	def keys
-		in_txn = self.in_transaction?
+		return self.conditional_snapshot do
-		self.snapshot unless in_txn
+			self.each_key.to_a
-
+		end
-		return self.each_key.to_a
-	ensure
-		self.abort unless in_txn
 	end
 
 
@@ -280,41 +271,32 @@ class MDBX::Database
 	### keys.  Any given keys that are not found are ignored.
 	###
 	def slice( *keys )
-		in_txn = self.in_transaction?
+		return self.conditional_snapshot do
-		self.snapshot unless in_txn
+			keys.each_with_object( {} ) do |key, acc|
-
+				val = self[ key ]
-		return keys.each_with_object( {} ) do |key, acc|
+				acc[ key ] = val if val
-			val = self[ key ]
+			end
-			acc[ key ] = val if val
 		end
-	ensure
-		self.abort unless in_txn
 	end
 
 
 	### Returns a new Array containing all values in the collection.
 	###
 	def values
-		in_txn = self.in_transaction?
+		return self.conditional_snapshot do
-		self.snapshot unless in_txn
+			self.each_value.to_a
-
+		end
-		return self.each_value.to_a
-	ensure
-		self.abort unless in_txn
 	end
 
 
 	### Returns a new Array containing values for the given +keys+.
 	###
 	def values_at( *keys )
-		in_txn = self.in_transaction?
+		return self.conditional_snapshot do
-		self.snapshot unless in_txn
+			keys.each_with_object( [] ) do |key, acc|
-
+				acc << self[ key ]
-		return keys.each_with_object( [] ) do |key, acc|
+			end
-			acc << self[ key ]
 		end
-	ensure
-		self.abort unless in_txn
 	end
 
 
@@ -347,5 +329,23 @@ class MDBX::Database
 		return stats
 	end
 
+
+	#########
+	protected
+	#########
+
+	### Yield and return the block, opening a snapshot first if
+	### there isn't already a transaction in progress.  Closes
+	### the snapshot if this method opened it.
+	###
+	def conditional_snapshot
+		in_txn = self.in_transaction?
+		self.snapshot unless in_txn
+
+		return yield
+	ensure
+		self.abort unless in_txn
+	end
+
 end # class MDBX::Database
 

spec/mdbx/database_spec.rb

@@ -324,6 +324,7 @@ RSpec.describe( MDBX::Database ) do
 			db.values
 			db.values_at( :woop )
 			expect( db.in_transaction? ).to be_truthy
+			db.abort
 		end
 	end