char *string_ptr;
char *end_ptr;
- assert(value_length);
- assert(flags);
- assert(error);
-
memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
end_ptr= buffer + MEMCACHED_DEFAULT_COMMAND_SIZE;
*value_length= 0;
+ *flags= 0;
*error= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
memset(key, 0, MEMCACHED_MAX_KEY);
*key_length= 0;
- for (; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++)
+ for (; end_ptr > string_ptr && *string_ptr != ' '; string_ptr++)
{
*key= *string_ptr;
key++;
}
}
else /* Skip characters */
- for (; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++);
+ for (; end_ptr > string_ptr && *string_ptr != ' '; string_ptr++);
if (end_ptr == string_ptr)
goto read_error;
string_ptr++;
if (end_ptr == string_ptr)
goto read_error;
- for (next_ptr= string_ptr; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++);
+ for (next_ptr= string_ptr; end_ptr > string_ptr && *string_ptr != ' '; string_ptr++);
*flags= (uint16_t)strtol(next_ptr, &string_ptr, 10);
if (end_ptr == string_ptr)
if (end_ptr == string_ptr)
goto read_error;
- for (next_ptr= string_ptr; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++);
+ 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)
/* We add two bytes so that we can walk the \r\n */
value= (char *)malloc(((*value_length) +2) * sizeof(char));
- memset(value, 0, ((*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.
+
+ 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,
goto read_error;
}
+ value[*value_length]= 0;
+ value[(*value_length) + 1]= 0;
+
return value;
}
}
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;
+ char *value= NULL;
LIBMEMCACHED_MEMCACHED_GET_START();
server_key= memcached_generate_hash(ptr, key, key_length);
if (*error != MEMCACHED_SUCCESS)
goto error;
- send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, "get %.*s\r\n",
- (int)key_length, key);
+ 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;
- if ((memcached_io_write(ptr, server_key, buffer, send_length, 1)) == -1)
+ if ((memcached_io_write(ptr, server_key, buffer, (size_t)(buf_ptr - buffer), 1)) == -1)
{
*error= MEMCACHED_WRITE_FAILURE;
goto error;
*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;
char **keys, size_t *key_length,
unsigned int number_of_keys)
{
- char buffer[HUGE_STRING_LEN];
unsigned int x;
- memcached_return rc;
- memcached_string_st **cursor_key_exec;
+ memcached_return rc= MEMCACHED_NOTFOUND;
+ char *cursor_key_exec;
LIBMEMCACHED_MEMCACHED_MGET_START();
-
ptr->cursor_server= 0;
- memset(buffer, 0, HUGE_STRING_LEN);
- 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);
+ if (number_of_keys == 0)
+ return MEMCACHED_NOTFOUND;
+ 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++)
{
server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
- if (cursor_key_exec[server_key])
+ if (cursor_key_exec[server_key] == 0)
{
- memcached_string_st *string= cursor_key_exec[server_key];
+ rc= memcached_connect(ptr, server_key);
- memcached_string_append_character(ptr, string, ' ');
- memcached_string_append(ptr, string, keys[x], key_length[x]);
+ if ((memcached_io_write(ptr, server_key, "get ", 4, 0)) == -1)
+ {
+ memcached_quit(ptr);
+ rc= MEMCACHED_SOME_ERRORS;
+ break;
+ }
}
- else
- {
- 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)
- assert(0);
- memcached_string_append(ptr, string, "get ", 4);
- memcached_string_append(ptr, string, keys[x], key_length[x]);
+ if ((memcached_io_write(ptr, server_key, keys[x], key_length[x], 0)) == -1)
+ {
+ memcached_quit(ptr);
+ rc= MEMCACHED_SOME_ERRORS;
+ break;
+ }
- cursor_key_exec[server_key]= string;
+ if ((memcached_io_write(ptr, server_key, " ", 1, 0)) == -1)
+ {
+ memcached_quit(ptr);
+ rc= MEMCACHED_SOME_ERRORS;
+ break;
}
+ cursor_key_exec[server_key]= 1;
}
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 ((memcached_io_write(ptr, x, string->string,
- memcached_string_length(ptr, string), 1)) == -1)
+ if ((memcached_io_write(ptr, x, "\r\n", 2, 1)) == -1)
{
memcached_quit(ptr);
rc= MEMCACHED_SOME_ERRORS;
+ break;
}
- memcached_string_free(ptr, string);
- cursor_key_exec[x]= NULL; /* Remove warning */
+
+ ptr->hosts[x].cursor_active= 1;
}
+ else
+ ptr->hosts[x].cursor_active= 0;
}
free(cursor_key_exec);
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