]> granicus.if.org Git - php/commitdiff
Add support for tokyo cabinet, patch from Michael Maclean
authorScott MacVicar <scottmac@php.net>
Mon, 18 May 2009 20:21:39 +0000 (20:21 +0000)
committerScott MacVicar <scottmac@php.net>
Mon, 18 May 2009 20:21:39 +0000 (20:21 +0000)
ext/dba/config.m4
ext/dba/dba.c
ext/dba/dba_tcadb.c [new file with mode: 0644]
ext/dba/php_tcadb.h [new file with mode: 0644]

index 66976481b0b595fcf4344697e7c564fb1ab2c2de..d04fbad190ed313e7f0e9a5e0eec3bce070be3c6 100644 (file)
@@ -97,6 +97,10 @@ PHP_ARG_WITH(db1,,
 PHP_ARG_WITH(dbm,,
 [  --with-dbm[=DIR]          DBA: DBM support], no, no)
 
+PHP_ARG_WITH(tcadb,,
+[  --with-tcadb[=DIR]        DBA: Tokyo Cabinet abstract DB support], no, no)
+
+
 dnl
 dnl Library checks
 dnl
@@ -193,6 +197,37 @@ if test "$PHP_NDBM" != "no"; then
 fi
 PHP_DBA_STD_RESULT(ndbm)
 
+dnl TCADB
+if test "$PHP_TCADB" != "no"; then
+  PHP_DBA_STD_BEGIN
+  for i in $PHP_TCADB /usr/local /usr; do
+       if test -f "$i/include/tcadb.h"; then
+         THIS_PREFIX=$i
+         PHP_ADD_INCLUDE($THIS_PREFIX/include)
+         THIS_INCLUDE=$i/include/tcadb.h
+         break
+       fi
+  done
+
+  if test -n "$THIS_INCLUDE"; then
+       for LIB in tokyocabinet; do
+         PHP_CHECK_LIBRARY($LIB, tcadbopen, [
+               AC_DEFINE_UNQUOTED(TCADB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
+               AC_DEFINE(DBA_TCADB, 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(tcadb)
+
 dnl Berkeley specific (library and version test)
 dnl parameters(version, library list, function)
 AC_DEFUN([PHP_DBA_DB_CHECK],[
@@ -569,7 +604,7 @@ if test "$HAVE_DBA" = "1"; then
     AC_MSG_RESULT([yes])
   fi
   AC_DEFINE(HAVE_DBA, 1, [ ])
-  PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c $cdb_sources $flat_sources $ini_sources, $ext_shared)
+  PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c dba_tcadb.c $cdb_sources $flat_sources $ini_sources, $ext_shared)
   PHP_ADD_BUILD_DIR($ext_builddir/libinifile)
   PHP_ADD_BUILD_DIR($ext_builddir/libcdb)
   PHP_ADD_BUILD_DIR($ext_builddir/libflatfile)
index 2d0f376bc38b6af2b6b9ba83f93496c1e50b5640..ccc36520dce73143a56cf95091718baf80f7b60c 100644 (file)
@@ -50,6 +50,7 @@
 #include "php_flatfile.h"
 #include "php_inifile.h"
 #include "php_qdbm.h"
+#include "php_tcadb.h"
 
 /* {{{ arginfo */
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2)
@@ -336,6 +337,9 @@ static dba_handler handler[] = {
 #endif
 #if DBA_QDBM
        DBA_HND(qdbm, DBA_LOCK_EXT)
+#endif
+#if DBA_TCADB
+       DBA_HND(tcadb, DBA_LOCK_ALL)
 #endif
        { NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
 };
@@ -358,6 +362,8 @@ static dba_handler handler[] = {
 #define DBA_DEFAULT "dbm"
 #elif DBA_QDBM
 #define DBA_DEFAULT "qdbm"
+#elif DBA_TCADB
+#define DBA_DEFAULT "tcadb"
 #else
 #define DBA_DEFAULT ""
 #endif
diff --git a/ext/dba/dba_tcadb.c b/ext/dba/dba_tcadb.c
new file mode 100644 (file)
index 0000000..f3e4a31
--- /dev/null
@@ -0,0 +1,219 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2009 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Author:  Michael Maclean <mgdm@php.net>                              |
+   +----------------------------------------------------------------------+
+ */
+
+/* $Id$ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php.h"
+
+#if DBA_TCADB
+#include "php_tcadb.h"
+
+#ifdef TCADB_INCLUDE_FILE
+#include TCADB_INCLUDE_FILE
+#endif
+
+#define TCADB_DATA dba_tcadb_data *dba = info->dbf
+
+typedef struct {
+       TCADB *tcadb;   
+} dba_tcadb_data;
+
+DBA_OPEN_FUNC(tcadb)
+{
+       char *path_string;
+       TCADB *tcadb = tcadbnew();
+
+       if (tcadb) {
+
+               /* alloc memory for the path and the mode string */
+               path_string = emalloc(strlen(info->path)+10);
+
+               switch(info->mode) {
+                       case DBA_READER:
+                               sprintf(path_string, "%s#mode=r", info->path);
+                               break;
+                       case DBA_WRITER:
+                               sprintf(path_string, "%s#mode=w", info->path);
+                               break;
+                       case DBA_CREAT:
+                               sprintf(path_string, "%s#mode=wc", info->path);
+                               break;
+                       case DBA_TRUNC:
+                               sprintf(path_string, "%s#mode=wct", info->path);
+                               break;
+                       default:
+                               efree(path_string);
+                               return FAILURE;
+               }
+
+               if (tcadbopen(tcadb, path_string)) {
+                       efree(path_string);
+                       return FAILURE;
+               }
+
+               efree(path_string);
+
+               info->dbf = pemalloc(sizeof(dba_tcadb_data), info->flags & DBA_PERSISTENT);
+               memset(info->dbf, 0, sizeof(dba_tcadb_data));
+               ((dba_tcadb_data *) info->dbf)->tcadb = tcadb;
+               return SUCCESS;
+       }
+
+       return FAILURE;
+}
+
+DBA_CLOSE_FUNC(tcadb)
+{
+       TCADB_DATA;
+
+       tcadbclose(dba->tcadb);
+       pefree(dba, info->flags & DBA_PERSISTENT);
+}
+
+DBA_FETCH_FUNC(tcadb)
+{
+       TCADB_DATA;
+       char *value, *new = NULL;
+       int value_size;
+
+       value = tcadbget(dba->tcadb, key, keylen, &value_size);
+       if (value) {
+               if (newlen) {
+                       *newlen = value_size;
+               }
+               new = estrndup(value, value_size);
+               tcfree(value);
+       }
+
+       return new;
+}
+
+DBA_UPDATE_FUNC(tcadb)
+{
+       TCADB_DATA;
+       int result;
+
+       result = tcadbput(dba->tcadb, key, keylen, val, vallen);
+
+       if (result) {
+               return SUCCESS;
+       }
+
+       php_error_docref2(NULL TSRMLS_CC, key, val, E_WARNING, "Error updating data");
+       return FAILURE;
+}
+
+DBA_EXISTS_FUNC(tcadb)
+{
+       TCADB_DATA;
+       char *value;
+       int value_len;
+
+       value = tcadbget(dba->tcadb, key, keylen, &value_len);
+       if (value) {
+               tcfree(value);
+               return SUCCESS;
+       }
+
+       return FAILURE;
+}
+
+DBA_DELETE_FUNC(tcadb)
+{
+       TCADB_DATA;
+
+       return tcadbout(dba->tcadb, key, keylen) ? SUCCESS : FAILURE;
+}
+
+DBA_FIRSTKEY_FUNC(tcadb)
+{
+       TCADB_DATA;
+       int value_size;
+       char *value, *new = NULL;
+
+       tcadbiterinit(dba->tcadb);
+
+       value = tcadbiternext(dba->tcadb, &value_size);
+       if (value) {
+               if (newlen) {
+                       *newlen = value_size;
+               }
+               new = estrndup(value, value_size);
+               tcfree(value);
+       }
+
+       return new;
+}
+
+DBA_NEXTKEY_FUNC(tcadb)
+{
+       TCADB_DATA;
+       int value_size;
+       char *value, *new = NULL;
+
+       value = tcadbiternext(dba->tcadb, &value_size);
+       if (value) {
+               if (newlen) {
+                       *newlen = value_size;
+               }
+               new = estrndup(value, value_size);
+               tcfree(value);
+       }
+
+       return new;
+}
+
+DBA_OPTIMIZE_FUNC(tcadb)
+{
+       TCADB_DATA;
+
+#if _TC_LIBVER >= 811
+       tcadboptimize(dba->tcadb, NULL);
+       return SUCCESS;
+#else
+       return FAILURE;
+#endif
+}
+
+DBA_SYNC_FUNC(tcadb)
+{
+       TCADB_DATA;
+
+       tcadbsync(dba->tcadb);
+       return SUCCESS;
+}
+
+DBA_INFO_FUNC(tcadb)
+{
+       return estrdup(tcversion);
+}
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/ext/dba/php_tcadb.h b/ext/dba/php_tcadb.h
new file mode 100644 (file)
index 0000000..a4de91c
--- /dev/null
@@ -0,0 +1,32 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2009 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Author: Michael Maclean <mgdm@php.net>                               |
+   +----------------------------------------------------------------------+
+ */
+
+/* $Id$ */
+
+#ifndef PHP_TCADB_H
+#define PHP_TCADB_H
+
+#if DBA_TCADB
+
+#include "php_dba.h"
+
+DBA_FUNCS(tcadb);
+
+#endif
+
+#endif