lmdb 0.3.1 → 0.4.0

data/ext/lmdb_ext/liblmdb/midl.c

@@ -59,7 +59,7 @@ unsigned mdb_midl_search( MDB_IDL ids, MDB_ID id )
 			return cursor;
 		}
 	}
-	
+
 	if( val > 0 ) {
 		++cursor;
 	}
@@ -89,7 +89,7 @@ int mdb_midl_insert( MDB_IDL ids, MDB_ID id )
 		/* no room */
 		--ids[0];
 		return -2;
-	
+
 	} else {
 		/* insert id */
 		for (i=ids[0]; i>x; i--)
@@ -203,7 +203,7 @@ int mdb_midl_append_range( MDB_IDL *idp, MDB_ID id, unsigned n )
 /* Quicksort + Insertion sort for small arrays */
 
 #define SMALL	8
-#define	SWAP(a,b)	{ itmp=(a); (a)=(b); (b)=itmp; }
+#define	MIDL_SWAP(a,b)	{ itmp=(a); (a)=(b); (b)=itmp; }
 
 void
 mdb_midl_sort( MDB_IDL ids )
@@ -231,15 +231,15 @@ mdb_midl_sort( MDB_IDL ids )
 			l = istack[jstack--];
 		} else {
 			k = (l + ir) >> 1;	/* Choose median of left, center, right */
-			SWAP(ids[k], ids[l+1]);
+			MIDL_SWAP(ids[k], ids[l+1]);
 			if (ids[l] < ids[ir]) {
-				SWAP(ids[l], ids[ir]);
+				MIDL_SWAP(ids[l], ids[ir]);
 			}
 			if (ids[l+1] < ids[ir]) {
-				SWAP(ids[l+1], ids[ir]);
+				MIDL_SWAP(ids[l+1], ids[ir]);
 			}
 			if (ids[l] < ids[l+1]) {
-				SWAP(ids[l], ids[l+1]);
+				MIDL_SWAP(ids[l], ids[l+1]);
 			}
 			i = l+1;
 			j = ir;
@@ -248,7 +248,7 @@ mdb_midl_sort( MDB_IDL ids )
 				do i++; while(ids[i] > a);
 				do j--; while(ids[j] < a);
 				if (j < i) break;
-				SWAP(ids[i],ids[j]);
+				MIDL_SWAP(ids[i],ids[j]);
 			}
 			ids[l+1] = ids[j];
 			ids[j] = a;

data/ext/lmdb_ext/liblmdb/midl.h

@@ -39,7 +39,7 @@ extern "C" {
 /** @defgroup idls	ID List Management
  *	@{
  */
-	/** A generic ID number. These were entryIDs in back-bdb.
+	/** A generic unsigned ID number. These were entryIDs in back-bdb.
 	 *	Preferably it should have the same size as a pointer.
 	 */
 typedef size_t MDB_ID;

data/ext/lmdb_ext/lmdb_ext.c

@@ -16,20 +16,12 @@ static void check(int code) {
         rb_raise(cError, "%s", err); /* fallback */
 }
 
-static void transaction_deref(Transaction* transaction) {
-        if (--transaction->refcount == 0) {
-                Environment* env = (Environment*)DATA_PTR(transaction->env);
-                environment_deref(env);
-                if (!NIL_P(transaction->parent)) {
-                        Transaction* parent = (Transaction*)DATA_PTR(transaction->parent);
-                        transaction_deref(parent);
-                }
-                if (transaction->txn) {
-                        rb_warn("Garbage collecting active transaction!");
-                        mdb_txn_abort(transaction->txn);
-                }
-                free(transaction);
+static void transaction_free(Transaction* transaction) {
+        if (transaction->txn) {
+                rb_warn("Memory leak - Garbage collecting active transaction");
+                //mdb_txn_abort(transaction->txn);
         }
+        free(transaction);
 }
 
 static void transaction_mark(Transaction* transaction) {
@@ -71,6 +63,7 @@ static void transaction_finish(VALUE self, int commit) {
         else
                 mdb_txn_abort(transaction->txn);
 
+        // Mark child transactions as closed
         p = environment_active_txn(transaction->env);
         while (p != self) {
                 TRANSACTION(p, txn);
@@ -108,21 +101,13 @@ static VALUE with_transaction(VALUE venv, VALUE(*fn)(VALUE), VALUE arg, int flag
         check(mdb_txn_begin(environment->env, active_txn(venv), flags, &txn));
 
         Transaction* transaction;
-        VALUE vtxn = Data_Make_Struct(cTransaction, Transaction, transaction_mark, transaction_deref, transaction);
-        transaction->refcount = 1;
+        VALUE vtxn = Data_Make_Struct(cTransaction, Transaction, transaction_mark, transaction_free, transaction);
         transaction->parent = environment_active_txn(venv);
         transaction->env = venv;
         transaction->txn = txn;
         transaction->thread = rb_thread_current();
         environment_set_active_txn(venv, transaction->thread, vtxn);
 
-        if (!NIL_P(transaction->parent)) {
-                TRANSACTION(transaction->parent, parent);
-                ++parent->refcount;
-        }
-
-        ++environment->refcount;
-
         int exception;
         VALUE ret = rb_protect(fn, NIL_P(arg) ? vtxn : arg, &exception);
 
@@ -141,12 +126,12 @@ static void environment_check(Environment* environment) {
                 rb_raise(cError, "Environment is closed");
 }
 
-static void environment_deref(Environment *environment) {
-        if (--environment->refcount == 0) {
-                if (environment->env)
-                        mdb_env_close(environment->env);
-                free(environment);
+static void environment_free(Environment *environment) {
+        if (environment->env) {
+                rb_warn("Memory leak - Garbage collecting open environment");
+                //mdb_env_close(environment->env);
         }
+        free(environment);
 }
 
 
@@ -262,9 +247,8 @@ static VALUE environment_new(int argc, VALUE *argv, VALUE klass) {
         check(mdb_env_create(&env));
 
         Environment* environment;
-        VALUE venv = Data_Make_Struct(cEnvironment, Environment, environment_mark, environment_deref, environment);
+        VALUE venv = Data_Make_Struct(cEnvironment, Environment, environment_mark, environment_free, environment);
         environment->env = env;
-        environment->refcount = 1;
         environment->thread_txn_hash = rb_hash_new();
         environment->txn_thread_hash = rb_hash_new();
 
@@ -379,14 +363,6 @@ static VALUE environment_transaction(int argc, VALUE *argv, VALUE self) {
         return with_transaction(self, rb_yield, Qnil, flags);
 }
 
-static void database_deref(Database* database) {
-        if (--database->refcount == 0) {
-                Environment* env = (Environment*)DATA_PTR(database->env);
-                environment_deref(env);
-                free(database);
-        }
-}
-
 static void database_mark(Database* database) {
         rb_gc_mark(database->env);
 }
@@ -413,11 +389,9 @@ static VALUE environment_database(int argc, VALUE *argv, VALUE self) {
         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, database_deref, database);
+        VALUE vdb = Data_Make_Struct(cDatabase, Database, database_mark, free, database);
         database->dbi = dbi;
         database->env = self;
-        database->refcount = 1;
-        ++environment->refcount;
 
         return vdb;
 }
@@ -524,10 +498,11 @@ static VALUE database_delete(int argc, VALUE *argv, VALUE self) {
 }
 
 static void cursor_free(Cursor* cursor) {
-        if (cursor->cur)
-                mdb_cursor_close(cursor->cur);
+        if (cursor->cur) {
+                rb_warn("Memory leak - Garbage collecting open cursor");
+                //mdb_cursor_close(cursor->cur);
+        }
 
-        database_deref((Database*)DATA_PTR(cursor->db));
         free(cursor);
 }
 
@@ -559,7 +534,6 @@ static VALUE database_cursor(VALUE self) {
         VALUE vcur = Data_Make_Struct(cCursor, Cursor, cursor_mark, cursor_free, cursor);
         cursor->cur = cur;
         cursor->db = self;
-        ++database->refcount;
 
         if (rb_block_given_p()) {
                 int exception;
@@ -583,6 +557,14 @@ static VALUE cursor_first(VALUE self) {
         return rb_assoc_new(rb_str_new(key.mv_data, key.mv_size), rb_str_new(value.mv_data, value.mv_size));
 }
 
+static VALUE cursor_last(VALUE self) {
+        CURSOR(self, cursor);
+        MDB_val key, value;
+
+        check(mdb_cursor_get(cursor->cur, &key, &value, MDB_LAST));
+        return rb_assoc_new(rb_str_new(key.mv_data, key.mv_size), rb_str_new(value.mv_data, value.mv_size));
+}
+
 static VALUE cursor_prev(VALUE self) {
         CURSOR(self, cursor);
         MDB_val key, value;
@@ -738,7 +720,7 @@ void Init_lmdb_ext() {
         rb_define_method(cDatabase, "cursor", database_cursor, 0);
 
         cTransaction = rb_define_class_under(mLMDB, "Transaction", rb_cObject);
-        rb_undef_method(rb_singleton_class(cCursor), "new");
+        rb_undef_method(rb_singleton_class(cTransaction), "new");
         rb_define_method(cTransaction, "commit", transaction_commit, 0);
         rb_define_method(cTransaction, "abort", transaction_abort, 0);
 
@@ -747,6 +729,7 @@ void Init_lmdb_ext() {
         rb_define_method(cCursor, "close", cursor_close, 0);
         rb_define_method(cCursor, "get", cursor_get, 0);
         rb_define_method(cCursor, "first", cursor_first, 0);
+        rb_define_method(cCursor, "last", cursor_last, 0);
         rb_define_method(cCursor, "next", cursor_next, 0);
         rb_define_method(cCursor, "prev", cursor_prev, 0);
         rb_define_method(cCursor, "set", cursor_set, 1);

data/ext/lmdb_ext/lmdb_ext.h

@@ -42,25 +42,22 @@
         Data_Get_Struct(var, Cursor, var_cur);  \
         cursor_check(var_cur)
 
-typedef struct Transaction {
+typedef struct {
         VALUE    env;
         VALUE    parent;
         VALUE    thread;
         MDB_txn* txn;
-        int      refcount;
 } Transaction;
 
 typedef struct {
         MDB_env* env;
         VALUE    thread_txn_hash;
         VALUE    txn_thread_hash;
-        int      refcount;
 } Environment;
 
 typedef struct {
         VALUE   env;
         MDB_dbi dbi;
-        int     refcount;
 } Database;
 
 typedef struct {
@@ -102,6 +99,7 @@ static VALUE cursor_delete(int argc, VALUE *argv, VALUE self);
 static VALUE cursor_first(VALUE self);
 static void cursor_free(Cursor* cursor);
 static VALUE cursor_get(VALUE self);
+static VALUE cursor_last(VALUE self);
 static void cursor_mark(Cursor* cursor);
 static VALUE cursor_next(VALUE self);
 static VALUE cursor_prev(VALUE self);
@@ -111,7 +109,6 @@ static VALUE cursor_set_range(VALUE self, VALUE vkey);
 static VALUE database_clear(VALUE self);
 static VALUE database_cursor(VALUE self);
 static VALUE database_delete(int argc, VALUE *argv, VALUE self);
-static void database_deref(Database* database);
 static VALUE database_drop(VALUE self);
 static VALUE database_get(VALUE self, VALUE vkey);
 static void database_mark(Database* database);
@@ -124,8 +121,8 @@ 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 void environment_deref(Environment *environment);
 static VALUE environment_flags(VALUE self);
+static void environment_free(Environment *environment);
 static VALUE environment_info(VALUE self);
 static void environment_mark(Environment* environment);
 static VALUE environment_new(int argc, VALUE *argv, VALUE klass);
@@ -140,8 +137,8 @@ static MDB_txn* need_txn(VALUE self);
 static VALUE stat2hash(const MDB_stat* stat);
 static VALUE transaction_abort(VALUE self);
 static VALUE transaction_commit(VALUE self);
-static void transaction_deref(Transaction* transaction);
 static void transaction_finish(VALUE self, int commit);
+static void transaction_free(Transaction* transaction);
 static void transaction_mark(Transaction* transaction);
 static VALUE with_transaction(VALUE venv, VALUE(*fn)(VALUE), VALUE arg, int flags);
 // END PROTOTYPES

data/lib/lmdb/version.rb

@@ -1,3 +1,3 @@
 module LMDB
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/spec/lmdb_spec.rb

@@ -251,12 +251,18 @@ describe LMDB do
       db.put('key2', 'value2')
     end
 
-    it 'should get next key/value' do
+    it 'should get first key/value' do
       db.cursor do |c|
         c.first.should == ['key1', 'value1']
       end
     end
 
+    it 'should get last key/value' do
+      db.cursor do |c|
+        c.last.should == ['key2', 'value2']
+      end
+    end
+
     it 'should get next key/value' do
       db.cursor do |c|
         c.first

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lmdb
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Daniel Mendler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to Lightning MDB