lmdb 0.6.3 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e28bee640bdc0adcca93b5efa23e98116257bdb3f933d9c5104c6aa289d824bd
-  data.tar.gz: a4f5f2fde8b1591c3dda79f9d84f006ce7deef2fbdc9aef1525505397d05df92
+  metadata.gz: 6d6a2b5d9eb4d0c1a93c0d807bb890ad33bd7eafe6e55d7a132796096296f078
+  data.tar.gz: 9ef7004f7734571bebb5352a99287f1de65e3392c7490d089de959c5a3502a68
 SHA512:
-  metadata.gz: a792888943a2cec0cd5733f5deaa48dd22991373d1b3af00c9a21ee35cd3ae6bbb563b85c26830684b8deef40bd4b5f7e9c62bec2281a0bc7d72bd6cb1c8ca9c
-  data.tar.gz: 32a600c64648a588dc57025260c39f1df79b9c47b2e36fe76fe281620ed1b64a04276653ba9f384811905eb1dc5ee6427f1783bf09be111fe9249b2ebf5f4f16
+  metadata.gz: bf624d2a0e988a764d1cbdd23c30fe48d249d79f855aa5cc3bb3c3c079474edc59df57a68a47aa85b723d4dc6e28621f01c529d1f09efa948d66205e392e485c
+  data.tar.gz: a659a1329886ffd36f6c901c9db4fb64f3f463bf085d17115b2a7b2bda9bf5cf365d5ab90850043395a66566a20d56c3548fa56997563ef714a91a5c3f764202

data/ext/lmdb_ext/lmdb_ext.c

@@ -248,7 +248,7 @@ static void stop_txn_begin(void *arg)
 
 /**
  * This is the code that opens transactions. Read-write transactions
- * have to be called outside the GVL because they will block without
+ * have to be called outside the GVL because they will block otherwise.
  *
  *
  * Here is the basic problem with LMDB transactions:
@@ -910,6 +910,53 @@ static VALUE environment_database(int argc, VALUE *argv, VALUE self) {
     return vdb;
 }
 
+/**
+ * @overload databases()
+ *   Returns a list of the names of all databases in the environment, or
+ *   an empty list if there are no named databases but only the defaut database.
+ *
+ * @return [Array] The names of all databases in the environment.
+ * @raise [Error] If there is an error opening the main database.
+ */
+static VALUE environment_databases(VALUE self) {
+    ENVIRONMENT(self, environment);
+    if (!active_txn(self))
+        return call_with_transaction(self, self, "databases", 0, 0, MDB_RDONLY);
+
+    MDB_dbi dbi;
+    MDB_cursor *cursor;
+    MDB_txn *txn = need_txn(self);
+    MDB_val key;
+
+    check(mdb_dbi_open(txn, NULL, 0, &dbi));
+    check(mdb_cursor_open(txn, dbi, &cursor));
+
+    VALUE ret = rb_ary_new();
+    while (mdb_cursor_get(cursor, &key, NULL, MDB_NEXT_NODUP) == MDB_SUCCESS) {
+        char *intern_db_name;
+        MDB_dbi db;
+        VALUE db_name;
+        
+        if (memchr(key.mv_data, '\0', key.mv_size))
+            continue;
+
+        intern_db_name = malloc(key.mv_size + 1);
+        memcpy(intern_db_name, key.mv_data, key.mv_size);
+        intern_db_name[key.mv_size] = '\0';
+
+        if (mdb_dbi_open(txn, intern_db_name, 0, &db) == MDB_SUCCESS) {
+            mdb_dbi_close(environment->env, db);
+            db_name = rb_str_new(key.mv_data, key.mv_size);
+            rb_ary_push(ret, db_name);
+        }
+        free(intern_db_name);
+    }
+
+    mdb_cursor_close(cursor);
+
+    return ret;
+}
+
 /**
  * @overload stat
  *   Return useful statistics about a database.
@@ -1337,9 +1384,10 @@ static VALUE cursor_next_range(VALUE self, VALUE upper_bound_key) {
         MDB_dbi dbi = mdb_cursor_dbi(cursor->cur);
 
         if (mdb_cmp(txn, dbi, &key, &ub_key) <= 0) {
-            return rb_assoc_new(rb_str_new(key.mv_data, key.mv_size), rb_str_new(value.mv_data, value.mv_size));
+          return rb_assoc_new(rb_str_new(key.mv_data, key.mv_size),
+                              rb_str_new(value.mv_data, value.mv_size));
         } else {
-            return Qnil;
+          return Qnil;
         }
 }
 
@@ -1360,19 +1408,32 @@ static VALUE cursor_next_range(VALUE self, VALUE upper_bound_key) {
 
          rb_scan_args(argc, argv, "11", &vkey, &vval);
 
+         /*
+           XXX TODO: this was a nasty segfault: the key (and any
+           non-nil value) should be asserted to be strings, but then
+           if the database is `integerkeys` then perhaps we should
+           coerce?
+         */
+
+         if (TYPE(vkey) != T_STRING)
+           rb_raise(rb_eArgError, "key must be a string");
+
          key.mv_size = RSTRING_LEN(vkey);
          key.mv_data = StringValuePtr(vkey);
 
          if (!NIL_P(vval)) {
-                 op = MDB_GET_BOTH;
-                 value.mv_size = RSTRING_LEN(vval);
-                 value.mv_data = StringValuePtr(vval);
+           if (TYPE(vval) != T_STRING)
+             rb_raise(rb_eArgError, "non-nil value must be a string");
+
+           op = MDB_GET_BOTH;
+           value.mv_size = RSTRING_LEN(vval);
+           value.mv_data = StringValuePtr(vval);
          }
 
          ret = mdb_cursor_get(cursor->cur, &key, &value, op);
 
          if (!NIL_P(vval) && ret == MDB_NOTFOUND)
-                 return Qnil;
+           return Qnil;
 
          check(ret);
 
@@ -1603,6 +1664,7 @@ void Init_lmdb_ext() {
         rb_undef_alloc_func(cEnvironment);
         rb_define_singleton_method(cEnvironment, "new", environment_new, -1);
         rb_define_method(cEnvironment, "database", environment_database, -1);
+        rb_define_method(cEnvironment, "databases", environment_databases, 0);
         rb_define_method(cEnvironment, "active_txn", environment_active_txn, 0);
         rb_define_method(cEnvironment, "close", environment_close, 0);
         rb_define_method(cEnvironment, "stat", environment_stat, 0);

data/ext/lmdb_ext/lmdb_ext.h

@@ -156,6 +156,7 @@ static VALUE environment_clear_flags(int argc, VALUE* argv, VALUE self);
 static VALUE environment_close(VALUE self);
 static VALUE environment_copy(VALUE self, VALUE path);
 static VALUE environment_database(int argc, VALUE *argv, VALUE self);
+static VALUE environment_databases(VALUE self);
 static VALUE environment_flags(VALUE self);
 static void environment_free(Environment *environment);
 static VALUE environment_info(VALUE self);

data/lib/lmdb/database.rb

@@ -122,6 +122,8 @@ module LMDB
       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 do
@@ -152,9 +154,11 @@ module LMDB
     # going to do this (djt; 2020-02-10)
     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

data/lib/lmdb/version.rb

@@ -1,3 +1,3 @@
 module LMDB
-  VERSION = '0.6.3'.freeze
+  VERSION = '0.6.5'.freeze
 end

data/lmdb.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.7'
 
-  s.add_development_dependency 'rake', '~> 13'
+  s.add_development_dependency 'rake',          '~> 13'
   s.add_development_dependency 'rake-compiler', '~> 1.2'
-  s.add_development_dependency 'rspec', '~> 3'
-  s.add_development_dependency 'ruby_memcheck', '~> 2'
+  s.add_development_dependency 'rspec',         '~> 3'
+  s.add_development_dependency 'ruby_memcheck', '~> 3'
 end

data/spec/lmdb_spec.rb

@@ -100,6 +100,27 @@ describe LMDB do
       subject.flags.should_not include(:nosync)
     end
 
+    describe 'databases' do
+      it 'returns empty list when there are no named databases' do
+        subject.databases.should == []
+      end
+
+      it 'returns list of named databases' do
+        db1 = subject.database 'db1', create: true
+        db2 = subject.database 'db2', create: true
+        subject.databases.should == ['db1', 'db2']
+      end
+
+      it 'returns list of named databases when there are non-database kes in the main db' do
+        main = subject.database
+        main['key'] = 'value'
+        subject.database 'db1', create: true
+        subject.database 'db2', create: true
+
+        subject.databases.should == ['db1', 'db2']
+      end
+    end
+
     describe LMDB::Transaction do
       subject { env }
 
@@ -418,5 +439,21 @@ describe LMDB do
         db.put 'hurr', 'durr' unless db.has? 'hurr', 'durr'
       end
     end
+
+    it 'should croak when cursor key is not given a string' do
+      proc do
+        db.cursor do |c|
+          c.set 1
+        end
+      end.should raise_error(ArgumentError)
+    end
+
+    it 'should croak when cursor value is not given a string' do
+      proc do
+        db.cursor do |c|
+          c.set 'hi', 1
+        end
+      end.should raise_error(ArgumentError)
+    end
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lmdb
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.5
 platform: ruby
 authors:
 - Daniel Mendler
 - Dorian Taylor
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-18 00:00:00.000000000 Z
+date: 2025-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 description: lmdb is a Ruby binding to OpenLDAP Lightning MDB.
 email: code@doriantaylor.com
 executables: []
@@ -130,7 +129,6 @@ homepage: https://github.com/doriantaylor/rb-lmdb
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -145,8 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Ruby bindings to Lightning MDB
 test_files: