lmdb 0.6 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eac165bb0261c0af6813f16df9b725b2ca2a63f4c5de98734473d9976930735
-  data.tar.gz: 3aa0562060e4586dd7c7a44e795adc1449f489f57634787ef5e6480abbd49a48
+  metadata.gz: ce93aeb587bfdacbda4c767a85fc71d7207707cb3ac8f11a614bd6b9478a6c5d
+  data.tar.gz: 9ae5404da5dccaeac5be828f3ea3710b81c2f4942642370d706b89b7d2183806
 SHA512:
-  metadata.gz: 22cc9f78002a05aa25fba212e4d3e3e97566ed7a9bd2e0c84996297398131b5afd57da0e1510a27086ac4b1938401d1369393f9b0515bdd044856109510c6432
-  data.tar.gz: eea983ccb0638bed2dbcfcd3e2ea76271072ea91d259b95e392d505c26f184c351f89ae6076025b93f47bfec3e42add3ec41055e5edb67bee5bfec2e8e341a80
+  metadata.gz: '038bc6f20a16aa7ef463e5e6bdd25c4db7529aa0c261582890a0e3171c5c2203d124ba1bb281a88852eaf09ad125636ca1affff3560bb4dd7daeab8eeb894d45'
+  data.tar.gz: c4eb231408c47a79054d52055ac3c4b1a3b5f8d02937aabddc12fb854ed3f5eb4874db9aa73434aeb320365c74538fa896a39a534fa0014e85691f1a87b17fab

data/ext/lmdb_ext/extconf.rb

@@ -5,10 +5,14 @@ $CFLAGS << ' -fdeclspec' if /darwin/.match? RUBY_PLATFORM
 
 # Embed lmdb if we cannot find it
 if enable_config("bundled-lmdb", false) || !(find_header('lmdb.h') && have_library('lmdb', 'mdb_env_create'))
-  $INCFLAGS << " -I$(srcdir)/liblmdb"
+  lmdbpath = "../../vendor/libraries/liblmdb"
+  $INCFLAGS << " -I$(srcdir)/#{lmdbpath}"
   $VPATH ||= []
-  $VPATH << "$(srcdir)/liblmdb"
-  $srcs = Dir.glob("#{$srcdir}/{,liblmdb/}*.c").map {|n| File.basename(n) }
+  $VPATH << "$(srcdir)/#{lmdbpath}"
+  # XXX this is a sketchy, sketchy way to do this
+  $srcs = Dir.glob("#{$srcdir}/{#{lmdbpath}/{mdb,midl}.c,*.c}").map do |n|
+    File.basename(n)
+  end
 end
 
 have_header 'limits.h'

data/ext/lmdb_ext/lmdb_ext.c

@@ -38,21 +38,21 @@ static void check(int code) {
 }
 
 static void transaction_free(Transaction* transaction) {
-        if (transaction->txn && !NIL_P(transaction->txn)) {
-          //int id = (int)mdb_txn_id(transaction->txn);
-          //rb_warn(sprintf("Memory leak: Garbage collecting active transaction %d", id));
-          rb_warn("Memory leak: Garbage collecting active transaction");
-          // transaction_abort(transaction);
-          // mdb_txn_abort(transaction->txn);
-        }
-        free(transaction);
+    if (transaction->txn) {
+        //int id = (int)mdb_txn_id(transaction->txn);
+        //rb_warn(sprintf("Memory leak: Garbage collecting active transaction %d", id));
+        rb_warn("Memory leak: Garbage collecting active transaction");
+        // transaction_abort(transaction);
+        // mdb_txn_abort(transaction->txn);
+    }
+    free(transaction);
 }
 
 static void transaction_mark(Transaction* transaction) {
-        rb_gc_mark(transaction->parent);
-        rb_gc_mark(transaction->child);
-        rb_gc_mark(transaction->env);
-        rb_gc_mark(transaction->cursors);
+    rb_gc_mark(transaction->parent);
+    rb_gc_mark(transaction->child);
+    rb_gc_mark(transaction->env);
+    rb_gc_mark(transaction->cursors);
 }
 
 /**
@@ -197,7 +197,8 @@ static void transaction_finish(VALUE self, int commit) {
     // no more active read-write transaction; unset the registry
     if (!(transaction->flags & MDB_RDONLY) && !transaction->parent) {
         ENVIRONMENT(transaction->env, env);
-        env->rw_txn_thread = NULL;
+        // maybe this should be Qnil, i dunno
+        env->rw_txn_thread = (VALUE)NULL;
     }
 
     // now set the active transaction to the parent, if there is one
@@ -296,8 +297,6 @@ static VALUE with_transaction(VALUE venv, VALUE(*fn)(VALUE), VALUE arg, int flag
     if (vparent && !NIL_P(vparent))
         Data_Get_Struct(vparent, Transaction, tparent);
 
-    // rb_warn("fart lol");
-
     // XXX note this is a cursed goto loop that could almost certainly
     // be rewritten as a do-while
  retry:
@@ -600,47 +599,50 @@ static int environment_options(VALUE key, VALUE value, EnvironmentOptions* optio
  *      end
  */
 static VALUE environment_new(int argc, VALUE *argv, VALUE klass) {
-        VALUE path, option_hash;
+    VALUE path, option_hash;
 
 #ifdef RB_SCAN_ARGS_KEYWORDS
-        rb_scan_args_kw(RB_SCAN_ARGS_LAST_HASH_KEYWORDS,
-                        argc, argv, "1:", &path, &option_hash);
+    rb_scan_args_kw(RB_SCAN_ARGS_LAST_HASH_KEYWORDS,
+                    argc, argv, "1:", &path, &option_hash);
 #else
-        rb_scan_args(argc, argv, "1:", &path, &option_hash);
+    rb_scan_args(argc, argv, "1:", &path, &option_hash);
 #endif
 
-        EnvironmentOptions options = {
-                .flags = MDB_NOTLS,
-                .maxreaders = -1,
-                .maxdbs = 128,
-                .mapsize = 0,
-                .mode = 0755,
-        };
-        if (!NIL_P(option_hash))
-                rb_hash_foreach(option_hash, environment_options, (VALUE)&options);
-
-        MDB_env* env;
-        check(mdb_env_create(&env));
-
-        Environment* environment;
-        VALUE venv = Data_Make_Struct(cEnvironment, Environment, environment_mark, environment_free, environment);
-        environment->env = env;
-        environment->thread_txn_hash = rb_hash_new();
-        environment->txn_thread_hash = rb_hash_new();
-
-        if (options.maxreaders > 0)
-                check(mdb_env_set_maxreaders(env, options.maxreaders));
-        if (options.mapsize > 0)
-                check(mdb_env_set_mapsize(env, options.mapsize));
-
-        check(mdb_env_set_maxdbs(env, options.maxdbs <= 0 ? 1 : options.maxdbs));
-        VALUE expanded_path = rb_file_expand_path(path, Qnil);
-        check(mdb_env_open(env, StringValueCStr(expanded_path), options.flags, options.mode));
+    EnvironmentOptions options = {
+        .flags = MDB_NOTLS,
+        .maxreaders = -1,
+        .maxdbs = 128,
+        .mapsize = 0,
+        .mode = 0755,
+    };
+    if (!NIL_P(option_hash))
+        rb_hash_foreach(option_hash, (int (*)(ANYARGS))environment_options,
+                        (VALUE)&options);
+
+    MDB_env* env;
+    check(mdb_env_create(&env));
+
+    Environment* environment;
+    VALUE venv = Data_Make_Struct(cEnvironment, Environment, environment_mark,
+                                  environment_free, environment);
+    environment->env = env;
+    environment->thread_txn_hash = rb_hash_new();
+    environment->txn_thread_hash = rb_hash_new();
 
-        if (rb_block_given_p())
-                return rb_ensure(rb_yield, venv, environment_close, venv);
+    if (options.maxreaders > 0)
+        check(mdb_env_set_maxreaders(env, options.maxreaders));
+    if (options.mapsize > 0)
+        check(mdb_env_set_mapsize(env, options.mapsize));
 
-        return venv;
+    check(mdb_env_set_maxdbs(env, options.maxdbs <= 0 ? 1 : options.maxdbs));
+    VALUE expanded_path = rb_file_expand_path(path, Qnil);
+    check(mdb_env_open(env, StringValueCStr(expanded_path), options.flags,
+                       options.mode));
+
+    if (rb_block_given_p())
+        return rb_ensure(rb_yield, venv, environment_close, venv);
+
+    return venv;
 }
 
 /**
@@ -877,32 +879,35 @@ static void database_mark(Database* database) {
  *       transaction or a read-only environment.
  */
 static VALUE environment_database(int argc, VALUE *argv, VALUE self) {
-        ENVIRONMENT(self, environment);
-        if (!active_txn(self))
-                return call_with_transaction(self, self, "database", argc, argv, 0);
+    ENVIRONMENT(self, environment);
+    if (!active_txn(self))
+        return call_with_transaction(self, self, "database", argc, argv, 0);
 
-        VALUE name, option_hash;
+    VALUE name, option_hash;
 #ifdef RB_SCAN_ARGS_KEYWORDS
-        rb_scan_args_kw(RB_SCAN_ARGS_KEYWORDS,
-                        argc, argv, "01:", &name, &option_hash);
+    rb_scan_args_kw(RB_SCAN_ARGS_KEYWORDS,
+                    argc, argv, "01:", &name, &option_hash);
 #else
-        rb_scan_args(argc, argv, "01:", &name, &option_hash);
+    rb_scan_args(argc, argv, "01:", &name, &option_hash);
 #endif
 
 
-        int flags = 0;
-        if (!NIL_P(option_hash))
-                rb_hash_foreach(option_hash, database_flags, (VALUE)&flags);
+    int flags = 0;
+    if (!NIL_P(option_hash))
+        rb_hash_foreach(option_hash, (int (*)(ANYARGS))database_flags,
+                        (VALUE)&flags);
 
-        MDB_dbi dbi;
-        check(mdb_dbi_open(need_txn(self), NIL_P(name) ? 0 : StringValueCStr(name), flags, &dbi));
+    MDB_dbi dbi;
+    check(mdb_dbi_open(need_txn(self), NIL_P(name) ? 0 : StringValueCStr(name),
+                       flags, &dbi));
 
-        Database* database;
-        VALUE vdb = Data_Make_Struct(cDatabase, Database, database_mark, free, database);
-        database->dbi = dbi;
-        database->env = self;
+    Database* database;
+    VALUE vdb = Data_Make_Struct(cDatabase, Database, database_mark, free,
+                                 database);
+    database->dbi = dbi;
+    database->env = self;
 
-        return vdb;
+    return vdb;
 }
 
 /**
@@ -1064,33 +1069,34 @@ static VALUE database_get(VALUE self, VALUE vkey) {
  *       data.
  */
 static VALUE database_put(int argc, VALUE *argv, VALUE self) {
-        DATABASE(self, database);
-        if (!active_txn(database->env))
-                return call_with_transaction(database->env, self, "put", argc, argv, 0);
+    DATABASE(self, database);
+    if (!active_txn(database->env))
+        return call_with_transaction(database->env, self, "put", argc, argv, 0);
 
-        VALUE vkey, vval, option_hash = Qnil;
+    VALUE vkey, vval, option_hash = Qnil;
 #ifdef RB_SCAN_ARGS_KEYWORDS
-        rb_scan_args_kw(RB_SCAN_ARGS_LAST_HASH_KEYWORDS,
-                        argc, argv, "20:", &vkey, &vval, &option_hash);
+    rb_scan_args_kw(RB_SCAN_ARGS_LAST_HASH_KEYWORDS,
+                    argc, argv, "20:", &vkey, &vval, &option_hash);
 #else
-        rb_scan_args(argc, argv, "20:", &vkey, &vval, &option_hash);
+    rb_scan_args(argc, argv, "20:", &vkey, &vval, &option_hash);
 #endif
 
-        int flags = 0;
-        if (!NIL_P(option_hash))
-                rb_hash_foreach(option_hash, database_put_flags, (VALUE)&flags);
+    int flags = 0;
+    if (!NIL_P(option_hash))
+        rb_hash_foreach(option_hash, (int (*)(ANYARGS))database_put_flags,
+                        (VALUE)&flags);
 
-        vkey = StringValue(vkey);
-        vval = StringValue(vval);
+    vkey = StringValue(vkey);
+    vval = StringValue(vval);
 
-        MDB_val key, value;
-        key.mv_size = RSTRING_LEN(vkey);
-        key.mv_data = RSTRING_PTR(vkey);
-        value.mv_size = RSTRING_LEN(vval);
-        value.mv_data = RSTRING_PTR(vval);
+    MDB_val key, value;
+    key.mv_size = RSTRING_LEN(vkey);
+    key.mv_data = RSTRING_PTR(vkey);
+    value.mv_size = RSTRING_LEN(vval);
+    value.mv_data = RSTRING_PTR(vval);
 
-        check(mdb_put(need_txn(database->env), database->dbi, &key, &value, flags));
-        return Qnil;
+    check(mdb_put(need_txn(database->env), database->dbi, &key, &value, flags));
+    return Qnil;
 }
 
 /**
@@ -1454,31 +1460,32 @@ static VALUE cursor_get(VALUE self) {
  *       data.
  */
 static VALUE cursor_put(int argc, VALUE* argv, VALUE self) {
-        CURSOR(self, cursor);
+    CURSOR(self, cursor);
 
-        VALUE vkey, vval, option_hash;
+    VALUE vkey, vval, option_hash;
 #ifdef RB_SCAN_ARGS_KEYWORDS
-        rb_scan_args_kw(RB_SCAN_ARGS_LAST_HASH_KEYWORDS,
-                        argc, argv, "2:", &vkey, &vval, &option_hash);
+    rb_scan_args_kw(RB_SCAN_ARGS_LAST_HASH_KEYWORDS,
+                    argc, argv, "2:", &vkey, &vval, &option_hash);
 #else
-        rb_scan_args(argc, argv, "2:", &vkey, &vval, &option_hash);
+    rb_scan_args(argc, argv, "2:", &vkey, &vval, &option_hash);
 #endif
 
-        int flags = 0;
-        if (!NIL_P(option_hash))
-                rb_hash_foreach(option_hash, cursor_put_flags, (VALUE)&flags);
+    int flags = 0;
+    if (!NIL_P(option_hash))
+        rb_hash_foreach(option_hash, (int (*)(ANYARGS))cursor_put_flags,
+                        (VALUE)&flags);
 
-        vkey = StringValue(vkey);
-        vval = StringValue(vval);
+    vkey = StringValue(vkey);
+    vval = StringValue(vval);
 
-        MDB_val key, value;
-        key.mv_size = RSTRING_LEN(vkey);
-        key.mv_data = RSTRING_PTR(vkey);
-        value.mv_size = RSTRING_LEN(vval);
-        value.mv_data = RSTRING_PTR(vval);
+    MDB_val key, value;
+    key.mv_size = RSTRING_LEN(vkey);
+    key.mv_data = RSTRING_PTR(vkey);
+    value.mv_size = RSTRING_LEN(vval);
+    value.mv_data = RSTRING_PTR(vval);
 
-        check(mdb_cursor_put(cursor->cur, &key, &value, flags));
-        return Qnil;
+    check(mdb_cursor_put(cursor->cur, &key, &value, flags));
+    return Qnil;
 }
 
 #define METHOD cursor_delete_flags
@@ -1496,22 +1503,23 @@ static VALUE cursor_put(int argc, VALUE* argv, VALUE self) {
  *        if the database was opened with +:dupsort+.
  */
 static VALUE cursor_delete(int argc, VALUE *argv, VALUE self) {
-        CURSOR(self, cursor);
+    CURSOR(self, cursor);
 
-        VALUE option_hash;
+    VALUE option_hash;
 #ifdef RB_SCAN_ARGS_KEYWORDS
-        rb_scan_args_kw(RB_SCAN_ARGS_LAST_HASH_KEYWORDS,
-                        argc, argv, ":", &option_hash);
+    rb_scan_args_kw(RB_SCAN_ARGS_LAST_HASH_KEYWORDS,
+                    argc, argv, ":", &option_hash);
 #else
-        rb_scan_args(argc, argv, ":", &option_hash);
+    rb_scan_args(argc, argv, ":", &option_hash);
 #endif
 
-        int flags = 0;
-        if (!NIL_P(option_hash))
-                rb_hash_foreach(option_hash, cursor_delete_flags, (VALUE)&flags);
+    int flags = 0;
+    if (!NIL_P(option_hash))
+        rb_hash_foreach(option_hash, (int (*)(ANYARGS))cursor_delete_flags,
+                        (VALUE)&flags);
 
-        check(mdb_cursor_del(cursor->cur, flags));
-        return Qnil;
+    check(mdb_cursor_del(cursor->cur, flags));
+    return Qnil;
 }
 
 /**
@@ -1562,7 +1570,8 @@ void Init_lmdb_ext() {
          * A general class of exceptions raised within the LMDB gem.
          */
         cError = rb_define_class_under(mLMDB, "Error", rb_eRuntimeError);
-#define ERROR(name) cError_##name = rb_define_class_under(cError, #name, cError);
+#define ERROR(name) \
+        cError_##name = rb_define_class_under(cError, #name, cError);
 #include "errors.h"
 #undef ERROR
 
@@ -1591,6 +1600,7 @@ void Init_lmdb_ext() {
          *    env.close
          */
         cEnvironment = rb_define_class_under(mLMDB, "Environment", rb_cObject);
+        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, "active_txn", environment_active_txn, 0);
@@ -1632,6 +1642,7 @@ void Init_lmdb_ext() {
          *    env.close
          */
         cDatabase = rb_define_class_under(mLMDB, "Database", rb_cObject);
+        rb_undef_alloc_func(cDatabase);
         rb_undef_method(rb_singleton_class(cDatabase), "new");
         rb_define_method(cDatabase, "stat", database_stat, 0);
         rb_define_method(cDatabase, "flags", database_get_flags, 0);
@@ -1703,6 +1714,7 @@ void Init_lmdb_ext() {
          *                            #=> storage.
          */
         cTransaction = rb_define_class_under(mLMDB, "Transaction", rb_cObject);
+        rb_undef_alloc_func(cTransaction);
         rb_undef_method(rb_singleton_class(cTransaction), "new");
         rb_define_method(cTransaction, "commit", transaction_commit, 0);
         rb_define_method(cTransaction, "abort", transaction_abort, 0);
@@ -1736,6 +1748,7 @@ void Init_lmdb_ext() {
          *    end
          */
         cCursor = rb_define_class_under(mLMDB, "Cursor", rb_cObject);
+        rb_undef_alloc_func(cCursor);
         rb_undef_method(rb_singleton_class(cCursor), "new");
         rb_define_method(cCursor, "close", cursor_close, 0);
         rb_define_method(cCursor, "get", cursor_get, 0);

data/lib/lmdb/version.rb

@@ -1,3 +1,3 @@
 module LMDB
-  VERSION = '0.6'.freeze
+  VERSION = '0.6.2'.freeze
 end

data/lmdb.gemspec

@@ -1,3 +1,4 @@
+
 # -*- encoding: utf-8 -*-
 require File.dirname(__FILE__) + '/lib/lmdb/version'
 require 'date'
@@ -9,19 +10,20 @@ Gem::Specification.new do |s|
   s.date        = Date.today.to_s
   s.licenses    = ['MIT']
   s.summary     = 'Ruby bindings to Lightning MDB'
-  s.email       = 'mail@daniel-mendler.de'
-  s.homepage    = 'https://github.com/minad/lmdb'
+  s.email       = 'code@doriantaylor.com'
+  s.homepage    = 'https://github.com/doriantaylor/rb-lmdb'
   s.description = 'lmdb is a Ruby binding to OpenLDAP Lightning MDB.'
-  s.authors     = ['Daniel Mendler']
+  s.authors     = ['Daniel Mendler', 'Dorian Taylor']
   s.extensions  = Dir['ext/**/extconf.rb']
 
-  s.files         = `git ls-files`.split("\n")
+  s.files         = `git ls-files --recurse-submodules -- *`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ['lib']
 
-  s.required_ruby_version = ">= 2.4"
-  s.add_development_dependency 'rake', "~> 13.0"
-  s.add_development_dependency 'rake-compiler', '~> 1.1'
-  s.add_development_dependency 'rspec', "~> 3.0"
-  s.add_development_dependency 'ruby_memcheck', "~> 1.0"
+  s.required_ruby_version = '>= 2.7'
+
+  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'
 end

data/{ext/lmdb_ext → vendor/libraries}/liblmdb/.gitignore

@@ -3,12 +3,20 @@ mtest[23456]
 testdb
 mdb_copy
 mdb_stat
+mdb_dump
+mdb_load
+mdb_drop
+*.lo
 *.[ao]
 *.so
+*.exe
 *[~#]
 *.bak
 *.orig
 *.rej
+*.gcov
+*.gcda
+*.gcno
 core
 core.*
 valgrind.*

data/{ext/lmdb_ext → vendor/libraries}/liblmdb/COPYRIGHT

@@ -1,4 +1,4 @@
-Copyright 2011-2014 Howard Chu, Symas Corp.
+Copyright 2011-2021 Howard Chu, Symas Corp.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without