X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_get.c;h=251cd59201c0ac67236cf289b6ee48006185af2f;hb=7add2cb42be7d072888ab916eb35cdef8a2774a1;hp=5bef0c04a54c9f19b2088f3b214899cc4c1c9e40;hpb=a95ca4ad9c0f9d23c8a83bd337acdecc221021ef;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index 5bef0c04..251cd592 100644
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -1,4 +1,5 @@
 #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, 
@@ -15,11 +16,11 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
   assert(flags);
   assert(error);
 
+  memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
   end_ptr= buffer + MEMCACHED_DEFAULT_COMMAND_SIZE;
 
   *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)
@@ -33,10 +34,13 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
     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 */
@@ -75,34 +79,33 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
     if (*value_length)
     {
       size_t read_length;
-      size_t partial_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));
-      memset(value, 0, ((*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;
-      /* This is overkill */
-      while ((partial_length= recv(ptr->hosts[server_key].fd, value_ptr, to_read, 0)) > 0)
-      {
-        value_ptr+= partial_length;
-        read_length+= partial_length;
-        to_read-= partial_length;
-        if (read_length == (size_t)(*value_length + 2))
-          break;
-      }
+
+      read_length= memcached_io_read(ptr, server_key,
+                                     value_ptr, to_read);
 
       if (read_length != (size_t)(*value_length + 2))
       {
@@ -110,9 +113,14 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
         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:
@@ -131,30 +139,58 @@ char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
   char *value;
   LIBMEMCACHED_MEMCACHED_GET_START();
 
+  server_key= memcached_generate_hash(ptr, key, key_length);
+
   *value_length= 0;
-  *error= memcached_connect(ptr);
+  *error= memcached_connect(ptr, server_key);
 
   if (*error != MEMCACHED_SUCCESS)
-    return NULL;
-
-  server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
+    goto error;
 
   send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, "get %.*s\r\n", 
                         (int)key_length, key);
-  if (*error != MEMCACHED_SUCCESS)
-    return NULL;
 
-  if ((send(ptr->hosts[server_key].fd, buffer, send_length, 0) == -1))
+  if ((memcached_io_write(ptr, server_key, buffer, send_length, 1)) == -1)
   {
     *error= MEMCACHED_WRITE_FAILURE;
-    return NULL;
+    goto error;
   }
 
   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, 
@@ -170,11 +206,6 @@ memcached_return memcached_mget(memcached_st *ptr,
   ptr->cursor_server= 0;
   memset(buffer, 0, HUGE_STRING_LEN);
 
-  rc= memcached_connect(ptr);
-
-  if (rc != MEMCACHED_SUCCESS)
-    return rc;
-
   cursor_key_exec= (memcached_string_st **)malloc(sizeof(memcached_string_st *) * ptr->number_of_hosts);
   memset(cursor_key_exec, 0, sizeof(memcached_string_st *) * ptr->number_of_hosts);
 
@@ -183,7 +214,7 @@ memcached_return memcached_mget(memcached_st *ptr,
   {
     unsigned int server_key;
 
-    server_key= memcached_generate_hash(keys[x], key_length[x]) % ptr->number_of_hosts;
+    server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
 
     if (cursor_key_exec[server_key])
     {
@@ -194,7 +225,7 @@ memcached_return memcached_mget(memcached_st *ptr,
     }
     else
     {
-      memcached_string_st *string= memcached_string_init(ptr, SMALL_STRING_LEN);
+      memcached_string_st *string= memcached_string_create(ptr, SMALL_STRING_LEN);
 
       /* We need to figure out the correct way to error in case of this failure */
       if (!string)
@@ -215,18 +246,24 @@ memcached_return memcached_mget(memcached_st *ptr,
   {
     if (cursor_key_exec[x])
     {
+      /* We need to doo something about non-connnected hosts in the future */
+      rc= memcached_connect(ptr, x);
+
       memcached_string_st *string= cursor_key_exec[x];
       memcached_string_append(ptr, string, "\r\n", 2);
 
-      if ((send(ptr->hosts[x].fd, string->string, 
-                 memcached_string_length(ptr, string), 0) == -1))
+      if ((memcached_io_write(ptr, x, string->string, 
+                              memcached_string_length(ptr, string), 1)) == -1)
       {
         memcached_quit(ptr);
         rc= MEMCACHED_SOME_ERRORS;
       }
       memcached_string_free(ptr, string);
       cursor_key_exec[x]= NULL; /* Remove warning */
+      ptr->hosts[x].cursor_active= 1;
     }
+    else
+      ptr->hosts[x].cursor_active= 0;
   }
 
   free(cursor_key_exec);
@@ -244,16 +281,28 @@ char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
 
   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;
 }