projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge
[awesomized/libmemcached]
/
lib
/
memcached_auto.c
diff --git
a/lib/memcached_auto.c
b/lib/memcached_auto.c
index 653764ab981a51a2ef61b86f63b68eb3338b1177..36780dc5409f3dee8dc5151cf1c8dc1ed96cd06a 100644
(file)
--- a/
lib/memcached_auto.c
+++ b/
lib/memcached_auto.c
@@
-4,17
+4,21
@@
static memcached_return memcached_auto(memcached_st *ptr,
char *verb,
char *key, size_t key_length,
unsigned int offset,
char *verb,
char *key, size_t key_length,
unsigned int offset,
- u
nsigned in
t *value)
+ u
int64_
t *value)
{
{
- size_t send_length
, sent_length
;
+ size_t send_length;
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
- 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;
+
+ if (key_test(&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)
+ return MEMCACHED_BAD_KEY_PROVIDED;
server_key= memcached_generate_hash(ptr, key, key_length);
server_key= memcached_generate_hash(ptr, key, key_length);
@@
-24,35
+28,33
@@
static memcached_return memcached_auto(memcached_st *ptr,
offset);
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
return MEMCACHED_WRITE_FAILURE;
offset);
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
return MEMCACHED_WRITE_FAILURE;
- sent_length= memcached_io_write(ptr, server_key, buffer, send_length, 1);
- if (sent_length == -1 || sent_length != send_length)
- return MEMCACHED_WRITE_FAILURE;
-
- memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
+ rc= memcached_do(&ptr->hosts[server_key], buffer, send_length, 1);
+ if (rc != MEMCACHED_SUCCESS)
+ return rc;
- 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;
}
else
{
{
*value= 0;
rc= MEMCACHED_NOTFOUND;
}
else
{
- *value=
strto
l(buffer, (char **)NULL, 10);
+ *value=
(uint64_t)strtol
l(buffer, (char **)NULL, 10);
rc= MEMCACHED_SUCCESS;
}
rc= MEMCACHED_SUCCESS;
}
@@
-61,8
+63,8
@@
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
nsigned in
t *value)
+ u
int32_
t offset,
+ u
int64_
t *value)
{
memcached_return rc;
{
memcached_return rc;
@@
-75,8
+77,8
@@
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
nsigned in
t *value)
+ u
int32_
t offset,
+ u
int64_
t *value)
{
memcached_return rc;
{
memcached_return rc;