X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_get.c;h=3ddeff886eb75cc8ab7af02d997dd29a75c4d043;hb=375ad7d822a4bbc121a79ce7e927385d6be7f754;hp=c688af34639684f8931d54c00e5db1b4a9c19946;hpb=be683ec76c3d55c427d72d3529f521e479967f6b;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index c688af34..3ddeff88 100644
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -1,101 +1,311 @@
-#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 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)
 {
-  size_t send_length;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   char *string_ptr;
-  unsigned int server_key;
-
-  *value_length= 0;
-  *error= memcached_connect(ptr);
+  char *end_ptr;
 
-  if (*error != MEMCACHED_SUCCESS)
-    return NULL;
-
-  server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
-
-  send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, "get %.*s\r\n", 
-                        key_length, key);
-  if (*error != MEMCACHED_SUCCESS)
-    return NULL;
+  memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
+  end_ptr= buffer + MEMCACHED_DEFAULT_COMMAND_SIZE;
 
-  if ((send(ptr->hosts[server_key].fd, buffer, send_length, 0) == -1))
-  {
-    fprintf(stderr, "failed fetch on %.*s TCP\n", key_length+1, key);
-    *error= MEMCACHED_WRITE_FAILURE;
-    return NULL;
-  }
+  *value_length= 0;
+  *flags= 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;
+    char *next_ptr;
 
     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 (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;
 
-    /* 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);
+    for (next_ptr= string_ptr; end_ptr > string_ptr && *string_ptr != ' '; string_ptr++);
+    *value_length= (size_t)strtoll(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;
+    string_ptr+= 2;
+
+    if (end_ptr < string_ptr)
+        goto read_error;
 
     if (*value_length)
     {
-      size_t need_to_copy;
-      char *pos_ptr;
+      size_t read_length;
+      size_t to_read;
       char *value;
+      char *value_ptr;
 
-      value= (char *)malloc(*value_length * sizeof(char));
-
+      /* 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));
 
-      need_to_copy= (*value_length < (size_t)(buffer-string_ptr)) 
-        ? *value_length 
-        : (size_t)(buffer-string_ptr) ;
+      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.
 
-      pos_ptr= memcpy(value, string_ptr, need_to_copy);
+        We are null terminating through, which will most likely make
+        some people lazy about using the return length.
+      */
+      to_read= (*value_length) + 2;
 
-      if ( need_to_copy > *value_length)
+      read_length= memcached_io_read(ptr, server_key,
+                                     value_ptr, to_read);
+
+      if (read_length != (size_t)(*value_length + 2))
       {
-        size_t read_length;
-        size_t need_to_read;
+        free(value);
+        goto read_error;
+      }
 
-        need_to_read= *value_length - need_to_copy;
+      value[*value_length]= 0;
+      value[(*value_length) + 1]= 0;
+
+      return value;
+    }
+  }
+  else if (*error == MEMCACHED_END)
+    *error= MEMCACHED_NOTFOUND;
 
-        read_length= read(ptr->hosts[server_key].fd, pos_ptr, need_to_read);
-        if (read_length != need_to_read)
-        {
-          free(value);
-          *error= MEMCACHED_PARTIAL_READ;
+  return NULL;
+read_error:
+  *error= MEMCACHED_PARTIAL_READ;
+  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)
+{
+  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);
+
+  if (*error != MEMCACHED_SUCCESS)
+    goto error;
+
+  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, (size_t)(buf_ptr - buffer), 1)) == -1)
+  {
+    *error= MEMCACHED_WRITE_FAILURE;
+    goto error;
+  }
 
-          return NULL;
-        }
+  value= memcached_value_fetch(ptr, key, &key_length, value_length, flags,
+                               error, 0, server_key);
+  if (*error == MEMCACHED_END && *value_length == 0)
+  {
+    *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;
+    /* 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;
+
+  LIBMEMCACHED_MEMCACHED_GET_END();
+
+  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)
+{
+  unsigned int x;
+  memcached_return rc= MEMCACHED_NOTFOUND;
+  char *cursor_key_exec;
+  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);
+
+  for (x= 0; x < number_of_keys; x++)
+  {
+    unsigned int server_key;
+
+    server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
+
+    if (cursor_key_exec[server_key] == 0)
+    {
+      rc= memcached_connect(ptr, server_key);
+
+      if ((memcached_io_write(ptr, server_key, "get ", 4, 0)) == -1)
+      {
+        memcached_quit(ptr);
+        rc= MEMCACHED_SOME_ERRORS;
+        break;
       }
+    }
 
-      return value;
+    if ((memcached_io_write(ptr, server_key, keys[x], key_length[x], 0)) == -1)
+    {
+      memcached_quit(ptr);
+      rc= MEMCACHED_SOME_ERRORS;
+      break;
     }
+
+    if ((memcached_io_write(ptr, server_key, " ", 1, 0)) == -1)
+    {
+      memcached_quit(ptr);
+      rc= MEMCACHED_SOME_ERRORS;
+      break;
+    }
+    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])
+    {
+      /* 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)
+      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;
 }