implement support for LMDB in ext/dba

don't abort txn if cursor is active

fix typos

Author: weltling

ext/dba/config.m4

@@ -100,6 +100,9 @@ PHP_ARG_WITH(dbm,,
 PHP_ARG_WITH(tcadb,,
 [  --with-tcadb[=DIR]        DBA: Tokyo Cabinet abstract DB support], no, no)
 
+PHP_ARG_WITH(lmdb,,
+[  --with-lmdb[=DIR]        DBA: Lightning memory-mapped database support], no, no)
+
 
 dnl
 dnl Library checks
@@ -228,6 +231,37 @@ if test "$PHP_TCADB" != "no"; then
 fi
 PHP_DBA_STD_RESULT(tcadb)
 
+dnl LMDB
+if test "$PHP_LMDB" != "no"; then
+  PHP_DBA_STD_BEGIN
+  for i in $PHP_LMDB /usr/local /usr; do
+	if test -f "$i/include/lmdb.h"; then
+	  THIS_PREFIX=$i
+	  PHP_ADD_INCLUDE($THIS_PREFIX/include)
+	  THIS_INCLUDE=$i/include/lmdb.h
+	  break
+	fi
+  done
+
+  if test -n "$THIS_INCLUDE"; then
+	for LIB in lmdb; do
+	  PHP_CHECK_LIBRARY($LIB, mdb_open, [
+		AC_DEFINE_UNQUOTED(LMDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
+		AC_DEFINE(DBA_LMDB, 1, [ ])
+		THIS_LIBS=$LIB
+	  ], [], [-L$THIS_PREFIX/$PHP_LIBDIR])
+	  if test -n "$THIS_LIBS"; then
+		break
+	  fi
+	done
+  fi
+
+  PHP_DBA_STD_ASSIGN
+  PHP_DBA_STD_CHECK
+  PHP_DBA_STD_ATTACH
+fi
+PHP_DBA_STD_RESULT(lmdb)
+
 dnl Berkeley specific (library and version test)
 dnl parameters(version, library list, function)
 AC_DEFUN([PHP_DBA_DB_CHECK],[

ext/dba/config.w32

@@ -4,6 +4,7 @@
 ARG_WITH("dba", "DBA support", "no");
 ARG_WITH("qdbm", "DBA: QDBM support", "no");
 ARG_WITH("db", "DBA: Berkeley DB support", "no");
+ARG_WITH("lmdb", "DBA: Lightning memory-mapped database support", "no");
 
 if (PHP_DBA != "no") {
 	EXTENSION("dba", "dba.c dba_cdb.c dba_db1.c dba_db2.c dba_db3.c dba_dbm.c dba_flatfile.c dba_gdbm.c dba_ndbm.c dba_inifile.c");
@@ -32,4 +33,16 @@ if (PHP_DBA != "no") {
 			WARNING("dba: qdbm handlers not enabled; libraries and headers not found");
 		}
 	}
+
+	if (PHP_QDBM != "no") {
+		if (CHECK_LIB("liblmdb_a.lib", "dba", PHP_DBA) &&
+			CHECK_HEADER_ADD_INCLUDE("lmdb.h", "CFLAGS_DBA") &&
+			CHECK_LIB("ntdll.lib", "dba", PHP_DBA)) {
+			ADD_SOURCES("ext/dba", "dba_lmdb.c", "dba");
+			AC_DEFINE("LMDB_INCLUDE_FILE", "<lmdb.h>", "", false);
+			AC_DEFINE("DBA_LMDB", 1, "");
+		} else {
+			WARNING("dba: lmdb handlers not enabled; libraries and headers not found");
+		}
+	}
 }

ext/dba/dba.c

@@ -51,6 +51,7 @@
 #include "php_inifile.h"
 #include "php_qdbm.h"
 #include "php_tcadb.h"
+#include "php_lmdb.h"
 
 /* {{{ arginfo */
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2)
@@ -362,6 +363,9 @@ static dba_handler handler[] = {
 #endif
 #if DBA_TCADB
 	DBA_HND(tcadb, DBA_LOCK_ALL)
+#endif
+#if DBA_LMDB
+	DBA_HND(lmdb, DBA_LOCK_EXT)
 #endif
 	{ NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
 };
@@ -387,6 +391,8 @@ static dba_handler handler[] = {
 #elif DBA_TCADB
 #define DBA_DEFAULT "tcadb"
 #else
+#define DBA_DEFAULT "lmdb"
+#else
 #define DBA_DEFAULT ""
 #endif
 /* cdb/cdb_make and ini are no option here */