memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_length,
time_t expiration)
{
- size_t send_length, sent_length;
+ return memcached_delete_by_key(ptr, key, key_length,
+ key, key_length, expiration);
+}
+
+memcached_return memcached_delete_by_key(memcached_st *ptr,
+ char *master_key, size_t master_key_length,
+ char *key, size_t key_length,
+ time_t expiration)
+{
+ char to_write;
+ size_t send_length;
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
LIBMEMCACHED_MEMCACHED_DELETE_START();
- rc= memcached_connect(ptr);
+ unlikely (key_length == 0)
+ return MEMCACHED_NO_KEY_PROVIDED;
- if (rc != MEMCACHED_SUCCESS)
- return rc;
+ unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0)
+ return MEMCACHED_NO_SERVERS;
- server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
+ server_key= memcached_generate_hash(ptr, master_key, master_key_length);
if (expiration)
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"delete %.*s\r\n", (int)key_length, key);
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
- return MEMCACHED_WRITE_FAILURE;
-
- sent_length= send(ptr->hosts[server_key].fd, buffer, send_length, 0);
+ {
+ rc= MEMCACHED_WRITE_FAILURE;
+ goto error;
+ }
- if (sent_length == -1 || sent_length != send_length)
- return MEMCACHED_WRITE_FAILURE;
+ to_write= (ptr->flags & MEM_BUFFER_REQUESTS) ? 0 : 1;
- rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
- LIBMEMCACHED_MEMCACHED_DELETE_END();
+ rc= memcached_do(&ptr->hosts[server_key], buffer, send_length, to_write);
+ if (rc != MEMCACHED_SUCCESS)
+ goto error;
- if (rc == MEMCACHED_DELETED)
- rc= MEMCACHED_SUCCESS;
+ if ((ptr->flags & MEM_BUFFER_REQUESTS))
+ {
+ rc= MEMCACHED_BUFFERED;
+ }
+ else
+ {
+ rc= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
+ if (rc == MEMCACHED_DELETED)
+ rc= MEMCACHED_SUCCESS;
+ }
+error:
+ LIBMEMCACHED_MEMCACHED_DELETE_END();
return rc;
}