#include "common.h"
+#include "memcached_io.h"
static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_length,
size_t *value_length,
if (*value_length)
{
size_t read_length;
- size_t partial_length;
size_t to_read;
char *value;
char *value_ptr;
value_ptr= value;
read_length= 0;
to_read= (*value_length) + 2;
- /* This is overkill */
- while ((partial_length= recv(ptr->hosts[server_key].fd, value_ptr, to_read, 0)) > 0)
- {
- value_ptr+= partial_length;
- read_length+= partial_length;
- to_read-= partial_length;
- if (read_length == (size_t)(*value_length + 2))
- break;
- }
+
+ read_length= memcached_io_read(ptr, server_key,
+ value_ptr, to_read);
if (read_length != (size_t)(*value_length + 2))
{
return value;
}
}
+ else if (*error == MEMCACHED_END)
+ *error= MEMCACHED_NOTFOUND;
return NULL;
read_error:
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
char *value;
- memcached_return rc;
LIBMEMCACHED_MEMCACHED_GET_START();
*value_length= 0;
*error= memcached_connect(ptr);
if (*error != MEMCACHED_SUCCESS)
- return NULL;
+ goto error;
server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, "get %.*s\r\n",
(int)key_length, key);
- if (*error != MEMCACHED_SUCCESS)
- return NULL;
-
if ((send(ptr->hosts[server_key].fd, buffer, send_length, 0) == -1))
{
*error= MEMCACHED_WRITE_FAILURE;
- return NULL;
+ goto error;
}
value= memcached_value_fetch(ptr, key, &key_length, value_length, flags,
error, 0, server_key);
- /* We need to read END */
- rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
- if (rc != MEMCACHED_NOTFOUND)
+ if (*error == MEMCACHED_END && *value_length == 0)
{
- free(value);
- *value_length= 0;
- *error= MEMCACHED_PROTOCOL_ERROR;
+ *error= MEMCACHED_NOTFOUND;
+ goto error;
}
+ else if (*error == MEMCACHED_SUCCESS)
+ {
+ memcached_return rc;
+ /* We need to read END */
+ rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+
+ if (rc != MEMCACHED_END)
+ {
+ *error= MEMCACHED_PROTOCOL_ERROR;
+ goto error;
+ }
+ }
+ else
+ goto error;
+
LIBMEMCACHED_MEMCACHED_GET_END();
return value;
+
+error:
+ free(value);
+ *value_length= 0;
+
+ LIBMEMCACHED_MEMCACHED_GET_END();
+
+ return NULL;
}
memcached_return memcached_mget(memcached_st *ptr,
}
else
{
- memcached_string_st *string= memcached_string_init(ptr, SMALL_STRING_LEN);
+ memcached_string_st *string= memcached_string_create(ptr, SMALL_STRING_LEN);
/* We need to figure out the correct way to error in case of this failure */
if (!string)