lmdb 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bef8556fe013707e1253bff4b1e2638517fb39a5de3fb33b1c0766a17e55597
-  data.tar.gz: 434ea5d0333c4b51851f2917a46d0f830bd080c2924812d9376e5baabdf00b30
+  metadata.gz: 6d6a2b5d9eb4d0c1a93c0d807bb890ad33bd7eafe6e55d7a132796096296f078
+  data.tar.gz: 9ef7004f7734571bebb5352a99287f1de65e3392c7490d089de959c5a3502a68
 SHA512:
-  metadata.gz: 31ec8737a301c0abdc06421291a2dc0afef6ed112c96bd403e63e64f5046178599edf13053c03ce09b937fa87f922056d7e8fdccc651052d6cb967999d36e0e2
-  data.tar.gz: f1f78664147747397102e76c7a84ba938a28e3888bd4a52ecf46f7bb2c8a6cdbbfe3adadbe0108f63ec9885ff80cbcccc9ab5f8fb9411033448f4fba17b36fe1
+  metadata.gz: bf624d2a0e988a764d1cbdd23c30fe48d249d79f855aa5cc3bb3c3c079474edc59df57a68a47aa85b723d4dc6e28621f01c529d1f09efa948d66205e392e485c
+  data.tar.gz: a659a1329886ffd36f6c901c9db4fb64f3f463bf085d17115b2a7b2bda9bf5cf365d5ab90850043395a66566a20d56c3548fa56997563ef714a91a5c3f764202

data/ext/lmdb_ext/lmdb_ext.c

@@ -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;
         }
 }
 
@@ -1363,7 +1411,8 @@ static VALUE cursor_next_range(VALUE self, VALUE upper_bound_key) {
          /*
            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 the database is `integerkeys` then perhaps we should
+           coerce?
          */
 
          if (TYPE(vkey) != T_STRING)
@@ -1384,7 +1433,7 @@ static VALUE cursor_next_range(VALUE self, VALUE upper_bound_key) {
          ret = mdb_cursor_get(cursor->cur, &key, &value, op);
 
          if (!NIL_P(vval) && ret == MDB_NOTFOUND)
-                 return Qnil;
+           return Qnil;
 
          check(ret);
 
@@ -1615,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/version.rb

@@ -1,3 +1,3 @@
 module LMDB
-  VERSION = '0.6.4'.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 '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 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lmdb
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Daniel Mendler
 - Dorian Taylor
 bindir: bin
 cert_chain: []
-date: 2025-05-06 00:00:00.000000000 Z
+date: 2025-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake