projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in solution for lp:581030.
[m6w6/libmemcached]
/
libmemcached
/
delete.c
diff --git
a/libmemcached/delete.c
b/libmemcached/delete.c
index b29101b4cf47990d5a1c8e3ed24dc3c26797ec33..ef1fa6da328e499e94d931e608f88db2ac6e5c81 100644
(file)
--- a/
libmemcached/delete.c
+++ b/
libmemcached/delete.c
@@
-12,19
+12,18
@@
static inline memcached_return_t binary_delete(memcached_st *ptr,
uint32_t server_key,
const char *key,
size_t key_length,
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)
{
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;
- size_t send_length;
+ bool to_write;
memcached_return_t rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
uint32_t server_key;
memcached_return_t rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
uint32_t server_key;
- memcached_server_
instance_st *
instance;
+ memcached_server_
write_instance_st
instance;
LIBMEMCACHED_MEMCACHED_DELETE_START();
LIBMEMCACHED_MEMCACHED_DELETE_START();
@@
-36,16
+35,16
@@
memcached_return_t memcached_delete_by_key(memcached_st *ptr,
unlikely (memcached_server_count(ptr) == 0)
return MEMCACHED_NO_SERVERS;
unlikely (memcached_server_count(ptr) == 0)
return MEMCACHED_NO_SERVERS;
- server_key= memcached_generate_hash(ptr, master_key, master_key_length);
+ server_key= memcached_generate_hash
_with_redistribution
(ptr, master_key, master_key_length);
instance= memcached_server_instance_fetch(ptr, server_key);
instance= memcached_server_instance_fetch(ptr, server_key);
- to_write= (
uint8_t)((ptr->flags.buffer_requests) ? 0 : 1)
;
+ to_write= (
ptr->flags.buffer_requests) ? false : true
;
bool no_reply= (ptr->flags.no_reply);
if (ptr->flags.binary_protocol)
{
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);
}
{
rc= binary_delete(ptr, server_key, key, key_length, to_write);
}
@@
-56,6
+55,8
@@
memcached_return_t memcached_delete_by_key(memcached_st *ptr,
}
else
{
}
else
{
+ int send_length;
+
unlikely (expiration)
{
if ((instance->major_version == 1 &&
unlikely (expiration)
{
if ((instance->major_version == 1 &&
@@
-77,56
+78,60
@@
memcached_return_t memcached_delete_by_key(memcached_st *ptr,
if (instance->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.
*/
{
/* 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(instance);
no_reply= false;
}
}
if (no_reply)
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",
-
(int)ptr->prefix_key_length,
-
ptr->prefix_key,
-
(int) key_length, key,
-
(uint32_t)expiration,
-
no_reply ? " noreply" :"" );
+ send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
+ "delete %.*s%.*s %u%s\r\n",
+ (int)ptr->prefix_key_length,
+ ptr->prefix_key,
+ (int) key_length, key,
+ (uint32_t)expiration,
+ no_reply ? " noreply" :"" );
}
}
else
}
}
else
- 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" :"");
+ {
+ send_length= 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)
+ if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE
|| send_length < 0
)
{
rc= MEMCACHED_WRITE_FAILURE;
goto error;
}
{
rc= MEMCACHED_WRITE_FAILURE;
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 + instance->write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH)
{
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, NULL, 0,
1
);
+ memcached_io_write(instance, NULL, 0,
true
);
}
}
- rc= memcached_do(instance, buffer, send_length, to_write);
+ rc= memcached_do(instance, buffer,
(size_t)
send_length, to_write);
}
if (rc != MEMCACHED_SUCCESS)
goto error;
}
if (rc != MEMCACHED_SUCCESS)
goto error;
- if (!to_write)
+ if (! to_write)
+ {
rc= MEMCACHED_BUFFERED;
rc= MEMCACHED_BUFFERED;
+ }
else if (!no_reply)
{
rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
else if (!no_reply)
{
rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
@@
-146,9
+151,9
@@
static inline memcached_return_t binary_delete(memcached_st *ptr,
uint32_t server_key,
const char *key,
size_t key_length,
uint32_t server_key,
const char *key,
size_t key_length,
-
uint8_t
flush)
+
bool
flush)
{
{
- memcached_server_
instance_st *
instance;
+ memcached_server_
write_instance_st
instance;
protocol_binary_request_delete request= {.bytes= {0}};
instance= memcached_server_instance_fetch(ptr, server_key);
protocol_binary_request_delete request= {.bytes= {0}};
instance= memcached_server_instance_fetch(ptr, server_key);
@@
-158,28
+163,32
@@
static inline memcached_return_t binary_delete(memcached_st *ptr,
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_DELETEQ;
else
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_DELETE;
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.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 + instance->write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH)
{
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, NULL, 0,
1
);
+ memcached_io_write(instance, NULL, 0,
true
);
}
}
+ struct libmemcached_io_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;
memcached_return_t rc= MEMCACHED_SUCCESS;
- if ((memcached_do(instance, request.bytes,
- sizeof(request.bytes), 0) != MEMCACHED_SUCCESS) ||
- (memcached_io_write(instance, key,
- key_length, (char) flush) == -1))
+ if ((rc= memcached_vdo(instance, vector, 3, flush)) != MEMCACHED_SUCCESS)
{
memcached_io_reset(instance);
{
memcached_io_reset(instance);
- rc=
MEMCACHED_WRITE_FAILURE
;
+ rc=
(rc == MEMCACHED_SUCCESS) ? MEMCACHED_WRITE_FAILURE : rc
;
}
unlikely (ptr->number_of_replicas > 0)
}
unlikely (ptr->number_of_replicas > 0)
@@
-188,7
+197,7
@@
static inline memcached_return_t binary_delete(memcached_st *ptr,
for (uint32_t x= 0; x < ptr->number_of_replicas; ++x)
{
for (uint32_t x= 0; x < ptr->number_of_replicas; ++x)
{
- memcached_server_
instance_st *
replica;
+ memcached_server_
write_instance_st
replica;
++server_key;
if (server_key == memcached_server_count(ptr))
++server_key;
if (server_key == memcached_server_count(ptr))
@@
-196,9
+205,7
@@
static inline memcached_return_t binary_delete(memcached_st *ptr,
replica= memcached_server_instance_fetch(ptr, server_key);
replica= memcached_server_instance_fetch(ptr, server_key);
- if ((memcached_do(replica, (const char*)request.bytes,
- sizeof(request.bytes), 0) != MEMCACHED_SUCCESS) ||
- (memcached_io_write(replica, key, key_length, (char) flush) == -1))
+ if (memcached_vdo(replica, vector, 3, flush) != MEMCACHED_SUCCESS)
{
memcached_io_reset(replica);
}
{
memcached_io_reset(replica);
}