X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fauto.c;h=325ddb6b7d49721b1b34d4d955557045097a0ad7;hb=f7936c06de41de0df9d561e4576d217595b0c5a4;hp=017f7f395571ba6e48c2575f9e01788bd7b23db8;hpb=14fbb41f4a761f96a047c36f9eaae33e6b57d21f;p=awesomized%2Flibmemcached diff --git a/libmemcached/auto.c b/libmemcached/auto.c index 017f7f39..325ddb6b 100644 --- a/libmemcached/auto.c +++ b/libmemcached/auto.c @@ -9,40 +9,40 @@ * */ -#include "common.h" +#include "libmemcached/common.h" -static memcached_return_t memcached_auto(memcached_st *ptr, +static memcached_return_t text_incr_decr(memcached_st *ptr, const char *verb, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t *value) { - size_t send_length; memcached_return_t rc; char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE]; uint32_t server_key; - memcached_server_instance_st *instance; + memcached_server_write_instance_st instance; bool no_reply= ptr->flags.no_reply; - unlikely (memcached_server_count(ptr) == 0) - return MEMCACHED_NO_SERVERS; + if (memcached_server_count(ptr) == 0) + return memcached_set_error(ptr, MEMCACHED_NO_SERVERS, NULL); if (ptr->flags.verify_key && (memcached_key_test((const 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); + server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length); instance= memcached_server_instance_fetch(ptr, server_key); - send_length= (size_t)snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, - "%s %s%.*s %" PRIu64 "%s\r\n", verb, - ptr->prefix_key, - (int)key_length, key, - offset, no_reply ? " noreply" : ""); - unlikely (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE) + int send_length; + send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, + "%s %.*s%.*s %" PRIu64 "%s\r\n", verb, + memcached_print_array(ptr->prefix_key), + (int)key_length, key, + offset, no_reply ? " noreply" : ""); + if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE || send_length < 0) return MEMCACHED_WRITE_FAILURE; - rc= memcached_do(instance, buffer, send_length, 1); + rc= memcached_do(instance, buffer, (size_t)send_length, true); if (no_reply || rc != MEMCACHED_SUCCESS) return rc; @@ -55,7 +55,12 @@ static memcached_return_t memcached_auto(memcached_st *ptr, use it. We still called memcached_response() though since it worked its magic for non-blocking IO. */ - if (!strncmp(buffer, "ERROR\r\n", 7)) + if (! strncmp(buffer, "ERROR\r\n", 7)) + { + *value= 0; + rc= MEMCACHED_PROTOCOL_ERROR; + } + else if (! strncmp(buffer, "CLIENT_ERROR\r\n", 14)) { *value= 0; rc= MEMCACHED_PROTOCOL_ERROR; @@ -75,20 +80,20 @@ static memcached_return_t memcached_auto(memcached_st *ptr, } static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, uint32_t expiration, uint64_t *value) { uint32_t server_key; - memcached_server_instance_st *instance; + memcached_server_write_instance_st instance; bool no_reply= ptr->flags.no_reply; - unlikely (memcached_server_count(ptr) == 0) - return MEMCACHED_NO_SERVERS; + if (memcached_server_count(ptr) == 0) + return memcached_set_error(ptr, MEMCACHED_NO_SERVERS, NULL); - server_key= memcached_generate_hash(ptr, master_key, master_key_length); + server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length); instance= memcached_server_instance_fetch(ptr, server_key); if (no_reply) @@ -102,20 +107,26 @@ static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd, request.message.header.request.magic= PROTOCOL_BINARY_REQ; request.message.header.request.opcode= cmd; - request.message.header.request.keylen= htons((uint16_t) key_length); + request.message.header.request.keylen= htons((uint16_t)(key_length + memcached_array_size(ptr->prefix_key))); request.message.header.request.extlen= 20; request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES; - request.message.header.request.bodylen= htonl((uint32_t) (key_length + request.message.header.request.extlen)); + request.message.header.request.bodylen= htonl((uint32_t)(key_length + memcached_array_size(ptr->prefix_key) +request.message.header.request.extlen)); request.message.body.delta= htonll(offset); request.message.body.initial= htonll(initial); request.message.body.expiration= htonl((uint32_t) expiration); - if ((memcached_do(instance, request.bytes, - sizeof(request.bytes), 0)!=MEMCACHED_SUCCESS) || - (memcached_io_write(instance, key, key_length, 1) == -1)) + struct libmemcached_io_vector_st vector[]= + { + { .length= sizeof(request.bytes), .buffer= request.bytes }, + { .length= memcached_array_size(ptr->prefix_key), .buffer= ptr->prefix_key }, + { .length= key_length, .buffer= key } + }; + + memcached_return_t rc; + if ((rc= memcached_vdo(instance, vector, 3, true)) != MEMCACHED_SUCCESS) { memcached_io_reset(instance); - return MEMCACHED_WRITE_FAILURE; + return (rc == MEMCACHED_SUCCESS) ? MEMCACHED_WRITE_FAILURE : rc; } if (no_reply) @@ -128,6 +139,10 @@ memcached_return_t memcached_increment(memcached_st *ptr, uint32_t offset, uint64_t *value) { + uint64_t local_value; + if (! value) + value= &local_value; + return memcached_increment_by_key(ptr, key, key_length, key, key_length, offset, value); } @@ -136,11 +151,15 @@ memcached_return_t memcached_decrement(memcached_st *ptr, uint32_t offset, uint64_t *value) { + uint64_t local_value; + if (! value) + value= &local_value; + return memcached_decrement_by_key(ptr, key, key_length, key, key_length, offset, value); } memcached_return_t memcached_increment_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t *value) @@ -149,17 +168,21 @@ memcached_return_t memcached_increment_by_key(memcached_st *ptr, unlikely (rc != MEMCACHED_SUCCESS) return rc; + uint64_t local_value; + if (! value) + value= &local_value; + LIBMEMCACHED_MEMCACHED_INCREMENT_START(); if (ptr->flags.binary_protocol) { rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_INCREMENT, - master_key, master_key_length, key, key_length, + group_key, group_key_length, key, key_length, (uint64_t)offset, 0, MEMCACHED_EXPIRATION_NOT_ADD, value); } else { - rc= memcached_auto(ptr, "incr", master_key, master_key_length, key, key_length, offset, value); + rc= text_incr_decr(ptr, "incr", group_key, group_key_length, key, key_length, offset, value); } LIBMEMCACHED_MEMCACHED_INCREMENT_END(); @@ -168,7 +191,7 @@ memcached_return_t memcached_increment_by_key(memcached_st *ptr, } memcached_return_t memcached_decrement_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t *value) @@ -177,14 +200,22 @@ memcached_return_t memcached_decrement_by_key(memcached_st *ptr, unlikely (rc != MEMCACHED_SUCCESS) return rc; + uint64_t local_value; + if (! value) + value= &local_value; + LIBMEMCACHED_MEMCACHED_DECREMENT_START(); if (ptr->flags.binary_protocol) + { rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_DECREMENT, - master_key, master_key_length, key, key_length, + group_key, group_key_length, key, key_length, (uint64_t)offset, 0, MEMCACHED_EXPIRATION_NOT_ADD, value); + } else - rc= memcached_auto(ptr, "decr", master_key, master_key_length, key, key_length, offset, value); + { + rc= text_incr_decr(ptr, "decr", group_key, group_key_length, key, key_length, offset, value); + } LIBMEMCACHED_MEMCACHED_DECREMENT_END(); @@ -199,14 +230,18 @@ memcached_return_t memcached_increment_with_initial(memcached_st *ptr, time_t expiration, uint64_t *value) { + uint64_t local_value; + if (! value) + value= &local_value; + return memcached_increment_with_initial_by_key(ptr, key, key_length, key, key_length, offset, initial, expiration, value); } memcached_return_t memcached_increment_with_initial_by_key(memcached_st *ptr, - const char *master_key, - size_t master_key_length, + const char *group_key, + size_t group_key_length, const char *key, size_t key_length, uint64_t offset, @@ -218,10 +253,14 @@ memcached_return_t memcached_increment_with_initial_by_key(memcached_st *ptr, unlikely (rc != MEMCACHED_SUCCESS) return rc; + uint64_t local_value; + if (! value) + value= &local_value; + LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_START(); if (ptr->flags.binary_protocol) rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_INCREMENT, - master_key, master_key_length, key, key_length, + group_key, group_key_length, key, key_length, offset, initial, (uint32_t)expiration, value); else @@ -240,14 +279,18 @@ memcached_return_t memcached_decrement_with_initial(memcached_st *ptr, time_t expiration, uint64_t *value) { + uint64_t local_value; + if (! value) + value= &local_value; + return memcached_decrement_with_initial_by_key(ptr, key, key_length, key, key_length, offset, initial, expiration, value); } memcached_return_t memcached_decrement_with_initial_by_key(memcached_st *ptr, - const char *master_key, - size_t master_key_length, + const char *group_key, + size_t group_key_length, const char *key, size_t key_length, uint64_t offset, @@ -259,11 +302,15 @@ memcached_return_t memcached_decrement_with_initial_by_key(memcached_st *ptr, unlikely (rc != MEMCACHED_SUCCESS) return rc; + uint64_t local_value; + if (! value) + value= &local_value; + LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_START(); if (ptr->flags.binary_protocol) { rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_DECREMENT, - master_key, master_key_length, key, key_length, + group_key, group_key_length, key, key_length, offset, initial, (uint32_t)expiration, value); }