memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_length,
time_t expiration)
+{
+ 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, sent_length;
+ size_t send_length;
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
LIBMEMCACHED_MEMCACHED_DELETE_START();
- if (key_length == 0)
+ unlikely (key_length == 0)
return MEMCACHED_NO_KEY_PROVIDED;
- if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
+ unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
- server_key= memcached_generate_hash(ptr, key, key_length);
-
- if ((rc= memcached_connect(ptr, server_key)) != MEMCACHED_SUCCESS)
- return rc;
-
+ server_key= memcached_generate_hash(ptr, master_key, master_key_length);
if (expiration)
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
goto error;
}
- if ((ptr->flags & MEM_NO_BLOCK))
- to_write= 0;
- else
- to_write= 1;
+ to_write= (ptr->flags & MEM_BUFFER_REQUESTS) ? 0 : 1;
- if ((sent_length= memcached_io_write(ptr, server_key, buffer, send_length, to_write)) == -1)
- {
- memcached_quit_server(ptr, server_key);
- rc= MEMCACHED_WRITE_FAILURE;
+ rc= memcached_do(&ptr->hosts[server_key], buffer, send_length, to_write);
+ if (rc != MEMCACHED_SUCCESS)
goto error;
- }
- if ((ptr->flags & MEM_NO_BLOCK))
+ if ((ptr->flags & MEM_BUFFER_REQUESTS))
{
- rc= MEMCACHED_SUCCESS;
- memcached_server_response_increment(ptr, server_key);
+ rc= MEMCACHED_BUFFERED;
}
else
{
- rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+ rc= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
if (rc == MEMCACHED_DELETED)
rc= MEMCACHED_SUCCESS;
}
- LIBMEMCACHED_MEMCACHED_DELETE_END();
-
error:
+ LIBMEMCACHED_MEMCACHED_DELETE_END();
return rc;
}