mdbx 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a961296e49a7e0e0fee9afbe7d2b92144a23b6295d68c3fc10d2296d5421666
-  data.tar.gz: 29fd9c1997cb4a6bd6d1f7ce99ccb8cb38651ddc78e34a1a93eb21d55a552505
+  metadata.gz: 7eb0c032fc0a9fd7c91e0db5f6bbd876921fac5e886de80651d7eaf6564e7629
+  data.tar.gz: 2820244c2ed1c1e6ed8efd6275fd62d4f62d5668f2a2d346056c70aef05b9dd1
 SHA512:
-  metadata.gz: 8d04ccf57c5cf613e930339c770acaa28c368eba2345e9b1255e0d2584f2271b9d166bdda8f55f2e27dc360315b00c41c4af7e59829f21611946fa2824975cc7
-  data.tar.gz: f6d39a0a124cd4bfbf189f439ae765c7aec0a99eb0bc7a8b2e4b7d29141faa99a294d50b4110e0d40ac13349b22b731b2df29f8b2b4a36eb199785c0dba22043
+  metadata.gz: 65b7dab9c906a5dc50965ed8561a2eb9965eadf724e38f13fafe67cce6791ab1fca2992463dc9b8459f5ef6c97cb326439944faa7bbe60dc8fb03d41e9cc1f6d
+  data.tar.gz: 89c8f70c38f150986b1b76052cc8870e5ab0705af73e59f5db9d20f91a6d201b47a6e2cd8c85a663dd0404a01fb46f10ccda38febfbfb53a19619badeda5889c

data/History.md

@@ -1,5 +1,24 @@
 # Release History for MDBX
 
+---
+## v0.3.5 [2023-03-24] Mahlon E. Smith <mahlon@martini.nu>
+
+Add support for libmdbx 0.12.x.
+
+
+Bugfixes:
+
+ - Ensure transactions are closed if exceptions are raised.
+
+
+---
+## v0.3.4 [2022-12-21] Mahlon E. Smith <mahlon@martini.nu>
+
+Bugfixes:
+
+ - Don't use mdbx_replace() when not using the original value(s)
+
+
 ---
 ## v0.3.3 [2021-10-22] Mahlon E. Smith <mahlon@martini.nu>
 

data/README.md

@@ -2,41 +2,34 @@
 # Ruby::MDBX
 
 home
-: https://code.martini.nu/ruby-mdbx
-
-code
-: https://code.martini.nu/ruby-mdbx
+: https://code.martini.nu/fossil/ruby-mdbx
 
 docs
 : https://martini.nu/docs/ruby-mdbx
 
-github
-: https://github.com/mahlon/ruby-mdbx
-
-gitlab
-: https://gitlab.com/mahlon/ruby-mdbx
-
-sourcehut:
-: https://hg.sr.ht/~mahlon/ruby-mdbx
+github_mirror
+: https://github.com/mahlonsmith/ruby-mdbx
 
 
 ## Description
 
 This is a Ruby (MRI) binding for the libmdbx database library.
 
+[![Gem Version](https://badge.fury.io/rb/mdbx.svg)](https://badge.fury.io/rb/mdbx)
+
 libmdbx is an extremely fast, compact, powerful, embedded, transactional
 key-value database, with a permissive license. libmdbx has a specific set
 of properties and capabilities, focused on creating unique lightweight
 solutions.
 
 For more information about libmdbx (features, limitations, etc), see the
-[introduction](https://erthink.github.io/libmdbx/intro.html).
+[introduction](https://libmdbx.dqdkfa.ru).
 
 
 ## Prerequisites
 
-* Ruby 2.6+
-* [libmdbx](https://github.com/erthink/libmdbx)
+* Ruby 3.0+
+* [libmdbx](https://gitflic.ru/project/erthink/libmdbx)
 
 
 ## Installation
@@ -339,12 +332,84 @@ Calling `statistics` on a database handle will provide a subset of
 information about the build environment, the database environment, and
 the currently connected clients.
 
+```bash
+% ruby -rmdbx -rjson -e "puts JSON.generate( MDBX::Database.open( '/tmp/testdb' ).statistics )" | jq
+```
+
+```json
+{
+  "build": {
+    "compiler": "FreeBSD clang version 13.0.0 (git@github.com:llvm/llvm-project.git llvmorg-13.0.0-0-gd7b669b3a303)",
+    "flags": "-DNDEBUG=1 -std=gnu++2b -O2 -pipe -Wall -Werror -Wextra -Wpedantic -ffunction-sections -fPIC -fvisibility=hidden -std=gnu11 -pthread -Wno-error=attributes -fstack-protector-strong -fno-strict-aliasing -fstack-
+protector-strong",
+    "options": {
+      "MDBX_DEBUG": 0,
+      "MDBX_WORDBITS": 64,
+      "BYTE_ORDER": "LITTLE_ENDIAN",
+      "MDBX_ENV_CHECKPID": "AUTO",
+      "MDBX_TXN_CHECKOWNER": "AUTO",
+      "MDBX_64BIT_ATOMIC": "AUTO",
+      "MDBX_64BIT_CAS": "AUTO",
+      "MDBX_TRUST_RTC": "AUTO",
+      "MDBX_ENABLE_REFUND": 1,
+      "MDBX_ENABLE_MADVISE": 1,
+      "_GNU_SOURCE": "NO",
+      "MDBX_LOCKING": "AUTO",
+      "MDBX_USE_OFDLOCKS": "AUTO",
+      "MDBX_CACHELINE_SIZE": 64,
+      "MDBX_CPU_WRITEBACK_INCOHERENT": 0,
+      "MDBX_MMAP_INCOHERENT_CPU_CACHE": 0,
+      "MDBX_MMAP_INCOHERENT_FILE_WRITE": 0,
+      "MDBX_UNALIGNED_OK": 0,
+      "MDBX_PNL_ASCENDING": 0
+    },
+    "target": "x86_64-unknown-freebsd13.1"
+  },
+    "system_memory": {
+    "pagesize": 4096,
+    "total_pages": 33522850,
+    "avail_pages": 4170509
+  },
+  "environment": {
+    "pagesize": 4096,
+    "branch_pages": 0,
+    "leaf_pages": 0,
+    "overflow_pages": 0,
+    "btree_depth": 0,
+    "entries": 0,
+    "last_txnid": 3,
+    "last_reader_txnid": 3,
+    "max_readers": 120,
+    "readers_in_use": 1,
+    "datafile": {
+      "size_current": 12288,
+      "pages": 3,
+      "type": "dynamic",
+      "size_lower": 12288,
+      "size_upper": 1048576,
+      "growth_step": 65536,
+      "shrink_threshold": 131072
+    }
+  },
+  "readers": [
+    {
+      "slot": 0,
+      "pid": 16731,
+      "thread": 34374492160,
+      "txnid": 0,
+      "lag": 0,
+      "bytes_used": 0,
+      "bytes_retired": 0
+    }
+  ]
+}
+```
 
 ## Contributing
 
-You can check out the current development source with Mercurial via its
-[home repo](https://code.martini.nu/ruby-mdbx), or with Git at its
-[project mirror](https://gitlab.com/mahlon/ruby-mdbx).
+You can check out the current development source with Fossil via its
+[home repo](https://code.martini.nu/fossil/ruby-mdbx), or with Git at its
+[project mirror](https://github.com/mahlonsmith/ruby-mdbx)
 
 After checking out the source, run:
 
@@ -355,6 +420,19 @@ This will install dependencies, and do any other necessary setup for
 development.
 
 
+## Reporting Issues
+
+Tests are performed against the latest stable MRI Ruby, and I endeavor to test
+against the latest stable libmdbx (as of this writing, the 0.12.x versioning),
+on both x86 and ARM chipsets.
+
+Things may work for you in other environments - I'm just not matrix testing
+every possible permutation.
+
+Bugs reported against tested environments take precedence over others.  Please
+report any issues [here](https://code.martini.nu/fossil/ruby-mdbx/tktnew).
+
+
 ## Authors
 
 - Mahlon E. Smith <mahlon@martini.nu>
@@ -362,7 +440,7 @@ development.
 
 ## License
 
-Copyright (c) 2020-2021 Mahlon E. Smith
+Copyright (c) 2020-2023 Mahlon E. Smith
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/ext/mdbx_ext/database.c

@@ -101,16 +101,6 @@ rmdbx_closed_p( VALUE self )
 }
 
 
-/*
- * Check if a given +flag+ is enabled for flag +val+.
- */
-int
-rmdbx_flag_enabled( val, flag )
-{
-	return ( val & flag ) == flag;
-}
-
-
 /*
  * Given a ruby string +key+ and a pointer to an MDBX_val, prepare the
  * key for usage within mdbx.  All keys are explicitly converted to
@@ -178,6 +168,12 @@ rmdbx_open_env( VALUE self )
 		rb_raise( rmdbx_eDatabaseError, "mdbx_env_open: (%d) %s", rc, mdbx_strerror(rc) );
 	}
 
+	/* Force populate the db->dbi handle.  Under 0.12.x, getting a
+	 * 'permission denied' doing this for the first access with a RDONLY
+	 * for some reason. */
+	rmdbx_open_txn( db, MDBX_TXN_READWRITE );
+	rmdbx_close_txn( db, RMDBX_TXN_ROLLBACK );
+
 	db->state.open = 1;
 	return Qtrue;
 }
@@ -199,8 +195,10 @@ rmdbx_clear( VALUE self )
 	rmdbx_open_txn( db, MDBX_TXN_READWRITE );
 	int rc = mdbx_drop( db->txn, db->dbi, false );
 
-	if ( rc != MDBX_SUCCESS )
+	if ( rc != MDBX_SUCCESS ) {
+		rmdbx_close_txn( db, RMDBX_TXN_ROLLBACK );
 		rb_raise( rmdbx_eDatabaseError, "mdbx_drop: (%d) %s", rc, mdbx_strerror(rc) );
+	}
 
 	rmdbx_close_txn( db, RMDBX_TXN_COMMIT );
 
@@ -239,8 +237,10 @@ rmdbx_drop( VALUE self, VALUE name )
 	rmdbx_open_txn( db, MDBX_TXN_READWRITE );
 	int rc = mdbx_drop( db->txn, db->dbi, true );
 
-	if ( rc != MDBX_SUCCESS )
+	if ( rc != MDBX_SUCCESS ) {
+		rmdbx_close_txn( db, RMDBX_TXN_ROLLBACK );
 		rb_raise( rmdbx_eDatabaseError, "mdbx_drop: (%d) %s", rc, mdbx_strerror(rc) );
+	}
 
 	rmdbx_close_txn( db, RMDBX_TXN_COMMIT );
 
@@ -248,6 +248,12 @@ rmdbx_drop( VALUE self, VALUE name )
 	db->subdb = NULL;
 	rmdbx_close_dbi( db ); /* ensure next access is not in the defunct subdb */
 
+	/* Force populate the new db->dbi handle.  Under 0.12.x, getting a
+	 * 'permission denied' doing this for the first access with a RDONLY
+	 * for some reason. */
+	rmdbx_open_txn( db, MDBX_TXN_READWRITE );
+	rmdbx_close_txn( db, RMDBX_TXN_ROLLBACK );
+
 	return self;
 }
 
@@ -371,10 +377,9 @@ rmdbx_put_val( VALUE self, VALUE key, VALUE val )
 		rc = mdbx_del( db->txn, db->dbi, &ckey, NULL );
 	}
 	else {
-		MDBX_val old;
 		MDBX_val data;
 		rmdbx_val_for( self, val, &data );
-		rc = mdbx_replace( db->txn, db->dbi, &ckey, &data, &old, 0 );
+		rc = mdbx_put( db->txn, db->dbi, &ckey, &data, 0 );
 		xfree( data.iov_base );
 	}
 
@@ -841,7 +846,7 @@ rmdbx_stats( VALUE self )
  *    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,
+ * 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 )
@@ -868,9 +873,9 @@ static VALUE rmdbx_init_copy( VALUE copy, VALUE orig )
  * Initialization for the MDBX::Database class.
  */
 void
-rmdbx_init_database()
+rmdbx_init_database( void )
 {
-	rmdbx_cDatabase = rb_define_class_under( rmdbx_mMDBX, "Database", rb_cData );
+	rmdbx_cDatabase = rb_define_class_under( rmdbx_mMDBX, "Database", rb_cObject );
 
 #ifdef FOR_RDOC
 	rmdbx_mMDBX = rb_define_module( "MDBX" );

data/ext/mdbx_ext/extconf.rb

@@ -3,6 +3,8 @@
 
 require 'mkmf'
 
+$CFLAGS << ' -Wno-suggest-attribute=format'
+
 have_library( 'mdbx' )  or abort "No mdbx library!"
 have_header( 'mdbx.h' ) or abort "No mdbx.h header!"
 

data/ext/mdbx_ext/mdbx_ext.c

@@ -58,13 +58,11 @@ rmdbx_log( const char *level, const char *fmt, va_dcl )
 }
 
 
-
-
 /*
  * MDBX initialization
  */
 void
-Init_mdbx_ext()
+Init_mdbx_ext( void )
 {
 	rmdbx_mMDBX = rb_define_module( "MDBX" );
 

data/lib/mdbx/database.rb

@@ -85,7 +85,7 @@ class MDBX::Database
 	###
 	### [:no_threadlocal]
 	###   Parallelize read-only transactions across threads.  Writes are
-	###   always thread local. (See MDBX documentatoin for details.)
+	###   always thread local. (See MDBX documentation for details.)
 	###
 	### [:readonly]
 	###   Reject any write attempts while using this database handle.
@@ -364,7 +364,6 @@ class MDBX::Database
 	protected
 	#########
 
-
 	### Safely serialize a value, closing any open transaction and re-raising
 	### if necessary.
 	###
@@ -391,7 +390,6 @@ class MDBX::Database
 	end
 
 
-
 	### 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.

data/lib/mdbx.rb

@@ -13,7 +13,7 @@ module MDBX
 	extend Loggability
 
 	# The version of this gem.
-	VERSION = '0.3.3'
+	VERSION = '0.3.5'
 
 
 	log_as :mdbx

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: mdbx
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Mahlon E. Smith
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -34,7 +34,7 @@ cert_chain:
   49pOzX5KHZLTS9DKeaP/xcGPz6C8MiwQdYrZarr2SHRASX1zFa79rkItO8kE6RDr
   b6WDF79UvZ55ajtE00TiwqjQL/ZPEtbd
   -----END CERTIFICATE-----
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2024-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -98,34 +98,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: '0.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: '0.22'
 - !ruby/object:Gem::Dependency
-  name: rdoc-generator-fivefish
+  name: rdoc-generator-sixfish
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -206,15 +200,14 @@ files:
 - ext/mdbx_ext/stats.c
 - lib/mdbx.rb
 - lib/mdbx/database.rb
-homepage: https://code.martini.nu/ruby-mdbx
+homepage: https://code.martini.nu/fossil/ruby-mdbx
 licenses:
 - BSD-3-Clause
 metadata:
-  homepage_uri: https://code.martini.nu/ruby-mdbx
+  homepage_uri: https://code.martini.nu/fossil/ruby-mdbx
   documentation_uri: https://martini.nu/docs/ruby-mdbx
   changelog_uri: https://martini.nu/docs/ruby-mdbx/History_md.html
-  source_uri: https://code.martini.nu/ruby-mdbx
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -229,8 +222,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: A ruby binding to libmdbx, an improved version of the Lightning Memory Mapped
   Database.