#include "common.h"
-static memcached_return memcached_auto(memcached_st *ptr,
+static memcached_return memcached_auto(memcached_st *ptr,
const char *verb,
+ const char *master_key, size_t master_key_length,
const char *key, size_t key_length,
- unsigned int offset,
+ uint64_t offset,
uint64_t *value)
{
size_t send_length;
if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((const char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
return MEMCACHED_BAD_KEY_PROVIDED;
- server_key= memcached_generate_hash(ptr, key, key_length);
+ server_key= memcached_generate_hash(ptr, master_key, master_key_length);
- send_length= (size_t)snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
- "%s %s%.*s %u%s\r\n", verb,
+ send_length= (size_t)snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
+ "%s %s%.*s %" PRIu64 "%s\r\n", verb,
ptr->prefix_key,
(int)key_length, key,
offset, no_reply ? " noreply" : "");
rc= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
- /*
+ /*
So why recheck responce? Because the protocol is brain dead :)
- The number returned might end up equaling one of the string
- values. Less chance of a mistake with strncmp() so we will
+ The number returned might end up equaling one of the string
+ values. Less chance of a mistake with strncmp() so we will
use it. We still called memcached_response() though since it
worked its magic for non-blocking IO.
*/
}
static memcached_return binary_incr_decr(memcached_st *ptr, uint8_t cmd,
+ const char *master_key, size_t master_key_length,
const char *key, size_t key_length,
uint64_t offset, uint64_t initial,
uint32_t expiration,
- uint64_t *value)
+ uint64_t *value)
{
unsigned int server_key;
bool no_reply= (ptr->flags & MEM_NOREPLY);
unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
- server_key= memcached_generate_hash(ptr, key, key_length);
+ server_key= memcached_generate_hash(ptr, master_key, master_key_length);
if (no_reply)
{
if ((memcached_do(&ptr->hosts[server_key], request.bytes,
sizeof(request.bytes), 0)!=MEMCACHED_SUCCESS) ||
- (memcached_io_write(&ptr->hosts[server_key], key, key_length, 1) == -1))
+ (memcached_io_write(&ptr->hosts[server_key], key, key_length, 1) == -1))
{
memcached_io_reset(&ptr->hosts[server_key]);
return MEMCACHED_WRITE_FAILURE;
return memcached_response(&ptr->hosts[server_key], (char*)value, sizeof(*value), NULL);
}
-memcached_return memcached_increment(memcached_st *ptr,
+memcached_return memcached_increment(memcached_st *ptr,
const char *key, size_t key_length,
uint32_t offset,
uint64_t *value)
+{
+ return memcached_increment_by_key(ptr, key, key_length, key, key_length, offset, value);
+}
+
+memcached_return memcached_decrement(memcached_st *ptr,
+ const char *key, size_t key_length,
+ uint32_t offset,
+ uint64_t *value)
+{
+ return memcached_decrement_by_key(ptr, key, key_length, key, key_length, offset, value);
+}
+
+memcached_return memcached_increment_by_key(memcached_st *ptr,
+ const char *master_key, size_t master_key_length,
+ const char *key, size_t key_length,
+ uint64_t offset,
+ uint64_t *value)
{
memcached_return rc= memcached_validate_key_length(key_length, ptr->flags & MEM_BINARY_PROTOCOL);
unlikely (rc != MEMCACHED_SUCCESS)
return rc;
LIBMEMCACHED_MEMCACHED_INCREMENT_START();
- if (ptr->flags & MEM_BINARY_PROTOCOL)
- rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_INCREMENT, key, key_length,
+ if (ptr->flags & MEM_BINARY_PROTOCOL)
+ rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_INCREMENT,
+ master_key, master_key_length, key, key_length,
(uint64_t)offset, 0, MEMCACHED_EXPIRATION_NOT_ADD,
value);
- else
- rc= memcached_auto(ptr, "incr", key, key_length, offset, value);
-
+ else
+ rc= memcached_auto(ptr, "incr", master_key, master_key_length, key, key_length, offset, value);
+
LIBMEMCACHED_MEMCACHED_INCREMENT_END();
return rc;
}
-memcached_return memcached_decrement(memcached_st *ptr,
- const char *key, size_t key_length,
- uint32_t offset,
- uint64_t *value)
+memcached_return memcached_decrement_by_key(memcached_st *ptr,
+ const char *master_key, size_t master_key_length,
+ const char *key, size_t key_length,
+ uint64_t offset,
+ uint64_t *value)
{
memcached_return rc= memcached_validate_key_length(key_length, ptr->flags & MEM_BINARY_PROTOCOL);
unlikely (rc != MEMCACHED_SUCCESS)
return rc;
LIBMEMCACHED_MEMCACHED_DECREMENT_START();
- if (ptr->flags & MEM_BINARY_PROTOCOL)
- rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_DECREMENT, key, key_length,
+ if (ptr->flags & MEM_BINARY_PROTOCOL)
+ rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_DECREMENT,
+ master_key, master_key_length, key, key_length,
(uint64_t)offset, 0, MEMCACHED_EXPIRATION_NOT_ADD,
value);
- else
- rc= memcached_auto(ptr, "decr", key, key_length, offset, value);
-
+ else
+ rc= memcached_auto(ptr, "decr", master_key, master_key_length, key, key_length, offset, value);
+
LIBMEMCACHED_MEMCACHED_DECREMENT_END();
return rc;
uint64_t initial,
time_t expiration,
uint64_t *value)
+{
+ return memcached_increment_with_initial_by_key(ptr, key, key_length,
+ key, key_length,
+ offset, initial, expiration, value);
+}
+
+memcached_return memcached_increment_with_initial_by_key(memcached_st *ptr,
+ const char *master_key,
+ size_t master_key_length,
+ const char *key,
+ size_t key_length,
+ uint64_t offset,
+ uint64_t initial,
+ time_t expiration,
+ uint64_t *value)
{
memcached_return rc= memcached_validate_key_length(key_length, ptr->flags & MEM_BINARY_PROTOCOL);
unlikely (rc != MEMCACHED_SUCCESS)
LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_START();
if (ptr->flags & MEM_BINARY_PROTOCOL)
- rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_INCREMENT, key,
- key_length, offset, initial, (uint32_t)expiration,
+ rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_INCREMENT,
+ master_key, master_key_length, key, key_length,
+ offset, initial, (uint32_t)expiration,
value);
else
rc= MEMCACHED_PROTOCOL_ERROR;
uint64_t initial,
time_t expiration,
uint64_t *value)
+{
+ return memcached_decrement_with_initial_by_key(ptr, key, key_length,
+ key, key_length,
+ offset, initial, expiration, value);
+}
+
+memcached_return memcached_decrement_with_initial_by_key(memcached_st *ptr,
+ const char *master_key,
+ size_t master_key_length,
+ const char *key,
+ size_t key_length,
+ uint64_t offset,
+ uint64_t initial,
+ time_t expiration,
+ uint64_t *value)
{
memcached_return rc= memcached_validate_key_length(key_length, ptr->flags & MEM_BINARY_PROTOCOL);
unlikely (rc != MEMCACHED_SUCCESS)
return rc;
- LIBMEMCACHED_MEMCACHED_DECREMENT_WITH_INITIAL_START();
+ LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_START();
if (ptr->flags & MEM_BINARY_PROTOCOL)
- rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_DECREMENT, key,
- key_length, offset, initial, (uint32_t)expiration,
+ rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_DECREMENT,
+ master_key, master_key_length, key, key_length,
+ offset, initial, (uint32_t)expiration,
value);
else
rc= MEMCACHED_PROTOCOL_ERROR;
- LIBMEMCACHED_MEMCACHED_DECREMENT_WITH_INITIAL_END();
+ LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_END();
return rc;
}
+
return TEST_SUCCESS;
}
+static test_return_t increment_by_key_test(memcached_st *memc)
+{
+ uint64_t new_number;
+ memcached_return rc;
+ const char *master_key= "foo";
+ const char *key= "number";
+ const char *value= "0";
+
+ rc= memcached_set_by_key(memc, master_key, strlen(master_key),
+ key, strlen(key),
+ value, strlen(value),
+ (time_t)0, (uint32_t)0);
+ assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED);
+
+ rc= memcached_increment_by_key(memc, master_key, strlen(master_key), key, strlen(key),
+ 1, &new_number);
+ assert(rc == MEMCACHED_SUCCESS);
+ assert(new_number == 1);
+
+ rc= memcached_increment_by_key(memc, master_key, strlen(master_key), key, strlen(key),
+ 1, &new_number);
+ assert(rc == MEMCACHED_SUCCESS);
+ assert(new_number == 2);
+
+ return TEST_SUCCESS;
+}
+
+static test_return_t increment_with_initial_by_key_test(memcached_st *memc)
+{
+ if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0)
+ {
+ uint64_t new_number;
+ memcached_return rc;
+ const char *master_key= "foo";
+ const char *key= "number";
+ uint64_t initial= 0;
+
+ rc= memcached_increment_with_initial_by_key(memc, master_key, strlen(master_key),
+ key, strlen(key),
+ 1, initial, 0, &new_number);
+ assert(rc == MEMCACHED_SUCCESS);
+ assert(new_number == initial);
+
+ rc= memcached_increment_with_initial_by_key(memc, master_key, strlen(master_key),
+ key, strlen(key),
+ 1, initial, 0, &new_number);
+ assert(rc == MEMCACHED_SUCCESS);
+ assert(new_number == (initial + 1));
+ }
+ return TEST_SUCCESS;
+}
+
+static test_return_t decrement_by_key_test(memcached_st *memc)
+{
+ uint64_t new_number;
+ memcached_return rc;
+ const char *master_key= "foo";
+ const char *key= "number";
+ const char *value= "3";
+
+ rc= memcached_set_by_key(memc, master_key, strlen(master_key),
+ key, strlen(key),
+ value, strlen(value),
+ (time_t)0, (uint32_t)0);
+ assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED);
+
+ rc= memcached_decrement_by_key(memc, master_key, strlen(master_key),
+ key, strlen(key),
+ 1, &new_number);
+ assert(rc == MEMCACHED_SUCCESS);
+ assert(new_number == 2);
+
+ rc= memcached_decrement_by_key(memc, master_key, strlen(master_key),
+ key, strlen(key),
+ 1, &new_number);
+ assert(rc == MEMCACHED_SUCCESS);
+ assert(new_number == 1);
+
+ return TEST_SUCCESS;
+}
+
+static test_return_t decrement_with_initial_by_key_test(memcached_st *memc)
+{
+ if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0)
+ {
+ uint64_t new_number;
+ memcached_return rc;
+ const char *master_key= "foo";
+ const char *key= "number";
+ uint64_t initial= 3;
+
+ rc= memcached_decrement_with_initial_by_key(memc, master_key, strlen(master_key),
+ key, strlen(key),
+ 1, initial, 0, &new_number);
+ assert(rc == MEMCACHED_SUCCESS);
+ assert(new_number == initial);
+
+ rc= memcached_decrement_with_initial_by_key(memc, master_key, strlen(master_key),
+ key, strlen(key),
+ 1, initial, 0, &new_number);
+ assert(rc == MEMCACHED_SUCCESS);
+ assert(new_number == (initial - 1));
+ }
+ return TEST_SUCCESS;
+}
+
static test_return_t quit_test(memcached_st *memc)
{
memcached_return rc;
{"increment_with_initial", 1, increment_with_initial_test },
{"decrement", 0, decrement_test },
{"decrement_with_initial", 1, decrement_with_initial_test },
+ {"increment_by_key", 0, increment_by_key_test },
+ {"increment_with_initial_by_key", 1, increment_with_initial_by_key_test },
+ {"decrement_by_key", 0, decrement_by_key_test },
+ {"decrement_with_initial_by_key", 1, decrement_with_initial_by_key_test },
{"quit", 0, quit_test },
{"mget", 1, mget_test },
{"mget_result", 1, mget_result_test },