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 88220e6bd67eb1c67998c38de4034519e824f3b6..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)
{
@@
-202,8
+203,8
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
bool mget_mode)
{
bool failures_occured_in_sending= false;
bool mget_mode)
{
bool failures_occured_in_sending= false;
- const char *get_command= "get
";
- uint8_t get_command_length=
4
;
+ const char *get_command= "get";
+ uint8_t get_command_length=
3
;
unsigned int master_server_key= (unsigned int)-1; /* 0 is a valid server id! */
memcached_return_t rc;
unsigned int master_server_key= (unsigned int)-1; /* 0 is a valid server id! */
memcached_return_t rc;
@@
-244,9
+245,9
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
*/
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
*/
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
-
memcached_server_write_instance_st instance= memcached_server
_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);
}
@@
-270,8
+271,8
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
if (ptr->flags.support_cas)
{
if (ptr->flags.support_cas)
{
- get_command= "gets
";
- get_command_length=
5
;
+ get_command= "gets";
+ get_command_length=
4
;
}
/*
}
/*
@@
-282,7
+283,6
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
size_t hosts_connected= 0;
for (uint32_t x= 0; x < number_of_keys; x++)
{
size_t hosts_connected= 0;
for (uint32_t x= 0; x < number_of_keys; x++)
{
- memcached_server_write_instance_st instance;
uint32_t server_key;
if (is_group_key_set)
uint32_t server_key;
if (is_group_key_set)
@@
-294,18
+294,18
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
server_key= memcached_generate_hash_with_redistribution(ptr, keys[x], key_length[x]);
}
server_key= memcached_generate_hash_with_redistribution(ptr, keys[x], key_length[x]);
}
-
instance= memcached_server
_instance_fetch(ptr, server_key);
+
org::libmemcached::Instance* instance= memcached
_instance_fetch(ptr, server_key);
libmemcached_io_vector_st vector[]=
{
{ get_command, get_command_length },
libmemcached_io_vector_st vector[]=
{
{ get_command, get_command_length },
+ { memcached_literal_param(" ") },
{ memcached_array_string(ptr->_namespace), memcached_array_size(ptr->_namespace) },
{ memcached_array_string(ptr->_namespace), memcached_array_size(ptr->_namespace) },
- { keys[x], key_length[x] },
- { memcached_literal_param(" ") }
+ { keys[x], key_length[x] }
};
};
- if (
memcached_instance_response_count(instance
) == 0)
+ if (
instance->response_count(
) == 0)
{
rc= memcached_connect(instance);
{
rc= memcached_connect(instance);
@@
-316,16
+316,16
@@
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;
}
- WATCHPOINT_ASSERT(instance->cursor_active == 0);
+ WATCHPOINT_ASSERT(instance->cursor_active
_
== 0);
memcached_instance_response_increment(instance);
memcached_instance_response_increment(instance);
- WATCHPOINT_ASSERT(instance->cursor_active == 1);
+ 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)
{
@@
-355,10
+355,9
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
bool success_happened= false;
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
bool success_happened= false;
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
- memcached_server_write_instance_st instance=
- memcached_server_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)
@@
-387,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);
}
@@
-411,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,
@@
-421,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,9
+481,9
@@
static memcached_return_t simple_binary_mget(memcached_st *ptr,
server_key= memcached_generate_hash_with_redistribution(ptr, keys[x], key_length[x]);
}
server_key= memcached_generate_hash_with_redistribution(ptr, keys[x], key_length[x]);
}
-
memcached_server_write_instance_st instance= memcached_server
_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))
@@
-553,10
+554,10
@@
static memcached_return_t simple_binary_mget(memcached_st *ptr,
for (uint32_t x= 0; x < memcached_server_count(ptr); ++x)
{
for (uint32_t x= 0; x < memcached_server_count(ptr); ++x)
{
-
memcached_server_write_instance_st instance= memcached_server
_instance_fetch(ptr, x);
+
org::libmemcached::Instance* instance= memcached
_instance_fetch(ptr, x);
initialize_binary_request(instance, request.message.header);
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,9
+625,9
@@
static memcached_return_t replication_binary_mget(memcached_st *ptr,
continue;
}
continue;
}
-
memcached_server_write_instance_st instance= memcached_server
_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);