mgdm Wed, 24 Mar 2010 23:38:59 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=296760
Log:
Add Tokyo Cabinet abstract DB support to ext/dba
Changed paths:
U php/php-src/trunk/NEWS
U php/php-src/trunk/ext/dba/config.m4
U php/php-src/trunk/ext/dba/dba.c
A php/php-src/trunk/ext/dba/dba_tcadb.c
A php/php-src/trunk/ext/dba/php_tcadb.h
A php/php-src/trunk/ext/dba/tests/dba_tcadb.phpt
Modified: php/php-src/trunk/NEWS
===================================================================
--- php/php-src/trunk/NEWS 2010-03-24 23:05:22 UTC (rev 296759)
+++ php/php-src/trunk/NEWS 2010-03-24 23:38:59 UTC (rev 296760)
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 201?, PHP 5.3.99
+- Added Tokyo Cabinet abstract DB support to ext/dba. (Michael Maclean)
- Added Jenkins's one-at-a-time hash support to ext/hash. (Martin Jansen)
- Added FNV-1 hash support to ext/hash. (Michael Maclean)
- default_charset if not specified is now UTF-8 instead of ISO-8859-1. (Rasmus)
Modified: php/php-src/trunk/ext/dba/config.m4
===================================================================
--- php/php-src/trunk/ext/dba/config.m4 2010-03-24 23:05:22 UTC (rev 296759)
+++ php/php-src/trunk/ext/dba/config.m4 2010-03-24 23:38:59 UTC (rev 296760)
@@ -97,6 +97,10 @@
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 @@
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],[
@@ -577,7 +612,7 @@
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)
Modified: php/php-src/trunk/ext/dba/dba.c
===================================================================
--- php/php-src/trunk/ext/dba/dba.c 2010-03-24 23:05:22 UTC (rev 296759)
+++ php/php-src/trunk/ext/dba/dba.c 2010-03-24 23:38:59 UTC (rev 296760)
@@ -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)
@@ -337,6 +338,9 @@
#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 @@
#define DBA_DEFAULT "dbm"
#elif DBA_QDBM
#define DBA_DEFAULT "qdbm"
+#elif DBA_TCADB
+#define DBA_DEFAULT "tcadb"
#else
#define DBA_DEFAULT ""
#endif
Added: php/php-src/trunk/ext/dba/dba_tcadb.c
===================================================================
--- php/php-src/trunk/ext/dba/dba_tcadb.c (rev 0)
+++ php/php-src/trunk/ext/dba/dba_tcadb.c 2010-03-24 23:38:59 UTC (rev 296760)
@@ -0,0 +1,221 @@
+/*
+ +----------------------------------------------------------------------+
+ | PHP Version 5 |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1997-2010 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 |
+ | lice...@php.net so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Author: Michael Maclean <m...@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) {
+ switch(info->mode) {
+ case DBA_READER:
+ spprintf(&path_string, 0, "%s#mode=r", info->path);
+ break;
+ case DBA_WRITER:
+ spprintf(&path_string, 0, "%s#mode=w", info->path);
+ break;
+ case DBA_CREAT:
+ spprintf(&path_string, 0, "%s#mode=wc", info->path);
+ break;
+ case DBA_TRUNC:
+ spprintf(&path_string, 0, "%s#mode=wct", info->path);
+ break;
+ default:
+ tcadbdel(tcadb);
+ return FAILURE;
+ }
+
+ if (!tcadbopen(tcadb, path_string)) {
+ efree(path_string);
+ tcadbdel(tcadb);
+ 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;
+
+ if (mode == 1) {
+ /* Insert */
+ if (tcadbvsiz(dba->tcadb, key, keylen) > -1) {
+ return FAILURE;
+ }
+ }
+
+ 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
+ return tcadboptimize(dba->tcadb, NULL) ? SUCCESS : FAILURE;
+#else
+ return FAILURE;
+#endif
+}
+
+DBA_SYNC_FUNC(tcadb)
+{
+ TCADB_DATA;
+
+ return tcadbsync(dba->tcadb) ? SUCCESS : FAILURE;
+}
+
+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
+ */
Property changes on: php/php-src/trunk/ext/dba/dba_tcadb.c
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Added: php/php-src/trunk/ext/dba/php_tcadb.h
===================================================================
--- php/php-src/trunk/ext/dba/php_tcadb.h (rev 0)
+++ php/php-src/trunk/ext/dba/php_tcadb.h 2010-03-24 23:38:59 UTC (rev 296760)
@@ -0,0 +1,41 @@
+/*
+ +----------------------------------------------------------------------+
+ | PHP Version 5 |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1997-2010 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 |
+ | lice...@php.net so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Author: Michael Maclean <m...@php.net> |
+ +----------------------------------------------------------------------+
+ */
+
+/* $Id$ */
+
+#ifndef PHP_TCADB_H
+#define PHP_TCADB_H
+
+#if DBA_TCADB
+
+#include "php_dba.h"
+
+DBA_FUNCS(tcadb);
+
+#endif
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
Property changes on: php/php-src/trunk/ext/dba/php_tcadb.h
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Added: php/php-src/trunk/ext/dba/tests/dba_tcadb.phpt
===================================================================
--- php/php-src/trunk/ext/dba/tests/dba_tcadb.phpt (rev 0)
+++ php/php-src/trunk/ext/dba/tests/dba_tcadb.phpt 2010-03-24 23:38:59 UTC (rev 296760)
@@ -0,0 +1,50 @@
+--TEST--
+DBA TCADB handler test
+--SKIPIF--
+<?php
+ $handler = 'tcadb';
+ require_once dirname(__FILE__) .'/skipif.inc';
+?>
+--FILE--
+<?php
+ $handler = 'tcadb';
+ require_once dirname(__FILE__) .'/skipif.inc';
+ $lock_flag = 'l';
+ $db_filename = $db_file = dirname(__FILE__) .'/test0.tch';
+ @unlink($db_filename);
+ @unlink($db_filename.'.lck');
+ require_once dirname(__FILE__) .'/dba_handler.inc';
+?>
+===DONE===
+--EXPECT--
+database handler: tcadb
+3NYNYY
+Content String 2
+Content 2 replaced
+Read during write: not allowed
+Content 2 replaced 2nd time
+The 6th value
+array(3) {
+ ["key number 6"]=>
+ string(13) "The 6th value"
+ ["key2"]=>
+ string(27) "Content 2 replaced 2nd time"
+ ["key5"]=>
+ string(23) "The last content string"
+}
+--NO-LOCK--
+3NYNYY
+Content String 2
+Content 2 replaced
+Read during write: not allowed
+Content 2 replaced 2nd time
+The 6th value
+array(3) {
+ ["key number 6"]=>
+ string(13) "The 6th value"
+ ["key2"]=>
+ string(27) "Content 2 replaced 2nd time"
+ ["key5"]=>
+ string(23) "The last content string"
+}
+===DONE===
Property changes on: php/php-src/trunk/ext/dba/tests/dba_tcadb.phpt
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
