X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_fetch.c;h=7f8a6b52ba622e0f0a5e3f39edc453d7656635eb;hb=29da9304fc64e62ae3c80916bac92d38c41f7f79;hp=37cec5d30366a857b9e99f7e7424170a5ff75326;hpb=34a8c3858f30b02568c87f56a827f618aba6d6be;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached_fetch.c b/libmemcached/memcached_fetch.c
index 37cec5d3..7f8a6b52 100644
--- a/libmemcached/memcached_fetch.c
+++ b/libmemcached/memcached_fetch.c
@@ -1,134 +1,19 @@
 #include "common.h"
 #include "memcached_io.h"
 
-memcached_return value_fetch(memcached_server_st *ptr,
-                             char *buffer,
-                             memcached_result_st *result)
+char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length, 
+                      size_t *value_length, 
+                      uint32_t *flags,
+                      memcached_return *error)
 {
-  memcached_return rc= MEMCACHED_SUCCESS;
-  char *string_ptr;
-  char *end_ptr;
-  char *next_ptr;
-  size_t value_length;
-  size_t read_length;
-  size_t to_read;
-  char *value_ptr;
-
-  end_ptr= buffer + MEMCACHED_DEFAULT_COMMAND_SIZE;
-
-  result->key_length= 0;
-  result->flags= 0;
-  memcached_string_reset(&result->value);
-
-  string_ptr= buffer;
-  string_ptr+= 6; /* "VALUE " */
-
-
-  /* We load the key */
-  {
-    char *key;
-
-    key= result->key;
-    result->key_length= 0;
-
-    for (; isgraph(*string_ptr); string_ptr++)
-    {
-      *key= *string_ptr;
-      key++;
-      result->key_length++;
-    }
-    result->key[result->key_length]= 0;
-  }
-
-  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; isdigit(*string_ptr); string_ptr++);
-  result->flags= (uint32_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; isdigit(*string_ptr); string_ptr++);
-  value_length= (size_t)strtoll(next_ptr, &string_ptr, 10);
-
-  if (end_ptr == string_ptr)
-    goto read_error;
-
-  /* Skip spaces */
-  if (*string_ptr == '\r')
-  {
-    /* Skip past the \r\n */
-    string_ptr+= 2;
-    result->cas= 0;
-  }
-  else
-  {
-    string_ptr++;
-    for (next_ptr= string_ptr; isdigit(*string_ptr); string_ptr++);
-    result->cas= (size_t)strtoll(next_ptr, &string_ptr, 10);
-  }
-
-  if (end_ptr < string_ptr)
-    goto read_error;
-
-  /* We add two bytes so that we can walk the \r\n */
-  rc= memcached_string_check(&result->value, value_length+2);
-  if (rc != MEMCACHED_SUCCESS)
-  {
-    value_length= 0;
-    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-  }
-
-  value_ptr= memcached_string_value(&result->value);
-  read_length= 0;
-  /* 
-    We read the \r\n into the string since not doing so is more 
-    cycles then the waster of memory to do so.
-
-    We are null terminating through, which will most likely make
-    some people lazy about using the return length.
-  */
-  to_read= (value_length) + 2;
-  read_length= memcached_io_read(ptr, value_ptr, to_read);
-  if (read_length != (size_t)(value_length + 2))
-  {
-    goto read_error;
-  }
+  memcached_result_st *result_buffer= &ptr->result;
 
-/* This next bit blows the API, but this is internal....*/
+  if (ptr->flags & MEM_USE_UDP)
   {
-    char *char_ptr;
-    char_ptr= memcached_string_value(&result->value);;
-    char_ptr[value_length]= 0;
-    char_ptr[value_length + 1]= 0;
-    memcached_string_set_length(&result->value, value_length);
+    *error= MEMCACHED_NOT_SUPPORTED;
+    return NULL;
   }
 
-  return MEMCACHED_SUCCESS;
-
-read_error:
-  memcached_io_reset(ptr);
-
-  return MEMCACHED_PARTIAL_READ;
-}
-
-char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length, 
-                    size_t *value_length, 
-                    uint32_t *flags,
-                    memcached_return *error)
-{
-  memcached_result_st *result_buffer= &ptr->result;
-
   while (ptr->cursor_server < ptr->number_of_hosts)
   {
     char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
@@ -176,50 +61,40 @@ char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
   return NULL;
 }
 
-memcached_result_st *memcached_fetch_result(memcached_st *ptr, 
+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);
+  memcached_server_st *server;
 
-  WATCHPOINT_ASSERT(result->value.is_allocated != MEMCACHED_USED);
+  if (ptr->flags & MEM_USE_UDP)
+  {
+    *error= MEMCACHED_NOT_SUPPORTED;
+    return NULL;
+  }
 
-#ifdef UNUSED
-  if (ptr->flags & MEM_NO_BLOCK)
-    memcached_io_preread(ptr);
-#endif
+  if (result == NULL)
+    if ((result= memcached_result_create(ptr, NULL)) == NULL)
+      return NULL;
 
-  while (ptr->cursor_server < ptr->number_of_hosts)
-  {
+  while ((server = memcached_io_get_readable_server(ptr)) != NULL) {
     char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+    *error= memcached_response(server, buffer, sizeof(buffer), result);
 
-    if (memcached_server_response_count(&ptr->hosts[ptr->cursor_server]) == 0)
-    {
-      ptr->cursor_server++;
-      continue;
-    }
-
-    *error= memcached_response(&ptr->hosts[ptr->cursor_server], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, result);
-    
-    if (*error == MEMCACHED_END) /* END means that we move on to the next */
-    {
-      memcached_server_response_reset(&ptr->hosts[ptr->cursor_server]);
-      ptr->cursor_server++;
-      continue;
-    }
-    else if (*error == MEMCACHED_SUCCESS)
+    if (*error == MEMCACHED_SUCCESS)
       return result;
+    else if (*error == MEMCACHED_END)
+      memcached_server_response_reset(server);
     else
-      return NULL;
+      break;
   }
 
   /* We have completed reading data */
-  if (result->is_allocated == MEMCACHED_ALLOCATED)
+  if (result->is_allocated)
     memcached_result_free(result);
   else
     memcached_string_reset(&result->value);
 
-  ptr->cursor_server= 0;
   return NULL;
 }
+