X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_delete.c;h=a7298141ab5f907df46b22711f2a228ccbf5a347;hb=edeb3965773b750c0cf454e8b1494fd030ba0369;hp=7c026cbcd9835005833220fd008f4e07c7856801;hpb=2dce97932fbd574db1179add7bc3facc0318186c;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_delete.c b/lib/memcached_delete.c
index 7c026cbc..a7298141 100644
--- a/lib/memcached_delete.c
+++ b/lib/memcached_delete.c
@@ -42,23 +42,19 @@ memcached_return memcached_delete_by_key(memcached_st *ptr,
     goto error;
   }
 
-  if ((ptr->flags & MEM_NO_BLOCK))
-    to_write= 0;
-  else
-    to_write= 1;
+  to_write= (ptr->flags & MEM_BUFFER_REQUESTS) ? 0 : 1;
 
   rc= memcached_do(ptr, server_key, buffer, send_length, to_write);
   if (rc != MEMCACHED_SUCCESS)
     goto error;
 
-  if ((ptr->flags & MEM_NO_BLOCK))
+  if ((ptr->flags & MEM_BUFFER_REQUESTS))
   {
-    rc= MEMCACHED_SUCCESS;
-    memcached_server_response_increment(ptr, server_key);
+    rc= MEMCACHED_BUFFERED;
   }
   else
   {
-    rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+    rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL, server_key);
     if (rc == MEMCACHED_DELETED)
       rc= MEMCACHED_SUCCESS;
   }
@@ -67,3 +63,57 @@ error:
   LIBMEMCACHED_MEMCACHED_DELETE_END();
   return rc;
 }
+
+memcached_return memcached_mdelete(memcached_st *ptr, 
+                                   char **key, size_t *key_length,
+                                   unsigned int number_of_keys,
+                                   time_t expiration)
+{
+  return memcached_mdelete_by_key(ptr, NULL, 0,
+                                   key, key_length,
+                                   number_of_keys, expiration);
+
+}
+
+memcached_return memcached_mdelete_by_key(memcached_st *ptr, 
+                                          char *master_key, size_t master_key_length,
+                                          char **key, size_t *key_length,
+                                          unsigned int number_of_keys,
+                                          time_t expiration)
+{
+  size_t send_length;
+  memcached_return rc= MEMCACHED_SUCCESS;
+  char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+  unsigned int master_server_key= 0;
+  unsigned int x;
+
+  LIBMEMCACHED_MEMCACHED_DELETE_START();
+
+  if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
+    return MEMCACHED_NO_SERVERS;
+
+  if (master_key && master_key_length)
+    master_server_key= memcached_generate_hash(ptr, master_key, master_key_length);
+
+  for (x= 0; x < number_of_keys; x++)
+  {
+    unsigned int server_key;
+
+    if (master_key && master_key_length)
+      server_key= master_server_key;
+    else
+      server_key= memcached_generate_hash(ptr, key[x], key_length[x]);
+
+    if (expiration)
+      send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
+                            "delete %.*s %llu\r\n", (int)(key_length[x]), key[x], 
+                            (unsigned long long)expiration);
+    else
+      send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
+                            "delete %.*s\r\n", (int)(key_length[x]), key[x]);
+
+    (void)memcached_do(ptr, server_key, buffer, send_length, 0);
+  }
+
+  return MEMCACHED_BUFFERED;
+}