mdbx 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e88f3e5ea2e66b7e924500a33f25f635c712e359bd0f8e19c52f60605bcafe46
-  data.tar.gz: c069a2b838b86f1cc9873613ad1b99c1f888f24eab395c9f264d830aa7ba810d
+  metadata.gz: ad20dc19f790a03c428f1d37d082e55934708b11db27bafca68d53ddf47a8e74
+  data.tar.gz: 91425da92a3a2747993800ba2a56d1e6314d886fd4e928e034bd299c35186808
 SHA512:
-  metadata.gz: 6d575ad77ff4c72382d13852d0d075c8b8caa664f8e55ace63e0e638695cd2cff43d2580484abff76fce0cf4efa60b8423d4330d65d1a1f39da07c8cd93ea7e9
-  data.tar.gz: 895d6aee64d76e6e2b62071ae7d1cc98aa4d692d2b377c0d04e6f9f5ebb7495f23db7dafa66c8a2cdaf6a9a1925f003fca6d02e4646e4a23bf415167050dc0b4
+  metadata.gz: 7c450fe97457401622eee77174e0ee77b16d7620c8842fb4045289972cc0f99a52533c790197a54a3e03c05db391cf64bbbb630e92fe64a7d0467de7b70ea079
+  data.tar.gz: b793386005b3fc04659de9fa608b75a5bba56b9257c5b472d570f19a3c4ca93a14b0f8de44b01a4be2ea2aaa8aa2ec2fb8f632eef183acf0421c50e00be9c652

data/History.md

@@ -1,6 +1,15 @@
 # Release History for MDBX
 
 ---
+## v0.2.0 [2021-03-19] Mahlon E. Smith <mahlon@martini.nu>
+
+Enhancement:
+
+- Support dup/clone.  This has limited use, as there can only
+  be one open handle per process, but implemented in the interests
+  of avoiding unexpected behavior.
+
+
 ## v0.1.1 [2021-03-14] Mahlon E. Smith <mahlon@martini.nu>
 
 Bugfix:

data/ext/mdbx_ext/database.c

@@ -717,6 +717,34 @@ rmdbx_database_initialize( int argc, VALUE *argv, VALUE self )
 }
 
 
+/*
+ * call-seq:
+ *    db.clone => [copy of db]
+ *
+ * Copy the object (clone/dup).  The returned copy is closed and needs
+ * to be reopened before use.  This function likely  has limited use,
+ * considering you can't open two handles within the same process.
+ */
+static VALUE rmdbx_init_copy( VALUE copy, VALUE orig )
+{
+	rmdbx_db_t *orig_db;
+	rmdbx_db_t *copy_db;
+
+	if ( copy == orig ) return copy;
+
+	TypedData_Get_Struct( orig, rmdbx_db_t, &rmdbx_db_data, orig_db );
+	TypedData_Get_Struct( copy, rmdbx_db_t, &rmdbx_db_data, copy_db );
+
+	/* Copy all fields from the original to the copy, and force-close
+	   the copy.
+	*/
+	MEMCPY( copy_db, orig_db, rmdbx_db_t, 1 );
+	rmdbx_close_all( copy_db );
+
+	return copy;
+}
+
+
 /*
  * Initialization for the MDBX::Database class.
  */
@@ -732,6 +760,7 @@ rmdbx_init_database()
 	rb_define_alloc_func( rmdbx_cDatabase, rmdbx_alloc );
 
 	rb_define_protected_method( rmdbx_cDatabase, "initialize", rmdbx_database_initialize, -1 );
+	rb_define_protected_method( rmdbx_cDatabase, "initialize_copy", rmdbx_init_copy, 1 );
 	rb_define_method( rmdbx_cDatabase, "collection", rmdbx_set_subdb, -1 );
 	rb_define_method( rmdbx_cDatabase, "close", rmdbx_close, 0 );
 	rb_define_method( rmdbx_cDatabase, "reopen", rmdbx_open_env, 0 );

data/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;

data/lib/mdbx.rb

@@ -10,7 +10,7 @@ require 'mdbx_ext'
 module MDBX
 
 	# The version of this gem.
-	VERSION = '0.1.1'
+	VERSION = '0.2.0'
 
 end # module MDBX
 

data/lib/mdbx/database.rb

@@ -201,24 +201,18 @@ class MDBX::Database
 	### pairs.
 	###
 	def to_a
-		in_txn = self.in_transaction?
-		self.snapshot unless in_txn
-
-		return self.each_pair.to_a
-	ensure
-		self.abort unless in_txn
+		return self.conditional_snapshot do
+			self.each_pair.to_a
+		end
 	end
 
 
 	### Return the entirety of database contents as a Hash.
 	###
 	def to_h
-		in_txn = self.in_transaction?
-		self.snapshot unless in_txn
-
-		return self.each_pair.to_h
-	ensure
-		self.abort unless in_txn
+		return self.conditional_snapshot do
+			self.each_pair.to_h
+		end
 	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?
-		self.snapshot unless in_txn
-
-		return self.each_key.to_a
-	ensure
-		self.abort unless in_txn
+		return self.conditional_snapshot do
+			self.each_key.to_a
+		end
 	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?
-		self.snapshot unless in_txn
-
-		return keys.each_with_object( {} ) do |key, acc|
-			val = self[ key ]
-			acc[ key ] = val if val
+		return self.conditional_snapshot do
+			keys.each_with_object( {} ) do |key, acc|
+				val = self[ key ]
+				acc[ key ] = val if val
+			end
 		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?
-		self.snapshot unless in_txn
-
-		return self.each_value.to_a
-	ensure
-		self.abort unless in_txn
+		return self.conditional_snapshot do
+			self.each_value.to_a
+		end
 	end
 
 
 	### Returns a new Array containing values for the given +keys+.
 	###
 	def values_at( *keys )
-		in_txn = self.in_transaction?
-		self.snapshot unless in_txn
-
-		return keys.each_with_object( [] ) do |key, acc|
-			acc << self[ key ]
+		return self.conditional_snapshot do
+			keys.each_with_object( [] ) do |key, acc|
+				acc << self[ key ]
+			end
 		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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdbx
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Mahlon E. Smith
@@ -34,7 +34,7 @@ cert_chain:
   49pOzX5KHZLTS9DKeaP/xcGPz6C8MiwQdYrZarr2SHRASX1zFa79rkItO8kE6RDr
   b6WDF79UvZ55ajtE00TiwqjQL/ZPEtbd
   -----END CERTIFICATE-----
-date: 2021-03-14 00:00:00.000000000 Z
+date: 2021-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.11
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A ruby binding to libmdbx, an improved version of the Lightning Memory Mapped