static memcached_return memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_length,
memcached_string_st *value,
uint16_t *flags,
+ uint64_t *cas,
char load_key,
unsigned int server_key)
{
char *string_ptr;
char *end_ptr;
- memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
end_ptr= buffer + MEMCACHED_DEFAULT_COMMAND_SIZE;
*flags= 0;
/* We load the key */
if (load_key)
{
- memset(key, 0, MEMCACHED_MAX_KEY);
*key_length= 0;
for (; end_ptr > string_ptr && *string_ptr != ' '; string_ptr++)
if (end_ptr == string_ptr)
goto read_error;
- /* Skip past the \r\n */
- string_ptr+= 2;
+ /* Skip spaces */
+ if (*string_ptr == '\r')
+ {
+ /* Skip past the \r\n */
+ string_ptr+= 2;
+ }
+ else
+ {
+ string_ptr++;
+ for (next_ptr= string_ptr; end_ptr > string_ptr && *string_ptr != ' '; string_ptr++);
+ if (cas)
+ *cas= (size_t)strtoll(next_ptr, &string_ptr, 10);
+ }
if (end_ptr < string_ptr)
goto read_error;
memcached_string_st *result_buffer;
LIBMEMCACHED_MEMCACHED_GET_START();
+ if (key_length == 0)
+ {
+ *error= MEMCACHED_NO_KEY_PROVIDED;
+ return NULL;
+ }
+
+ if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
+ {
+ *error= MEMCACHED_NO_SERVERS;
+ return NULL;
+ }
+
server_key= memcached_generate_hash(ptr, key, key_length);
result_buffer= &ptr->result_buffer;
*value_length= 0;
- *error= memcached_connect(ptr, server_key);
-
- if (*error != MEMCACHED_SUCCESS)
- goto error;
-
memcpy(buf_ptr, "get ", 4);
buf_ptr+= 4;
memcpy(buf_ptr, key, key_length);
memcpy(buf_ptr, "\r\n", 2);
buf_ptr+= 2;
- if ((memcached_io_write(ptr, server_key, buffer, (size_t)(buf_ptr - buffer), 1)) == -1)
- {
- *error= MEMCACHED_WRITE_FAILURE;
+ *error= memcached_do(ptr, server_key, buffer, (size_t)(buf_ptr - buffer), 1);
+ if (*error != MEMCACHED_SUCCESS)
goto error;
- }
*error= memcached_value_fetch(ptr, key, &key_length, result_buffer,
- flags, 0, server_key);
+ flags, NULL, 0, server_key);
*value_length= memcached_string_length(result_buffer);
if (*error == MEMCACHED_END && *value_length == 0)
{
{
unsigned int x;
memcached_return rc= MEMCACHED_NOTFOUND;
- char *cursor_key_exec;
+ char *get_command= "get ";
+ uint8_t get_command_length= 4
+
LIBMEMCACHED_MEMCACHED_MGET_START();
ptr->cursor_server= 0;
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);
+ if (ptr->number_of_hosts == 0)
+ return MEMCACHED_NO_SERVERS;
+
+ if (ptr->flags & MEM_SUPPORT_CAS)
+ {
+ get_command= "gets ";
+ get_command_length= 5;
+ }
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] == 0)
+ if (ptr->hosts[server_key].cursor_active == 0)
{
rc= memcached_connect(ptr, server_key);
- if ((memcached_io_write(ptr, server_key, "get ", 4, 0)) == -1)
+ if ((memcached_io_write(ptr, server_key, get_command, get_command_length, 0)) == -1)
{
- memcached_quit(ptr);
+ memcached_quit_server(ptr, server_key);
rc= MEMCACHED_SOME_ERRORS;
- break;
+ continue;
}
+ ptr->hosts[server_key].cursor_active= 1;
}
if ((memcached_io_write(ptr, server_key, keys[x], key_length[x], 0)) == -1)
{
- memcached_quit(ptr);
+ ptr->hosts[server_key].cursor_active = 0;
+ memcached_quit_server(ptr, server_key);
rc= MEMCACHED_SOME_ERRORS;
- break;
+ continue;
}
if ((memcached_io_write(ptr, server_key, " ", 1, 0)) == -1)
{
- memcached_quit(ptr);
+ ptr->hosts[server_key].cursor_active = 0;
+ memcached_quit_server(ptr, server_key);
rc= MEMCACHED_SOME_ERRORS;
- break;
+ continue;
}
- cursor_key_exec[server_key]= 1;
}
*/
for (x= 0; x < ptr->number_of_hosts; x++)
{
- if (cursor_key_exec[x])
+ if (ptr->hosts[x].cursor_active == 1)
{
/* 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);
+ memcached_quit_server(ptr, x);
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;
}
}
*error = memcached_value_fetch(ptr, key, key_length, result_buffer,
- flags, 1, ptr->cursor_server);
+ flags, NULL, 1, ptr->cursor_server);
*value_length= memcached_string_length(result_buffer);
if (*error == MEMCACHED_NOTFOUND)
+ {
+ ptr->hosts[ptr->cursor_server].cursor_active = 0;
ptr->cursor_server++;
+ }
else if (*error == MEMCACHED_END && *value_length == 0)
+ {
return NULL;
+ }
else if (*error == MEMCACHED_END)
{
WATCHPOINT_ASSERT(0); /* If this happens we have somehow messed up the fetch */
+ *value_length= 0;
return NULL;
}
else if (*error != MEMCACHED_SUCCESS)
+ {
return NULL;
+ }
else
+ {
return memcached_string_c_copy(result_buffer);
+ }
}
continue;
}
+ result->cas= 0; /* We do this so we do not send in any junk */
*error= memcached_value_fetch(ptr, result->key, &result->key_length,
&result->value,
&result->flags,
+ &result->cas,
1, ptr->cursor_server);
if (*error == MEMCACHED_NOTFOUND)
+ {
+ ptr->hosts[ptr->cursor_server].cursor_active = 0;
ptr->cursor_server++;
+ }
else if (*error == MEMCACHED_END && memcached_string_length((memcached_string_st *)(&result->value)) == 0)
+ {
return NULL;
+ }
else if (*error == MEMCACHED_END)
{
WATCHPOINT_ASSERT(0); /* If this happens we have somehow messed up the fetch */
return NULL;
}
else if (*error != MEMCACHED_SUCCESS)
+ {
return NULL;
+ }
else
+ {
return result;
+ }
}
projects / awesomized / libmemcached / blobdiff