X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_delete.c;h=bba3c1969fcd5b03674729713b59eab97b5a7f32;hb=a0fa9535659f0f5a9678406f47201bfd47245114;hp=3fc7c037f696542e03c90d87c60728c91375b19e;hpb=8a446d30fe5d3dfc915b8cd0383229b1f51fe7c4;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached_delete.c b/libmemcached/memcached_delete.c
index 3fc7c037..bba3c196 100644
--- a/libmemcached/memcached_delete.c
+++ b/libmemcached/memcached_delete.c
@@ -8,13 +8,13 @@ memcached_return memcached_delete(memcached_st *ptr, const char *key, size_t key
                                  key, key_length, expiration);
 }
 
-static inline memcached_return binary_delete(memcached_st *ptr, 
+static inline memcached_return binary_delete(memcached_st *ptr,
                                              unsigned int server_key,
-                                             const char *key, 
+                                             const char *key,
                                              size_t key_length,
 					     uint8_t flush);
 
-memcached_return memcached_delete_by_key(memcached_st *ptr, 
+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)
@@ -27,7 +27,7 @@ memcached_return memcached_delete_by_key(memcached_st *ptr,
 
   LIBMEMCACHED_MEMCACHED_DELETE_START();
 
-  rc= memcached_validate_key_length(key_length, 
+  rc= memcached_validate_key_length(key_length,
                                     ptr->flags & MEM_BINARY_PROTOCOL);
   unlikely (rc != MEMCACHED_SUCCESS)
     return rc;
@@ -38,24 +38,56 @@ memcached_return memcached_delete_by_key(memcached_st *ptr,
   server_key= memcached_generate_hash(ptr, master_key, master_key_length);
   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 (ptr->flags & MEM_BINARY_PROTOCOL)
   {
-    if (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" :"" );
+    likely (!expiration)
+      rc= binary_delete(ptr, server_key, key, key_length, to_write);
     else
-       send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
+      rc= MEMCACHED_INVALID_ARGUMENTS;
+  }
+  else
+  {
+    unlikely (expiration)
+    {
+       if ((ptr->hosts[server_key].major_version == 1 &&
+            ptr->hosts[server_key].minor_version > 2) ||
+           ptr->hosts[server_key].major_version > 1)
+       {
+         rc= MEMCACHED_INVALID_ARGUMENTS;
+         goto error;
+       }
+       else
+       {
+          if (ptr->hosts[server_key].minor_version == 0)
+          {
+             if (no_reply || !to_write)
+             {
+                /* We might get out of sync with the server if we
+                 * send this command to a server newer than 1.2.x..
+                 * disable no_reply and buffered mode.
+                 */
+                to_write= 1;
+                if (no_reply)
+                   memcached_server_response_increment(&ptr->hosts[server_key]);
+                no_reply= false;
+             }
+          }
+          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= (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) 
+
+    if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
     {
       rc= MEMCACHED_WRITE_FAILURE;
       goto error;
@@ -68,14 +100,14 @@ memcached_return memcached_delete_by_key(memcached_st *ptr,
       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);
   }
 
   if (rc != MEMCACHED_SUCCESS)
     goto error;
 
-  if ((ptr->flags & MEM_BUFFER_REQUESTS))
+  if (!to_write)
     rc= MEMCACHED_BUFFERED;
   else if (!no_reply)
   {
@@ -92,9 +124,9 @@ error:
   return rc;
 }
 
-static inline memcached_return binary_delete(memcached_st *ptr, 
+static inline memcached_return binary_delete(memcached_st *ptr,
                                              unsigned int server_key,
-                                             const char *key, 
+                                             const char *key,
 					     size_t key_length,
 					     uint8_t flush)
 {
@@ -117,19 +149,19 @@ static inline memcached_return binary_delete(memcached_st *ptr,
     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, 
+  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, (char) flush) == -1)) 
+      (memcached_io_write(&ptr->hosts[server_key], key,
+                          key_length, (char) flush) == -1))
   {
     memcached_io_reset(&ptr->hosts[server_key]);
     rc= MEMCACHED_WRITE_FAILURE;
   }
 
-  unlikely (ptr->number_of_replicas > 0) 
+  unlikely (ptr->number_of_replicas > 0)
   {
     request.message.header.request.opcode= PROTOCOL_BINARY_CMD_DELETEQ;
 
@@ -138,9 +170,9 @@ static inline memcached_return binary_delete(memcached_st *ptr,
       ++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, 
+      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);