X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_delete.c;h=3fc7c037f696542e03c90d87c60728c91375b19e;hb=94cd1cbfb3fe6d0c446be9151ae9b15f775b6511;hp=3e1390fa56d71fe6e78874a79af664c6710a4106;hpb=b34c702fa781b33f8a1f7751385929122c3e6bae;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached_delete.c b/libmemcached/memcached_delete.c
index 3e1390fa..3fc7c037 100644
--- a/libmemcached/memcached_delete.c
+++ b/libmemcached/memcached_delete.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "memcached/protocol_binary.h"
 
 memcached_return memcached_delete(memcached_st *ptr, const char *key, size_t key_length,
                                   time_t expiration)
@@ -11,14 +12,14 @@ static inline memcached_return binary_delete(memcached_st *ptr,
                                              unsigned int server_key,
                                              const char *key, 
                                              size_t key_length,
-					     int flush);
+					     uint8_t flush);
 
 memcached_return memcached_delete_by_key(memcached_st *ptr, 
                                          const char *master_key, size_t master_key_length,
                                          const char *key, size_t key_length,
                                          time_t expiration)
 {
-  char to_write;
+  uint8_t to_write;
   size_t send_length;
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
@@ -26,37 +27,48 @@ memcached_return memcached_delete_by_key(memcached_st *ptr,
 
   LIBMEMCACHED_MEMCACHED_DELETE_START();
 
-  unlikely (key_length == 0)
-    return MEMCACHED_NO_KEY_PROVIDED;
+  rc= memcached_validate_key_length(key_length, 
+                                    ptr->flags & MEM_BINARY_PROTOCOL);
+  unlikely (rc != MEMCACHED_SUCCESS)
+    return rc;
 
   unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0)
     return MEMCACHED_NO_SERVERS;
 
   server_key= memcached_generate_hash(ptr, master_key, master_key_length);
-  to_write= (ptr->flags & MEM_BUFFER_REQUESTS) ? 0 : 1;
+  to_write= (uint8_t)((ptr->flags & MEM_BUFFER_REQUESTS) ? 0 : 1);
+  bool no_reply= (ptr->flags & MEM_NOREPLY);
      
   if (ptr->flags & MEM_BINARY_PROTOCOL) 
     rc= binary_delete(ptr, server_key, key, key_length, to_write);
   else 
   {
     if (expiration)
-      send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                            "delete %s%.*s %llu\r\n", 
-                            ptr->prefix_key,
-                            (int)key_length, key, 
-                            (unsigned long long)expiration);
+      send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
+                                     "delete %s%.*s %u%s\r\n",
+                                     ptr->prefix_key,
+                                     (int) key_length, key, 
+                                     (uint32_t)expiration, no_reply ? " noreply" :"" );
     else
-       send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                             "delete %s%.*s\r\n", 
-                             ptr->prefix_key,
-                             (int)key_length, key);
+       send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
+                                      "delete %s%.*s%s\r\n",
+                                      ptr->prefix_key,
+                                      (int)key_length, key, no_reply ? " noreply" :"");
     
     if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE) 
     {
       rc= MEMCACHED_WRITE_FAILURE;
       goto error;
     }
-     
+
+    if (ptr->flags & MEM_USE_UDP && !to_write)
+    {
+      if (send_length > MAX_UDP_DATAGRAM_LENGTH - UDP_DATAGRAM_HEADER_LENGTH)
+        return MEMCACHED_WRITE_FAILURE;
+      if (send_length + ptr->hosts[server_key].write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH)
+        memcached_io_write(&ptr->hosts[server_key], NULL, 0, 1);
+    }
+    
     rc= memcached_do(&ptr->hosts[server_key], buffer, send_length, to_write);
   }
 
@@ -64,10 +76,8 @@ memcached_return memcached_delete_by_key(memcached_st *ptr,
     goto error;
 
   if ((ptr->flags & MEM_BUFFER_REQUESTS))
-  {
     rc= MEMCACHED_BUFFERED;
-  }
-  else
+  else if (!no_reply)
   {
     rc= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
     if (rc == MEMCACHED_DELETED)
@@ -86,24 +96,58 @@ static inline memcached_return binary_delete(memcached_st *ptr,
                                              unsigned int server_key,
                                              const char *key, 
 					     size_t key_length,
-					     int flush)
+					     uint8_t flush)
 {
   protocol_binary_request_delete request= {.bytes= {0}};
 
   request.message.header.request.magic= PROTOCOL_BINARY_REQ;
-  request.message.header.request.opcode= PROTOCOL_BINARY_CMD_DELETE;
+  if (ptr->flags & MEM_NOREPLY)
+    request.message.header.request.opcode= PROTOCOL_BINARY_CMD_DELETEQ;
+  else
+    request.message.header.request.opcode= PROTOCOL_BINARY_CMD_DELETE;
   request.message.header.request.keylen= htons((uint16_t)key_length);
   request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
-  request.message.header.request.bodylen= htonl(key_length);
+  request.message.header.request.bodylen= htonl((uint32_t) key_length);
+
+  if (ptr->flags & MEM_USE_UDP && !flush)
+  {
+    size_t cmd_size= sizeof(request.bytes) + key_length;
+    if (cmd_size > MAX_UDP_DATAGRAM_LENGTH - UDP_DATAGRAM_HEADER_LENGTH)
+      return MEMCACHED_WRITE_FAILURE;
+    if (cmd_size + ptr->hosts[server_key].write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH)
+      memcached_io_write(&ptr->hosts[server_key], NULL, 0, 1);
+  }
   
+  memcached_return rc= MEMCACHED_SUCCESS;
+
   if ((memcached_do(&ptr->hosts[server_key], request.bytes, 
                     sizeof(request.bytes), 0) != MEMCACHED_SUCCESS) ||
       (memcached_io_write(&ptr->hosts[server_key], key, 
-                          key_length, flush) == -1)) 
+                          key_length, (char) flush) == -1)) 
   {
     memcached_io_reset(&ptr->hosts[server_key]);
-    return MEMCACHED_WRITE_FAILURE;
+    rc= MEMCACHED_WRITE_FAILURE;
+  }
+
+  unlikely (ptr->number_of_replicas > 0) 
+  {
+    request.message.header.request.opcode= PROTOCOL_BINARY_CMD_DELETEQ;
+
+    for (uint32_t x= 0; x < ptr->number_of_replicas; ++x)
+    {
+      ++server_key;
+      if (server_key == ptr->number_of_hosts)
+        server_key= 0;
+  
+      memcached_server_st* server= &ptr->hosts[server_key];
+      if ((memcached_do(server, (const char*)request.bytes, 
+                        sizeof(request.bytes), 0) != MEMCACHED_SUCCESS) ||
+          (memcached_io_write(server, key, key_length, (char) flush) == -1))
+        memcached_io_reset(server);
+      else
+        memcached_server_response_decrement(server);
+    }
   }
 
-  return MEMCACHED_SUCCESS;
+  return rc;
 }