-#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,
{
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
char *string_ptr;
+ char *end_ptr;
+
+ memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
+ end_ptr= buffer + MEMCACHED_DEFAULT_COMMAND_SIZE;
*value_length= 0;
+ *flags= 0;
- memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
*error= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
if (*error == MEMCACHED_SUCCESS)
{
- char *end_ptr;
+ char *next_ptr;
string_ptr= buffer;
string_ptr+= 6; /* "VALUE " */
if (load_key)
{
memset(key, 0, MEMCACHED_MAX_KEY);
- for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++)
+ *key_length= 0;
+
+ for (; end_ptr > string_ptr && *string_ptr != ' '; string_ptr++)
{
- *key= *end_ptr;
+ *key= *string_ptr;
key++;
+ (*key_length)++;
}
}
else /* Skip characters */
- for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++);
+ for (; end_ptr > string_ptr && *string_ptr != ' '; string_ptr++);
+
+ if (end_ptr == string_ptr)
+ goto read_error;
- /* Flags fetch */
- string_ptr= end_ptr + 1;
- for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++);
- *flags= (uint16_t)strtol(string_ptr, &end_ptr, 10);
+ /* Flags fetch move past space */
+ string_ptr++;
+ if (end_ptr == string_ptr)
+ goto read_error;
+ for (next_ptr= string_ptr; end_ptr > string_ptr && *string_ptr != ' '; string_ptr++);
+ *flags= (uint16_t)strtol(next_ptr, &string_ptr, 10);
- /* Length fetch */
- string_ptr= end_ptr + 1;
- for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++);
- *value_length= strtoll(string_ptr, &end_ptr, 10);
+ if (end_ptr == string_ptr)
+ goto read_error;
+
+ /* Length fetch move past space*/
+ string_ptr++;
+ if (end_ptr == string_ptr)
+ goto read_error;
+
+ for (next_ptr= string_ptr; end_ptr > string_ptr && *string_ptr != ' '; string_ptr++);
+ *value_length= (size_t)strtoll(next_ptr, &string_ptr, 10);
+
+ if (end_ptr == string_ptr)
+ goto read_error;
/* Skip past the \r\n */
- string_ptr= end_ptr +2;
+ string_ptr+= 2;
+
+ if (end_ptr < string_ptr)
+ goto read_error;
if (*value_length)
{
size_t read_length;
+ size_t to_read;
char *value;
+ char *value_ptr;
/* We add two bytes so that we can walk the \r\n */
value= (char *)malloc(((*value_length) +2) * sizeof(char));
-
if (!value)
{
*value_length= 0;
*error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return NULL;
}
+ memset(value, 0, ((*value_length) +2) * sizeof(char));
+
+ value_ptr= 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.
- read_length= read(ptr->hosts[server_key].fd, value, (*value_length)+2);
+ We are null terminating through, which will most likely make
+ some people lazy about using the return length.
+ */
+ to_read= (*value_length) + 2;
- if ((read_length -2) != *value_length)
+ read_length= memcached_io_read(ptr, server_key,
+ value_ptr, to_read);
+
+ if (read_length != (size_t)(*value_length + 2))
{
free(value);
- *error= MEMCACHED_PARTIAL_READ;
-
- return NULL;
+ goto read_error;
}
+ value[*value_length]= 0;
+ value[(*value_length) + 1]= 0;
+
return value;
}
}
+ else if (*error == MEMCACHED_END)
+ *error= MEMCACHED_NOTFOUND;
return NULL;
+read_error:
+ *error= MEMCACHED_PARTIAL_READ;
+ return NULL;
}
+/*
+ What happens if no servers exist?
+*/
char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
size_t *value_length,
uint16_t *flags,
memcached_return *error)
{
- size_t send_length;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+ char *buf_ptr= buffer;
unsigned int server_key;
+ char *value= NULL;
+ 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;
+ goto error;
- server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
+ memcpy(buf_ptr, "get ", 4);
+ buf_ptr+= 4;
+ memcpy(buf_ptr, key, key_length);
+ buf_ptr+= key_length;
+ memcpy(buf_ptr, "\r\n", 2);
+ buf_ptr+= 2;
- send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, "get %.*s\r\n",
- (int)key_length, key);
- if (*error != MEMCACHED_SUCCESS)
- return NULL;
-
- if ((write(ptr->hosts[server_key].fd, buffer, send_length) == -1))
+ if ((memcached_io_write(ptr, server_key, buffer, (size_t)(buf_ptr - buffer), 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_END)
+ assert(0); /* If this happens we have somehow messed up the fetch */
+ 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,
char **keys, size_t *key_length,
unsigned int number_of_keys)
{
- char buffer[HUGE_STRING_LEN];
- char *buffer_ptr;
unsigned int x;
- memcached_return rc;
-
+ memcached_return rc= MEMCACHED_NOTFOUND;
+ char *cursor_key_exec;
+ LIBMEMCACHED_MEMCACHED_MGET_START();
ptr->cursor_server= 0;
- memset(buffer, 0, HUGE_STRING_LEN);
- rc= memcached_connect(ptr);
+ if (number_of_keys == 0)
+ return MEMCACHED_NOTFOUND;
- if (rc != MEMCACHED_SUCCESS)
- return rc;
-
- memcpy(buffer, "get", strlen("get"));
- buffer_ptr= buffer;
- buffer_ptr+=strlen("get");
+ cursor_key_exec= (char *)malloc(sizeof(char) * ptr->number_of_hosts);
+ memset(cursor_key_exec, 0, sizeof(char) * ptr->number_of_hosts);
for (x= 0; x < number_of_keys; x++)
{
- *buffer_ptr= ' ';
- buffer_ptr++;
- memcpy(buffer_ptr, keys[x], key_length[x]);
- buffer_ptr+= key_length[x];
+ unsigned int server_key;
+
+ server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
+
+ if (cursor_key_exec[server_key] == 0)
+ {
+ rc= memcached_connect(ptr, server_key);
+
+ if ((memcached_io_write(ptr, server_key, "get ", 4, 0)) == -1)
+ {
+ memcached_quit(ptr);
+ rc= MEMCACHED_SOME_ERRORS;
+ break;
+ }
+ }
+
+ if ((memcached_io_write(ptr, server_key, keys[x], key_length[x], 0)) == -1)
+ {
+ memcached_quit(ptr);
+ rc= MEMCACHED_SOME_ERRORS;
+ break;
+ }
+
+ if ((memcached_io_write(ptr, server_key, " ", 1, 0)) == -1)
+ {
+ memcached_quit(ptr);
+ rc= MEMCACHED_SOME_ERRORS;
+ break;
+ }
+ cursor_key_exec[server_key]= 1;
}
- memcpy(buffer_ptr, "\r\n", 2);
- buffer_ptr+=2;
/*
- This must be fixed. Right now we hit every server, and send keys
- to all servers. We should fix this quickly.
+ Should we muddle on if some servers are dead?
*/
for (x= 0; x < ptr->number_of_hosts; x++)
{
- if ((write(ptr->hosts[x].fd, buffer, (size_t)(buffer_ptr - buffer)) == -1))
+ if (cursor_key_exec[x])
{
- memcached_quit(ptr);
- rc= MEMCACHED_SOME_ERRORS;
+ /* We need to doo something about non-connnected hosts in the future */
+ if ((memcached_io_write(ptr, x, "\r\n", 2, 1)) == -1)
+ {
+ memcached_quit(ptr);
+ rc= MEMCACHED_SOME_ERRORS;
+ break;
+ }
+
+ ptr->hosts[x].cursor_active= 1;
}
+ else
+ ptr->hosts[x].cursor_active= 0;
}
+ free(cursor_key_exec);
+
+ LIBMEMCACHED_MEMCACHED_MGET_END();
return rc;
}
while (ptr->cursor_server < ptr->number_of_hosts)
{
+ if (!ptr->hosts[ptr->cursor_server].cursor_active)
+ {
+ ptr->cursor_server++;
+ continue;
+ }
+
value_check= memcached_value_fetch(ptr, key, key_length, value_length, flags,
error, 1, ptr->cursor_server);
if (*error == MEMCACHED_NOTFOUND)
ptr->cursor_server++;
+ else if (*error == MEMCACHED_END && *value_length == 0)
+ return NULL;
+ else if (*error == MEMCACHED_END)
+ assert(0); /* If this happens we have somehow messed up the fetch */
+ else if (*error != MEMCACHED_SUCCESS)
+ return NULL;
else
return value_check;
+
}
+ *value_length= 0;
return NULL;
}
projects / m6w6 / libmemcached / blobdiff