X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fdelete.c;h=9db350c14c823eba203e16005cb4dff7844343fe;hb=a56e26d1e492bda3bf3c789a9391ae5b73f500cb;hp=3109c9e66677c45728df5d881c264c81582cbd65;hpb=9b767485048053ad0b4c2897a0d3784aa6e9fe10;p=m6w6%2Flibmemcached diff --git a/libmemcached/delete.c b/libmemcached/delete.c index 3109c9e6..9db350c1 100644 --- a/libmemcached/delete.c +++ b/libmemcached/delete.c @@ -1,5 +1,42 @@ -#include "common.h" -#include "memcached/protocol_binary.h" +/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: + * + * Libmemcached library + * + * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * Copyright (C) 2006-2009 Brian Aker All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * * The names of its contributors may not be used to endorse or + * promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include +#include memcached_return_t memcached_delete(memcached_st *ptr, const char *key, size_t key_length, time_t expiration) @@ -12,22 +49,26 @@ static inline memcached_return_t binary_delete(memcached_st *ptr, uint32_t server_key, const char *key, size_t key_length, - uint8_t flush); + bool flush); memcached_return_t memcached_delete_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, time_t expiration) { - uint8_t to_write; - size_t send_length; - memcached_return_t rc; + bool to_write; char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE]; uint32_t server_key; - memcached_server_instance_st *instance; + memcached_server_write_instance_st instance; LIBMEMCACHED_MEMCACHED_DELETE_START(); + memcached_return_t rc; + if ((rc= initialize_query(ptr)) != MEMCACHED_SUCCESS) + { + return rc; + } + rc= memcached_validate_key_length(key_length, ptr->flags.binary_protocol); unlikely (rc != MEMCACHED_SUCCESS) @@ -36,16 +77,16 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr, unlikely (memcached_server_count(ptr) == 0) return MEMCACHED_NO_SERVERS; - server_key= memcached_generate_hash(ptr, master_key, master_key_length); + server_key= memcached_generate_hash_with_redistribution(ptr, master_key, master_key_length); instance= memcached_server_instance_fetch(ptr, server_key); - to_write= (uint8_t)((ptr->flags.buffer_requests) ? 0 : 1); + to_write= (ptr->flags.buffer_requests) ? false : true; bool no_reply= (ptr->flags.no_reply); if (ptr->flags.binary_protocol) { - likely (!expiration) + likely (! expiration) { rc= binary_delete(ptr, server_key, key, key_length, to_write); } @@ -56,6 +97,8 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr, } else { + int send_length; + unlikely (expiration) { if ((instance->major_version == 1 && @@ -77,41 +120,41 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr, if (instance->minor_version == 0) { - if (no_reply || !to_write) + if (no_reply || ! to_write) { /* We might get out of sync with the server if we * send this command to a server newer than 1.2.x.. * disable no_reply and buffered mode. */ - to_write= 1; + to_write= true; if (no_reply) memcached_server_response_increment(instance); no_reply= false; } } - send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, - "delete %.*s%.*s %u%s\r\n", - (int)ptr->prefix_key_length, - ptr->prefix_key, - (int) key_length, key, - (uint32_t)expiration, - no_reply ? " noreply" :"" ); + send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, + "delete %.*s%.*s %u%s\r\n", + memcached_print_array(ptr->prefix_key), + (int) key_length, key, + (uint32_t)expiration, + no_reply ? " noreply" :"" ); } } else - send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, - "delete %.*s%.*s%s\r\n", - (int)ptr->prefix_key_length, - ptr->prefix_key, - (int)key_length, key, no_reply ? " noreply" :""); + { + send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, + "delete %.*s%.*s%s\r\n", + memcached_print_array(ptr->prefix_key), + (int)key_length, key, no_reply ? " noreply" :""); + } - if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE) + if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE || send_length < 0) { rc= MEMCACHED_WRITE_FAILURE; goto error; } - if (ptr->flags.use_udp && !to_write) + if (ptr->flags.use_udp && ! to_write) { if (send_length > MAX_UDP_DATAGRAM_LENGTH - UDP_DATAGRAM_HEADER_LENGTH) return MEMCACHED_WRITE_FAILURE; @@ -119,14 +162,16 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr, memcached_io_write(instance, NULL, 0, true); } - rc= memcached_do(instance, buffer, send_length, to_write); + rc= memcached_do(instance, buffer, (size_t)send_length, to_write); } if (rc != MEMCACHED_SUCCESS) goto error; - if (!to_write) + if (! to_write) + { rc= MEMCACHED_BUFFERED; + } else if (!no_reply) { rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL); @@ -146,9 +191,9 @@ static inline memcached_return_t binary_delete(memcached_st *ptr, uint32_t server_key, const char *key, size_t key_length, - uint8_t flush) + bool flush) { - memcached_server_instance_st *instance; + memcached_server_write_instance_st instance; protocol_binary_request_delete request= {.bytes= {0}}; instance= memcached_server_instance_fetch(ptr, server_key); @@ -158,11 +203,11 @@ static inline memcached_return_t binary_delete(memcached_st *ptr, request.message.header.request.opcode= PROTOCOL_BINARY_CMD_DELETEQ; else request.message.header.request.opcode= PROTOCOL_BINARY_CMD_DELETE; - 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.datatype= PROTOCOL_BINARY_RAW_BYTES; - request.message.header.request.bodylen= htonl((uint32_t) key_length); + request.message.header.request.bodylen= htonl((uint32_t)(key_length + memcached_array_size(ptr->prefix_key))); - if (ptr->flags.use_udp && !flush) + if (ptr->flags.use_udp && ! flush) { size_t cmd_size= sizeof(request.bytes) + key_length; if (cmd_size > MAX_UDP_DATAGRAM_LENGTH - UDP_DATAGRAM_HEADER_LENGTH) @@ -171,15 +216,19 @@ static inline memcached_return_t binary_delete(memcached_st *ptr, memcached_io_write(instance, NULL, 0, true); } + struct libmemcached_io_vector_st vector[]= + { + { .length= sizeof(request.bytes), .buffer= request.bytes}, + { .length= memcached_array_size(ptr->prefix_key), .buffer= memcached_array_string(ptr->prefix_key) }, + { .length= key_length, .buffer= key }, + }; + memcached_return_t rc= MEMCACHED_SUCCESS; - if ((memcached_do(instance, request.bytes, - sizeof(request.bytes), 0) != MEMCACHED_SUCCESS) || - (memcached_io_write(instance, key, - key_length, (bool) flush) == -1)) + if ((rc= memcached_vdo(instance, vector, 3, flush)) != MEMCACHED_SUCCESS) { memcached_io_reset(instance); - rc= MEMCACHED_WRITE_FAILURE; + rc= (rc == MEMCACHED_SUCCESS) ? MEMCACHED_WRITE_FAILURE : rc; } unlikely (ptr->number_of_replicas > 0) @@ -188,7 +237,7 @@ static inline memcached_return_t binary_delete(memcached_st *ptr, for (uint32_t x= 0; x < ptr->number_of_replicas; ++x) { - memcached_server_instance_st *replica; + memcached_server_write_instance_st replica; ++server_key; if (server_key == memcached_server_count(ptr)) @@ -196,9 +245,7 @@ static inline memcached_return_t binary_delete(memcached_st *ptr, replica= memcached_server_instance_fetch(ptr, server_key); - if ((memcached_do(replica, (const char*)request.bytes, - sizeof(request.bytes), 0) != MEMCACHED_SUCCESS) || - (memcached_io_write(replica, key, key_length, (bool) flush) == -1)) + if (memcached_vdo(replica, vector, 3, flush) != MEMCACHED_SUCCESS) { memcached_io_reset(replica); }