Skip to content

Add support for 64-bit numbers in increment/decrement operations #156

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

Closed
wants to merge 3 commits into from
Closed

Add support for 64-bit numbers in increment/decrement operations #156

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5e4615
Add support for 64-bit numbers in increment/decrement operations
reva2work Oct 24, 2014
d4d4ae7
Fix issue with tests
reva2work Oct 27, 2014
ab3d6d8
Fix issue with old libmemcached versions
reva2work Oct 27, 2014
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
55 changes: 48 additions & 7 deletions php_memcached.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1795,7 +1795,11 @@ static void php_memc_incdec_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key,
{
char *key, *server_key;
int key_len, server_key_len;
long offset = 1;
#if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000016
int64_t offset = 1;
#else
long offset = 1;
#endif
uint64_t value, initial = 0;
time_t expiry = 0;
memcached_return status;
Expand Down Expand Up @@ -1828,12 +1832,14 @@ static void php_memc_incdec_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key,
}

retry:
#if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000016

if ((!by_key && n_args < 3) || (by_key && n_args < 4)) {
if (by_key) {
if (incr) {
status = memcached_increment_by_key(m_obj->memc, server_key, server_key_len, key, key_len, (unsigned int)offset, &value);
status = memcached_increment_by_key(m_obj->memc, server_key, server_key_len, key, key_len, offset, &value);
} else {
status = memcached_decrement_by_key(m_obj->memc, server_key, server_key_len, key, key_len, (unsigned int)offset, &value);
status = memcached_decrement_by_key(m_obj->memc, server_key, server_key_len, key, key_len, offset, &value);
}
} else {
if (incr) {
Expand All @@ -1849,18 +1855,53 @@ static void php_memc_incdec_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key,
}
if (by_key) {
if (incr) {
status = memcached_increment_with_initial_by_key(m_obj->memc, server_key, server_key_len, key, key_len, (unsigned int)offset, initial, expiry, &value);
status = memcached_increment_with_initial_by_key(m_obj->memc, server_key, server_key_len, key, key_len, offset, initial, expiry, &value);
} else {
status = memcached_decrement_with_initial_by_key(m_obj->memc, server_key, server_key_len, key, key_len, (unsigned int)offset, initial, expiry, &value);
status = memcached_decrement_with_initial_by_key(m_obj->memc, server_key, server_key_len, key, key_len, offset, initial, expiry, &value);
}
} else {
if (incr) {
status = memcached_increment_with_initial(m_obj->memc, key, key_len, (unsigned int)offset, initial, expiry, &value);
status = memcached_increment_with_initial(m_obj->memc, key, key_len, offset, initial, expiry, &value);
} else {
status = memcached_decrement_with_initial(m_obj->memc, key, key_len, (unsigned int)offset, initial, expiry, &value);
status = memcached_decrement_with_initial(m_obj->memc, key, key_len, offset, initial, expiry, &value);
}
}
}
#else
if ((!by_key && n_args < 3) || (by_key && n_args < 4)) {
if (by_key) {
if (incr) {
status = memcached_increment_by_key(m_obj->memc, server_key, server_key_len, key, key_len, (unsigned int)offset, &value);
} else {
status = memcached_decrement_by_key(m_obj->memc, server_key, server_key_len, key, key_len, (unsigned int)offset, &value);
}
} else {
if (incr) {
status = memcached_increment(m_obj->memc, key, key_len, (unsigned int)offset, &value);
} else {
status = memcached_decrement(m_obj->memc, key, key_len, (unsigned int)offset, &value);
}
}
} else {
if (!memcached_behavior_get(m_obj->memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Initial value is only supported with binary protocol");
RETURN_FALSE;
}
if (by_key) {
if (incr) {
status = memcached_increment_with_initial_by_key(m_obj->memc, server_key, server_key_len, key, key_len, (unsigned int)offset, initial, expiry, &value);
} else {
status = memcached_decrement_with_initial_by_key(m_obj->memc, server_key, server_key_len, key, key_len, (unsigned int)offset, initial, expiry, &value);
}
} else {
if (incr) {
status = memcached_increment_with_initial(m_obj->memc, key, key_len, (unsigned int)offset, initial, expiry, &value);
} else {
status = memcached_decrement_with_initial(m_obj->memc, key, key_len, (unsigned int)offset, initial, expiry, &value);
}
}
}
#endif

if (php_memc_handle_error(i_obj, status TSRMLS_CC) < 0) {
PHP_MEMC_FAILOVER_RETRY
Expand Down