LIBMEMCACHED_MEMCACHED_DELETE_START();
- unlikely (key_length == 0)
- return MEMCACHED_NO_KEY_PROVIDED;
+ rc= memcached_validate_key_length(key_length,
+ ptr->flags & MEM_BINARY_PROTOCOL);
+ unlikely (rc != MEMCACHED_SUCCESS)
+ return rc;
unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
server_key= memcached_generate_hash(ptr, master_key, master_key_length);
to_write= (ptr->flags & MEM_BUFFER_REQUESTS) ? 0 : 1;
+ bool no_reply= (ptr->flags & MEM_NOREPLY);
if (ptr->flags & MEM_BINARY_PROTOCOL)
rc= binary_delete(ptr, server_key, key, key_length, to_write);
{
if (expiration)
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
- "delete %s%.*s %llu\r\n",
+ "delete %s%.*s %u%s\r\n",
ptr->prefix_key,
(int)key_length, key,
- (unsigned long long)expiration);
+ (uint32_t)expiration, no_reply ? " noreply" :"" );
else
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
- "delete %s%.*s\r\n",
+ "delete %s%.*s%s\r\n",
ptr->prefix_key,
- (int)key_length, key);
+ (int)key_length, key, no_reply ? " noreply" :"");
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
{
rc= MEMCACHED_WRITE_FAILURE;
goto error;
}
-
+
+ if (ptr->flags & MEM_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);
+ }
+
rc= memcached_do(&ptr->hosts[server_key], buffer, send_length, to_write);
}
goto error;
if ((ptr->flags & MEM_BUFFER_REQUESTS))
- {
rc= MEMCACHED_BUFFERED;
- }
- else
+ else if (!no_reply)
{
rc= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
if (rc == MEMCACHED_DELETED)
size_t key_length,
int flush)
{
- protocol_binary_request_delete request= {0};
+ protocol_binary_request_delete request= {.bytes= {0}};
request.message.header.request.magic= PROTOCOL_BINARY_REQ;
- request.message.header.request.opcode= PROTOCOL_BINARY_CMD_DELETE;
+ if (ptr->flags & MEM_NOREPLY)
+ 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.datatype= PROTOCOL_BINARY_RAW_BYTES;
request.message.header.request.bodylen= htonl(key_length);
+
+ if (ptr->flags & MEM_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 ((memcached_do(&ptr->hosts[server_key], request.bytes,
sizeof(request.bytes), 0) != MEMCACHED_SUCCESS) ||