lmdb 0.6.4 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bef8556fe013707e1253bff4b1e2638517fb39a5de3fb33b1c0766a17e55597
-  data.tar.gz: 434ea5d0333c4b51851f2917a46d0f830bd080c2924812d9376e5baabdf00b30
+  metadata.gz: fcfc5ce25df41f83029918b757006f4f34b674f41c2c2691cc40128a7e63a46e
+  data.tar.gz: 9cf681ab6dc945eac9b8225717248f42cf27940a704e951aed3dbd59f151df23
 SHA512:
-  metadata.gz: 31ec8737a301c0abdc06421291a2dc0afef6ed112c96bd403e63e64f5046178599edf13053c03ce09b937fa87f922056d7e8fdccc651052d6cb967999d36e0e2
-  data.tar.gz: f1f78664147747397102e76c7a84ba938a28e3888bd4a52ecf46f7bb2c8a6cdbbfe3adadbe0108f63ec9885ff80cbcccc9ab5f8fb9411033448f4fba17b36fe1
+  metadata.gz: 888eb18fa7e8be017e950f1b8893fc9c4f3c4cc1fa616312438b23be86344cfdeb37d2cc7edc477a528292776ae45e95c0f65c8cd49cd417a4be387f1dd3a28f
+  data.tar.gz: 07740710e001f491d22b902d27c1e446d2bab1b93e42d41951e47fdd084b5d5f982dadc551f13764146e8725b8dda4b7a7084c2781454bac2d9f332e16fd666e

data/README.md

@@ -1,8 +1,5 @@
 # LMDB
 
-[![Gittip donate button](http://img.shields.io/gittip/bevry.png)](https://www.gittip.com/min4d/ "Donate weekly to this project using Gittip")
-[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=min4d&url=https://github.com/minad/lmdb&title=LMDB&language=&tags=github&category=software)
-
 Ruby bindings for the amazing [OpenLDAP's Lightning Memory-Mapped Database (LMDB)](https://www.symas.com/lmdb/).
 
 ## Installation
@@ -15,12 +12,9 @@ gem install lmdb
 
 ## Links
 
-* Source: <http://github.com/minad/lmdb>
-* Bugs:   <http://github.com/minad/lmdb/issues>
-* Tests and benchmarks: <http://travis-ci.org/minad/lmdb>
-* API documentation:
-    * Latest Gem: <http://rubydoc.info/gems/lmdb/frames>
-    * GitHub master: <http://rubydoc.info/github/minad/lmdb/master/frames>
+* Source: <http://github.com/doriantaylor/rb-lmdb>
+* Bugs:   <http://github.com/doriantaylor/rb-lmdb/issues>
+* API documentation: <http://rubydoc.info/gems/lmdb/>
 
 ## API
 
@@ -42,12 +36,16 @@ end
 env.close
 ```
 
-If you want to have a simpler interface to LMDB databases please consider using [Moneta](https://github.com/minad/moneta). The Moneta gem provides an LMDB adapter which uses this gem.
+## Moneta
+
+If you want to have a simpler interface to LMDB databases please
+consider using [Moneta](https://github.com/minad/moneta). The Moneta
+gem provides an LMDB adapter which uses this gem.
 
 ## License (MIT)
 
 ```
-Copyright (c) 2013 Daniel Mendler
+Copyright ©2013 Daniel Mendler (later changes ©2025 Dorian Taylor)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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/database.rb

@@ -84,10 +84,10 @@ module LMDB
       maybe_txn true do
       # env.transaction do
         cursor do |c|
-          method = :set
-          while rec = c.send(method, key)
-            method = :next_range
-            yield rec[1]
+          rec = c.set key
+          while rec
+            yield rec.last
+            rec = c.next_range key
           end
         end
       end
@@ -134,19 +134,53 @@ module LMDB
       ret
     end
 
+    # Conditionally put a value into the database.
+    #
+    # @param key [String] The key of the record
+    # @param value [String] the (optional) value
+    # @param options [Hash] options
+    #
+    # @see #put
+    #
+    # @return [void]
+    def put?(key, value = nil, **options)
+      begin
+        put key, value, **options
+      rescue LMDB::Error::KEYEXIST
+        nil
+      end
+    end
+
     # Delete the key (and optional value pair) if it exists; do not
     # complain about missing keys.
-    # @param key [#to_s] The key.
-    # @param value [#to_s] The optional value.
-    def delete?(key, value = nil)
-      delete key, value if has? key, value
+    # @param key [#to_s] The key of the record
+    # @param value [#to_s] The optional value
+    #
+    # @see #delete
+    #
+    # @return [void]
+    #
+    def delete?(key, value = nil, **options)
+      begin
+        delete key, value, **options
+      rescue LMDB::Error::NOTFOUND
+        nil
+      end
     end
 
+    # Return how many records there are in this database.
+    #
     # @return the number of records in this database
     def size
       stat[:entries]
     end
 
+    #
+    # @return whether the database is empty
+    def empty?
+      stat[:entries] == 0
+    end
+
     private
 
     # having trouble with read-only transactions embedded in

data/lib/lmdb/version.rb

@@ -1,3 +1,3 @@
 module LMDB
-  VERSION = '0.6.4'.freeze
+  VERSION = '0.6.6'.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 }
 
@@ -371,6 +392,8 @@ describe LMDB do
         c.set('key1', 'value3').should == nil
       end
 
+      dupdb.put?('key1', 'value1', nodupdata: true).should be_nil
+
       # this is basically an extended test of `cursor.set key, val`
       dupdb.has?('key1', 'value1').should == true
       dupdb.has?('key1', 'value2').should == true

metadata

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