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

diff --git a/lib/memcached_delete.c b/lib/memcached_delete.c
index df16d2f4..7c026cbc 100644
--- a/lib/memcached_delete.c
+++ b/lib/memcached_delete.c
@@ -1,26 +1,69 @@
-#include <memcached.h>
+#include "common.h"
 
 memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_length,
                                   time_t expiration)
 {
+  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;
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+  unsigned int server_key;
+
+  LIBMEMCACHED_MEMCACHED_DELETE_START();
 
-  rc= memcached_connect(ptr);
+  if (key_length == 0)
+    return MEMCACHED_NO_KEY_PROVIDED;
+
+  if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
+    return MEMCACHED_NO_SERVERS;
+
+  server_key= memcached_generate_hash(ptr, master_key, master_key_length);
 
   if (expiration)
     send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                          "delete %.*s %u\r\n", key_length, key, expiration);
+                          "delete %.*s %llu\r\n", (int)key_length, key, 
+                          (unsigned long long)expiration);
   else
     send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                          "delete %.*s\r\n", key_length, key);
-  if ((write(ptr->hosts[0].fd, buffer, send_length) == -1))
+                          "delete %.*s\r\n", (int)key_length, key);
+
+  if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
   {
-    fprintf(stderr, "failed set on %.*s TCP\n", key_length+1, key);
+    rc= MEMCACHED_WRITE_FAILURE;
+    goto error;
+  }
 
-    return MEMCACHED_WRITE_FAILURE;
+  if ((ptr->flags & MEM_NO_BLOCK))
+    to_write= 0;
+  else
+    to_write= 1;
+
+  rc= memcached_do(ptr, server_key, buffer, send_length, to_write);
+  if (rc != MEMCACHED_SUCCESS)
+    goto error;
+
+  if ((ptr->flags & MEM_NO_BLOCK))
+  {
+    rc= MEMCACHED_SUCCESS;
+    memcached_server_response_increment(ptr, server_key);
+  }
+  else
+  {
+    rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+    if (rc == MEMCACHED_DELETED)
+      rc= MEMCACHED_SUCCESS;
   }
 
-  return memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE);
+error:
+  LIBMEMCACHED_MEMCACHED_DELETE_END();
+  return rc;
 }