projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updated for help commands (and a little bit on ketama)
[m6w6/libmemcached]
/
lib
/
memcached_delete.c
diff --git
a/lib/memcached_delete.c
b/lib/memcached_delete.c
index b50aaef0f9be5c7fdb4c459d0ee79b31f0c3f22d..ff085453ab63a0fc602df81205b3348c59ddd118 100644
(file)
--- a/
lib/memcached_delete.c
+++ b/
lib/memcached_delete.c
@@
-1,4
+1,4
@@
-#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)
@@
-8,12
+8,13
@@
memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
-
rc= memcached_connect(ptr
);
+
LIBMEMCACHED_MEMCACHED_DELETE_START(
);
- if (rc != MEMCACHED_SUCCESS)
+ server_key= memcached_generate_hash(ptr, key, key_length);
+
+ if ((rc= memcached_connect(ptr, server_key)) != MEMCACHED_SUCCESS)
return rc;
return rc;
- server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
if (expiration)
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
if (expiration)
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
@@
-24,12
+25,26
@@
memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
"delete %.*s\r\n", (int)key_length, key);
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
"delete %.*s\r\n", (int)key_length, key);
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
- return MEMCACHED_WRITE_FAILURE;
+ {
+ rc= MEMCACHED_WRITE_FAILURE;
+ goto error;
+ }
- sent_length=
write(ptr->hosts[server_key].fd, buffer, send_length
);
+ sent_length=
memcached_io_write(ptr, server_key, buffer, send_length, 1
);
if (sent_length == -1 || sent_length != send_length)
if (sent_length == -1 || sent_length != send_length)
- return MEMCACHED_WRITE_FAILURE;
+ {
+ rc= MEMCACHED_WRITE_FAILURE;
+ goto error;
+ }
+
+ rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+
+ if (rc == MEMCACHED_DELETED)
+ rc= MEMCACHED_SUCCESS;
+
+ LIBMEMCACHED_MEMCACHED_DELETE_END();
- return memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+error:
+ return rc;
}
}