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

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index baff7074..3ddeff88 100644
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -12,14 +12,11 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
   char *string_ptr;
   char *end_ptr;
 
-  assert(value_length);
-  assert(flags);
-  assert(error);
-
   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);
 
@@ -36,7 +33,7 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
       memset(key, 0, MEMCACHED_MAX_KEY);
       *key_length= 0;
 
-      for (; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++)
+      for (; end_ptr > string_ptr && *string_ptr != ' '; string_ptr++)
       {
         *key= *string_ptr;
         key++;
@@ -44,7 +41,7 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
       }
     }
     else /* Skip characters */
-      for (; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++);
+      for (; end_ptr > string_ptr && *string_ptr != ' '; string_ptr++);
 
     if (end_ptr == string_ptr)
         goto read_error;
@@ -53,7 +50,7 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
     string_ptr++;
     if (end_ptr == string_ptr)
         goto read_error;
-    for (next_ptr= string_ptr; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++);
+    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)
@@ -64,7 +61,7 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
     if (end_ptr == string_ptr)
         goto read_error;
 
-    for (next_ptr= string_ptr; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++);
+    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)
@@ -128,6 +125,9 @@ read_error:
   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,
@@ -136,7 +136,7 @@ char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   char *buf_ptr= buffer;
   unsigned int server_key;
-  char *value;
+  char *value= NULL;
   LIBMEMCACHED_MEMCACHED_GET_START();
 
   server_key= memcached_generate_hash(ptr, key, key_length);
@@ -201,18 +201,17 @@ memcached_return memcached_mget(memcached_st *ptr,
                                 char **keys, size_t *key_length, 
                                 unsigned int number_of_keys)
 {
-  char buffer[HUGE_STRING_LEN];
   unsigned int x;
-  memcached_return rc;
-  memcached_string_st **cursor_key_exec;
+  memcached_return rc= MEMCACHED_NOTFOUND;
+  char *cursor_key_exec;
   LIBMEMCACHED_MEMCACHED_MGET_START();
-
   ptr->cursor_server= 0;
-  memset(buffer, 0, HUGE_STRING_LEN);
 
-  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);
+  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++)
   {
@@ -220,26 +219,32 @@ memcached_return memcached_mget(memcached_st *ptr,
 
     server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
 
-    if (cursor_key_exec[server_key])
+    if (cursor_key_exec[server_key] == 0)
     {
-      memcached_string_st *string= cursor_key_exec[server_key];
+      rc= memcached_connect(ptr, server_key);
 
-      memcached_string_append_character(ptr, string, ' ');
-      memcached_string_append(ptr, string, keys[x], key_length[x]);
+      if ((memcached_io_write(ptr, server_key, "get ", 4, 0)) == -1)
+      {
+        memcached_quit(ptr);
+        rc= MEMCACHED_SOME_ERRORS;
+        break;
+      }
     }
-    else
-    {
-      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)
-        assert(0);
-
-      memcached_string_append(ptr, string, "get ", 4);
-      memcached_string_append(ptr, string, keys[x], key_length[x]);
+    if ((memcached_io_write(ptr, server_key, keys[x], key_length[x], 0)) == -1)
+    {
+      memcached_quit(ptr);
+      rc= MEMCACHED_SOME_ERRORS;
+      break;
+    }
 
-      cursor_key_exec[server_key]= string;
+    if ((memcached_io_write(ptr, server_key, " ", 1, 0)) == -1)
+    {
+      memcached_quit(ptr);
+      rc= MEMCACHED_SOME_ERRORS;
+      break;
     }
+    cursor_key_exec[server_key]= 1;
   }
 
 
@@ -251,19 +256,13 @@ 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 ((memcached_io_write(ptr, x, string->string, 
-                              memcached_string_length(ptr, string), 1)) == -1)
+      if ((memcached_io_write(ptr, x, "\r\n", 2, 1)) == -1)
       {
         memcached_quit(ptr);
         rc= MEMCACHED_SOME_ERRORS;
+        break;
       }
-      memcached_string_free(ptr, string);
-      cursor_key_exec[x]= NULL; /* Remove warning */
+
       ptr->hosts[x].cursor_active= 1;
     }
     else