X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_storage.c;h=93bc140ae2175341c56c446935f5fa4a2420cee3;hb=1af835409ff66c8a2860d2d95aa72d7a7a817358;hp=0f6daa4ec1fa2b5568ad762730c25ef8b1867ef8;hpb=acfe9c2d6b22bf010e4a81d81430830ab1763829;p=awesomized%2Flibmemcached diff --git a/libmemcached/memcached_storage.c b/libmemcached/memcached_storage.c index 0f6daa4e..93bc140a 100644 --- a/libmemcached/memcached_storage.c +++ b/libmemcached/memcached_storage.c @@ -6,7 +6,6 @@ memcached_add() */ - #include "common.h" #include "memcached_io.h" @@ -36,15 +35,27 @@ static char *storage_op_string(memcached_storage_action verb) return "append"; case CAS_OP: return "cas"; + default: + return "tosserror"; /* This is impossible, fixes issue for compiler warning in VisualStudio */ }; return SET_OP; } +static memcached_return memcached_send_binary(memcached_server_st* server, + const char *key, + size_t key_length, + const char *value, + size_t value_length, + time_t expiration, + uint32_t flags, + uint64_t cas, + memcached_storage_action verb); + static inline memcached_return memcached_send(memcached_st *ptr, - char *master_key, size_t master_key_length, - char *key, size_t key_length, - char *value, size_t value_length, + const char *master_key, size_t master_key_length, + const char *key, size_t key_length, + const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas, @@ -58,7 +69,6 @@ static inline memcached_return memcached_send(memcached_st *ptr, unsigned int server_key; WATCHPOINT_ASSERT(!(value == NULL && value_length > 0)); - WATCHPOINT_ASSERT(!(value && value_length == 0)); unlikely (key_length == 0) return MEMCACHED_NO_KEY_PROVIDED; @@ -66,20 +76,27 @@ static inline memcached_return memcached_send(memcached_st *ptr, unlikely (ptr->number_of_hosts == 0) return MEMCACHED_NO_SERVERS; - if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test(&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)) + if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)) return MEMCACHED_BAD_KEY_PROVIDED; server_key= memcached_generate_hash(ptr, master_key, master_key_length); + if (ptr->flags & MEM_BINARY_PROTOCOL) + return memcached_send_binary(&ptr->hosts[server_key], key, key_length, + value, value_length, expiration, + flags, cas, verb); + if (cas) write_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, - "%s %.*s %u %llu %zu %llu\r\n", storage_op_string(verb), + "%s %s%.*s %u %llu %zu %llu\r\n", storage_op_string(verb), + ptr->prefix_key, (int)key_length, key, flags, (unsigned long long)expiration, value_length, (unsigned long long)cas); else write_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, - "%s %.*s %u %llu %zu\r\n", storage_op_string(verb), + "%s %s%.*s %u %llu %zu\r\n", storage_op_string(verb), + ptr->prefix_key, (int)key_length, key, flags, (unsigned long long)expiration, value_length); @@ -126,8 +143,9 @@ error: return rc; } -memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length, - char *value, size_t value_length, + +memcached_return memcached_set(memcached_st *ptr, const char *key, size_t key_length, + const char *value, size_t value_length, time_t expiration, uint32_t flags) { @@ -141,8 +159,8 @@ memcached_return memcached_set(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, + const char *key, size_t key_length, + const char *value, size_t value_length, time_t expiration, uint32_t flags) { @@ -156,8 +174,8 @@ memcached_return memcached_add(memcached_st *ptr, } memcached_return memcached_replace(memcached_st *ptr, - char *key, size_t key_length, - char *value, size_t value_length, + const char *key, size_t key_length, + const char *value, size_t value_length, time_t expiration, uint32_t flags) { @@ -171,8 +189,8 @@ memcached_return memcached_replace(memcached_st *ptr, } memcached_return memcached_prepend(memcached_st *ptr, - char *key, size_t key_length, - char *value, size_t value_length, + const char *key, size_t key_length, + const char *value, size_t value_length, time_t expiration, uint32_t flags) { @@ -184,8 +202,8 @@ memcached_return memcached_prepend(memcached_st *ptr, } memcached_return memcached_append(memcached_st *ptr, - char *key, size_t key_length, - char *value, size_t value_length, + const char *key, size_t key_length, + const char *value, size_t value_length, time_t expiration, uint32_t flags) { @@ -197,8 +215,8 @@ memcached_return memcached_append(memcached_st *ptr, } memcached_return memcached_cas(memcached_st *ptr, - char *key, size_t key_length, - char *value, size_t value_length, + const char *key, size_t key_length, + const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas) @@ -211,15 +229,16 @@ memcached_return memcached_cas(memcached_st *ptr, } memcached_return memcached_set_by_key(memcached_st *ptr, - char *master_key, size_t master_key_length, - char *key, size_t key_length, - char *value, size_t value_length, + const char *master_key __attribute__((unused)), + size_t master_key_length __attribute__((unused)), + const char *key, size_t key_length, + const char *value, size_t value_length, time_t expiration, uint32_t flags) { memcached_return rc; LIBMEMCACHED_MEMCACHED_SET_START(); - rc= memcached_send(ptr, key, key_length, + rc= memcached_send(ptr, master_key, master_key_length, key, key_length, value, value_length, expiration, flags, 0, SET_OP); LIBMEMCACHED_MEMCACHED_SET_END(); @@ -227,15 +246,15 @@ memcached_return memcached_set_by_key(memcached_st *ptr, } memcached_return memcached_add_by_key(memcached_st *ptr, - char *master_key, size_t master_key_length, - char *key, size_t key_length, - char *value, size_t value_length, + const char *master_key, size_t master_key_length, + const char *key, size_t key_length, + const char *value, size_t value_length, time_t expiration, uint32_t flags) { memcached_return rc; LIBMEMCACHED_MEMCACHED_ADD_START(); - rc= memcached_send(ptr, key, key_length, + rc= memcached_send(ptr, master_key, master_key_length, key, key_length, value, value_length, expiration, flags, 0, ADD_OP); LIBMEMCACHED_MEMCACHED_ADD_END(); @@ -243,15 +262,15 @@ memcached_return memcached_add_by_key(memcached_st *ptr, } memcached_return memcached_replace_by_key(memcached_st *ptr, - char *master_key, size_t master_key_length, - char *key, size_t key_length, - char *value, size_t value_length, + const char *master_key, size_t master_key_length, + const char *key, size_t key_length, + const char *value, size_t value_length, time_t expiration, uint32_t flags) { memcached_return rc; LIBMEMCACHED_MEMCACHED_REPLACE_START(); - rc= memcached_send(ptr, key, key_length, + rc= memcached_send(ptr, master_key, master_key_length, key, key_length, value, value_length, expiration, flags, 0, REPLACE_OP); LIBMEMCACHED_MEMCACHED_REPLACE_END(); @@ -259,37 +278,37 @@ memcached_return memcached_replace_by_key(memcached_st *ptr, } memcached_return memcached_prepend_by_key(memcached_st *ptr, - char *master_key, size_t master_key_length, - char *key, size_t key_length, - char *value, size_t value_length, + const char *master_key, size_t master_key_length, + const char *key, size_t key_length, + const char *value, size_t value_length, time_t expiration, uint32_t flags) { memcached_return rc; - rc= memcached_send(ptr, key, key_length, + rc= memcached_send(ptr, master_key, master_key_length, key, key_length, value, value_length, expiration, flags, 0, PREPEND_OP); return rc; } memcached_return memcached_append_by_key(memcached_st *ptr, - char *master_key, size_t master_key_length, - char *key, size_t key_length, - char *value, size_t value_length, + const char *master_key, size_t master_key_length, + const char *key, size_t key_length, + const char *value, size_t value_length, time_t expiration, uint32_t flags) { memcached_return rc; - rc= memcached_send(ptr, key, key_length, + rc= memcached_send(ptr, master_key, master_key_length, key, key_length, value, value_length, expiration, flags, 0, APPEND_OP); return rc; } memcached_return memcached_cas_by_key(memcached_st *ptr, - char *master_key, size_t master_key_length, - char *key, size_t key_length, - char *value, size_t value_length, + const char *master_key, size_t master_key_length, + const char *key, size_t key_length, + const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas) @@ -300,3 +319,74 @@ memcached_return memcached_cas_by_key(memcached_st *ptr, expiration, flags, cas, CAS_OP); return rc; } + +static memcached_return memcached_send_binary(memcached_server_st* server, + const char *key, + size_t key_length, + const char *value, + size_t value_length, + time_t expiration, + uint32_t flags, + uint64_t cas, + memcached_storage_action verb) +{ + char flush; + protocol_binary_request_set request= {.bytes= {0}}; + size_t send_length= sizeof(request.bytes); + + request.message.header.request.magic= PROTOCOL_BINARY_REQ; + switch (verb) + { + case SET_OP: + request.message.header.request.opcode= PROTOCOL_BINARY_CMD_SET; + break; + case ADD_OP: + request.message.header.request.opcode= PROTOCOL_BINARY_CMD_ADD; + break; + case REPLACE_OP: + request.message.header.request.opcode= PROTOCOL_BINARY_CMD_REPLACE; + break; + case APPEND_OP: + request.message.header.request.opcode= PROTOCOL_BINARY_CMD_APPEND; + break; + case PREPEND_OP: + request.message.header.request.opcode= PROTOCOL_BINARY_CMD_PREPEND; + break; + case CAS_OP: + request.message.header.request.opcode= PROTOCOL_BINARY_CMD_REPLACE; + break; + } + + request.message.header.request.keylen= htons((uint16_t)key_length); + request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES; + if (verb == APPEND_OP || verb == PREPEND_OP) + send_length -= 8; /* append & prepend does not contain extras! */ + else + { + request.message.header.request.extlen= 8; + request.message.body.flags= htonl(flags); + request.message.body.expiration= htonl((uint32_t)expiration); + } + + request.message.header.request.bodylen= htonl(key_length + value_length + + request.message.header.request.extlen); + + if (cas) + request.message.header.request.cas= htonll(cas); + + flush= ((server->root->flags & MEM_BUFFER_REQUESTS) && verb == SET_OP) ? 0 : 1; + /* write the header */ + if ((memcached_do(server, (const char*)request.bytes, send_length, 0) != MEMCACHED_SUCCESS) || + (memcached_io_write(server, key, key_length, 0) == -1) || + (memcached_io_write(server, value, value_length, flush) == -1)) + { + memcached_io_reset(server); + return MEMCACHED_WRITE_FAILURE; + } + + if (flush == 0) + return MEMCACHED_BUFFERED; + + return memcached_response(server, NULL, 0, NULL); +} +