Skip to content
This repository has been archived by the owner on Apr 20, 2022. It is now read-only.

Commit

Permalink
PCBC-83 - Add persist_to and replicate_to
Browse files Browse the repository at this point in the history 
This replace the observe parameter for the object oriented
variants for add, set, replace, cas, setMulti and delete

Change-Id: Idcba1502371de680c4212065d56cfb7272ca0460
Reviewed-on: http://review.couchbase.org/22712
Tested-by: Trond Norbye <trond.norbye@gmail.com>
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
  • Loading branch information
@trondn
trondn committed Dec 3, 2012
1 parent 5d40a2b commit ad692a4
Show file tree
Hide file tree
Showing 29 changed files with 1,483 additions and 276 deletions.
62 changes: 26 additions & 36 deletions apidecl.c
View file
Expand Up @@ -42,7 +42,6 @@ ZEND_ARG_INFO(0, resource)
ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, key)
ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, expiration) ZEND_ARG_INFO(0, expiration)
ZEND_ARG_ARRAY_INFO(0, durability, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
Expand All @@ -52,15 +51,13 @@ ZEND_ARG_INFO(0, key)
ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, expiration) ZEND_ARG_INFO(0, expiration)
ZEND_ARG_INFO(0, cas) ZEND_ARG_INFO(0, cas)
ZEND_ARG_ARRAY_INFO(0, durability, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
ZEND_BEGIN_ARG_INFO_EX(arginfo_set_multi, 0, 0, 2) ZEND_BEGIN_ARG_INFO_EX(arginfo_set_multi, 0, 0, 2)
ZEND_ARG_INFO(0, resource) ZEND_ARG_INFO(0, resource)
ZEND_ARG_ARRAY_INFO(0, values, 0) ZEND_ARG_ARRAY_INFO(0, values, 0)
ZEND_ARG_INFO(0, expiration) ZEND_ARG_INFO(0, expiration)
ZEND_ARG_ARRAY_INFO(0, durability, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
Expand All @@ -70,7 +67,6 @@ ZEND_ARG_INFO(0, key)
ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, expiration) ZEND_ARG_INFO(0, expiration)
ZEND_ARG_INFO(0, cas) ZEND_ARG_INFO(0, cas)
ZEND_ARG_ARRAY_INFO(0, durability, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
Expand All @@ -80,7 +76,6 @@ ZEND_ARG_INFO(0, key)
ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, expiration) ZEND_ARG_INFO(0, expiration)
ZEND_ARG_INFO(0, cas) ZEND_ARG_INFO(0, cas)
ZEND_ARG_ARRAY_INFO(0, durability, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
Expand All @@ -90,7 +85,6 @@ ZEND_ARG_INFO(0, key)
ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, expiration) ZEND_ARG_INFO(0, expiration)
ZEND_ARG_INFO(0, cas) ZEND_ARG_INFO(0, cas)
ZEND_ARG_ARRAY_INFO(0, durability, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
Expand All @@ -100,7 +94,6 @@ ZEND_ARG_INFO(0, cas)
ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, key)
ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, expiration) ZEND_ARG_INFO(0, expiration)
ZEND_ARG_ARRAY_INFO(0, durability, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
Expand Down Expand Up @@ -138,15 +131,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_touch, 0, 0, 3)
ZEND_ARG_INFO(0, resource) ZEND_ARG_INFO(0, resource)
ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, key)
ZEND_ARG_INFO(0, expiry) ZEND_ARG_INFO(0, expiry)
ZEND_ARG_ARRAY_INFO(0, durability, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
ZEND_BEGIN_ARG_INFO_EX(arginfo_touch_multi, 0, 0, 3) ZEND_BEGIN_ARG_INFO_EX(arginfo_touch_multi, 0, 0, 3)
ZEND_ARG_INFO(0, resource) ZEND_ARG_INFO(0, resource)
ZEND_ARG_ARRAY_INFO(0, keys, 0) ZEND_ARG_ARRAY_INFO(0, keys, 0)
ZEND_ARG_INFO(0, expiry) ZEND_ARG_INFO(0, expiry)
ZEND_ARG_ARRAY_INFO(0, durability, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
Expand Down Expand Up @@ -185,7 +176,6 @@ ZEND_ARG_INFO(0, offset)
ZEND_ARG_INFO(0, create) ZEND_ARG_INFO(0, create)
ZEND_ARG_INFO(0, expiration) ZEND_ARG_INFO(0, expiration)
ZEND_ARG_INFO(0, initial) ZEND_ARG_INFO(0, initial)
ZEND_ARG_ARRAY_INFO(0, durability, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
Expand All @@ -196,15 +186,13 @@ ZEND_ARG_INFO(0, offset)
ZEND_ARG_INFO(0, create) ZEND_ARG_INFO(0, create)
ZEND_ARG_INFO(0, expiration) ZEND_ARG_INFO(0, expiration)
ZEND_ARG_INFO(0, initial) ZEND_ARG_INFO(0, initial)
ZEND_ARG_ARRAY_INFO(0, durability, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
ZEND_BEGIN_ARG_INFO_EX(arginfo_delete, 0, 0, 2) ZEND_BEGIN_ARG_INFO_EX(arginfo_delete, 0, 0, 2)
ZEND_ARG_INFO(0, resource) ZEND_ARG_INFO(0, resource)
ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, key)
ZEND_ARG_INFO(0, cas) ZEND_ARG_INFO(0, cas)
ZEND_ARG_ARRAY_INFO(0, durability, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
Expand Down Expand Up @@ -318,7 +306,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_m_add, 0, 0, 2)
ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, key)
ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, expiration) ZEND_ARG_INFO(0, expiration)
ZEND_ARG_ARRAY_INFO(0, durability, 0) ZEND_ARG_INFO(0, persist_to)
ZEND_ARG_INFO(0, replicate_to)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
Expand All @@ -327,14 +316,16 @@ ZEND_ARG_INFO(0, key)
ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, expiration) ZEND_ARG_INFO(0, expiration)
ZEND_ARG_INFO(0, cas) ZEND_ARG_INFO(0, cas)
ZEND_ARG_ARRAY_INFO(0, durability, 0) ZEND_ARG_INFO(0, persist_to)
ZEND_ARG_INFO(0, replicate_to)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
ZEND_BEGIN_ARG_INFO_EX(arginfo_m_setmulti, 0, 0, 1) ZEND_BEGIN_ARG_INFO_EX(arginfo_m_setmulti, 0, 0, 1)
ZEND_ARG_ARRAY_INFO(0, values, 0) ZEND_ARG_ARRAY_INFO(0, values, 0)
ZEND_ARG_INFO(0, expiration) ZEND_ARG_INFO(0, expiration)
ZEND_ARG_ARRAY_INFO(0, durability, 0) ZEND_ARG_INFO(0, persist_to)
ZEND_ARG_INFO(0, replicate_to)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
Expand All @@ -343,7 +334,8 @@ ZEND_ARG_INFO(0, key)
ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, expiration) ZEND_ARG_INFO(0, expiration)
ZEND_ARG_INFO(0, cas) ZEND_ARG_INFO(0, cas)
ZEND_ARG_ARRAY_INFO(0, durability, 0) ZEND_ARG_INFO(0, persist_to)
ZEND_ARG_INFO(0, replicate_to)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
Expand All @@ -352,7 +344,8 @@ ZEND_ARG_INFO(0, key)
ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, expiration) ZEND_ARG_INFO(0, expiration)
ZEND_ARG_INFO(0, cas) ZEND_ARG_INFO(0, cas)
ZEND_ARG_ARRAY_INFO(0, durability, 0) ZEND_ARG_INFO(0, persist_to)
ZEND_ARG_INFO(0, replicate_to)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
Expand All @@ -361,7 +354,8 @@ ZEND_ARG_INFO(0, key)
ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, expiration) ZEND_ARG_INFO(0, expiration)
ZEND_ARG_INFO(0, cas) ZEND_ARG_INFO(0, cas)
ZEND_ARG_ARRAY_INFO(0, durability, 0) ZEND_ARG_INFO(0, persist_to)
ZEND_ARG_INFO(0, replicate_to)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
Expand All @@ -370,7 +364,6 @@ ZEND_ARG_INFO(0, cas)
ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, key)
ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, expiration) ZEND_ARG_INFO(0, expiration)
ZEND_ARG_ARRAY_INFO(0, durability, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
Expand Down Expand Up @@ -404,14 +397,12 @@ COUCHBASE_ARG_PREFIX
ZEND_BEGIN_ARG_INFO_EX(arginfo_m_touch, 0, 0, 2) ZEND_BEGIN_ARG_INFO_EX(arginfo_m_touch, 0, 0, 2)
ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, key)
ZEND_ARG_INFO(0, expiry) ZEND_ARG_INFO(0, expiry)
ZEND_ARG_ARRAY_INFO(0, durability, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
ZEND_BEGIN_ARG_INFO_EX(arginfo_m_touchmulti, 0, 0, 2) ZEND_BEGIN_ARG_INFO_EX(arginfo_m_touchmulti, 0, 0, 2)
ZEND_ARG_ARRAY_INFO(0, keys, 0) ZEND_ARG_ARRAY_INFO(0, keys, 0)
ZEND_ARG_INFO(0, expiry) ZEND_ARG_INFO(0, expiry)
ZEND_ARG_ARRAY_INFO(0, durability, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
Expand Down Expand Up @@ -446,7 +437,6 @@ ZEND_ARG_INFO(0, offset)
ZEND_ARG_INFO(0, create) ZEND_ARG_INFO(0, create)
ZEND_ARG_INFO(0, expiration) ZEND_ARG_INFO(0, expiration)
ZEND_ARG_INFO(0, initial) ZEND_ARG_INFO(0, initial)
ZEND_ARG_ARRAY_INFO(0, durability, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
Expand All @@ -456,14 +446,14 @@ ZEND_ARG_INFO(0, offset)
ZEND_ARG_INFO(0, create) ZEND_ARG_INFO(0, create)
ZEND_ARG_INFO(0, expiration) ZEND_ARG_INFO(0, expiration)
ZEND_ARG_INFO(0, initial) ZEND_ARG_INFO(0, initial)
ZEND_ARG_ARRAY_INFO(0, durability, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
ZEND_BEGIN_ARG_INFO_EX(arginfo_m_delete, 0, 0, 1) ZEND_BEGIN_ARG_INFO_EX(arginfo_m_delete, 0, 0, 1)
ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, key)
ZEND_ARG_INFO(0, cas) ZEND_ARG_INFO(0, cas)
ZEND_ARG_ARRAY_INFO(0, durability, 0) ZEND_ARG_INFO(0, persist_to)
ZEND_ARG_INFO(0, replicate_to)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()


COUCHBASE_ARG_PREFIX COUCHBASE_ARG_PREFIX
Expand Down Expand Up @@ -682,47 +672,47 @@ PHP_METHOD(couchbase, cas)
*/ */
PHP_METHOD(couchbase, add) PHP_METHOD(couchbase, add)
{ {
php_couchbase_store_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_ADD, 0, 1); php_couchbase_store_impl_oo(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_ADD);
} }
/* }}} */ /* }}} */


/* {{{ proto Couchbase::set(string $key, mixed $value[, int $expiration]) /* {{{ proto Couchbase::set(string $key, mixed $value[, int $expiration])
*/ */
PHP_METHOD(couchbase, set) PHP_METHOD(couchbase, set)
{ {
php_couchbase_store_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_SET, 0, 1); php_couchbase_store_impl_oo(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_SET);
} }
/* }}} */ /* }}} */


/* {{{ proto Couchbase::setMulti(array $values[, int $expiration]) /* {{{ proto Couchbase::setMulti(array $values[, int $expiration])
*/ */
PHP_METHOD(couchbase, setMulti) PHP_METHOD(couchbase, setMulti)
{ {
php_couchbase_store_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_SET, 1, 1); php_couchbase_store_multi_impl_oo(INTERNAL_FUNCTION_PARAM_PASSTHRU);
} }
/* }}} */ /* }}} */


/* {{{ proto Couchbase::prepend(string $key[, string $cas = '0']) /* {{{ proto Couchbase::prepend(string $key[, string $cas = '0'])
*/ */
PHP_METHOD(couchbase, prepend) PHP_METHOD(couchbase, prepend)
{ {
php_couchbase_store_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_PREPEND, 0, 1); php_couchbase_store_impl_oo(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_PREPEND);
} }
/* }}} */ /* }}} */


/* {{{ proto Couchbase::append(string $key[, string $cas = '0']) /* {{{ proto Couchbase::append(string $key[, string $cas = '0'])
*/ */
PHP_METHOD(couchbase, append) PHP_METHOD(couchbase, append)
{ {
php_couchbase_store_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_APPEND, 0, 1); php_couchbase_store_impl_oo(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_APPEND);
} }
/* }}} */ /* }}} */


/* {{{ proto Couchbase::replace(string $key, mixed $value[, int $expiration[, string $cas = '0']]) /* {{{ proto Couchbase::replace(string $key, mixed $value[, int $expiration[, string $cas = '0']])
*/ */
PHP_METHOD(couchbase, replace) PHP_METHOD(couchbase, replace)
{ {
php_couchbase_store_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_REPLACE, 0, 1); php_couchbase_store_impl_oo(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_REPLACE);
} }
/* }}} */ /* }}} */


Expand Down Expand Up @@ -969,47 +959,47 @@ PHP_FUNCTION(couchbase_cas)
*/ */
PHP_FUNCTION(couchbase_add) PHP_FUNCTION(couchbase_add)
{ {
php_couchbase_store_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_ADD, 0, 0); php_couchbase_store_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_ADD, 0);
} }
/* }}} */ /* }}} */


/* {{{ proto couchbase_set(resource $couchbase, string $key, mixed $value[, int $expiration]) /* {{{ proto couchbase_set(resource $couchbase, string $key, mixed $value[, int $expiration])
*/ */
PHP_FUNCTION(couchbase_set) PHP_FUNCTION(couchbase_set)
{ {
php_couchbase_store_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_SET, 0, 0); php_couchbase_store_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_SET, 0);
} }
/* }}} */ /* }}} */


/* {{{ proto couchbase_set_multi(resource $couchbase, array $values[, int $expiration]) /* {{{ proto couchbase_set_multi(resource $couchbase, array $values[, int $expiration])
*/ */
PHP_FUNCTION(couchbase_set_multi) PHP_FUNCTION(couchbase_set_multi)
{ {
php_couchbase_store_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_SET, 1, 0); php_couchbase_store_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_SET, 1);
} }
/* }}} */ /* }}} */


/* {{{ proto couchbase_prepend(resource $couchbase, string $key[, string $cas = '0']) /* {{{ proto couchbase_prepend(resource $couchbase, string $key[, string $cas = '0'])
*/ */
PHP_FUNCTION(couchbase_prepend) PHP_FUNCTION(couchbase_prepend)
{ {
php_couchbase_store_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_PREPEND, 0, 0); php_couchbase_store_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_PREPEND, 0);
} }
/* }}} */ /* }}} */


/* {{{ proto couchbase_append(resource $couchbase, string $key[, string $cas = '0']) /* {{{ proto couchbase_append(resource $couchbase, string $key[, string $cas = '0'])
*/ */
PHP_FUNCTION(couchbase_append) PHP_FUNCTION(couchbase_append)
{ {
php_couchbase_store_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_APPEND, 0, 0); php_couchbase_store_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_APPEND, 0);
} }
/* }}} */ /* }}} */


/* {{{ proto couchbase_replace(resource $couchbase, string $key, mixed $value[, int $expiration[, string $cas = '0']]) /* {{{ proto couchbase_replace(resource $couchbase, string $key, mixed $value[, int $expiration[, string $cas = '0']])
*/ */
PHP_FUNCTION(couchbase_replace) PHP_FUNCTION(couchbase_replace)
{ {
php_couchbase_store_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_REPLACE, 0, 0); php_couchbase_store_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, LCB_REPLACE, 0);
} }
/* }}} */ /* }}} */


Expand Down
8 changes: 7 additions & 1 deletion apidecl.h
View file
Expand Up @@ -54,7 +54,13 @@ PHP_COUCHBASE_LOCAL
void php_couchbase_fetch_impl(INTERNAL_FUNCTION_PARAMETERS, int multi, int oo); void php_couchbase_fetch_impl(INTERNAL_FUNCTION_PARAMETERS, int multi, int oo);


PHP_COUCHBASE_LOCAL PHP_COUCHBASE_LOCAL
void php_couchbase_store_impl(INTERNAL_FUNCTION_PARAMETERS, lcb_storage_t op, int multi, int oo); void php_couchbase_store_impl(INTERNAL_FUNCTION_PARAMETERS, lcb_storage_t op, int multi);

PHP_COUCHBASE_LOCAL
void php_couchbase_store_multi_impl_oo(INTERNAL_FUNCTION_PARAMETERS);

PHP_COUCHBASE_LOCAL
void php_couchbase_store_impl_oo(INTERNAL_FUNCTION_PARAMETERS, lcb_storage_t op);


PHP_COUCHBASE_LOCAL PHP_COUCHBASE_LOCAL
void php_couchbase_remove_impl(INTERNAL_FUNCTION_PARAMETERS, int oo); void php_couchbase_remove_impl(INTERNAL_FUNCTION_PARAMETERS, int oo);
Expand Down
1 change: 1 addition & 0 deletions config.m4
View file
Expand Up @@ -187,6 +187,7 @@ if test "$PHP_COUCHBASE" != "no"; then
views.c \ views.c \
convert.c \ convert.c \
get.c \ get.c \
simple_observe.c \
store.c \ store.c \
arithmetic.c \ arithmetic.c \
remove.c \ remove.c \
Expand Down
1 change: 1 addition & 0 deletions config.w32
View file
Expand Up @@ -20,6 +20,7 @@ if (PHP_COUCHBASE != "no") {
ADD_SOURCES(configure_module_dirname, "observe.c", "couchbase"); ADD_SOURCES(configure_module_dirname, "observe.c", "couchbase");
ADD_SOURCES(configure_module_dirname, "remove.c", "couchbase"); ADD_SOURCES(configure_module_dirname, "remove.c", "couchbase");
ADD_SOURCES(configure_module_dirname, "resmgr.c", "couchbase"); ADD_SOURCES(configure_module_dirname, "resmgr.c", "couchbase");
ADD_SOURCES(configure_module_dirname, "simple_observe.c", "couchbase");
ADD_SOURCES(configure_module_dirname, "store.c", "couchbase"); ADD_SOURCES(configure_module_dirname, "store.c", "couchbase");
ADD_SOURCES(configure_module_dirname, "timeout.c", "couchbase"); ADD_SOURCES(configure_module_dirname, "timeout.c", "couchbase");
ADD_SOURCES(configure_module_dirname, "touch.c", "couchbase"); ADD_SOURCES(configure_module_dirname, "touch.c", "couchbase");
Expand Down
19 changes: 19 additions & 0 deletions exceptions.c
View file
Expand Up @@ -26,6 +26,9 @@ zend_class_entry *cb_exception;
PHP_COUCHBASE_LOCAL PHP_COUCHBASE_LOCAL
zend_class_entry *cb_illegal_key_exception; zend_class_entry *cb_illegal_key_exception;


PHP_COUCHBASE_LOCAL
zend_class_entry *cb_no_such_key_exception;

PHP_COUCHBASE_LOCAL PHP_COUCHBASE_LOCAL
zend_class_entry *cb_auth_exception; zend_class_entry *cb_auth_exception;


Expand All @@ -35,6 +38,15 @@ zend_class_entry *cb_lcb_exception;
PHP_COUCHBASE_LOCAL PHP_COUCHBASE_LOCAL
zend_class_entry *cb_server_exception; zend_class_entry *cb_server_exception;


PHP_COUCHBASE_LOCAL
zend_class_entry *cb_key_mutated_exception;

PHP_COUCHBASE_LOCAL
zend_class_entry *cb_timeout_exception;

PHP_COUCHBASE_LOCAL
zend_class_entry *cb_not_enough_nodes_exception;

#define setup(var, name, parent) \ #define setup(var, name, parent) \
do { \ do { \
zend_class_entry cbe; \ zend_class_entry cbe; \
Expand All @@ -57,9 +69,16 @@ void init_couchbase_exceptions(TSRMLS_D)
setup(cb_exception, "CouchbaseException", root); setup(cb_exception, "CouchbaseException", root);
setup(cb_illegal_key_exception, "CouchbaseIllegalKeyException", setup(cb_illegal_key_exception, "CouchbaseIllegalKeyException",
cb_exception); cb_exception);
setup(cb_no_such_key_exception, "CouchbaseNoSuchKeyException",
cb_exception);
setup(cb_auth_exception, "CouchbaseAuthenticationException", cb_exception); setup(cb_auth_exception, "CouchbaseAuthenticationException", cb_exception);
setup(cb_lcb_exception, "CouchbaseLibcouchbaseException", cb_exception); setup(cb_lcb_exception, "CouchbaseLibcouchbaseException", cb_exception);
setup(cb_server_exception, "CouchbaseServerException", cb_exception); setup(cb_server_exception, "CouchbaseServerException", cb_exception);
setup(cb_key_mutated_exception, "CouchbaseKeyMutatedException",
cb_exception);
setup(cb_timeout_exception, "CouchbaseTimeoutException", cb_exception);
setup(cb_not_enough_nodes_exception, "CouchbaseNotEnoughNodesException",
cb_exception);
} }


/* /*
Expand Down

0 comments on commit ad692a4

Please sign in to comment.