X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_get.c;h=80423e6b56ff443b9d6ca28a3dd96b2f2e9bd703;hb=311bd0fafe1da7b5cc770a2ff4fac5472a801a40;hp=1b53b11973cad78f1d7934bd1d17cdda31498d3c;hpb=7cbcd28d0e2958df0572d965996a65e22b18e66a;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index 1b53b119..80423e6b 100644
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -1,97 +1,375 @@
-#include <memcached.h>
+#include "common.h"
+#include "memcached_io.h"
 
-char *memcached_get(memcached_st *ptr, char *key, size_t key_length, 
-                    size_t *value_length, 
-                    uint16_t *flags,
-                    memcached_return *error)
+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,
+                                              unsigned int server_key)
 {
-  size_t send_length;
+  memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   char *string_ptr;
+  char *end_ptr;
 
-  *error= memcached_connect(ptr);
+  end_ptr= buffer + MEMCACHED_DEFAULT_COMMAND_SIZE;
 
-  if (*error != MEMCACHED_SUCCESS)
-    return NULL;
+  if (flags)
+    *flags= 0;
 
-  send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, "get %.*s\r\n", 
-                        key_length, key);
-  if (*error != MEMCACHED_SUCCESS)
-    return NULL;
+  memcached_string_reset(value);
 
-  if ((send(ptr->fd, buffer, send_length, 0) == -1))
-  {
-    fprintf(stderr, "failed fetch on %.*s TCP\n", key_length+1, key);
-    *error= MEMCACHED_WRITE_FAILURE;
-    return NULL;
-  }
+  rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
 
-  memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
-  *error= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE);
 
-  if (*error == MEMCACHED_SUCCESS)
+  if (rc == MEMCACHED_SUCCESS)
   {
-    char *end_ptr;
+    char *next_ptr;
+    size_t value_length;
 
     string_ptr= buffer;
     string_ptr+= 6; /* "VALUE " */
 
-    /* We do nothing with the key, since we only asked for one key */
-    for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++);
+    /* We load the key */
+    if (key)
+    {
+      *key_length= 0;
+
+      for (; isalnum(*string_ptr); string_ptr++)
+      {
+        *key= *string_ptr;
+        key++;
+        (*key_length)++;
+      }
+    }
+    else /* Skip characters */
+      for (; isalnum(*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; isdigit(*string_ptr); string_ptr++);
+    if (flags)
+      *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;
 
-    /* Skip past the \r\n */
-    string_ptr= end_ptr +2;
+    /* Length fetch move past space*/
+    string_ptr++;
+    if (end_ptr == string_ptr)
+        goto read_error;
 
-    if (*value_length)
+    for (next_ptr= string_ptr; isdigit(*string_ptr); string_ptr++);
+    value_length= (size_t)strtoll(next_ptr, &string_ptr, 10);
+
+    if (end_ptr == string_ptr)
+        goto read_error;
+
+    /* Skip spaces */
+    if (*string_ptr == '\r')
+    {
+      /* Skip past the \r\n */
+      string_ptr+= 2;
+    }
+    else
     {
-      size_t need_to_copy;
-      char *pos_ptr;
-      char *value;
+      string_ptr++;
+      for (next_ptr= string_ptr; isdigit(*string_ptr); string_ptr++);
+      if (cas)
+        *cas= (size_t)strtoll(next_ptr, &string_ptr, 10);
+    }
+
+    if (end_ptr < string_ptr)
+        goto read_error;
 
-      value= (char *)malloc(*value_length * sizeof(char));
+    if (value_length)
+    {
+      size_t read_length;
+      size_t to_read;
+      char *value_ptr;
 
-      if (!value)
+      /* We add two bytes so that we can walk the \r\n */
+      rc= memcached_string_check(value, value_length+2);
+      if (rc != MEMCACHED_SUCCESS)
       {
-        *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-        return NULL;
+        value_length= 0;
+        return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
       }
 
-      need_to_copy= (*value_length < (size_t)(buffer-string_ptr)) 
-        ? *value_length 
-        : (size_t)(buffer-string_ptr) ;
+      value_ptr= memcached_string_value(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,
+                                     value_ptr, to_read);
+
+      if (read_length != (size_t)(value_length + 2))
+      {
+        goto read_error;
+      }
+
+      /* This next bit blows the API, but this is internal....*/
+      {
+        char *char_ptr;
+        char_ptr= memcached_string_value(value);;
+        char_ptr[value_length]= 0;
+        char_ptr[value_length + 1]= 0;
+        memcached_string_set_length(value, value_length);
+      }
+
+      return MEMCACHED_SUCCESS;
+    }
+  }
+
+  return rc;
+
+read_error:
+  return MEMCACHED_PARTIAL_READ;
+}
+
+/* 
+  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)
+{
+  char *value;
+  char *dummy_value;
+  size_t dummy_length;
+  uint16_t dummy_flags;
+  memcached_return dummy_error;
+
+  /* Request the key */
+  *error= memcached_mget(ptr, &key, &key_length, 1);
+
+  value= memcached_fetch(ptr, NULL, NULL, 
+                         value_length, flags, error);
+
+  if (*error == MEMCACHED_END)
+    *error= MEMCACHED_NOTFOUND;
+
+  if (value == NULL)
+    return NULL;
+
+  /* We do a second read to clean the cursor */
+  dummy_value= memcached_fetch(ptr, NULL, NULL, 
+                               &dummy_length, &dummy_flags, 
+                               &dummy_error);
+
+  /* Something is really wrong if this happens */
+  WATCHPOINT_ASSERT(dummy_value == NULL);
+  if (dummy_value)
+    free(dummy_value);
+
+  return value;
+}
+
+memcached_return memcached_mget(memcached_st *ptr, 
+                                char **keys, size_t *key_length, 
+                                unsigned int number_of_keys)
+{
+  unsigned int x;
+  memcached_return rc= MEMCACHED_NOTFOUND;
+  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;
+
+  if (ptr->number_of_hosts == 0)
+    return MEMCACHED_NO_SERVERS;
+
+  if (ptr->flags & MEM_SUPPORT_CAS)
+  {
+    get_command= "gets ";
+    get_command_length= 5;
+  }
+
+  memcached_finish(ptr);
+
+  for (x= 0; x < number_of_keys; x++)
+  {
+    unsigned int server_key;
+
+    server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
 
-      pos_ptr= memcpy(value, string_ptr, need_to_copy);
+    if (ptr->hosts[server_key].cursor_active == 0)
+    {
+      rc= memcached_connect(ptr, server_key);
 
-      if ( need_to_copy > *value_length)
+      if ((memcached_io_write(ptr, server_key, get_command, get_command_length, 0)) == -1)
       {
-        size_t read_length;
-        size_t need_to_read;
+        memcached_quit_server(ptr, server_key);
+        rc= MEMCACHED_SOME_ERRORS;
+        continue;
+      }
+      ptr->hosts[server_key].cursor_active= 1;
+    }
 
-        need_to_read= *value_length - need_to_copy;
+    if ((memcached_io_write(ptr, server_key, keys[x], key_length[x], 0)) == -1)
+    {
+      ptr->hosts[server_key].cursor_active= 0;
+      memcached_quit_server(ptr, server_key);
+      rc= MEMCACHED_SOME_ERRORS;
+      continue;
+    }
 
-        read_length= read(ptr->fd, pos_ptr, need_to_read);
-        if (read_length != need_to_read)
-        {
-          free(value);
-          *error= MEMCACHED_PARTIAL_READ;
+    if ((memcached_io_write(ptr, server_key, " ", 1, 0)) == -1)
+    {
+      ptr->hosts[server_key].cursor_active= 0;
+      memcached_quit_server(ptr, server_key);
+      rc= MEMCACHED_SOME_ERRORS;
+      continue;
+    }
+  }
 
-          return NULL;
-        }
+  /*
+    Should we muddle on if some servers are dead?
+  */
+  for (x= 0; x < ptr->number_of_hosts; 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_server(ptr, x);
+        rc= MEMCACHED_SOME_ERRORS;
       }
+    }
+  }
+
+  LIBMEMCACHED_MEMCACHED_MGET_END();
+  return rc;
+}
 
-      return value;
+char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length, 
+                    size_t *value_length, 
+                    uint16_t *flags,
+                    memcached_return *error)
+{
+  memcached_string_st *result_buffer;
+  result_buffer= &ptr->result_buffer;
+
+  while (ptr->cursor_server < ptr->number_of_hosts)
+  {
+    if (!ptr->hosts[ptr->cursor_server].cursor_active)
+    {
+      ptr->cursor_server++;
+      continue;
     }
+
+    *error = memcached_value_fetch(ptr, key, key_length, result_buffer, 
+                                   flags, NULL, ptr->cursor_server);
+    *value_length= memcached_string_length(result_buffer);
+    
+    if (*error == MEMCACHED_END) /* END means that we move on to the next */
+    {
+      ptr->hosts[ptr->cursor_server].cursor_active= 0;
+      ptr->cursor_server++;
+      continue;
+    }
+    else if (*error == MEMCACHED_SUCCESS)
+      return  memcached_string_c_copy(result_buffer);
+    else
+      return NULL;
   }
 
+  ptr->cursor_server= 0;
+  *value_length= 0;
   return NULL;
 }
+
+memcached_result_st *memcached_fetch_result(memcached_st *ptr, 
+                                            memcached_result_st *result,
+                                            memcached_return *error)
+{
+  if (result == NULL)
+    result= memcached_result_create(ptr, NULL);
+
+  WATCHPOINT_ASSERT(result->value.is_allocated != MEMCACHED_USED);
+
+  while (ptr->cursor_server < ptr->number_of_hosts)
+  {
+    if (!ptr->hosts[ptr->cursor_server].cursor_active)
+    {
+      ptr->cursor_server++;
+      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,
+                                       ptr->cursor_server);
+    
+    if (*error == MEMCACHED_END) /* END means that we move on to the next */
+    {
+      ptr->hosts[ptr->cursor_server].cursor_active= 0;
+      ptr->cursor_server++;
+      continue;
+    }
+    else if (*error == MEMCACHED_SUCCESS)
+      return result;
+    else
+      return NULL;
+  }
+
+  /* An error has occurred */
+  if (result->is_allocated == MEMCACHED_ALLOCATED)
+    memcached_result_free(result);
+  else
+    memcached_string_reset(&result->value);
+
+  ptr->cursor_server= 0;
+  return NULL;
+}
+
+memcached_return memcached_finish_server(memcached_st *ptr, unsigned int server_key)
+{
+  memcached_return rc;
+  memcached_string_st *result_buffer;
+
+  result_buffer= &ptr->result_buffer;
+
+  rc= MEMCACHED_SUCCESS;
+  while (rc == MEMCACHED_SUCCESS)
+  {
+    rc= memcached_value_fetch(ptr, NULL, NULL, result_buffer, 
+                               NULL, NULL, server_key);
+  }
+  ptr->hosts[server_key].cursor_active= 0;
+
+  return rc;
+}
+
+void memcached_finish(memcached_st *ptr)
+{
+  unsigned int x;
+
+  for (x= 0; x < ptr->number_of_hosts; x++)
+  {
+    if (ptr->hosts[x].cursor_active)
+      (void)memcached_finish_server(ptr, x);
+  }
+
+  ptr->cursor_server= 0;
+}