X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_get.c;h=db626f6fa07eefc54b9159c64adc51f05abb5e64;hb=8d0cd77fc7bafd1f353bc7c50910b751766f931a;hp=a8ece5361ac3a08f18c6f6b383f23606a95f0c09;hpb=583fff6ac27c305e31e2b4b906f4e0702e26fee6;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index a8ece536..db626f6f 100644
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -12,7 +12,6 @@ static memcached_return memcached_value_fetch(memcached_st *ptr, char *key, size
   char *string_ptr;
   char *end_ptr;
 
-  memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
   end_ptr= buffer + MEMCACHED_DEFAULT_COMMAND_SIZE;
 
   *flags= 0;
@@ -32,7 +31,6 @@ static memcached_return memcached_value_fetch(memcached_st *ptr, char *key, size
     /* 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++)
@@ -143,15 +141,22 @@ char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
   memcached_string_st *result_buffer;
   LIBMEMCACHED_MEMCACHED_GET_START();
 
+  if (key_length == 0)
+  {
+    *error= MEMCACHED_NO_KEY_PROVIDED;
+    return NULL;
+  }
+
+  if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
+  {
+    *error= MEMCACHED_NO_SERVERS;
+    return NULL;
+  }
+
   server_key= memcached_generate_hash(ptr, key, key_length);
   result_buffer= &ptr->result_buffer;
 
   *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);
@@ -159,11 +164,9 @@ char *memcached_get(memcached_st *ptr, char *key, size_t 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;
+  *error= memcached_do(ptr, server_key, buffer, (size_t)(buf_ptr - buffer), 1);
+  if (*error != MEMCACHED_SUCCESS)
     goto error;
-  }
 
   *error= memcached_value_fetch(ptr, key, &key_length, result_buffer, 
                                 flags, 0, server_key);
@@ -211,15 +214,14 @@ memcached_return memcached_mget(memcached_st *ptr,
 {
   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);
+  if (ptr->number_of_hosts == 0)
+    return MEMCACHED_NO_SERVERS;
 
   for (x= 0; x < number_of_keys; x++)
   {
@@ -227,32 +229,34 @@ memcached_return memcached_mget(memcached_st *ptr,
 
     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)
       {
-        memcached_quit(ptr);
+        memcached_quit_server(ptr, server_key);
         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;
+      memcached_quit_server(ptr, server_key);
       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;
+      memcached_quit_server(ptr, server_key);
       rc= MEMCACHED_SOME_ERRORS;
-      break;
+      continue;
     }
-    cursor_key_exec[server_key]= 1;
   }
 
 
@@ -261,24 +265,17 @@ memcached_return memcached_mget(memcached_st *ptr,
   */
   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);
+        memcached_quit_server(ptr, x);
         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;
 }
@@ -304,17 +301,28 @@ char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
     *value_length= memcached_string_length(result_buffer);
     
     if (*error == MEMCACHED_NOTFOUND)
+    {
+      ptr->hosts[ptr->cursor_server].cursor_active = 0;
       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 */
+      *value_length= 0;
+      return NULL;
     }
     else if (*error != MEMCACHED_SUCCESS)
+    {
       return NULL;
+    }
     else
+    {
       return  memcached_string_c_copy(result_buffer);
+    }
 
   }
 
@@ -322,11 +330,12 @@ char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
   return NULL;
 }
 
-#ifdef NOT_YET
-char *memcached_fetch_result(memcached_st *ptr, memcached_result_st *result,
-                    memcached_return *error)
+memcached_result_st *memcached_fetch_result(memcached_st *ptr, 
+                                            memcached_result_st *result,
+                                            memcached_return *error)
 {
-  char *value_check;
+  if (result == NULL)
+    result= memcached_result_create(ptr, NULL);
 
   while (ptr->cursor_server < ptr->number_of_hosts)
   {
@@ -336,25 +345,35 @@ char *memcached_fetch_result(memcached_st *ptr, memcached_result_st *result,
       continue;
     }
 
-    value_check= memcached_value_fetch(ptr, key, key_length, value_length, flags,
-                                       error, 1, ptr->cursor_server);
+    *error= memcached_value_fetch(ptr, result->key, &result->key_length, 
+                                       &result->value, 
+                                       &result->flags,
+                                       1, ptr->cursor_server);
     
     if (*error == MEMCACHED_NOTFOUND)
+    {
+      ptr->hosts[ptr->cursor_server].cursor_active = 0;
       ptr->cursor_server++;
-    else if (*error == MEMCACHED_END && *value_length == 0)
+    }
+    else if (*error == MEMCACHED_END && memcached_string_length((memcached_string_st *)(&result->value)) == 0)
+    {
       return NULL;
+    }
     else if (*error == MEMCACHED_END)
     {
       WATCHPOINT_ASSERT(0); /* If this happens we have somehow messed up the fetch */
+      return NULL;
     }
     else if (*error != MEMCACHED_SUCCESS)
+    {
       return NULL;
+    }
     else
-      return value_check;
+    {
+      return result;
+    }
 
   }
 
-  *value_length= 0;
   return NULL;
 }
-#endif