X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_get.c;h=087e4960f33355e3bf49ae93d2d85f6839c7355f;hb=95494802800a78d0ab84db3cb67aedc6a112b951;hp=8ec8cb1c2eddd9e49ae91460ff1e8be296d9f20d;hpb=174e1d4d3011843e7e909c9b378b888c67d02538;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index 8ec8cb1c..087e4960 100644
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -1,130 +1,6 @@
 #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, 
-                                   uint16_t *flags,
-                                   memcached_return *error,
-                                   char load_key,
-                                   unsigned int server_key)
-{
-  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;
-
-  *error= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
-
-  if (*error == MEMCACHED_SUCCESS)
-  {
-    char *next_ptr;
-
-    string_ptr= buffer;
-    string_ptr+= 6; /* "VALUE " */
-
-    /* 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++)
-      {
-        *key= *string_ptr;
-        key++;
-        (*key_length)++;
-      }
-    }
-    else /* Skip characters */
-      for (; end_ptr > string_ptr && *string_ptr != ' '; string_ptr++);
-
-    if (end_ptr == string_ptr)
-        goto read_error;
-
-    /* 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);
-
-    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+= 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.
-
-        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))
-      {
-        free(value);
-        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?
 */
@@ -133,220 +9,133 @@ char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
                     uint16_t *flags,
                     memcached_return *error)
 {
-  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, server_key);
+  return memcached_get_by_key(ptr, NULL, 0, key, key_length, value_length, 
+                              flags, error);
+}
 
-  if (*error != MEMCACHED_SUCCESS)
-    goto error;
+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;
 
-  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;
+  /* Request the key */
+  *error= memcached_mget_by_key(ptr, 
+                                master_key, 
+                                master_key_length, 
+                                &key, &key_length, 1);
 
-  if ((memcached_io_write(ptr, server_key, buffer, (size_t)(buf_ptr - buffer), 1)) == -1)
-  {
-    *error= MEMCACHED_WRITE_FAILURE;
-    goto error;
-  }
+  value= memcached_fetch(ptr, NULL, NULL, 
+                         value_length, flags, error);
 
-  value= memcached_value_fetch(ptr, key, &key_length, value_length, flags,
-                               error, 0, server_key);
-  if (*error == MEMCACHED_END && *value_length == 0)
-  {
+  /* This is for historical reasons */
+  if (*error == MEMCACHED_END)
     *error= MEMCACHED_NOTFOUND;
-    goto error;
-  }
-  else if (*error == MEMCACHED_END)
-  {
-    WATCHPOINT_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;
+  if (value == NULL)
+    return NULL;
 
-  LIBMEMCACHED_MEMCACHED_GET_END();
+  memcached_finish(ptr);
 
   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)
+{
+  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_NOTFOUND;
-  char *cursor_key_exec;
+  char *get_command= "get ";
+  uint8_t get_command_length= 4;
+  unsigned int master_server_key= 0;
+
   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;
+  }
 
+  memcached_finish(ptr);
+
+  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 < number_of_keys; x++)
   {
     unsigned int server_key;
 
-    server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
+    if (master_server_key)
+      server_key= master_server_key;
+    else
+      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);
         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;
       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;
       rc= MEMCACHED_SOME_ERRORS;
-      break;
+      continue;
     }
-    cursor_key_exec[server_key]= 1;
   }
 
-
   /*
     Should we muddle on if some servers are dead?
   */
   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);
         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;
 }
-
-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;
-
-  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)
-    {
-      WATCHPOINT_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;
-}
-
-#ifdef NOT_YET
-char *memcached_fetch_result(memcached_st *ptr, memcached_result_st *result,
-                    memcached_return *error)
-{
-  char *value_check;
-
-  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)
-    {
-      WATCHPOINT_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;
-}
-#endif