X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_delete.c;h=96db7b4efabe2f3bcf5247ab685f7197033bc236;hb=cb6733efbbd39a7cb80eff53c09a05775f4570dc;hp=5ec5d1b4c11d353a52857ae25a9037193cd5260c;hpb=a95ca4ad9c0f9d23c8a83bd337acdecc221021ef;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_delete.c b/lib/memcached_delete.c
index 5ec5d1b4..96db7b4e 100644
--- a/lib/memcached_delete.c
+++ b/lib/memcached_delete.c
@@ -3,19 +3,29 @@
 memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_length,
                                   time_t expiration)
 {
-  size_t send_length, sent_length;
-  memcached_return rc;
+  return memcached_delete_by_key(ptr, key, key_length,
+                                 key, key_length, expiration);
+}
+
+memcached_return memcached_delete_by_key(memcached_st *ptr, 
+                                         char *master_key, size_t master_key_length,
+                                         char *key, size_t key_length,
+                                         time_t expiration)
+{
+  char to_write;
+  size_t send_length;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
+  uint8_t replicas= 0;
+  memcached_return rc[MEMCACHED_MAX_REPLICAS];
 
-  LIBMEMCACHED_MEMCACHED_DELETE_START();
+  if (key_length == 0)
+    return MEMCACHED_NO_KEY_PROVIDED;
 
-  rc= memcached_connect(ptr);
+  if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
+    return MEMCACHED_NO_SERVERS;
 
-  if (rc != MEMCACHED_SUCCESS)
-    return rc;
-
-  server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
+  server_key= memcached_generate_hash(ptr, master_key, master_key_length);
 
   if (expiration)
     send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
@@ -26,15 +36,49 @@ memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
                           "delete %.*s\r\n", (int)key_length, key);
 
   if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
-    return MEMCACHED_WRITE_FAILURE;
+  {
+    rc[replicas]= MEMCACHED_WRITE_FAILURE;
+    goto error;
+  }
+
+  to_write= (ptr->flags & MEM_BUFFER_REQUESTS) ? 0 : 1;
+
+  do
+  {
+    rc[replicas]= memcached_do(&ptr->hosts[server_key], buffer, send_length, to_write);
+    if (rc[replicas] != MEMCACHED_SUCCESS)
+      goto error;
 
-  sent_length= send(ptr->hosts[server_key].fd, buffer, send_length, 0);
+    if ((ptr->flags & MEM_BUFFER_REQUESTS))
+    {
+      rc[replicas]= MEMCACHED_BUFFERED;
+    }
+    else
+    {
+      rc[replicas]= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
+      if (rc[replicas] == MEMCACHED_DELETED)
+        rc[replicas]= MEMCACHED_SUCCESS;
+    }
 
-  if (sent_length == -1 || sent_length != send_length)
-    return MEMCACHED_WRITE_FAILURE;
+    /* On error we just jump to the next potential server */
+error:
+    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);
 
-  rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
-  LIBMEMCACHED_MEMCACHED_DELETE_END();
+  /* As long as one object gets stored, we count this as a success */
+  while (replicas--)
+  {
+    if (rc[replicas] == MEMCACHED_DELETED)
+      return MEMCACHED_SUCCESS;
+    else if (rc[replicas] == MEMCACHED_DELETED)
+      rc[replicas]= MEMCACHED_BUFFERED;
+  }
 
-  return rc;
+  return rc[0];
 }