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(instance->root->_namespace), memcached_array_size(instance->root->_namespace) },
{ key, key_length },
{ 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);
- }
- }
-
/* 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_server_write_instance_st instance,
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
request.message.header.request.bodylen= htonl((uint32_t)(key_length + memcached_array_size(instance->root->_namespace)));
- if (memcached_is_udp(instance->root))
- {
- 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);
- }
- }
-
- struct libmemcached_io_vector_st vector[]=
+ libmemcached_io_vector_st vector[]=
{
+ { NULL, 0 },
{ request.bytes, sizeof(request.bytes) },
{ 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);
}
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(instance->root))
+ {
server_key= 0;
+ }
- replica= memcached_server_instance_fetch(instance->root, 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);
}
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;
}
- rc= memcached_validate_key_length(key_length, ptr->flags.binary_protocol);
- if (memcached_failed(rc))
+ if (memcached_failed(rc= memcached_key_test(*ptr, (const char **)&key, &key_length, 1)))
{
- return rc;
+ return memcached_last_error(ptr);
}
if (expiration)