X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_delete.c;h=6a8495335e17a10e5f30aa167043efe6ba5e9431;hb=1bd637f6eccc1064a4e19e40b14a340818d1ccf3;hp=e601e6fa969fca32cbb4a6e9c879edb6215cec75;hpb=3efc2e6fb6a17e8eb52dbe3590a5dcb063b30537;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_delete.c b/lib/memcached_delete.c
index e601e6fa..6a849533 100644
--- a/lib/memcached_delete.c
+++ b/lib/memcached_delete.c
@@ -1,32 +1,62 @@
-#include <memcached.h>
+#include "common.h"
 
 memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_length,
                                   time_t expiration)
 {
-  size_t send_length;
+  char to_write;
+  size_t send_length, sent_length;
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
 
-  rc= memcached_connect(ptr);
+  LIBMEMCACHED_MEMCACHED_DELETE_START();
 
-  if (rc != MEMCACHED_SUCCESS)
+  server_key= memcached_generate_hash(ptr, key, key_length);
+
+  if ((rc= memcached_connect(ptr, server_key)) != MEMCACHED_SUCCESS)
     return rc;
 
-  server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
 
   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[server_key].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;
+
+  if ((sent_length= memcached_io_write(ptr, server_key, buffer, send_length, to_write)) == -1)
+  {
+    memcached_quit_server(ptr, server_key);
+    rc= MEMCACHED_WRITE_FAILURE;
+    goto error;
   }
 
-  return memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+  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;
+  }
+
+  LIBMEMCACHED_MEMCACHED_DELETE_END();
+
+error:
+  return rc;
 }