#include "common.h"
#include "memcached_io.h"
-memcached_return value_fetch(memcached_st *ptr,
+memcached_return value_fetch(memcached_server_st *ptr,
char *buffer,
- memcached_result_st *result,
- unsigned int server_key)
+ memcached_result_st *result)
{
- memcached_return rc;
+ memcached_return rc= MEMCACHED_SUCCESS;
char *string_ptr;
char *end_ptr;
char *next_ptr;
key++;
result->key_length++;
}
+ result->key[result->key_length]= 0;
}
if (end_ptr == string_ptr)
*/
to_read= (value_length) + 2;
- read_length= memcached_io_read(ptr, server_key,
- value_ptr, to_read);
+ read_length= memcached_io_read(ptr, value_ptr, to_read);
if (read_length != (size_t)(value_length + 2))
{
{
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
- if (memcached_server_response_count(ptr, ptr->cursor_server) == 0)
+ if (memcached_server_response_count(&ptr->hosts[ptr->cursor_server]) == 0)
{
ptr->cursor_server++;
continue;
}
- *error= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, result_buffer, ptr->cursor_server);
+ *error= memcached_response(&ptr->hosts[ptr->cursor_server], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, result_buffer);
if (*error == MEMCACHED_END) /* END means that we move on to the next */
{
- memcached_server_response_reset(ptr, ptr->cursor_server);
+ memcached_server_response_reset(&ptr->hosts[ptr->cursor_server]);
ptr->cursor_server++;
continue;
}
WATCHPOINT_ASSERT(result->value.is_allocated != MEMCACHED_USED);
+#ifdef UNUSED
if (ptr->flags & MEM_NO_BLOCK)
memcached_io_preread(ptr);
+#endif
while (ptr->cursor_server < ptr->number_of_hosts)
{
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
- if (memcached_server_response_count(ptr, ptr->cursor_server) == 0)
+ if (memcached_server_response_count(&ptr->hosts[ptr->cursor_server]) == 0)
{
ptr->cursor_server++;
continue;
}
- *error= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, result, ptr->cursor_server);
+ *error= memcached_response(&ptr->hosts[ptr->cursor_server], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, result);
if (*error == MEMCACHED_END) /* END means that we move on to the next */
{
- memcached_server_response_reset(ptr, ptr->cursor_server);
+ memcached_server_response_reset(&ptr->hosts[ptr->cursor_server]);
ptr->cursor_server++;
continue;
}