X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_delete.c;h=f2fab3221a53cca25203b936d100d86460c5a259;hb=20b4431225d4ccd4aa22f6d7f67476c92d1c9546;hp=60e3bed4406e3ce89c1b6c64868559af8f77b7b8;hpb=8fce86636639afaeac4ca0e869e8bcd833324a62;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached_delete.c b/libmemcached/memcached_delete.c
index 60e3bed4..f2fab322 100644
--- a/libmemcached/memcached_delete.c
+++ b/libmemcached/memcached_delete.c
@@ -1,15 +1,21 @@
 #include "common.h"
 
-memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_length,
+memcached_return memcached_delete(memcached_st *ptr, const char *key, size_t key_length,
                                   time_t expiration)
 {
   return memcached_delete_by_key(ptr, key, key_length,
                                  key, key_length, expiration);
 }
 
+static inline memcached_return binary_delete(memcached_st *ptr, 
+                                             unsigned int server_key,
+                                             const char *key, 
+                                             size_t key_length,
+					     int flush);
+
 memcached_return memcached_delete_by_key(memcached_st *ptr, 
-                                         char *master_key, size_t master_key_length,
-                                         char *key, size_t key_length,
+                                         const char *master_key, size_t master_key_length,
+                                         const char *key, size_t key_length,
                                          time_t expiration)
 {
   char to_write;
@@ -20,46 +26,105 @@ 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);
-
-  if (expiration)
-    send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                          "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", (int)key_length, key);
-
-  if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
+  to_write= (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 
   {
-    rc= MEMCACHED_WRITE_FAILURE;
-    goto error;
-  }
+    if (expiration)
+      send_length= 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%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;
+    }
 
-  to_write= (ptr->flags & MEM_BUFFER_REQUESTS) ? 0 : 1;
+    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);
+  }
 
-  rc= memcached_do(&ptr->hosts[server_key], buffer, send_length, to_write);
   if (rc != MEMCACHED_SUCCESS)
     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)
       rc= MEMCACHED_SUCCESS;
   }
 
+  if (rc == MEMCACHED_SUCCESS && ptr->delete_trigger)
+    ptr->delete_trigger(ptr, key, key_length);
+
 error:
   LIBMEMCACHED_MEMCACHED_DELETE_END();
   return rc;
 }
+
+static inline memcached_return binary_delete(memcached_st *ptr, 
+                                             unsigned int server_key,
+                                             const char *key, 
+					     size_t key_length,
+					     int flush)
+{
+  protocol_binary_request_delete request= {.bytes= {0}};
+
+  request.message.header.request.magic= PROTOCOL_BINARY_REQ;
+  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);
+
+  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);
+  }
+  
+  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)) 
+  {
+    memcached_io_reset(&ptr->hosts[server_key]);
+    return MEMCACHED_WRITE_FAILURE;
+  }
+
+  return MEMCACHED_SUCCESS;
+}