-#include <memcached.h>
+#include "common.h"
static memcached_return memcached_auto(memcached_st *ptr,
char *verb,
char *key, size_t key_length,
unsigned int offset,
- unsigned int *value)
+ 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;
- rc= memcached_connect(ptr);
+ if (key_length == 0)
+ return MEMCACHED_NO_KEY_PROVIDED;
- if (rc != MEMCACHED_SUCCESS)
- return rc;
+ if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
+ return MEMCACHED_NO_SERVERS;
- server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
+ 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= write(ptr->hosts[server_key].fd, buffer, send_length);
- if (sent_length == -1)
- {
- fprintf(stderr, "error %s: write: %m\n", __FUNCTION__);
- return MEMCACHED_WRITE_FAILURE;
- }
- if (sent_length != send_length)
- {
- fprintf(stderr, "error %s: short write %d %d: %m\n",
- __FUNCTION__, sent_length, send_length);
- return MEMCACHED_WRITE_FAILURE;
- }
- memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
- send_length= read(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE);
+ rc= memcached_do(&ptr->hosts[server_key], buffer, send_length, 1);
+ if (rc != MEMCACHED_SUCCESS)
+ return rc;
- if (!memcmp(buffer, "ERROR\r\n", MEMCACHED_DEFAULT_COMMAND_SIZE))
+ 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
+ use it. We still called memcached_response() though since it
+ worked its magic for non-blocking IO.
+ */
+ 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;
}
else
{
- *value= strtol(buffer, (char **)NULL, 10);
+ *value= (uint64_t)strtoll(buffer, (char **)NULL, 10);
rc= MEMCACHED_SUCCESS;
}
memcached_return memcached_increment(memcached_st *ptr,
char *key, size_t key_length,
- unsigned int offset,
- unsigned int *value)
+ uint32_t offset,
+ uint64_t *value)
{
- return memcached_auto(ptr, "incr", key, key_length, offset, value);
+ memcached_return rc;
+
+ LIBMEMCACHED_MEMCACHED_INCREMENT_START();
+ rc= memcached_auto(ptr, "incr", key, key_length, offset, value);
+ LIBMEMCACHED_MEMCACHED_INCREMENT_END();
+
+ return rc;
}
memcached_return memcached_decrement(memcached_st *ptr,
char *key, size_t key_length,
- unsigned int offset,
- unsigned int *value)
+ uint32_t offset,
+ uint64_t *value)
{
- return memcached_auto(ptr, "decr", key, key_length, offset, value);
+ memcached_return rc;
+
+ LIBMEMCACHED_MEMCACHED_DECREMENT_START();
+ rc= memcached_auto(ptr, "decr", key, key_length, offset, value);
+ LIBMEMCACHED_MEMCACHED_DECREMENT_END();
+
+ return rc;
}