X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fdelete.c;h=70553d94e651112b217fea5cf535b18b0ebc17ab;hb=7202efa0916ab09b135ad93083e63ed01c854330;hp=8250d58e0d21c210ce14efa136b4c60365b3cd2f;hpb=474deb0826ebcd7b748e15dd7f0fc6da0f64cd89;p=m6w6%2Flibmemcached diff --git a/libmemcached/delete.c b/libmemcached/delete.c index 8250d58e..70553d94 100644 --- a/libmemcached/delete.c +++ b/libmemcached/delete.c @@ -9,21 +9,22 @@ memcached_return_t memcached_delete(memcached_st *ptr, const char *key, size_t k } static inline memcached_return_t binary_delete(memcached_st *ptr, - unsigned int server_key, + 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; + bool to_write; size_t send_length; memcached_return_t rc; char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE]; - unsigned int server_key; + uint32_t server_key; + memcached_server_write_instance_st instance; LIBMEMCACHED_MEMCACHED_DELETE_START(); @@ -32,27 +33,34 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr, unlikely (rc != MEMCACHED_SUCCESS) return rc; - unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0) + unlikely (memcached_server_count(ptr) == 0) return MEMCACHED_NO_SERVERS; - server_key= memcached_generate_hash(ptr, master_key, master_key_length); - to_write= (uint8_t)((ptr->flags.buffer_requests) ? 0 : 1); + server_key= memcached_generate_hash_with_redistribution(ptr, master_key, master_key_length); + instance= memcached_server_instance_fetch(ptr, server_key); + + 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); + } else + { rc= MEMCACHED_INVALID_ARGUMENTS; + } } else { unlikely (expiration) { - if ((ptr->hosts[server_key].major_version == 1 && - ptr->hosts[server_key].minor_version > 2) || - ptr->hosts[server_key].major_version > 1) + if ((instance->major_version == 1 && + instance->minor_version > 2) || + instance->major_version > 1) { rc= MEMCACHED_INVALID_ARGUMENTS; goto error; @@ -61,28 +69,29 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr, { /* ensure that we are connected, otherwise we might bump the * command counter before connection */ - if ((rc= memcached_connect(&ptr->hosts[server_key])) != MEMCACHED_SUCCESS) + if ((rc= memcached_connect(instance)) != MEMCACHED_SUCCESS) { WATCHPOINT_ERROR(rc); return rc; } - if (ptr->hosts[server_key].minor_version == 0) + 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(&ptr->hosts[server_key]); + 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", + "delete %.*s%.*s %u%s\r\n", + (int)ptr->prefix_key_length, ptr->prefix_key, (int) key_length, key, (uint32_t)expiration, @@ -90,10 +99,13 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr, } } else - send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, - "delete %s%.*s%s\r\n", - ptr->prefix_key, - (int)key_length, key, no_reply ? " noreply" :""); + { + 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" :""); + } if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE) { @@ -101,25 +113,27 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr, 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; - if (send_length + ptr->hosts[server_key].write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH) - memcached_io_write(&ptr->hosts[server_key], NULL, 0, 1); + if (send_length + instance->write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH) + memcached_io_write(instance, NULL, 0, true); } - rc= memcached_do(&ptr->hosts[server_key], buffer, send_length, to_write); + rc= memcached_do(instance, buffer, 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(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL); + rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL); if (rc == MEMCACHED_DELETED) rc= MEMCACHED_SUCCESS; } @@ -133,40 +147,47 @@ error: } static inline memcached_return_t binary_delete(memcached_st *ptr, - unsigned int server_key, + uint32_t server_key, const char *key, size_t key_length, - uint8_t flush) + bool flush) { + memcached_server_write_instance_st instance; protocol_binary_request_delete request= {.bytes= {0}}; + instance= memcached_server_instance_fetch(ptr, server_key); + request.message.header.request.magic= PROTOCOL_BINARY_REQ; if (ptr->flags.no_reply) 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 + ptr->prefix_key_length)); 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 + ptr->prefix_key_length)); - 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) return MEMCACHED_WRITE_FAILURE; - if (cmd_size + ptr->hosts[server_key].write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH) - memcached_io_write(&ptr->hosts[server_key], NULL, 0, 1); + if (cmd_size + instance->write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH) + memcached_io_write(instance, NULL, 0, true); } + struct __write_vector_st vector[]= + { + { .length= sizeof(request.bytes), .buffer= request.bytes}, + { .length= ptr->prefix_key_length, .buffer= ptr->prefix_key }, + { .length= key_length, .buffer= key }, + }; + memcached_return_t rc= MEMCACHED_SUCCESS; - 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, (char) flush) == -1)) + if ((rc= memcached_vdo(instance, vector, 3, flush)) != MEMCACHED_SUCCESS) { - memcached_io_reset(&ptr->hosts[server_key]); - rc= MEMCACHED_WRITE_FAILURE; + memcached_io_reset(instance); + rc= (rc == MEMCACHED_SUCCESS) ? MEMCACHED_WRITE_FAILURE : rc; } unlikely (ptr->number_of_replicas > 0) @@ -175,17 +196,22 @@ static inline memcached_return_t binary_delete(memcached_st *ptr, for (uint32_t x= 0; x < ptr->number_of_replicas; ++x) { + memcached_server_write_instance_st replica; + ++server_key; - if (server_key == ptr->number_of_hosts) + if (server_key == memcached_server_count(ptr)) server_key= 0; - memcached_server_st* server= &ptr->hosts[server_key]; - if ((memcached_do(server, (const char*)request.bytes, - sizeof(request.bytes), 0) != MEMCACHED_SUCCESS) || - (memcached_io_write(server, key, key_length, (char) flush) == -1)) - memcached_io_reset(server); + replica= memcached_server_instance_fetch(ptr, server_key); + + if (memcached_vdo(replica, vector, 3, flush) != MEMCACHED_SUCCESS) + { + memcached_io_reset(replica); + } else - memcached_server_response_decrement(server); + { + memcached_server_response_decrement(replica); + } } }