X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fdelete.cc;h=1ffdbfac336dd0b0438a0d47fa3b29fdcaae9a74;hb=refs%2Ftags%2F1.0.4;hp=9baf56b85b3bc3962d8d4df4811b5ac2040902c6;hpb=26ec654470aafe3772c2c7817f7089e95aabed4d;p=awesomized%2Flibmemcached

diff --git a/libmemcached/delete.cc b/libmemcached/delete.cc
index 9baf56b8..1ffdbfac 100644
--- a/libmemcached/delete.cc
+++ b/libmemcached/delete.cc
@@ -61,21 +61,6 @@ static inline memcached_return_t ascii_delete(memcached_server_write_instance_st
     { memcached_literal_param("\r\n") }
   };
 
-  if (memcached_is_udp(instance->root))
-  {
-    size_t send_length= io_vector_total_size(vector, 6);
-
-    if (send_length > MAX_UDP_DATAGRAM_LENGTH - UDP_DATAGRAM_HEADER_LENGTH)
-    {
-      return MEMCACHED_WRITE_FAILURE;
-    }
-
-    if (send_length +instance->write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH)
-    {
-      memcached_io_write(instance);
-    }
-  }
-
   /* Send command header */
   return memcached_vdo(instance, vector, 6, flush);
 }
@@ -102,20 +87,6 @@ static inline memcached_return_t binary_delete(memcached_server_write_instance_s
   request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
   request.message.header.request.bodylen= htonl((uint32_t)(key_length + memcached_array_size(instance->root->_namespace)));
 
-  if (memcached_is_udp(instance->root))
-  {
-    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 +instance->write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH)
-    {
-      memcached_io_write(instance);
-    }
-  }
-
   libmemcached_io_vector_st vector[]=
   {
     { NULL, 0 },
@@ -173,8 +144,7 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr,
     return rc;
   }
 
-  rc= memcached_validate_key_length(key_length, ptr->flags.binary_protocol);
-  if (memcached_failed(rc))
+  if (memcached_failed(rc= memcached_key_test(*ptr, (const char **)&key, &key_length, 1)))
   {
     return rc;
   }