projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fixing failure of socket issue.
[m6w6/libmemcached]
/
lib
/
memcached_delete.c
diff --git
a/lib/memcached_delete.c
b/lib/memcached_delete.c
index 64036c7998bbb84a0034765986853b799b099292..0c36aaebb172b40fcb6c8ed643b109db02aed602 100644
(file)
--- a/
lib/memcached_delete.c
+++ b/
lib/memcached_delete.c
@@
-3,19
+3,21
@@
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, sent_length;
+ char to_write;
+ size_t send_length;
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
LIBMEMCACHED_MEMCACHED_DELETE_START();
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
LIBMEMCACHED_MEMCACHED_DELETE_START();
- rc= memcached_connect(ptr);
+ if (key_length == 0)
+ return MEMCACHED_NO_KEY_PROVIDED;
- if (
rc != MEMCACHED_SUCCESS
)
- return
rc
;
+ if (
ptr->hosts == NULL || ptr->number_of_hosts == 0
)
+ return
MEMCACHED_NO_SERVERS
;
- server_key= memcached_generate_hash(
key, key_length) % ptr->number_of_hosts
;
+ server_key= memcached_generate_hash(
ptr, key, key_length)
;
if (expiration)
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
if (expiration)
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
@@
-26,18
+28,33
@@
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;
-
- sent_length= send(ptr->hosts[server_key].fd, buffer, send_length, 0);
+ {
+ rc= MEMCACHED_WRITE_FAILURE;
+ goto error;
+ }
- if (sent_length == -1 || sent_length != send_length)
- return MEMCACHED_WRITE_FAILURE;
+ if ((ptr->flags & MEM_NO_BLOCK))
+ to_write= 0;
+ else
+ to_write= 1;
- rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
- LIBMEMCACHED_MEMCACHED_DELETE_END();
+ rc= memcached_do(ptr, server_key, buffer, send_length, to_write);
+ if (rc != MEMCACHED_SUCCESS)
+ goto error;
- if (rc == MEMCACHED_DELETED)
+ if ((ptr->flags & MEM_NO_BLOCK))
+ {
rc= MEMCACHED_SUCCESS;
rc= MEMCACHED_SUCCESS;
+ memcached_server_response_increment(ptr, server_key);
+ }
+ else
+ {
+ rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+ if (rc == MEMCACHED_DELETED)
+ rc= MEMCACHED_SUCCESS;
+ }
+error:
+ LIBMEMCACHED_MEMCACHED_DELETE_END();
return rc;
}
return rc;
}