-#include <memcached.h>
+#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,
assert(flags);
assert(error);
+ memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
end_ptr= buffer + MEMCACHED_DEFAULT_COMMAND_SIZE;
*value_length= 0;
- memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
*error= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
if (*error == MEMCACHED_SUCCESS)
if (load_key)
{
memset(key, 0, MEMCACHED_MAX_KEY);
+ *key_length= 0;
+
for (; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++)
{
*key= *string_ptr;
key++;
+ (*key_length)++;
}
}
else /* Skip characters */
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:
size_t send_length;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
+ char *value;
+ LIBMEMCACHED_MEMCACHED_GET_START();
+
+ server_key= memcached_generate_hash(ptr, key, key_length);
*value_length= 0;
- *error= memcached_connect(ptr);
+ *error= memcached_connect(ptr, server_key);
if (*error != MEMCACHED_SUCCESS)
- return NULL;
-
- server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
+ goto error;
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))
+ if ((memcached_io_write(ptr, server_key, buffer, send_length, 1)) == -1)
{
*error= MEMCACHED_WRITE_FAILURE;
- return NULL;
+ goto error;
}
- return memcached_value_fetch(ptr, key, &key_length, value_length, flags,
+ value= memcached_value_fetch(ptr, key, &key_length, value_length, flags,
error, 0, server_key);
+ if (*error == MEMCACHED_END && *value_length == 0)
+ {
+ *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,
unsigned int x;
memcached_return rc;
memcached_string_st **cursor_key_exec;
+ LIBMEMCACHED_MEMCACHED_MGET_START();
ptr->cursor_server= 0;
memset(buffer, 0, HUGE_STRING_LEN);
- rc= memcached_connect(ptr);
-
- if (rc != MEMCACHED_SUCCESS)
- return rc;
-
cursor_key_exec= (memcached_string_st **)malloc(sizeof(memcached_string_st *) * ptr->number_of_hosts);
memset(cursor_key_exec, 0, sizeof(memcached_string_st *) * ptr->number_of_hosts);
{
unsigned int server_key;
- server_key= memcached_generate_hash(keys[x], key_length[x]) % ptr->number_of_hosts;
+ server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
if (cursor_key_exec[server_key])
{
}
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)
{
if (cursor_key_exec[x])
{
+ /* We need to doo something about non-connnected hosts in the future */
+ rc= memcached_connect(ptr, x);
+
memcached_string_st *string= cursor_key_exec[x];
memcached_string_append(ptr, string, "\r\n", 2);
- if ((send(ptr->hosts[x].fd, string->string,
- memcached_string_length(ptr, string), 0) == -1))
+ if ((memcached_io_write(ptr, x, string->string,
+ memcached_string_length(ptr, string), 1)) == -1)
{
memcached_quit(ptr);
rc= MEMCACHED_SOME_ERRORS;
free(cursor_key_exec);
+ LIBMEMCACHED_MEMCACHED_MGET_END();
return rc;
}