X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmemcached_get.c;h=98e24d9fbf938ba3c72a04eaa6ec0c783bad7c2d;hb=d1b81fd3181ddae3787fa7ca9c0c7f922e7ddafd;hp=147b6105ca87d68d42449247b5bc25edcfff846c;hpb=02c35e9f14dddc82c86f246002b91bf8e25cbaa3;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index 147b6105..98e24d9f 100644
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -1,31 +1,30 @@
 #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)
+static memcached_return memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_length, 
+                                              memcached_string_st *value,
+                                              uint16_t *flags,
+                                              uint64_t *cas,
+                                              char load_key,
+                                              unsigned int server_key)
 {
+  memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   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;
+
+  memcached_string_reset(value);
 
-  *error= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+  rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
 
-  if (*error == MEMCACHED_SUCCESS)
+  if (rc == MEMCACHED_SUCCESS)
   {
     char *next_ptr;
+    size_t value_length;
 
     string_ptr= buffer;
     string_ptr+= 6; /* "VALUE " */
@@ -33,10 +32,9 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
     /* 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++)
+      for (; isalnum(*string_ptr); string_ptr++)
       {
         *key= *string_ptr;
         key++;
@@ -44,7 +42,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 (; isalnum(*string_ptr); string_ptr++);
 
     if (end_ptr == string_ptr)
         goto read_error;
@@ -53,7 +51,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; isdigit(*string_ptr); string_ptr++);
     *flags= (uint16_t)strtol(next_ptr, &string_ptr, 10);
 
     if (end_ptr == string_ptr)
@@ -64,36 +62,44 @@ 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++);
-    *value_length= (size_t)strtoll(next_ptr, &string_ptr, 10);
+    for (next_ptr= string_ptr; isdigit(*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;
+    /* Skip spaces */
+    if (*string_ptr == '\r')
+    {
+      /* Skip past the \r\n */
+      string_ptr+= 2;
+    }
+    else
+    {
+      string_ptr++;
+      for (next_ptr= string_ptr; isdigit(*string_ptr); string_ptr++);
+      if (cas)
+        *cas= (size_t)strtoll(next_ptr, &string_ptr, 10);
+    }
 
     if (end_ptr < string_ptr)
         goto read_error;
 
-    if (*value_length)
+    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)
+      rc= memcached_string_check(value, value_length+2);
+      if (rc != MEMCACHED_SUCCESS)
       {
-        *value_length= 0;
-        *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-        return NULL;
+        value_length= 0;
+        return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
       }
-      memset(value, 0, ((*value_length) +2) * sizeof(char));
 
-      value_ptr= value;
+      value_ptr= memcached_string_value(value);
       read_length= 0;
       /* 
         We read the \r\n into the string since not doing so is more 
@@ -102,32 +108,40 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
         We are null terminating through, which will most likely make
         some people lazy about using the return length.
       */
-      to_read= (*value_length) + 2;
+      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))
+      if (read_length != (size_t)(value_length + 2))
       {
-        free(value);
         goto read_error;
       }
 
-      value[*value_length]= 0;
-      value[(*value_length) + 1]= 0;
+      /* This next bit blows the API, but this is internal....*/
+      {
+        char *char_ptr;
+        char_ptr= memcached_string_value(value);;
+        char_ptr[value_length]= 0;
+        char_ptr[value_length + 1]= 0;
+        memcached_string_set_length(value, value_length);
+      }
 
-      return value;
+      return MEMCACHED_SUCCESS;
     }
   }
-  else if (*error == MEMCACHED_END)
-    *error= MEMCACHED_NOTFOUND;
+  else if (rc == MEMCACHED_END)
+    rc= MEMCACHED_NOTFOUND;
+
+  return rc;
 
-  return NULL;
 read_error:
-  *error= MEMCACHED_PARTIAL_READ;
-  return NULL;
+  return MEMCACHED_PARTIAL_READ;
 }
 
+/* 
+  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,17 +150,25 @@ 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;
+  memcached_string_st *result_buffer;
   LIBMEMCACHED_MEMCACHED_GET_START();
 
-  server_key= memcached_generate_hash(ptr, key, key_length);
+  if (key_length == 0)
+  {
+    *error= MEMCACHED_NO_KEY_PROVIDED;
+    return NULL;
+  }
 
-  *value_length= 0;
-  *error= memcached_connect(ptr, server_key);
+  if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
+  {
+    *error= MEMCACHED_NO_SERVERS;
+    return NULL;
+  }
 
-  if (*error != MEMCACHED_SUCCESS)
-    goto error;
+  server_key= memcached_generate_hash(ptr, key, key_length);
+  result_buffer= &ptr->result_buffer;
 
+  *value_length= 0;
   memcpy(buf_ptr, "get ", 4);
   buf_ptr+= 4;
   memcpy(buf_ptr, key, key_length);
@@ -154,21 +176,22 @@ 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;
-  }
 
-  value= memcached_value_fetch(ptr, key, &key_length, value_length, flags,
-                               error, 0, server_key);
+  *error= memcached_value_fetch(ptr, key, &key_length, result_buffer, 
+                                flags, NULL, 0, server_key);
+  *value_length= memcached_string_length(result_buffer);
   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 */
+  {
+    WATCHPOINT_ASSERT(0); /* If this happens we have somehow messed up the fetch */
+  }
   else if (*error == MEMCACHED_SUCCESS)
   {
     memcached_return rc;
@@ -186,33 +209,39 @@ char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
 
   LIBMEMCACHED_MEMCACHED_GET_END();
 
-  return value;
+  return memcached_string_c_copy(result_buffer);
 
 error:
-  free(value);
   *value_length= 0;
 
   LIBMEMCACHED_MEMCACHED_GET_END();
 
-    return NULL;
+  return NULL;
 }
 
 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;
-  LIBMEMCACHED_MEMCACHED_MGET_START();
+  memcached_return rc= MEMCACHED_NOTFOUND;
+  char *get_command= "get ";
+  uint8_t get_command_length= 4
 
+  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;
 
+  if (ptr->number_of_hosts == 0)
+    return MEMCACHED_NO_SERVERS;
+
+  if (ptr->flags & MEM_SUPPORT_CAS)
+  {
+    get_command= "gets ";
+    get_command_length= 5;
+  }
 
   for (x= 0; x < number_of_keys; x++)
   {
@@ -220,25 +249,33 @@ 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 (ptr->hosts[server_key].cursor_active == 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_command, get_command_length, 0)) == -1)
+      {
+        memcached_quit_server(ptr, server_key);
+        rc= MEMCACHED_SOME_ERRORS;
+        continue;
+      }
+      ptr->hosts[server_key].cursor_active= 1;
     }
-    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)
+    {
+      ptr->hosts[server_key].cursor_active = 0;
+      memcached_quit_server(ptr, server_key);
+      rc= MEMCACHED_SOME_ERRORS;
+      continue;
+    }
 
-      cursor_key_exec[server_key]= string;
+    if ((memcached_io_write(ptr, server_key, " ", 1, 0)) == -1)
+    {
+      ptr->hosts[server_key].cursor_active = 0;
+      memcached_quit_server(ptr, server_key);
+      rc= MEMCACHED_SOME_ERRORS;
+      continue;
     }
   }
 
@@ -248,30 +285,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 */
-      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);
+        memcached_quit_server(ptr, x);
         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);
-
   LIBMEMCACHED_MEMCACHED_MGET_END();
   return rc;
 }
@@ -281,7 +305,8 @@ char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
                     uint16_t *flags,
                     memcached_return *error)
 {
-  char *value_check;
+  memcached_string_st *result_buffer;
+  result_buffer= &ptr->result_buffer;
 
   while (ptr->cursor_server < ptr->number_of_hosts)
   {
@@ -291,22 +316,93 @@ char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
       continue;
     }
 
-    value_check= memcached_value_fetch(ptr, key, key_length, value_length, flags,
-                                       error, 1, ptr->cursor_server);
+    *error = memcached_value_fetch(ptr, key, key_length, result_buffer, 
+                                   flags, NULL, 1, ptr->cursor_server);
+    *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)
-      assert(0); /* If this happens we have somehow messed up the fetch */
+    {
+      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 value_check;
+    {
+      return  memcached_string_c_copy(result_buffer);
+    }
 
   }
 
   *value_length= 0;
   return NULL;
 }
+
+memcached_result_st *memcached_fetch_result(memcached_st *ptr, 
+                                            memcached_result_st *result,
+                                            memcached_return *error)
+{
+  if (result == NULL)
+    result= memcached_result_create(ptr, NULL);
+
+  WATCHPOINT_ASSERT(result->value.is_allocated != MEMCACHED_USED);
+
+  while (ptr->cursor_server < ptr->number_of_hosts)
+  {
+    if (!ptr->hosts[ptr->cursor_server].cursor_active)
+    {
+      ptr->cursor_server++;
+      continue;
+    }
+
+    result->cas= 0; /* We do this so we do not send in any junk */
+    *error= memcached_value_fetch(ptr, result->key, &result->key_length, 
+                                       &result->value, 
+                                       &result->flags,
+                                       &result->cas,
+                                       1, ptr->cursor_server);
+    
+    if (*error == MEMCACHED_NOTFOUND)
+    {
+      ptr->hosts[ptr->cursor_server].cursor_active = 0;
+      ptr->cursor_server++;
+    }
+    else if (*error == MEMCACHED_END && memcached_string_length((memcached_string_st *)(&result->value)) == 0)
+    {
+      break;
+    }
+    else if (*error == MEMCACHED_END)
+    {
+      WATCHPOINT_ASSERT(0); /* If this happens we have somehow messed up the fetch */
+      break;
+    }
+    else if (*error != MEMCACHED_SUCCESS)
+    {
+      break;
+    }
+    else
+    {
+      return result;
+    }
+  }
+
+  /* An error has occurred */
+  if (result->is_allocated == MEMCACHED_ALLOCATED)
+    memcached_result_free(result);
+  else
+    memcached_string_reset(&result->value);
+
+  return NULL;
+}