#include "common.h"
#include "memcached_io.h"
+typedef enum {
+ SET_OP,
+ REPLACE_OP,
+ ADD_OP,
+} memcached_storage_action;
+
+/* Inline this */
+#define storage_op_string(A) A == SET_OP ? "set" : ( A == REPLACE_OP ? "replace" : "add")
+
static memcached_return memcached_send(memcached_st *ptr,
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
uint16_t flags,
- char *verb)
+ memcached_storage_action verb)
{
size_t write_length;
ssize_t sent_length;
memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
- rc= memcached_connect(ptr);
- if (rc != MEMCACHED_SUCCESS)
- return rc;
-
+ /* Leaveing this assert in since only a library fubar could blow this */
assert(ptr->write_buffer_offset == 0);
- server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
+ server_key= memcached_generate_hash(ptr, key, key_length);
+
+ rc= memcached_connect(ptr, server_key);
+ if (rc != MEMCACHED_SUCCESS)
+ return rc;
write_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
- "%s %.*s %x %llu %zu\r\n", verb,
+ "%s %.*s %x %llu %zu\r\n", storage_op_string(verb),
(int)key_length, key, flags,
(unsigned long long)expiration, value_length);
if (write_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
goto error;
}
- if ((sent_length= memcached_io_write(ptr, server_key, buffer, write_length)) == -1)
- {
- rc= MEMCACHED_WRITE_FAILURE;
- goto error;
- }
- assert(write_length == sent_length);
-
/*
We have to flush after sending the command. Memcached is not smart enough
to just keep reading from the socket :(
*/
- if ((sent_length= memcached_io_flush(ptr, server_key)) == -1)
- return MEMCACHED_WRITE_FAILURE;
-
- if ((sent_length= memcached_io_write(ptr, server_key, value, value_length)) == -1)
+ if ((sent_length= memcached_io_write(ptr, server_key, buffer, write_length, 1)) == -1)
{
rc= MEMCACHED_WRITE_FAILURE;
goto error;
}
- assert(value_length == sent_length);
- if ((sent_length= memcached_io_write(ptr, server_key, "\r\n", 2)) == -1)
+ if ((sent_length= memcached_io_write(ptr, server_key, value, value_length, 0)) == -1)
{
rc= MEMCACHED_WRITE_FAILURE;
goto error;
}
- assert(2 == sent_length);
-
- if ((sent_length= memcached_io_flush(ptr, server_key)) == -1)
- return MEMCACHED_WRITE_FAILURE;
-
- //assert(sent_length == write_length + value_length + 2);
-
- sent_length= recv(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 0);
+ if ((sent_length= memcached_io_write(ptr, server_key, "\r\n", 2, 1)) == -1)
+ {
+ rc= MEMCACHED_WRITE_FAILURE;
+ goto error;
+ }
- if (sent_length && buffer[0] == 'S') /* STORED */
- return MEMCACHED_SUCCESS;
- else if (write_length && buffer[0] == 'N') /* NOT_STORED */
- return MEMCACHED_NOTSTORED;
- else if (write_length && buffer[0] == 'E') /* ERROR */
+ if ((ptr->flags & MEM_NO_BLOCK) && verb == SET_OP)
{
- printf("BUFFER :%s:\n", buffer);
- return MEMCACHED_PROTOCOL_ERROR;
+ rc= MEMCACHED_SUCCESS;
+ ptr->stack_responses++;
}
else
- return MEMCACHED_READ_FAILURE;
+ {
+ rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+ }
+
+ if (rc == MEMCACHED_STORED)
+ return MEMCACHED_SUCCESS;
+ else
+ return rc;
error:
memcached_io_reset(ptr, server_key);
memcached_return rc;
LIBMEMCACHED_MEMCACHED_SET_START();
rc= memcached_send(ptr, key, key_length, value, value_length,
- expiration, flags, "set");
+ expiration, flags, SET_OP);
LIBMEMCACHED_MEMCACHED_SET_END();
return rc;
}
memcached_return rc;
LIBMEMCACHED_MEMCACHED_ADD_START();
rc= memcached_send(ptr, key, key_length, value, value_length,
- expiration, flags, "add");
+ expiration, flags, ADD_OP);
LIBMEMCACHED_MEMCACHED_ADD_END();
return rc;
}
memcached_return rc;
LIBMEMCACHED_MEMCACHED_REPLACE_START();
rc= memcached_send(ptr, key, key_length, value, value_length,
- expiration, flags, "replace");
+ expiration, flags, REPLACE_OP);
LIBMEMCACHED_MEMCACHED_REPLACE_END();
return rc;
}