projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Rollup from build trunk.
[awesomized/libmemcached]
/
libmemcached
/
get.cc
diff --git
a/libmemcached/get.cc
b/libmemcached/get.cc
index b24283869a668eb001fc58f8c101213592ebd538..a6fe4034e7a4416caa23005e01cf86668f5b2a27 100644
(file)
--- a/
libmemcached/get.cc
+++ b/
libmemcached/get.cc
@@
-111,7
+111,9
@@
char *memcached_get_by_key(memcached_st *ptr,
/* This is for historical reasons */
if (*error == MEMCACHED_END)
/* This is for historical reasons */
if (*error == MEMCACHED_END)
+ {
*error= MEMCACHED_NOTFOUND;
*error= MEMCACHED_NOTFOUND;
+ }
if (value == NULL)
{
if (value == NULL)
{
@@
-121,14
+123,16
@@
char *memcached_get_by_key(memcached_st *ptr,
memcached_return_t rc= ptr->get_key_failure(ptr, key, key_length, &ptr->result);
/* On all failure drop to returning NULL */
memcached_return_t rc= ptr->get_key_failure(ptr, key, key_length, &ptr->result);
/* On all failure drop to returning NULL */
- if (rc == MEMCACHED_SUCCESS
||
rc == MEMCACHED_BUFFERED)
+ if (rc == MEMCACHED_SUCCESS
or
rc == MEMCACHED_BUFFERED)
{
if (rc == MEMCACHED_BUFFERED)
{
uint64_t latch; /* We use latch to track the state of the original socket */
latch= memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS);
if (latch == 0)
{
if (rc == MEMCACHED_BUFFERED)
{
uint64_t latch; /* We use latch to track the state of the original socket */
latch= memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS);
if (latch == 0)
+ {
memcached_behavior_set(ptr, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1);
memcached_behavior_set(ptr, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1);
+ }
rc= memcached_set(ptr, key, key_length,
(memcached_result_value(&ptr->result)),
rc= memcached_set(ptr, key, key_length,
(memcached_result_value(&ptr->result)),
@@
-227,7
+231,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
if (memcached_failed(memcached_key_test(*ptr, keys, key_length, number_of_keys)))
{
if (memcached_failed(memcached_key_test(*ptr, keys, key_length, number_of_keys)))
{
- return memcached_
set_error(*ptr, MEMCACHED_BAD_KEY_PROVIDED, MEMCACHED_AT, memcached_literal_param("A bad key value was provided")
);
+ return memcached_
last_error(ptr
);
}
bool is_group_key_set= false;
}
bool is_group_key_set= false;
@@
-439,7
+443,8
@@
memcached_return_t memcached_mget_execute_by_key(memcached_st *ptr,
if (memcached_is_binary(ptr) == false)
{
if (memcached_is_binary(ptr) == false)
{
- return MEMCACHED_NOT_SUPPORTED;
+ return memcached_set_error(*ptr, MEMCACHED_NOT_SUPPORTED, MEMCACHED_AT,
+ memcached_literal_param("ASCII protocol is not supported for memcached_mget_execute_by_key()"));
}
memcached_callback_st *original_callbacks= ptr->callbacks;
}
memcached_callback_st *original_callbacks= ptr->callbacks;
@@
-498,14
+503,18
@@
static memcached_return_t simple_binary_mget(memcached_st *ptr,
protocol_binary_request_getk request= { }; //= {.bytes= {0}};
request.message.header.request.magic= PROTOCOL_BINARY_REQ;
if (mget_mode)
protocol_binary_request_getk request= { }; //= {.bytes= {0}};
request.message.header.request.magic= PROTOCOL_BINARY_REQ;
if (mget_mode)
+ {
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_GETKQ;
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_GETKQ;
+ }
else
else
+ {
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_GETK;
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_GETK;
+ }
memcached_return_t vk;
vk= memcached_validate_key_length(key_length[x],
ptr->flags.binary_protocol);
memcached_return_t vk;
vk= memcached_validate_key_length(key_length[x],
ptr->flags.binary_protocol);
-
unlikely
(vk != MEMCACHED_SUCCESS)
+
if
(vk != MEMCACHED_SUCCESS)
{
if (x > 0)
{
{
if (x > 0)
{