X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_storage.c;h=af763a3ed5dd945f7b0debed1befc5cc519bfcf5;hb=8d0cd77fc7bafd1f353bc7c50910b751766f931a;hp=5a8701fafb25a350bf5e5b870af4d0a82444f2f7;hpb=9e9572af3e9be02dd3de5c71bf1665217a770e1b;p=m6w6%2Flibmemcached diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c index 5a8701fa..af763a3e 100644 --- a/lib/memcached_storage.c +++ b/lib/memcached_storage.c @@ -14,45 +14,82 @@ typedef enum { SET_OP, REPLACE_OP, ADD_OP, + PREPEND_OP, + APPEND_OP, + CAS_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, - memcached_storage_action verb) +char *storage_op_string(memcached_storage_action verb) { + switch (verb) + { + case SET_OP: + return "set"; + case REPLACE_OP: + return "replace"; + case ADD_OP: + return "add"; + case PREPEND_OP: + return "prepend"; + case APPEND_OP: + return "append"; + case CAS_OP: + return "cas"; + }; + + return SET_OP; +} + +static inline 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, + uint64_t cas, + memcached_storage_action verb) +{ + char to_write; size_t write_length; ssize_t sent_length; memcached_return rc; char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE]; unsigned int server_key; - assert(value); - assert(value_length); + WATCHPOINT_ASSERT(!(value == NULL && value_length > 0)); + WATCHPOINT_ASSERT(!(value && value_length == 0)); - /* Leaving this assert in since only a library fubar could blow this */ - if (ptr->write_buffer_offset != 0) - { - WATCHPOINT_NUMBER(ptr->write_buffer_offset); - } - - assert(ptr->write_buffer_offset == 0); + if (key_length == 0) + return MEMCACHED_NO_KEY_PROVIDED; + + /* Leaving this WATCHPOINT_ASSERT in since only a library fubar could blow this */ +#ifdef NOT_DONE + if (!(ptr->flags & MEM_NO_BLOCK) && ptr->write_buffer_offset != 0) + WATCHPOINT_ASSERT(0); +#endif + if (ptr->hosts == NULL || ptr->number_of_hosts == 0) + return MEMCACHED_NO_SERVERS; + 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", storage_op_string(verb), - (int)key_length, key, flags, - (unsigned long long)expiration, value_length); + + if (cas) + write_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, + "%s %.*s %u %llu %zu\r\n", storage_op_string(verb), + (int)key_length, key, flags, + (unsigned long long)expiration, value_length); + else + write_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, + "%s %.*s %u %llu %zu %llu\r\n", storage_op_string(verb), + (int)key_length, key, flags, + (unsigned long long)expiration, value_length, + (unsigned long long)cas); + if (write_length >= MEMCACHED_DEFAULT_COMMAND_SIZE) { rc= MEMCACHED_WRITE_FAILURE; @@ -75,7 +112,12 @@ static memcached_return memcached_send(memcached_st *ptr, goto error; } - if ((sent_length= memcached_io_write(ptr, server_key, "\r\n", 2, 1)) == -1) + if ((ptr->flags & MEM_NO_BLOCK) && verb == SET_OP) + to_write= 0; + else + to_write= 1; + + if ((sent_length= memcached_io_write(ptr, server_key, "\r\n", 2, to_write)) == -1) { memcached_quit_server(ptr, server_key); rc= MEMCACHED_WRITE_FAILURE; @@ -91,7 +133,6 @@ static memcached_return memcached_send(memcached_st *ptr, { rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key); } - if (rc == MEMCACHED_STORED) return MEMCACHED_SUCCESS; else @@ -106,38 +147,77 @@ error: memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags) + uint16_t flags) { memcached_return rc; LIBMEMCACHED_MEMCACHED_SET_START(); rc= memcached_send(ptr, key, key_length, value, value_length, - expiration, flags, SET_OP); + expiration, flags, 0, SET_OP); LIBMEMCACHED_MEMCACHED_SET_END(); return rc; } -memcached_return memcached_add(memcached_st *ptr, char *key, size_t key_length, +memcached_return memcached_add(memcached_st *ptr, + char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags) + uint16_t flags) { memcached_return rc; LIBMEMCACHED_MEMCACHED_ADD_START(); rc= memcached_send(ptr, key, key_length, value, value_length, - expiration, flags, ADD_OP); + expiration, flags, 0, ADD_OP); LIBMEMCACHED_MEMCACHED_ADD_END(); return rc; } -memcached_return memcached_replace(memcached_st *ptr, char *key, size_t key_length, +memcached_return memcached_replace(memcached_st *ptr, + char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags) + uint16_t flags) { memcached_return rc; LIBMEMCACHED_MEMCACHED_REPLACE_START(); rc= memcached_send(ptr, key, key_length, value, value_length, - expiration, flags, REPLACE_OP); + expiration, flags, 0, REPLACE_OP); LIBMEMCACHED_MEMCACHED_REPLACE_END(); return rc; } + +memcached_return memcached_prepend(memcached_st *ptr, + char *key, size_t key_length, + char *value, size_t value_length, + time_t expiration, + uint16_t flags) +{ + memcached_return rc; + rc= memcached_send(ptr, key, key_length, value, value_length, + expiration, flags, 0, PREPEND_OP); + return rc; +} + +memcached_return memcached_append(memcached_st *ptr, + char *key, size_t key_length, + char *value, size_t value_length, + time_t expiration, + uint16_t flags) +{ + memcached_return rc; + rc= memcached_send(ptr, key, key_length, value, value_length, + expiration, flags, 0, APPEND_OP); + return rc; +} + +memcached_return memcached_cas(memcached_st *ptr, + char *key, size_t key_length, + char *value, size_t value_length, + time_t expiration, + uint16_t flags, + uint64_t cas) +{ + memcached_return rc; + rc= memcached_send(ptr, key, key_length, value, value_length, + expiration, flags, cas, APPEND_OP); + return rc; +}