projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-198
[awesomized/libmemcached]
/
libmemcached
/
get.cc
diff --git
a/libmemcached/get.cc
b/libmemcached/get.cc
index b774e7d5e775eea011caff5d2171d93d39378578..2a25d7883468d2701c009af7a573f0031b5f94ce 100644
(file)
--- a/
libmemcached/get.cc
+++ b/
libmemcached/get.cc
@@
-58,7
+58,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
size_t number_of_keys,
bool mget_mode);
size_t number_of_keys,
bool mget_mode);
-char *memcached_get_by_key(memcached_st *
ptr
,
+char *memcached_get_by_key(memcached_st *
shell
,
const char *group_key,
size_t group_key_length,
const char *key, size_t key_length,
const char *group_key,
size_t group_key_length,
const char *key, size_t key_length,
@@
-66,6
+66,7
@@
char *memcached_get_by_key(memcached_st *ptr,
uint32_t *flags,
memcached_return_t *error)
{
uint32_t *flags,
memcached_return_t *error)
{
+ Memcached* ptr= memcached2Memcached(shell);
memcached_return_t unused;
if (error == NULL)
{
memcached_return_t unused;
if (error == NULL)
{
@@
-246,7
+247,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
{
org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
{
org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
- if (
memcached_instance_response_count(instance
))
+ if (
instance->response_count(
))
{
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
{
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
@@
-255,7
+256,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
memcached_io_write(instance);
}
memcached_io_write(instance);
}
- while(
memcached_instance_response_count(instance
))
+ while(
instance->response_count(
))
{
(void)memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, &ptr->result);
}
{
(void)memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, &ptr->result);
}
@@
-304,7
+305,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
};
};
- if (
memcached_instance_response_count(instance
) == 0)
+ if (
instance->response_count(
) == 0)
{
rc= memcached_connect(instance);
{
rc= memcached_connect(instance);
@@
-315,7
+316,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
}
hosts_connected++;
}
hosts_connected++;
- if ((memcached_io_writev(instance, vector,
4
, false)) == false)
+ if ((memcached_io_writev(instance, vector,
1
, false)) == false)
{
failures_occured_in_sending= true;
continue;
{
failures_occured_in_sending= true;
continue;
@@
-324,7
+325,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
memcached_instance_response_increment(instance);
WATCHPOINT_ASSERT(instance->cursor_active_ == 1);
}
memcached_instance_response_increment(instance);
WATCHPOINT_ASSERT(instance->cursor_active_ == 1);
}
- else
+
{
if ((memcached_io_writev(instance, (vector + 1), 3, false)) == false)
{
{
if ((memcached_io_writev(instance, (vector + 1), 3, false)) == false)
{
@@
-356,7
+357,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
{
org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
{
org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
- if (
memcached_instance_response_count(instance
))
+ if (
instance->response_count(
))
{
/* We need to do something about non-connnected hosts in the future */
if ((memcached_io_write(instance, "\r\n", 2, true)) == -1)
{
/* We need to do something about non-connnected hosts in the future */
if ((memcached_io_write(instance, "\r\n", 2, true)) == -1)
@@
-385,13
+386,14
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
return MEMCACHED_FAILURE; // Complete failure occurred
}
return MEMCACHED_FAILURE; // Complete failure occurred
}
-memcached_return_t memcached_mget_by_key(memcached_st *
ptr
,
+memcached_return_t memcached_mget_by_key(memcached_st *
shell
,
const char *group_key,
size_t group_key_length,
const char * const *keys,
const size_t *key_length,
size_t number_of_keys)
{
const char *group_key,
size_t group_key_length,
const char * const *keys,
const size_t *key_length,
size_t number_of_keys)
{
+ Memcached* ptr= memcached2Memcached(shell);
return memcached_mget_by_key_real(ptr, group_key, group_key_length, keys,
key_length, number_of_keys, true);
}
return memcached_mget_by_key_real(ptr, group_key, group_key_length, keys,
key_length, number_of_keys, true);
}
@@
-409,7
+411,7
@@
memcached_return_t memcached_mget_execute(memcached_st *ptr,
context, number_of_callbacks);
}
context, number_of_callbacks);
}
-memcached_return_t memcached_mget_execute_by_key(memcached_st *
ptr
,
+memcached_return_t memcached_mget_execute_by_key(memcached_st *
shell
,
const char *group_key,
size_t group_key_length,
const char * const *keys,
const char *group_key,
size_t group_key_length,
const char * const *keys,
@@
-419,6
+421,7
@@
memcached_return_t memcached_mget_execute_by_key(memcached_st *ptr,
void *context,
unsigned int number_of_callbacks)
{
void *context,
unsigned int number_of_callbacks)
{
+ Memcached* ptr= memcached2Memcached(shell);
memcached_return_t rc;
if (memcached_failed(rc= initialize_query(ptr, false)))
{
memcached_return_t rc;
if (memcached_failed(rc= initialize_query(ptr, false)))
{
@@
-480,7
+483,7
@@
static memcached_return_t simple_binary_mget(memcached_st *ptr,
org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, server_key);
org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, server_key);
- if (
memcached_instance_response_count(instance
) == 0)
+ if (
instance->response_count(
) == 0)
{
rc= memcached_connect(instance);
if (memcached_failed(rc))
{
rc= memcached_connect(instance);
if (memcached_failed(rc))
@@
-554,7
+557,7
@@
static memcached_return_t simple_binary_mget(memcached_st *ptr,
org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
initialize_binary_request(instance, request.message.header);
org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
initialize_binary_request(instance, request.message.header);
- if (
memcached_instance_response_count(instance
))
+ if (
instance->response_count(
))
{
if (memcached_io_write(instance) == false)
{
{
if (memcached_io_write(instance) == false)
{
@@
-624,7
+627,7
@@
static memcached_return_t replication_binary_mget(memcached_st *ptr,
org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, server);
org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, server);
- if (
memcached_instance_response_count(instance
) == 0)
+ if (
instance->response_count(
) == 0)
{
rc= memcached_connect(instance);
{
rc= memcached_connect(instance);