#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;
size_t value_length;
+ size_t read_length;
+ size_t to_read;
+ char *value_ptr;
end_ptr= buffer + MEMCACHED_DEFAULT_COMMAND_SIZE;
if (end_ptr < string_ptr)
goto read_error;
- if (value_length)
+ /* We add two bytes so that we can walk the \r\n */
+ rc= memcached_string_check(&result->value, value_length+2);
+ if (rc != MEMCACHED_SUCCESS)
{
- size_t read_length;
- size_t to_read;
- char *value_ptr;
-
- /* We add two bytes so that we can walk the \r\n */
- rc= memcached_string_check(&result->value, value_length+2);
- if (rc != MEMCACHED_SUCCESS)
- {
- value_length= 0;
- return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
- }
-
- value_ptr= memcached_string_value(&result->value);
- read_length= 0;
- /*
- We read the \r\n into the string since not doing so is more
- cycles then the waster of memory to do so.
-
- We are null terminating through, which will most likely make
- some people lazy about using the return length.
- */
- to_read= (value_length) + 2;
-
- read_length= memcached_io_read(ptr, server_key,
- value_ptr, to_read);
-
- if (read_length != (size_t)(value_length + 2))
- {
- goto read_error;
- }
+ value_length= 0;
+ return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+ }
- /* This next bit blows the API, but this is internal....*/
- {
- char *char_ptr;
- char_ptr= memcached_string_value(&result->value);;
- char_ptr[value_length]= 0;
- char_ptr[value_length + 1]= 0;
- memcached_string_set_length(&result->value, value_length);
- }
+ value_ptr= memcached_string_value(&result->value);
+ read_length= 0;
+ /*
+ We read the \r\n into the string since not doing so is more
+ cycles then the waster of memory to do so.
+
+ We are null terminating through, which will most likely make
+ some people lazy about using the return length.
+ */
+ to_read= (value_length) + 2;
+ read_length= memcached_io_read(ptr, value_ptr, to_read);
+ if (read_length != (size_t)(value_length + 2))
+ {
+ goto read_error;
+ }
- return MEMCACHED_SUCCESS;
+/* This next bit blows the API, but this is internal....*/
+ {
+ char *char_ptr;
+ char_ptr= memcached_string_value(&result->value);;
+ char_ptr[value_length]= 0;
+ char_ptr[value_length + 1]= 0;
+ memcached_string_set_length(&result->value, value_length);
}
- return rc;
+ return MEMCACHED_SUCCESS;
read_error:
+ memcached_io_reset(ptr);
+
return MEMCACHED_PARTIAL_READ;
}
{
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;
}
strncpy(key, result_buffer->key, result_buffer->key_length);
*key_length= result_buffer->key_length;
}
- *flags= result_buffer->flags;
+
+ if (result_buffer->flags)
+ *flags= result_buffer->flags;
return memcached_string_c_copy(&result_buffer->value);
}
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;
}