projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Rewrote internal connect function to do by demand (aka only open up
[m6w6/libmemcached]
/
lib
/
memcached_delete.c
diff --git
a/lib/memcached_delete.c
b/lib/memcached_delete.c
index df16d2f4a68d5451e8bba19af9eb4de072dc5ddf..ff085453ab63a0fc602df81205b3348c59ddd118 100644
(file)
--- a/
lib/memcached_delete.c
+++ b/
lib/memcached_delete.c
@@
-1,26
+1,50
@@
-#include
<memcached.h>
+#include
"common.h"
memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_length,
time_t expiration)
{
memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_length,
time_t expiration)
{
- size_t send_length;
+ size_t send_length
, sent_length
;
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+ unsigned int server_key;
+
+ LIBMEMCACHED_MEMCACHED_DELETE_START();
+
+ server_key= memcached_generate_hash(ptr, key, key_length);
+
+ if ((rc= memcached_connect(ptr, server_key)) != MEMCACHED_SUCCESS)
+ return rc;
- rc= memcached_connect(ptr);
if (expiration)
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
if (expiration)
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
- "delete %.*s %u\r\n", key_length, key, expiration);
+ "delete %.*s %llu\r\n", (int)key_length, key,
+ (unsigned long long)expiration);
else
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
else
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
- "delete %.*s\r\n", key_length, key);
- if ((write(ptr->hosts[0].fd, buffer, send_length) == -1))
+ "delete %.*s\r\n", (int)key_length, key);
+
+ if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
{
{
- fprintf(stderr, "failed set on %.*s TCP\n", key_length+1, key);
+ rc= MEMCACHED_WRITE_FAILURE;
+ goto error;
+ }
- return MEMCACHED_WRITE_FAILURE;
+ sent_length= memcached_io_write(ptr, server_key, buffer, send_length, 1);
+
+ if (sent_length == -1 || sent_length != send_length)
+ {
+ rc= MEMCACHED_WRITE_FAILURE;
+ goto error;
}
}
- return memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE);
+ rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+
+ if (rc == MEMCACHED_DELETED)
+ rc= MEMCACHED_SUCCESS;
+
+ LIBMEMCACHED_MEMCACHED_DELETE_END();
+
+error:
+ return rc;
}
}