projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Remove special condition for block and version.
[awesomized/libmemcached]
/
libmemcached
/
delete.c
diff --git
a/libmemcached/delete.c
b/libmemcached/delete.c
index da91f7036edabf4c67e175db19861318108a62fd..ef1fa6da328e499e94d931e608f88db2ac6e5c81 100644
(file)
--- a/
libmemcached/delete.c
+++ b/
libmemcached/delete.c
@@
-20,7
+20,6
@@
memcached_return_t memcached_delete_by_key(memcached_st *ptr,
time_t expiration)
{
bool to_write;
time_t expiration)
{
bool to_write;
- size_t send_length;
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;
@@
-45,7
+44,7
@@
memcached_return_t memcached_delete_by_key(memcached_st *ptr,
if (ptr->flags.binary_protocol)
{
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 &&
@@
-89,23
+90,25
@@
memcached_return_t memcached_delete_by_key(memcached_st *ptr,
no_reply= false;
}
}
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;
@@
-119,14
+122,16
@@
memcached_return_t memcached_delete_by_key(memcached_st *ptr,
memcached_io_write(instance, NULL, 0, true);
}
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 (! to_write)
}
if (rc != MEMCACHED_SUCCESS)
goto error;
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);
@@
-158,9
+163,9
@@
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)
{
@@
-171,12
+176,16
@@
static inline memcached_return_t binary_delete(memcached_st *ptr,
memcached_io_write(instance, NULL, 0, true);
}
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 (((rc= memcached_do(instance, request.bytes,
- sizeof(request.bytes), false)) != MEMCACHED_SUCCESS) ||
- (memcached_io_write(instance, key,
- key_length, flush) == -1))
+ if ((rc= memcached_vdo(instance, vector, 3, flush)) != MEMCACHED_SUCCESS)
{
memcached_io_reset(instance);
rc= (rc == MEMCACHED_SUCCESS) ? MEMCACHED_WRITE_FAILURE : rc;
{
memcached_io_reset(instance);
rc= (rc == MEMCACHED_SUCCESS) ? MEMCACHED_WRITE_FAILURE : rc;
@@
-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), false) != MEMCACHED_SUCCESS) ||
- (memcached_io_write(replica, key, key_length, flush) == -1))
+ if (memcached_vdo(replica, vector, 3, flush) != MEMCACHED_SUCCESS)
{
memcached_io_reset(replica);
}
{
memcached_io_reset(replica);
}