X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_get.c;h=06b406e39f467d5c0ba836240604924021d44624;hb=a368fe94e9bc94eb63adad413c668b046d6f583f;hp=9eb60e2668afafecc589ef800955540220c93238;hpb=1c5dea03fd77a12341688b41e8b63e1c358a2ad6;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index 9eb60e26..06b406e3 100644
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -1,13 +1,118 @@
 #include <memcached.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)
+{
+  char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+  char *string_ptr;
+  char *end_ptr;
+
+  assert(value_length);
+  assert(flags);
+  assert(error);
+
+  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)
+  {
+    char *next_ptr;
+
+    string_ptr= buffer;
+    string_ptr+= 6; /* "VALUE " */
+
+    /* We load the key */
+    if (load_key)
+    {
+      memset(key, 0, MEMCACHED_MAX_KEY);
+      for (; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++)
+      {
+        *key= *string_ptr;
+        key++;
+      }
+    }
+    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;
+
+    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)
+        goto read_error;
+
+    /* Skip past the \r\n */
+    string_ptr+= 2;
+
+    if (end_ptr < string_ptr)
+        goto read_error;
+
+    if (*value_length)
+    {
+      size_t read_length;
+      char *value;
+
+      /* 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;
+      }
+
+      read_length= read(ptr->hosts[server_key].fd, value, (*value_length)+2);
+
+      if (read_length != (size_t)(*value_length + 2))
+      {
+        free(value);
+        goto read_error;
+      }
+
+      return value;
+    }
+  }
+
+  return NULL;
+read_error:
+  *error= MEMCACHED_PARTIAL_READ;
+  return NULL;
+}
+
 char *memcached_get(memcached_st *ptr, char *key, size_t key_length, 
                     size_t *value_length, 
                     uint16_t *flags,
                     memcached_return *error)
 {
-  size_t send_length, sent_length;
+  size_t send_length;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
-  char *string_ptr;
   unsigned int server_key;
 
   *value_length= 0;
@@ -20,85 +125,113 @@ char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
 
   send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, "get %.*s\r\n", 
                         (int)key_length, key);
+  if (*error != MEMCACHED_SUCCESS)
+    return NULL;
 
-  if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
-    return MEMCACHED_WRITE_FAILURE;
-
-  if ((sent_length = write(ptr->hosts[server_key].fd, buffer, send_length) == -1))
+  if ((write(ptr->hosts[server_key].fd, buffer, send_length) == -1))
   {
     *error= MEMCACHED_WRITE_FAILURE;
     return NULL;
   }
-  if (sent_length != send_length) {
-    *error= MEMCACHED_WRITE_FAILURE;
-    return NULL;
-  }
 
-  memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
-  *error= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+  return memcached_value_fetch(ptr, key, &key_length, value_length, flags,
+                               error, 0, server_key);
+}
 
-  if (*error == MEMCACHED_SUCCESS)
-  {
-    char *end_ptr;
+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;
 
-    string_ptr= buffer;
-    string_ptr+= 6; /* "VALUE " */
+  ptr->cursor_server= 0;
+  memset(buffer, 0, HUGE_STRING_LEN);
 
-    /* We do nothing with the key, since we only asked for one key */
-    for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++);
+  rc= memcached_connect(ptr);
 
-    /* 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);
+  if (rc != MEMCACHED_SUCCESS)
+    return rc;
 
-    /* Length fetch */
-    string_ptr= end_ptr + 1;
-    for (end_ptr= string_ptr; *end_ptr != ' '; end_ptr++);
-    *value_length= strtoll(string_ptr, &end_ptr, 10);
+  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);
 
-    /* Skip past the \r\n */
-    string_ptr= end_ptr +2;
 
-    if (*value_length)
+  for (x= 0; x < number_of_keys; x++)
+  {
+    unsigned int server_key;
+
+    server_key= memcached_generate_hash(keys[x], key_length[x]) % ptr->number_of_hosts;
+
+    if (cursor_key_exec[server_key])
     {
-      size_t need_to_copy;
-      char *pos_ptr;
-      char *value;
+      memcached_string_st *string= cursor_key_exec[server_key];
 
-      value= (char *)malloc(*value_length * sizeof(char));
+      memcached_string_append_character(ptr, string, ' ');
+      memcached_string_append(ptr, string, keys[x], key_length[x]);
+    }
+    else
+    {
+      memcached_string_st *string= memcached_string_init(ptr, SMALL_STRING_LEN);
 
-      if (!value)
-      {
-        *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-        return NULL;
-      }
+      /* We need to figure out the correct way to error in case of this failure */
+      if (!string)
+        assert(0);
 
-      need_to_copy= (*value_length < (size_t)(buffer-string_ptr)) 
-        ? *value_length 
-        : (size_t)(buffer-string_ptr) ;
+      memcached_string_append(ptr, string, "get ", 4);
+      memcached_string_append(ptr, string, keys[x], key_length[x]);
 
-      pos_ptr= memcpy(value, string_ptr, need_to_copy);
+      cursor_key_exec[server_key]= string;
+    }
+  }
+
+
+  /*
+    Should we muddle on if some servers are dead?
+  */
+  for (x= 0; x < ptr->number_of_hosts; x++)
+  {
+    if (cursor_key_exec[x])
+    {
+      memcached_string_st *string= cursor_key_exec[x];
+      memcached_string_append(ptr, string, "\r\n", 2);
 
-      if ( need_to_copy > *value_length)
+      if ((write(ptr->hosts[x].fd, string->string, 
+                 memcached_string_length(ptr, string)) == -1))
       {
-        size_t read_length;
-        size_t need_to_read;
+        memcached_quit(ptr);
+        rc= MEMCACHED_SOME_ERRORS;
+      }
+      memcached_string_free(ptr, string);
+      cursor_key_exec[x]= NULL; /* Remove warning */
+    }
+  }
 
-        need_to_read= *value_length - need_to_copy;
+  free(cursor_key_exec);
 
-        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 rc;
+}
 
-          return NULL;
-        }
-      }
+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;
 
-      return value;
-    }
+  while (ptr->cursor_server < ptr->number_of_hosts)
+  {
+    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_SUCCESS)
+      return NULL;
+    else
+      return value_check;
   }
 
   return NULL;