X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_get.c;h=087e4960f33355e3bf49ae93d2d85f6839c7355f;hb=95494802800a78d0ab84db3cb67aedc6a112b951;hp=a29deab3bfac2818f2385cb9bd500f777b5d074e;hpb=f4ff3ba0a9f212ac1323fc056d61fefd3782093c;p=awesomized%2Flibmemcached diff --git a/lib/memcached_get.c b/lib/memcached_get.c index a29deab3..087e4960 100644 --- a/lib/memcached_get.c +++ b/lib/memcached_get.c @@ -1,182 +1,141 @@ -#include - -static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_length, - size_t *value_length, - uint16_t *flags, - memcached_return *error, - char load_key, - unsigned int server_key) -{ - char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE]; - char *string_ptr; - - *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) - { - char *end_ptr; - - string_ptr= buffer; - string_ptr+= 6; /* "VALUE " */ - - /* We load the key */ - if (load_key) - { - memset(key, 0, MEMCACHED_MAX_KEY); - for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++) - { - *key= *end_ptr; - key++; - } - } - else /* Skip characters */ - for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++); - - /* 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); - - /* Length fetch */ - string_ptr= end_ptr + 1; - for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++); - *value_length= strtoll(string_ptr, &end_ptr, 10); - - /* Skip past the \r\n */ - string_ptr= end_ptr +2; - - if (*value_length) - { - size_t read_length; - char *value; - - /* 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; - } - - read_length= read(ptr->hosts[server_key].fd, value, (*value_length)+2); - - if ((read_length -2) != *value_length) - { - free(value); - *error= MEMCACHED_PARTIAL_READ; - - return NULL; - } - - return value; - } - } - - return NULL; -} +#include "common.h" +#include "memcached_io.h" +/* + 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]; - unsigned int server_key; + return memcached_get_by_key(ptr, NULL, 0, key, key_length, value_length, + flags, error); +} - *value_length= 0; - *error= memcached_connect(ptr); +char *memcached_get_by_key(memcached_st *ptr, + char *master_key, size_t master_key_length, + char *key, size_t key_length, + size_t *value_length, + uint16_t *flags, + memcached_return *error) +{ + char *value; - if (*error != MEMCACHED_SUCCESS) - return NULL; + /* Request the key */ + *error= memcached_mget_by_key(ptr, + master_key, + master_key_length, + &key, &key_length, 1); - server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts; + value= memcached_fetch(ptr, NULL, NULL, + value_length, flags, error); - send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, "get %.*s\r\n", - (int)key_length, key); - if (*error != MEMCACHED_SUCCESS) - return NULL; + /* This is for historical reasons */ + if (*error == MEMCACHED_END) + *error= MEMCACHED_NOTFOUND; - if ((write(ptr->hosts[server_key].fd, buffer, send_length) == -1)) - { - *error= MEMCACHED_WRITE_FAILURE; + if (value == NULL) return NULL; - } - return memcached_value_fetch(ptr, key, &key_length, value_length, flags, - error, 0, server_key); + memcached_finish(ptr); + + return value; } 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; + return memcached_mget_by_key(ptr, NULL, 0, keys, key_length, number_of_keys); +} + +memcached_return memcached_mget_by_key(memcached_st *ptr, + char *master_key, size_t master_key_length, + char **keys, size_t *key_length, + unsigned int number_of_keys) +{ unsigned int x; - memcached_return rc; + memcached_return rc= MEMCACHED_NOTFOUND; + char *get_command= "get "; + uint8_t get_command_length= 4; + unsigned int master_server_key= 0; + LIBMEMCACHED_MEMCACHED_MGET_START(); ptr->cursor_server= 0; - memset(buffer, 0, HUGE_STRING_LEN); - - rc= memcached_connect(ptr); - if (rc != MEMCACHED_SUCCESS) - return rc; + if (number_of_keys == 0) + return MEMCACHED_NOTFOUND; - memcpy(buffer, "get", strlen("get")); - buffer_ptr= buffer; - buffer_ptr+=strlen("get"); + if (ptr->number_of_hosts == 0) + return MEMCACHED_NO_SERVERS; - for (x= 0; x < number_of_keys; x++) + if (ptr->flags & MEM_SUPPORT_CAS) { - *buffer_ptr= ' '; - buffer_ptr++; - memcpy(buffer_ptr, keys[x], key_length[x]); - buffer_ptr+= key_length[x]; + get_command= "gets "; + get_command_length= 5; } - memcpy(buffer_ptr, "\r\n", 2); - buffer_ptr+=2; + memcached_finish(ptr); - /* - This must be fixed. Right now we hit every server, and send keys - to all servers. We should fix this quickly. + if (master_key && master_key_length) + master_server_key= memcached_generate_hash(ptr, master_key, master_key_length); + + /* + If a server fails we warn about errors and start all over with sending keys + to the server. */ - for (x= 0; x < ptr->number_of_hosts; x++) + for (x= 0; x < number_of_keys; x++) { - if ((write(ptr->hosts[x].fd, buffer, (size_t)(buffer_ptr - buffer)) == -1)) + unsigned int server_key; + + if (master_server_key) + server_key= master_server_key; + else + server_key= memcached_generate_hash(ptr, keys[x], key_length[x]); + + if (ptr->hosts[server_key].cursor_active == 0) { - memcached_quit(ptr); - rc= MEMCACHED_SOME_ERRORS; + rc= memcached_connect(ptr, server_key); + + if ((memcached_io_write(ptr, server_key, get_command, get_command_length, 0)) == -1) + { + rc= MEMCACHED_SOME_ERRORS; + continue; + } + ptr->hosts[server_key].cursor_active= 1; } - } - return rc; -} + if ((memcached_io_write(ptr, server_key, keys[x], key_length[x], 0)) == -1) + { + ptr->hosts[server_key].cursor_active= 0; + rc= MEMCACHED_SOME_ERRORS; + continue; + } -char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length, - size_t *value_length, - uint16_t *flags, - memcached_return *error) -{ - char *value_check; + if ((memcached_io_write(ptr, server_key, " ", 1, 0)) == -1) + { + ptr->hosts[server_key].cursor_active= 0; + rc= MEMCACHED_SOME_ERRORS; + continue; + } + } - while (ptr->cursor_server < ptr->number_of_hosts) + /* + Should we muddle on if some servers are dead? + */ + for (x= 0; x < ptr->number_of_hosts; x++) { - 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 - return value_check; + 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) + { + rc= MEMCACHED_SOME_ERRORS; + } + } } - return NULL; + LIBMEMCACHED_MEMCACHED_MGET_END(); + return rc; }