X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fdelete.cc;h=121ec91bf0e550bdf8c871c8cdc8452ff2ab6739;hb=9169cee9ec0f231b3117a0d5a7840d2067f29610;hp=9846bb51625d6a96dd77cfc655eff57dc3dd9ff5;hpb=aabc9fc24b965a3ac14bce9fd033aaba012c494b;p=m6w6%2Flibmemcached diff --git a/libmemcached/delete.cc b/libmemcached/delete.cc index 9846bb51..121ec91b 100644 --- a/libmemcached/delete.cc +++ b/libmemcached/delete.cc @@ -44,49 +44,33 @@ memcached_return_t memcached_delete(memcached_st *ptr, const char *key, size_t k return memcached_delete_by_key(ptr, key, key_length, key, key_length, expiration); } -static inline memcached_return_t ascii_delete(memcached_st *ptr, - memcached_server_write_instance_st instance, +static inline memcached_return_t ascii_delete(memcached_server_write_instance_st instance, uint32_t , const char *key, - size_t key_length, - bool& reply, - bool& flush) + const size_t key_length, + const bool reply, + const bool flush) { - struct libmemcached_io_vector_st vector[]= + libmemcached_io_vector_st vector[]= { + { NULL, 0 }, { memcached_literal_param("delete ") }, - { memcached_array_string(ptr->_namespace), memcached_array_size(ptr->_namespace) }, + { memcached_array_string(instance->root->_namespace), memcached_array_size(instance->root->_namespace) }, { key, key_length }, { " noreply", reply ? 0 : memcached_literal_param_size(" noreply") }, { memcached_literal_param("\r\n") } }; - if (memcached_is_udp(instance->root)) - { - size_t send_length= io_vector_total_size(vector, 5); - - if (send_length > MAX_UDP_DATAGRAM_LENGTH - UDP_DATAGRAM_HEADER_LENGTH) - { - return MEMCACHED_WRITE_FAILURE; - } - - if (send_length +instance->write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH) - { - memcached_io_write(instance, NULL, 0, true); - } - } - /* Send command header */ - return memcached_vdo(instance, vector, 5, flush); + return memcached_vdo(instance, vector, 6, flush); } -static inline memcached_return_t binary_delete(memcached_st *ptr, - memcached_server_write_instance_st instance, +static inline memcached_return_t binary_delete(memcached_server_write_instance_st instance, uint32_t server_key, const char *key, - size_t key_length, - bool& reply, - bool& flush) + const size_t key_length, + const bool reply, + const bool flush) { protocol_binary_request_delete request= {}; @@ -99,53 +83,41 @@ static inline memcached_return_t binary_delete(memcached_st *ptr, { request.message.header.request.opcode= PROTOCOL_BINARY_CMD_DELETEQ; } - request.message.header.request.keylen= htons((uint16_t)(key_length + memcached_array_size(ptr->_namespace))); + request.message.header.request.keylen= htons((uint16_t)(key_length + memcached_array_size(instance->root->_namespace))); request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES; - request.message.header.request.bodylen= htonl((uint32_t)(key_length + memcached_array_size(ptr->_namespace))); + request.message.header.request.bodylen= htonl((uint32_t)(key_length + memcached_array_size(instance->root->_namespace))); - if (ptr->flags.use_udp and flush == false) - { - size_t cmd_size= sizeof(request.bytes) + key_length; - if (cmd_size > MAX_UDP_DATAGRAM_LENGTH - UDP_DATAGRAM_HEADER_LENGTH) - { - return MEMCACHED_WRITE_FAILURE; - } - - if (cmd_size +instance->write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH) - { - memcached_io_write(instance, NULL, 0, true); - } - } - - struct libmemcached_io_vector_st vector[]= + libmemcached_io_vector_st vector[]= { + { NULL, 0 }, { request.bytes, sizeof(request.bytes) }, - { memcached_array_string(ptr->_namespace), memcached_array_size(ptr->_namespace) }, + { memcached_array_string(instance->root->_namespace), memcached_array_size(instance->root->_namespace) }, { key, key_length } }; memcached_return_t rc= MEMCACHED_SUCCESS; - if ((rc= memcached_vdo(instance, vector, 3, flush)) != MEMCACHED_SUCCESS) + if ((rc= memcached_vdo(instance, vector, 4, flush)) != MEMCACHED_SUCCESS) { memcached_io_reset(instance); } - if (ptr->number_of_replicas > 0) + if (instance->root->number_of_replicas > 0) { request.message.header.request.opcode= PROTOCOL_BINARY_CMD_DELETEQ; - for (uint32_t x= 0; x < ptr->number_of_replicas; ++x) + for (uint32_t x= 0; x < instance->root->number_of_replicas; ++x) { - memcached_server_write_instance_st replica; ++server_key; - if (server_key == memcached_server_count(ptr)) + if (server_key == memcached_server_count(instance->root)) + { server_key= 0; + } - replica= memcached_server_instance_fetch(ptr, server_key); + memcached_server_write_instance_st replica= memcached_server_instance_fetch(instance->root, server_key); - if (memcached_vdo(replica, vector, 3, flush) != MEMCACHED_SUCCESS) + if (memcached_vdo(replica, vector, 4, flush) != MEMCACHED_SUCCESS) { memcached_io_reset(replica); } @@ -167,7 +139,7 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr, LIBMEMCACHED_MEMCACHED_DELETE_START(); memcached_return_t rc; - if (memcached_failed(rc= initialize_query(ptr))) + if (memcached_failed(rc= initialize_query(ptr, true))) { return rc; } @@ -183,63 +155,63 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr, return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, memcached_literal_param("Memcached server version does not allow expiration of deleted items")); } + + uint32_t server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length); + memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, server_key); + bool buffering= memcached_is_buffering(instance->root); + bool reply= memcached_is_replying(instance->root); + // If a delete trigger exists, we need a response, so no buffering/noreply if (ptr->delete_trigger) { - if (ptr->flags.buffer_requests) + if (buffering) { return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, memcached_literal_param("Delete triggers cannot be used if buffering is enabled")); } - if (ptr->flags.no_reply) + if (reply == false) { return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, memcached_literal_param("Delete triggers cannot be used if MEMCACHED_BEHAVIOR_NOREPLY is set")); } } - - uint32_t server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length); - memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, server_key); - - bool to_write= (ptr->flags.buffer_requests) ? false : true; - - // Invert the logic to make it simpler to read the code - bool reply= (ptr->flags.no_reply) ? false : true; - - if (ptr->flags.binary_protocol) + if (memcached_is_binary(ptr)) { - rc= binary_delete(ptr, instance, server_key, key, key_length, reply, to_write); + rc= binary_delete(instance, server_key, key, key_length, reply, buffering ? false : true); } else { - rc= ascii_delete(ptr, instance, server_key, key, key_length, reply, to_write); + rc= ascii_delete(instance, server_key, key, key_length, reply, buffering ? false : true); } if (rc == MEMCACHED_SUCCESS) { - if (to_write == false) + if (buffering == true) { rc= MEMCACHED_BUFFERED; } - else if (reply) + else if (reply == false) + { + rc= MEMCACHED_SUCCESS; + } + else { char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE]; rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL); if (rc == MEMCACHED_DELETED) { rc= MEMCACHED_SUCCESS; + if (ptr->delete_trigger) + { + ptr->delete_trigger(ptr, key, key_length); + } } } - - if (rc == MEMCACHED_SUCCESS and ptr->delete_trigger) - { - ptr->delete_trigger(ptr, key, key_length); - } } LIBMEMCACHED_MEMCACHED_DELETE_END(); - return rc; + return memcached_set_error(*ptr, rc, MEMCACHED_AT ); }