projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
MEMCACHED_BEHAVIOR_RETRY_TIMEOUT added for timeout
[m6w6/libmemcached]
/
lib
/
memcached_auto.c
diff --git
a/lib/memcached_auto.c
b/lib/memcached_auto.c
index 61ad91259377f3670614642789ae97f47e27a5c9..0d0fc91797141d32a50b934613a921d970773a7a 100644
(file)
--- a/
lib/memcached_auto.c
+++ b/
lib/memcached_auto.c
@@
-17,6
+17,9
@@
static memcached_return memcached_auto(memcached_st *ptr,
if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
+ if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test(&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+ return MEMCACHED_BAD_KEY_PROVIDED;
+
server_key= memcached_generate_hash(ptr, key, key_length);
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
server_key= memcached_generate_hash(ptr, key, key_length);
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
@@
-26,27
+29,25
@@
static memcached_return memcached_auto(memcached_st *ptr,
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
return MEMCACHED_WRITE_FAILURE;
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
return MEMCACHED_WRITE_FAILURE;
- rc= memcached_do(
ptr, server_key
, buffer, send_length, 1);
+ rc= memcached_do(
&ptr->hosts[server_key]
, buffer, send_length, 1);
if (rc != MEMCACHED_SUCCESS)
return rc;
if (rc != MEMCACHED_SUCCESS)
return rc;
- memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
-
- rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+ rc= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
/*
So why recheck responce? Because the protocol is brain dead :)
The number returned might end up equaling one of the string
/*
So why recheck responce? Because the protocol is brain dead :)
The number returned might end up equaling one of the string
- values. Less chance of a mistake with
mem
cmp() so we will
+ values. Less chance of a mistake with
strn
cmp() so we will
use it. We still called memcached_response() though since it
worked its magic for non-blocking IO.
*/
use it. We still called memcached_response() though since it
worked its magic for non-blocking IO.
*/
- if (!
memcmp(buffer, "ERROR\r\n", MEMCACHED_DEFAULT_COMMAND_SIZE
))
+ if (!
strncmp(buffer, "ERROR\r\n", 7
))
{
*value= 0;
rc= MEMCACHED_PROTOCOL_ERROR;
}
{
*value= 0;
rc= MEMCACHED_PROTOCOL_ERROR;
}
- else if (!
memcmp(buffer, "NOT_FOUND\r\n", MEMCACHED_DEFAULT_COMMAND_SIZE
))
+ else if (!
strncmp(buffer, "NOT_FOUND\r\n", 11
))
{
*value= 0;
rc= MEMCACHED_NOTFOUND;
{
*value= 0;
rc= MEMCACHED_NOTFOUND;
@@
-62,7
+63,7
@@
static memcached_return memcached_auto(memcached_st *ptr,
memcached_return memcached_increment(memcached_st *ptr,
char *key, size_t key_length,
memcached_return memcached_increment(memcached_st *ptr,
char *key, size_t key_length,
- u
nsigned in
t offset,
+ u
int32_
t offset,
uint64_t *value)
{
memcached_return rc;
uint64_t *value)
{
memcached_return rc;
@@
-76,7
+77,7
@@
memcached_return memcached_increment(memcached_st *ptr,
memcached_return memcached_decrement(memcached_st *ptr,
char *key, size_t key_length,
memcached_return memcached_decrement(memcached_st *ptr,
char *key, size_t key_length,
- u
nsigned in
t offset,
+ u
int32_
t offset,
uint64_t *value)
{
memcached_return rc;
uint64_t *value)
{
memcached_return rc;