unsigned int offset,
uint64_t *value)
{
- size_t send_length, sent_length;
+ size_t send_length;
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
+ if (key_length == 0)
+ return MEMCACHED_NO_KEY_PROVIDED;
+
if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
- server_key= memcached_generate_hash(ptr, key, key_length);
+ if (key_test(&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)
+ return MEMCACHED_BAD_KEY_PROVIDED;
- if ((rc= memcached_connect(ptr, server_key)) != MEMCACHED_SUCCESS)
- return rc;
+ server_key= memcached_generate_hash(ptr, key, key_length);
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"%s %.*s %u\r\n", verb,
offset);
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
return MEMCACHED_WRITE_FAILURE;
- sent_length= memcached_io_write(ptr, server_key, buffer, send_length, 1);
- if (sent_length == -1 || sent_length != send_length)
- return MEMCACHED_WRITE_FAILURE;
-
- memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
+ rc= memcached_do(&ptr->hosts[server_key], buffer, send_length, 1);
+ if (rc != MEMCACHED_SUCCESS)
+ return rc;
- rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+ 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 memcmp() so we will
+ 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.
*/
- if (!memcmp(buffer, "ERROR\r\n", MEMCACHED_DEFAULT_COMMAND_SIZE))
+ if (!strncmp(buffer, "ERROR\r\n", 7))
{
*value= 0;
rc= MEMCACHED_PROTOCOL_ERROR;
}
- else if (!memcmp(buffer, "NOT_FOUND\r\n", MEMCACHED_DEFAULT_COMMAND_SIZE))
+ else if (!strncmp(buffer, "NOT_FOUND\r\n", 11))
{
*value= 0;
rc= MEMCACHED_NOTFOUND;
memcached_return memcached_increment(memcached_st *ptr,
char *key, size_t key_length,
- unsigned int offset,
+ uint32_t offset,
uint64_t *value)
{
memcached_return rc;
memcached_return memcached_decrement(memcached_st *ptr,
char *key, size_t key_length,
- unsigned int offset,
+ uint32_t offset,
uint64_t *value)
{
memcached_return rc;