X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmemcached_storage.c;h=eabe6ce981bd6ea61bb16b3b4253010c9dbab750;hb=d3ef73cd144dfdbcaff41d3373e4458fb351f7af;hp=0c27c76681fdfc310c39bf99488decaec842becc;hpb=cf34e0d38a58e81ec3993af0db6c221585d712e5;p=awesomized%2Flibmemcached diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c index 0c27c766..eabe6ce9 100644 --- a/lib/memcached_storage.c +++ b/lib/memcached_storage.c @@ -10,12 +10,21 @@ #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; @@ -32,12 +41,13 @@ static memcached_return memcached_send(memcached_st *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); 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) @@ -46,53 +56,42 @@ static memcached_return memcached_send(memcached_st *ptr, 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); @@ -108,7 +107,7 @@ memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length, 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; } @@ -121,7 +120,7 @@ memcached_return memcached_add(memcached_st *ptr, char *key, size_t key_length, 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; } @@ -134,7 +133,7 @@ memcached_return memcached_replace(memcached_st *ptr, char *key, size_t key_leng 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; }