projects
/
m6w6
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
3d4ad99
)
Incomming fixes from Charles on the replication branch.
author
<brian@gir-2.local>
<>
Sat, 8 Mar 2008 20:01:48 +0000
(15:01 -0500)
committer
<brian@gir-2.local>
<>
Sat, 8 Mar 2008 20:01:48 +0000
(15:01 -0500)
lib/memcached_delete.c
patch
|
blob
|
history
lib/memcached_get.c
patch
|
blob
|
history
diff --git
a/lib/memcached_delete.c
b/lib/memcached_delete.c
index dea5c92ff367c2df7631cab331e9037f54a814d9..16ab0cd56e103abcc2489e7c26d603e48145078d 100644
(file)
--- a/
lib/memcached_delete.c
+++ b/
lib/memcached_delete.c
@@
-35,11
+35,8
@@
memcached_return memcached_delete_by_key(memcached_st *ptr,
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"delete %.*s\r\n", (int)key_length, key);
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"delete %.*s\r\n", (int)key_length, key);
- if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
- {
- rc[replicas]= MEMCACHED_WRITE_FAILURE;
- goto error;
- }
+ unlikely (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
+ return MEMCACHED_WRITE_FAILURE;
do
{
do
{
@@
-53,9
+50,9
@@
memcached_return memcached_delete_by_key(memcached_st *ptr,
}
else
{
}
else
{
-
rc[replicas]= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL)
;
- if (rc[replicas] == MEMCACHED_DELETED)
-
rc[replicas]= MEMCACHED_SUCCESS
;
+
char response_buffer[MEMCACHED_DEFAULT_COMMAND_SIZE]
;
+
+
rc[replicas]= memcached_response(&ptr->hosts[server_key], response_buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL)
;
}
/* On error we just jump to the next potential server */
}
/* On error we just jump to the next potential server */
@@
-74,8
+71,8
@@
error:
{
if (rc[replicas] == MEMCACHED_DELETED)
return MEMCACHED_SUCCESS;
{
if (rc[replicas] == MEMCACHED_DELETED)
return MEMCACHED_SUCCESS;
- else if (rc[replicas] == MEMCACHED_
DELET
ED)
- r
c[replicas]=
MEMCACHED_BUFFERED;
+ else if (rc[replicas] == MEMCACHED_
BUFFER
ED)
+ r
eturn
MEMCACHED_BUFFERED;
}
return rc[0];
}
return rc[0];
diff --git
a/lib/memcached_get.c
b/lib/memcached_get.c
index b3cd8e51b64418a453127a8064fb051c2b59508b..12d301ec35319d0faabbe336f75e002a0d024777 100644
(file)
--- a/
lib/memcached_get.c
+++ b/
lib/memcached_get.c
@@
-50,22
+50,22
@@
char *memcached_get_by_key(memcached_st *ptr,
do
{
do
{
+ char response_buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+
if (memcached_server_response_count(&ptr->hosts[server_key]))
{
if (memcached_server_response_count(&ptr->hosts[server_key]))
{
- char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
-
if (ptr->flags & MEM_NO_BLOCK)
(void)memcached_io_write(&ptr->hosts[server_key], NULL, 0, 1);
while(memcached_server_response_count(&ptr->hosts[server_key]))
if (ptr->flags & MEM_NO_BLOCK)
(void)memcached_io_write(&ptr->hosts[server_key], NULL, 0, 1);
while(memcached_server_response_count(&ptr->hosts[server_key]))
- (void)memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, result_buffer);
+ (void)memcached_response(&ptr->hosts[server_key],
response_
buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, result_buffer);
}
rc[replicas]= memcached_do(&ptr->hosts[server_key], buffer, send_length, 1);
if (rc[replicas] != MEMCACHED_SUCCESS)
goto error;
}
rc[replicas]= memcached_do(&ptr->hosts[server_key], buffer, send_length, 1);
if (rc[replicas] != MEMCACHED_SUCCESS)
goto error;
- rc[replicas]= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, result_buffer);
+ rc[replicas]= memcached_response(&ptr->hosts[server_key],
response_
buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, result_buffer);
/* On no key found, we check the replica */
if (rc[replicas] == MEMCACHED_END) /* END means that we move on to the next */
/* On no key found, we check the replica */
if (rc[replicas] == MEMCACHED_END) /* END means that we move on to the next */
@@
-79,6
+79,7
@@
char *memcached_get_by_key(memcached_st *ptr,
if (result_buffer->flags)
*flags= result_buffer->flags;
if (result_buffer->flags)
*flags= result_buffer->flags;
+ *error= MEMCACHED_SUCCESS;
return memcached_string_c_copy(&result_buffer->value);
}
return memcached_string_c_copy(&result_buffer->value);
}