Fix from Charles Aylward for reuse of buffer.

[m6w6/libmemcached] / lib / memcached_storage.c

diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c
index 38d6d0db3ca689ccb75d3717bdef30930ab488a9..aac9b9227cae8d1c77f62ee0a912a86f53e39fb3 100644 (file)
--- a/lib/memcached_storage.c
+++ b/lib/memcached_storage.c
@@ -53,19 +53,20 @@ static inline memcached_return memcached_send(memcached_st *ptr,
   char to_write;
   size_t write_length;
   ssize_t sent_length;
-  memcached_return rc;
+  memcached_return rc[MEMCACHED_MAX_REPLICAS];
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
+  uint8_t replicas= 0;
 
-  WATCHPOINT_ASSERT(!(value == NULL && value_length > 0));
-  WATCHPOINT_ASSERT(!(value && value_length == 0));
-
-  if (key_length == 0)
+  unlikely (key_length == 0)
     return MEMCACHED_NO_KEY_PROVIDED;
 
-  if (ptr->number_of_hosts == 0)
+  unlikely (ptr->number_of_hosts == 0)
     return MEMCACHED_NO_SERVERS;
 
+  if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test(&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+    return MEMCACHED_BAD_KEY_PROVIDED;
+
   server_key= memcached_generate_hash(ptr, master_key, master_key_length);
 
   if (cas)
@@ -81,46 +82,59 @@ static inline memcached_return memcached_send(memcached_st *ptr,
                            (unsigned long long)expiration, value_length);
 
   if (write_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
-  {
-    rc= MEMCACHED_WRITE_FAILURE;
-    goto error;
-  }
-
-  rc=  memcached_do(ptr, server_key, buffer, write_length, 0);
-  if (rc != MEMCACHED_SUCCESS)
-    goto error;
-
-  if ((sent_length= memcached_io_write(ptr, server_key, value, value_length, 0)) == -1)
-  {
-    rc= MEMCACHED_WRITE_FAILURE;
-    goto error;
-  }
+    return MEMCACHED_WRITE_FAILURE;
 
   if ((ptr->flags & MEM_BUFFER_REQUESTS) && verb == SET_OP)
     to_write= 0;
   else
     to_write= 1;
 
-  if ((sent_length= memcached_io_write(ptr, server_key, "\r\n", 2, to_write)) == -1)
+  do
   {
-    rc= MEMCACHED_WRITE_FAILURE;
-    goto error;
-  }
+    char response_buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+
+    rc[replicas]=  memcached_do(&ptr->hosts[server_key], buffer, write_length, 0);
+
+    if (rc[replicas] != MEMCACHED_SUCCESS)
+      goto error;
 
-  if (to_write == 0)
-    return MEMCACHED_BUFFERED;
+    if ((sent_length= memcached_io_write(&ptr->hosts[server_key], value, value_length, 0)) == -1)
+    {
+      rc[replicas]= MEMCACHED_WRITE_FAILURE;
+      goto error;
+    }
 
-  rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL, server_key);
+    if ((sent_length= memcached_io_write(&ptr->hosts[server_key], "\r\n", 2, to_write)) == -1)
+    {
+      rc[replicas]= MEMCACHED_WRITE_FAILURE;
+      goto error;
+    }
 
-  if (rc == MEMCACHED_STORED)
-    return MEMCACHED_SUCCESS;
-  else 
-    return rc;
+    if (to_write == 0)
+      return MEMCACHED_BUFFERED;
+    else
+      rc[replicas]= memcached_response(&ptr->hosts[server_key],
+                                       response_buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
 
+    /* On error we just jump to the next potential server */
 error:
-  memcached_io_reset(ptr, server_key);
+    if (replicas > 1 && ptr->distribution == MEMCACHED_DISTRIBUTION_CONSISTENT)
+    {
+      if (server_key == (ptr->number_of_hosts - 1))
+        server_key= 0;
+      else
+        server_key++;
+    }
+  } while ((++replicas) < ptr->number_of_replicas);
+
+  /* As long as one object gets stored, we count this as a success */
+  while (replicas--)
+  {
+    if (rc[replicas] == MEMCACHED_STORED)
+      return MEMCACHED_SUCCESS;
+  }
 
-  return rc;
+  return rc[0];
 }
 
 memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length, 
@@ -203,7 +217,7 @@ memcached_return memcached_cas(memcached_st *ptr,
   memcached_return rc;
   rc= memcached_send(ptr, key, key_length, 
                      key, key_length, value, value_length,
-                     expiration, flags, cas, APPEND_OP);
+                     expiration, flags, cas, CAS_OP);
   return rc;
 }
 
@@ -294,6 +308,6 @@ memcached_return memcached_cas_by_key(memcached_st *ptr,
   memcached_return rc;
   rc= memcached_send(ptr, key, key_length, 
                      key, key_length, value, value_length,
-                     expiration, flags, cas, APPEND_OP);
+                     expiration, flags, cas, CAS_OP);
   return rc;
 }