projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Refactor test system to give me times on calling tests (frankly I still need
[m6w6/libmemcached]
/
lib
/
memcached_delete.c
diff --git
a/lib/memcached_delete.c
b/lib/memcached_delete.c
index 5ec5d1b4c11d353a52857ae25a9037193cd5260c..ff085453ab63a0fc602df81205b3348c59ddd118 100644
(file)
--- a/
lib/memcached_delete.c
+++ b/
lib/memcached_delete.c
@@
-10,12
+10,11
@@
memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
LIBMEMCACHED_MEMCACHED_DELETE_START();
LIBMEMCACHED_MEMCACHED_DELETE_START();
-
rc= memcached_connect(ptr
);
+
server_key= memcached_generate_hash(ptr, key, key_length
);
- if (
rc
!= MEMCACHED_SUCCESS)
+ 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,
@@
-26,15
+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=
send(ptr->hosts[server_key].fd, buffer, send_length, 0
);
+ 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);
rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+
+ if (rc == MEMCACHED_DELETED)
+ rc= MEMCACHED_SUCCESS;
+
LIBMEMCACHED_MEMCACHED_DELETE_END();
LIBMEMCACHED_MEMCACHED_DELETE_END();
+error:
return rc;
}
return rc;
}