Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cache increment and decrement implementation #1374

Merged
merged 3 commits into from
Oct 14, 2013
Merged

Cache increment and decrement implementation #1374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65d0b13
Cache increment and decrement implementation
iwalz Oct 13, 2013
408d743
Fixed unused variables
iwalz Oct 13, 2013
4d74e2e
Removed unused variables
iwalz Oct 13, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 135 additions & 4 deletions ext/cache/backend/apc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,13 @@ PHP_METHOD(Phalcon_Cache_Backend_Apc, get){
if (PHALCON_IS_FALSE(cached_content)) {
RETURN_MM_NULL();
}

if (phalcon_is_numeric(cached_content)) {
RETURN_CCTOR(cached_content);
} else {
phalcon_return_call_method_p1(frontend, "afterretrieve", cached_content);
}

phalcon_return_call_method_p1(frontend, "afterretrieve", cached_content);
RETURN_MM();
}

Expand Down Expand Up @@ -163,8 +168,10 @@ PHP_METHOD(Phalcon_Cache_Backend_Apc, save){
cached_content = content;
}

PHALCON_OBS_VAR(prepared_content);
phalcon_call_method_p1_ex(prepared_content, &prepared_content, frontend, "beforestore", cached_content);
if (!phalcon_is_numeric(cached_content)) {
PHALCON_OBS_VAR(prepared_content);
phalcon_call_method_p1_ex(prepared_content, &prepared_content, frontend, "beforestore", cached_content);
}

/**
* Take the lifetime from the frontend or read it from the set in start()
Expand All @@ -187,7 +194,11 @@ PHP_METHOD(Phalcon_Cache_Backend_Apc, save){
* Call apc_store in the PHP userland since most of the time it isn't available at
* compile time
*/
phalcon_call_func_p3_noret("apc_store", last_key, prepared_content, ttl);
if (phalcon_is_numeric(cached_content)) {
phalcon_call_func_p3_noret("apc_store", last_key, cached_content, ttl);
} else {
phalcon_call_func_p3_noret("apc_store", last_key, prepared_content, ttl);
}

PHALCON_OBS_VAR(is_buffering);
phalcon_call_method_p0_ex(is_buffering, &is_buffering, frontend, "isbuffering");
Expand All @@ -204,6 +215,126 @@ PHP_METHOD(Phalcon_Cache_Backend_Apc, save){
PHALCON_MM_RESTORE();
}

/**
* Increment of a given key, by number $value
*
* @param string $keyName
* @param long $value
* @return mixed
*/
PHP_METHOD(Phalcon_Cache_Backend_Apc, increment){

zval *key_name, *value = NULL, *prefixed_key;
zval *cached_content = NULL, *function_name;
zval *prefix;

PHALCON_MM_GROW();

PHALCON_INIT_VAR(function_name);
ZVAL_STRING(function_name, "apc_inc", 1);

phalcon_fetch_params(1, 1, 1, &key_name, &value);

if (!value) {
PHALCON_INIT_VAR(value);
}

if (Z_TYPE_P(value) == IS_NULL) {
ZVAL_LONG(value, 1);
}

if (Z_TYPE_P(value) != IS_LONG) {
PHALCON_SEPARATE_PARAM(value);
convert_to_long_ex(&value);
}

prefix = phalcon_fetch_nproperty_this(this_ptr, SL("_prefix"), PH_NOISY_CC);

PHALCON_INIT_VAR(prefixed_key);
PHALCON_CONCAT_SVV(prefixed_key, "_PHCA", prefix, key_name);
phalcon_update_property_this(this_ptr, SL("_lastKey"), prefixed_key TSRMLS_CC);

if (phalcon_function_exists(function_name TSRMLS_CC)) {
phalcon_call_func_p1(return_value, "apc_inc", value);
} else {
PHALCON_OBS_VAR(cached_content);
phalcon_call_func_p1_ex(cached_content, &cached_content, "apc_fetch", prefixed_key);

if (Z_TYPE_P(cached_content) != IS_LONG) {
PHALCON_SEPARATE_PARAM(cached_content);
convert_to_long_ex(&cached_content);
}

if (phalcon_is_numeric(cached_content)) {
add_function(return_value, cached_content, value TSRMLS_CC);

phalcon_call_method_p2_noret(this_ptr, "save", key_name, return_value);
}
}

RETURN_MM();
}

/**
* Decrement of a given key, by number $value
*
* @param string $keyName
* @param long $value
* @return mixed
*/
PHP_METHOD(Phalcon_Cache_Backend_Apc, decrement){

zval *key_name, *value = NULL, *prefixed_key;
zval *cached_content = NULL, *function_name;
zval *prefix;

PHALCON_MM_GROW();

PHALCON_INIT_VAR(function_name);
ZVAL_STRING(function_name, "apc_dec", 1);

phalcon_fetch_params(1, 1, 1, &key_name, &value);

if (!value) {
PHALCON_INIT_VAR(value);
}

if (Z_TYPE_P(value) == IS_NULL) {
ZVAL_LONG(value, 1);
}

if (Z_TYPE_P(value) != IS_LONG) {
PHALCON_SEPARATE_PARAM(value);
convert_to_long_ex(&value);
}

prefix = phalcon_fetch_nproperty_this(this_ptr, SL("_prefix"), PH_NOISY_CC);

PHALCON_INIT_VAR(prefixed_key);
PHALCON_CONCAT_SVV(prefixed_key, "_PHCA", prefix, key_name);
phalcon_update_property_this(this_ptr, SL("_lastKey"), prefixed_key TSRMLS_CC);

if (phalcon_function_exists(function_name TSRMLS_CC)) {
phalcon_call_func_p1(return_value, "apc_dec", value);
} else {
PHALCON_OBS_VAR(cached_content);
phalcon_call_func_p1_ex(cached_content, &cached_content, "apc_fetch", prefixed_key);

if (Z_TYPE_P(cached_content) != IS_LONG) {
PHALCON_SEPARATE_PARAM(cached_content);
convert_to_long_ex(&cached_content);
}

if (phalcon_is_numeric(cached_content)) {
sub_function(return_value, cached_content, value TSRMLS_CC);

phalcon_call_method_p2_noret(this_ptr, "save", key_name, return_value);
}
}

RETURN_MM();
}

/**
* Deletes a value from the cache by its key
*
Expand Down
14 changes: 14 additions & 0 deletions ext/cache/backend/apc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ PHP_METHOD(Phalcon_Cache_Backend_Apc, save);
PHP_METHOD(Phalcon_Cache_Backend_Apc, delete);
PHP_METHOD(Phalcon_Cache_Backend_Apc, queryKeys);
PHP_METHOD(Phalcon_Cache_Backend_Apc, exists);
PHP_METHOD(Phalcon_Cache_Backend_Apc, increment);
PHP_METHOD(Phalcon_Cache_Backend_Apc, decrement);

ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_backend_apc_get, 0, 0, 1)
ZEND_ARG_INFO(0, keyName)
Expand All @@ -52,12 +54,24 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_backend_apc_exists, 0, 0, 0)
ZEND_ARG_INFO(0, lifetime)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_backend_apc_increment, 0, 0, 0)
ZEND_ARG_INFO(0, key_name)
ZEND_ARG_INFO(0, value)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_backend_apc_decrement, 0, 0, 0)
ZEND_ARG_INFO(0, key_name)
ZEND_ARG_INFO(0, value)
ZEND_END_ARG_INFO()

PHALCON_INIT_FUNCS(phalcon_cache_backend_apc_method_entry){
PHP_ME(Phalcon_Cache_Backend_Apc, get, arginfo_phalcon_cache_backend_apc_get, ZEND_ACC_PUBLIC)
PHP_ME(Phalcon_Cache_Backend_Apc, save, arginfo_phalcon_cache_backend_apc_save, ZEND_ACC_PUBLIC)
PHP_ME(Phalcon_Cache_Backend_Apc, delete, arginfo_phalcon_cache_backend_apc_delete, ZEND_ACC_PUBLIC)
PHP_ME(Phalcon_Cache_Backend_Apc, queryKeys, arginfo_phalcon_cache_backend_apc_querykeys, ZEND_ACC_PUBLIC)
PHP_ME(Phalcon_Cache_Backend_Apc, exists, arginfo_phalcon_cache_backend_apc_exists, ZEND_ACC_PUBLIC)
PHP_ME(Phalcon_Cache_Backend_Apc, increment, arginfo_phalcon_cache_backend_apc_increment, ZEND_ACC_PUBLIC)
PHP_ME(Phalcon_Cache_Backend_Apc, decrement, arginfo_phalcon_cache_backend_apc_decrement, ZEND_ACC_PUBLIC)
PHP_FE_END
};

Loading