lmdb 0.4.1 → 0.4.2

data/ext/lmdb_ext/liblmdb/midl.c

@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <assert.h>
 #include "midl.h"
 
 /** @defgroup internal	MDB Internals
@@ -150,7 +149,7 @@ int mdb_midl_need( MDB_IDL *idp, unsigned num )
 		num = (num + num/4 + (256 + 2)) & -256;
 		if (!(ids = realloc(ids-1, num * sizeof(MDB_ID))))
 			return ENOMEM;
-		*ids++ = num -= 2;
+		*ids++ = num - 2;
 		*idp = ids;
 	}
 	return 0;
@@ -306,7 +305,6 @@ int mdb_mid2l_insert( MDB_ID2L ids, MDB_ID2 *id )
 	unsigned x, i;
 
 	x = mdb_mid2l_search( ids, id->mid );
-	assert( x > 0 );
 
 	if( x < 1 ) {
 		/* internal error */

data/ext/lmdb_ext/lmdb_ext.c

@@ -1,4 +1,5 @@
 #include "lmdb_ext.h"
+#include "ruby/thread.h"
 
 static void check(int code) {
         if (!code)
@@ -110,6 +111,13 @@ static void transaction_finish(VALUE self, int commit) {
         else
                 mdb_txn_abort(transaction->txn);
 
+        long i;
+        for (i=0; i<RARRAY_LEN(transaction->cursors); i++) {
+                VALUE cursor = RARRAY_AREF(transaction->cursors, i);
+                cursor_close(cursor);
+        }
+        rb_ary_clear(transaction->cursors);
+
         // Mark child transactions as closed
         p = environment_active_txn(transaction->env);
         while (p != self) {
@@ -141,11 +149,58 @@ static VALUE call_with_transaction(VALUE venv, VALUE self, const char* name, int
         return with_transaction(venv, call_with_transaction_helper, (VALUE)&arg, flags);
 }
 
+static void *call_txn_begin(void *arg) {
+        TxnArgs *txn_args = arg;
+        txn_args->result = mdb_txn_begin(txn_args->env,
+          txn_args->parent, txn_args->flags, txn_args->htxn);
+        return (void *)NULL;
+}
+
+static void stop_txn_begin(void *arg)
+{
+        TxnArgs *txn_args = arg;
+        // There's no way to stop waiting for mutex:
+        //   http://www.cognitus.net/faq/pthread/pthreadSemiFAQ_6.html
+        // However, we can (and must) release the mutex as soon as we get it:
+        txn_args->stop = 1;
+}
+
 static VALUE with_transaction(VALUE venv, VALUE(*fn)(VALUE), VALUE arg, int flags) {
         ENVIRONMENT(venv, environment);
 
         MDB_txn* txn;
-        check(mdb_txn_begin(environment->env, active_txn(venv), flags, &txn));
+        TxnArgs txn_args;
+
+    retry:
+        txn = NULL;
+
+        txn_args.env = environment->env;
+        txn_args.parent = active_txn(venv);
+        txn_args.flags = flags;
+        txn_args.htxn = &txn;
+        txn_args.result = 0;
+        txn_args.stop = 0;
+
+        if (flags & MDB_RDONLY) {
+                call_txn_begin(&txn_args);
+        }
+        else {
+                rb_thread_call_without_gvl2(
+                    call_txn_begin, &txn_args,
+                    stop_txn_begin, &txn_args);
+
+                if (txn_args.stop || !txn) {
+                        // !txn is when rb_thread_call_without_gvl2
+                        // returns before calling txn_begin
+                        if (txn) {
+                                mdb_txn_abort(txn);
+                        }
+                        rb_thread_check_ints();
+                        goto retry; // in what cases do we get here?
+                }
+        }
+
+        check(txn_args.result);
 
         Transaction* transaction;
         VALUE vtxn = Data_Make_Struct(cTransaction, Transaction, transaction_mark, transaction_free, transaction);
@@ -153,6 +208,7 @@ static VALUE with_transaction(VALUE venv, VALUE(*fn)(VALUE), VALUE arg, int flag
         transaction->env = venv;
         transaction->txn = txn;
         transaction->thread = rb_thread_current();
+        transaction->cursors = rb_ary_new();
         environment_set_active_txn(venv, transaction->thread, vtxn);
 
         int exception;
@@ -855,10 +911,13 @@ static VALUE cursor_close(VALUE self) {
 
 /**
  * @overload cursor
- *   Create a cursor to iterate through a database.
+ *   Create a cursor to iterate through a database. Uses current
+ *   transaction, if any. Otherwise, if called with a block,
+ *   creates a new transaction for the scope of the block.
+ *   Otherwise, fails.
  *
  *   @see Cursor
- *   @yield [cursor] A block to be executed with the cursor
+ *   @yield [cursor] A block to be executed with the cursor.
  *   @yieldparam cursor [Cursor] The cursor to be used to iterate
  *   @example
  *    db = env.database "abc"
@@ -869,8 +928,12 @@ static VALUE cursor_close(VALUE self) {
  */
 static VALUE database_cursor(VALUE self) {
         DATABASE(self, database);
-        if (!active_txn(database->env))
+        if (!active_txn(database->env)) {
+                if (!rb_block_given_p()) {
+                        rb_raise(cError, "Must call with block or active transaction.");
+                }
                 return call_with_transaction(database->env, self, "cursor", 0, 0, 0);
+        }
 
         MDB_cursor* cur;
         check(mdb_cursor_open(need_txn(database->env), database->dbi, &cur));
@@ -890,6 +953,16 @@ static VALUE database_cursor(VALUE self) {
                 cursor_close(vcur);
                 return ret;
         }
+        else {
+                VALUE vtxn = environment_active_txn(database->env);
+                if (NIL_P(vtxn)) {
+                        rb_fatal("Internal error: transaction finished unexpectedly.");
+                }
+                else {
+                        TRANSACTION(vtxn, txn);
+                        rb_ary_push(txn->cursors, vcur);
+                }
+        }
 
         return vcur;
 }

data/ext/lmdb_ext/lmdb_ext.h

@@ -24,6 +24,11 @@
 #  endif
 #endif
 
+// Ruby 2.0 compatibility
+#ifndef RARRAY_AREF
+#  define RARRAY_AREF(ary,n) (RARRAY_PTR(ary)[n])
+#endif
+
 #define ENVIRONMENT(var, var_env)                       \
         Environment* var_env;                           \
         Data_Get_Struct(var, Environment, var_env);     \
@@ -46,6 +51,7 @@ typedef struct {
         VALUE    env;
         VALUE    parent;
         VALUE    thread;
+        VALUE    cursors;
         MDB_txn* txn;
 } Transaction;
 
@@ -80,6 +86,15 @@ typedef struct {
         size_t mapsize;
 } EnvironmentOptions;
 
+typedef struct {
+        MDB_env *env;
+        MDB_txn *parent;
+        unsigned int flags;
+        MDB_txn **htxn;
+        int result;
+        int stop;
+} TxnArgs;
+
 static VALUE cEnvironment, cDatabase, cTransaction, cCursor, cError;
 
 #define ERROR(name) static VALUE cError_##name;

data/lib/lmdb/version.rb

@@ -1,3 +1,3 @@
 module LMDB
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/lmdb.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake', "~> 10.0"
   s.add_development_dependency 'rake-compiler', '<=0.8.2'
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec', "~> 3.0"
 end

data/spec/helper.rb

@@ -24,5 +24,7 @@ end
 RSpec.configure do |c|
   c.include LMDB::SpecHelper
   c.after { FileUtils.rm_rf TEMP_ROOT }
+  c.expect_with :rspec do |cc|
+    cc.syntax = :should
+  end
 end
-

data/spec/lmdb_spec.rb

@@ -25,20 +25,20 @@ describe LMDB do
     describe 'new' do
       it 'returns environment' do
         env = LMDB::Environment.new(path)
-        env.should be_instance_of(described_class::Environment)
+        env.should be_instance_of(described_class)
         env.close
       end
 
       it 'accepts block' do
         LMDB::Environment.new(path) do |env|
-          env.should be_instance_of(described_class::Environment)
+          env.should be_instance_of(described_class)
           42
         end.should == 42
       end
 
       it 'accepts options' do
         env = LMDB::Environment.new(path, :nosync => true, :mode => 0777, :maxreaders => 777, :mapsize => 111111, :maxdbs => 666)
-        env.should be_instance_of(described_class::Environment)
+        env.should be_instance_of(described_class)
         env.info[:maxreaders].should == 777
         env.info[:mapsize].should == 111111
         env.flags.should include(:nosync)
@@ -93,14 +93,14 @@ describe LMDB do
       subject.flags.should_not include(:nosync)
     end
 
-    describe 'transaction' do
+    describe LMDB::Transaction do
       subject { env}
 
       it 'should create transactions' do
         subject.active_txn.should == nil
         subject.transaction do |txn|
           subject.active_txn.should == txn
-          txn.should be_instance_of(described_class::Transaction)
+          txn.should be_instance_of(described_class)
           txn.abort
           subject.active_txn.should == nil
         end
@@ -111,7 +111,7 @@ describe LMDB do
         subject.active_txn.should == nil
         subject.transaction(true) do |txn|
           subject.active_txn.should == txn
-          txn.should be_instance_of(described_class::Transaction)
+          txn.should be_instance_of(described_class)
           txn.abort
           subject.active_txn.should == nil
         end
@@ -287,5 +287,15 @@ describe LMDB do
         c.set_range('\x00').should == ['key1', 'value1']
       end
     end
+
+    it 'should raise without block or txn' do
+      proc { db.cursor.next }.should raise_error(LMDB::Error)
+    end
+
+    it 'should raise outside txn' do
+      c = nil
+      env.transaction { c = db.cursor }
+      proc { c.next }.should raise_error(LMDB::Error)
+    end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lmdb
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Daniel Mendler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: lmdb is a Ruby binding to OpenLDAP Lightning MDB.
 email: mail@daniel-mendler.de
 executables: []
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to Lightning MDB