X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_auto.c;h=207c4e518b63c16c170ebddac84049383eb03160;hb=a7a011c2ea4a63368b3a96a332da00820ed402cb;hp=176cbcc908e3c3179beb73e2845d773662210891;hpb=17715ceb4fae0acb43811fa8ec17e0e788c44931;p=m6w6%2Flibmemcached diff --git a/libmemcached/memcached_auto.c b/libmemcached/memcached_auto.c index 176cbcc9..207c4e51 100644 --- a/libmemcached/memcached_auto.c +++ b/libmemcached/memcached_auto.c @@ -1,9 +1,10 @@ #include "common.h" -static memcached_return memcached_auto(memcached_st *ptr, +static memcached_return memcached_auto(memcached_st *ptr, const char *verb, + const char *master_key, size_t master_key_length, const char *key, size_t key_length, - unsigned int offset, + uint64_t offset, uint64_t *value) { size_t send_length; @@ -18,10 +19,10 @@ static memcached_return memcached_auto(memcached_st *ptr, if ((ptr->flags & MEM_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, key, key_length); + server_key= memcached_generate_hash(ptr, master_key, master_key_length); - send_length= (size_t)snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, - "%s %s%.*s %u%s\r\n", verb, + 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" : ""); @@ -34,10 +35,10 @@ static memcached_return memcached_auto(memcached_st *ptr, rc= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL); - /* + /* So why recheck responce? Because the protocol is brain dead :) - The number returned might end up equaling one of the string - values. Less chance of a mistake with strncmp() so we will + The number returned might end up equaling one of the string + values. Less chance of a mistake with strncmp() so we will use it. We still called memcached_response() though since it worked its magic for non-blocking IO. */ @@ -61,10 +62,11 @@ static memcached_return memcached_auto(memcached_st *ptr, } static memcached_return binary_incr_decr(memcached_st *ptr, uint8_t cmd, + const char *master_key, size_t master_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, - time_t expiration, - uint64_t *value) + uint32_t expiration, + uint64_t *value) { unsigned int server_key; bool no_reply= (ptr->flags & MEM_NOREPLY); @@ -72,7 +74,7 @@ static memcached_return binary_incr_decr(memcached_st *ptr, uint8_t cmd, unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0) return MEMCACHED_NO_SERVERS; - server_key= memcached_generate_hash(ptr, key, key_length); + server_key= memcached_generate_hash(ptr, master_key, master_key_length); if (no_reply) { @@ -85,17 +87,17 @@ static memcached_return 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(key_length); + request.message.header.request.keylen= htons((uint16_t) key_length); request.message.header.request.extlen= 20; request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES; - request.message.header.request.bodylen= htonl(key_length + request.message.header.request.extlen); + request.message.header.request.bodylen= htonl((uint32_t) (key_length + request.message.header.request.extlen)); request.message.body.delta= htonll(offset); request.message.body.initial= htonll(initial); - request.message.body.expiration= htonl(expiration); + request.message.body.expiration= htonl((uint32_t) expiration); if ((memcached_do(&ptr->hosts[server_key], request.bytes, sizeof(request.bytes), 0)!=MEMCACHED_SUCCESS) || - (memcached_io_write(&ptr->hosts[server_key], key, key_length, 1) == -1)) + (memcached_io_write(&ptr->hosts[server_key], key, key_length, 1) == -1)) { memcached_io_reset(&ptr->hosts[server_key]); return MEMCACHED_WRITE_FAILURE; @@ -106,45 +108,65 @@ static memcached_return binary_incr_decr(memcached_st *ptr, uint8_t cmd, return memcached_response(&ptr->hosts[server_key], (char*)value, sizeof(*value), NULL); } -memcached_return memcached_increment(memcached_st *ptr, +memcached_return memcached_increment(memcached_st *ptr, const char *key, size_t key_length, uint32_t offset, uint64_t *value) +{ + return memcached_increment_by_key(ptr, key, key_length, key, key_length, offset, value); +} + +memcached_return memcached_decrement(memcached_st *ptr, + const char *key, size_t key_length, + uint32_t offset, + uint64_t *value) +{ + return memcached_decrement_by_key(ptr, key, key_length, key, key_length, offset, value); +} + +memcached_return memcached_increment_by_key(memcached_st *ptr, + const char *master_key, size_t master_key_length, + const char *key, size_t key_length, + uint64_t offset, + uint64_t *value) { memcached_return rc= memcached_validate_key_length(key_length, ptr->flags & MEM_BINARY_PROTOCOL); unlikely (rc != MEMCACHED_SUCCESS) return rc; LIBMEMCACHED_MEMCACHED_INCREMENT_START(); - if (ptr->flags & MEM_BINARY_PROTOCOL) - rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_INCREMENT, key, key_length, + if (ptr->flags & MEM_BINARY_PROTOCOL) + rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_INCREMENT, + master_key, master_key_length, key, key_length, (uint64_t)offset, 0, MEMCACHED_EXPIRATION_NOT_ADD, value); - else - rc= memcached_auto(ptr, "incr", key, key_length, offset, value); - + else + rc= memcached_auto(ptr, "incr", master_key, master_key_length, key, key_length, offset, value); + LIBMEMCACHED_MEMCACHED_INCREMENT_END(); return rc; } -memcached_return memcached_decrement(memcached_st *ptr, - const char *key, size_t key_length, - uint32_t offset, - uint64_t *value) +memcached_return memcached_decrement_by_key(memcached_st *ptr, + const char *master_key, size_t master_key_length, + const char *key, size_t key_length, + uint64_t offset, + uint64_t *value) { memcached_return rc= memcached_validate_key_length(key_length, ptr->flags & MEM_BINARY_PROTOCOL); unlikely (rc != MEMCACHED_SUCCESS) return rc; LIBMEMCACHED_MEMCACHED_DECREMENT_START(); - if (ptr->flags & MEM_BINARY_PROTOCOL) - rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_DECREMENT, key, key_length, + if (ptr->flags & MEM_BINARY_PROTOCOL) + rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_DECREMENT, + master_key, master_key_length, key, key_length, (uint64_t)offset, 0, MEMCACHED_EXPIRATION_NOT_ADD, value); - else - rc= memcached_auto(ptr, "decr", key, key_length, offset, value); - + else + rc= memcached_auto(ptr, "decr", master_key, master_key_length, key, key_length, offset, value); + LIBMEMCACHED_MEMCACHED_DECREMENT_END(); return rc; @@ -157,6 +179,21 @@ memcached_return memcached_increment_with_initial(memcached_st *ptr, uint64_t initial, time_t expiration, uint64_t *value) +{ + return memcached_increment_with_initial_by_key(ptr, key, key_length, + key, key_length, + offset, initial, expiration, value); +} + +memcached_return memcached_increment_with_initial_by_key(memcached_st *ptr, + const char *master_key, + size_t master_key_length, + const char *key, + size_t key_length, + uint64_t offset, + uint64_t initial, + time_t expiration, + uint64_t *value) { memcached_return rc= memcached_validate_key_length(key_length, ptr->flags & MEM_BINARY_PROTOCOL); unlikely (rc != MEMCACHED_SUCCESS) @@ -164,8 +201,10 @@ memcached_return memcached_increment_with_initial(memcached_st *ptr, LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_START(); if (ptr->flags & MEM_BINARY_PROTOCOL) - rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_INCREMENT, key, - key_length, offset, initial, expiration, value); + rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_INCREMENT, + master_key, master_key_length, key, key_length, + offset, initial, (uint32_t)expiration, + value); else rc= MEMCACHED_PROTOCOL_ERROR; @@ -181,19 +220,37 @@ memcached_return memcached_decrement_with_initial(memcached_st *ptr, uint64_t initial, time_t expiration, uint64_t *value) +{ + return memcached_decrement_with_initial_by_key(ptr, key, key_length, + key, key_length, + offset, initial, expiration, value); +} + +memcached_return memcached_decrement_with_initial_by_key(memcached_st *ptr, + const char *master_key, + size_t master_key_length, + const char *key, + size_t key_length, + uint64_t offset, + uint64_t initial, + time_t expiration, + uint64_t *value) { memcached_return rc= memcached_validate_key_length(key_length, ptr->flags & MEM_BINARY_PROTOCOL); unlikely (rc != MEMCACHED_SUCCESS) return rc; - LIBMEMCACHED_MEMCACHED_DECREMENT_WITH_INITIAL_START(); + LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_START(); if (ptr->flags & MEM_BINARY_PROTOCOL) - rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_DECREMENT, key, - key_length, offset, initial, expiration, value); + rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_DECREMENT, + master_key, master_key_length, key, key_length, + offset, initial, (uint32_t)expiration, + value); else rc= MEMCACHED_PROTOCOL_ERROR; - LIBMEMCACHED_MEMCACHED_DECREMENT_WITH_INITIAL_END(); + LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_END(); return rc; } +