X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_get.c;h=8cc7ce30b04adee6eb7d62555ed9fd90b0c8ecd4;hb=8a86b578acc594d37a8638e3e0afba1286c4b6ca;hp=06b406e39f467d5c0ba836240604924021d44624;hpb=806525899ce3dff894b829416307a4290cd882e2;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index 06b406e3..8cc7ce30 100644
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -1,238 +1,172 @@
-#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;
-}
+#include "common.h"
+#include "memcached_io.h"
 
+/* 
+  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,
+                    uint32_t *flags,
                     memcached_return *error)
 {
-  size_t send_length;
-  char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
-  unsigned int server_key;
-
-  *value_length= 0;
-  *error= memcached_connect(ptr);
+  return memcached_get_by_key(ptr, NULL, 0, key, key_length, value_length, 
+                              flags, error);
+}
 
-  if (*error != MEMCACHED_SUCCESS)
+char *memcached_get_by_key(memcached_st *ptr, 
+                           char *master_key, size_t master_key_length, 
+                           char *key, size_t key_length, 
+                           size_t *value_length, 
+                           uint32_t *flags,
+                           memcached_return *error)
+{
+  char *value;
+  size_t dummy_length;
+  uint32_t dummy_flags;
+  memcached_return dummy_error;
+
+  /* Request the key */
+  *error= memcached_mget_by_key(ptr, 
+                                master_key, 
+                                master_key_length, 
+                                &key, &key_length, 1);
+
+  value= memcached_fetch(ptr, NULL, NULL, 
+                         value_length, flags, error);
+  /* This is for historical reasons */
+  if (*error == MEMCACHED_END)
+    *error= MEMCACHED_NOTFOUND;
+
+  if (value == NULL)
     return NULL;
 
-  server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
-
-  send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, "get %.*s\r\n", 
-                        (int)key_length, key);
-  if (*error != MEMCACHED_SUCCESS)
-    return NULL;
+  (void)memcached_fetch(ptr, NULL, NULL, 
+                        &dummy_length, &dummy_flags, 
+                        &dummy_error);
+  WATCHPOINT_ASSERT(dummy_length == 0);
 
-  if ((write(ptr->hosts[server_key].fd, buffer, send_length) == -1))
-  {
-    *error= MEMCACHED_WRITE_FAILURE;
-    return NULL;
-  }
-
-  return memcached_value_fetch(ptr, key, &key_length, value_length, flags,
-                               error, 0, server_key);
+  return value;
 }
 
 memcached_return memcached_mget(memcached_st *ptr, 
                                 char **keys, size_t *key_length, 
                                 unsigned int number_of_keys)
 {
-  char buffer[HUGE_STRING_LEN];
+  return memcached_mget_by_key(ptr, NULL, 0, keys, key_length, number_of_keys);
+}
+
+memcached_return memcached_mget_by_key(memcached_st *ptr, 
+                                       char *master_key, size_t master_key_length,
+                                       char **keys, size_t *key_length, 
+                                       unsigned int number_of_keys)
+{
   unsigned int x;
-  memcached_return rc;
-  memcached_string_st **cursor_key_exec;
+  memcached_return rc= MEMCACHED_NOTFOUND;
+  char *get_command= "get ";
+  uint8_t get_command_length= 4;
+  unsigned int master_server_key= 0;
 
+  LIBMEMCACHED_MEMCACHED_MGET_START();
   ptr->cursor_server= 0;
-  memset(buffer, 0, HUGE_STRING_LEN);
-
-  rc= memcached_connect(ptr);
 
-  if (rc != MEMCACHED_SUCCESS)
-    return rc;
+  if (number_of_keys == 0)
+    return MEMCACHED_NOTFOUND;
 
-  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 (ptr->number_of_hosts == 0)
+    return MEMCACHED_NO_SERVERS;
 
+  if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test(keys, key_length, number_of_keys) == MEMCACHED_BAD_KEY_PROVIDED))
+    return MEMCACHED_BAD_KEY_PROVIDED;
 
-  for (x= 0; x < number_of_keys; x++)
+  if (ptr->flags & MEM_SUPPORT_CAS)
   {
-    unsigned int server_key;
+    get_command= "gets ";
+    get_command_length= 5;
+  }
 
-    server_key= memcached_generate_hash(keys[x], key_length[x]) % ptr->number_of_hosts;
+  if (master_key && master_key_length)
+    master_server_key= memcached_generate_hash(ptr, master_key, master_key_length);
 
-    if (cursor_key_exec[server_key])
+  /* 
+    Here is where we pay for the non-block API. We need to remove any data sitting
+    in the queue before we start our get.
+
+    It might be optimum to bounce the connection if count > some number.
+  */
+  for (x= 0; x < ptr->number_of_hosts; x++)
+  {
+    if (memcached_server_response_count(&ptr->hosts[x]))
     {
-      memcached_string_st *string= cursor_key_exec[server_key];
+      char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+
+      if (ptr->flags & MEM_NO_BLOCK)
+        (void)memcached_io_write(&ptr->hosts[x], NULL, 0, 1);
 
-      memcached_string_append_character(ptr, string, ' ');
-      memcached_string_append(ptr, string, keys[x], key_length[x]);
+      while(memcached_server_response_count(&ptr->hosts[x]))
+        (void)memcached_response(&ptr->hosts[x], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, &ptr->result);
     }
+  }
+
+  /* 
+    If a server fails we warn about errors and start all over with sending keys
+    to the server.
+  */
+  for (x= 0; x < number_of_keys; x++)
+  {
+    unsigned int server_key;
+
+    if (master_server_key)
+      server_key= master_server_key;
     else
+      server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
+
+    if (memcached_server_response_count(&ptr->hosts[server_key]) == 0)
     {
-      memcached_string_st *string= memcached_string_init(ptr, SMALL_STRING_LEN);
+      rc= memcached_connect(&ptr->hosts[server_key]);
 
-      /* We need to figure out the correct way to error in case of this failure */
-      if (!string)
-        assert(0);
+      if (rc != MEMCACHED_SUCCESS)
+        continue;
 
-      memcached_string_append(ptr, string, "get ", 4);
-      memcached_string_append(ptr, string, keys[x], key_length[x]);
+      if ((memcached_io_write(&ptr->hosts[server_key], get_command, get_command_length, 0)) == -1)
+      {
+        rc= MEMCACHED_SOME_ERRORS;
+        continue;
+      }
+      WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
+      memcached_server_response_increment(&ptr->hosts[server_key]);
+      WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 1);
+    }
 
-      cursor_key_exec[server_key]= string;
+    if ((memcached_io_write(&ptr->hosts[server_key], keys[x], key_length[x], 0)) == -1)
+    {
+      memcached_server_response_reset(&ptr->hosts[server_key]);
+      rc= MEMCACHED_SOME_ERRORS;
+      continue;
     }
-  }
 
+    if ((memcached_io_write(&ptr->hosts[server_key], " ", 1, 0)) == -1)
+    {
+      memcached_server_response_reset(&ptr->hosts[server_key]);
+      rc= MEMCACHED_SOME_ERRORS;
+      continue;
+    }
+  }
 
   /*
     Should we muddle on if some servers are dead?
   */
   for (x= 0; x < ptr->number_of_hosts; x++)
   {
-    if (cursor_key_exec[x])
+    if (memcached_server_response_count(&ptr->hosts[x]))
     {
-      memcached_string_st *string= cursor_key_exec[x];
-      memcached_string_append(ptr, string, "\r\n", 2);
-
-      if ((write(ptr->hosts[x].fd, string->string, 
-                 memcached_string_length(ptr, string)) == -1))
+      /* We need to do something about non-connnected hosts in the future */
+      if ((memcached_io_write(&ptr->hosts[x], "\r\n", 2, 1)) == -1)
       {
-        memcached_quit(ptr);
         rc= MEMCACHED_SOME_ERRORS;
       }
-      memcached_string_free(ptr, string);
-      cursor_key_exec[x]= NULL; /* Remove warning */
     }
   }
 
-  free(cursor_key_exec);
-
+  LIBMEMCACHED_MEMCACHED_MGET_END();
   return rc;
 }
-
-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;
-
-  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;
-}