Update for storage to now use vector

[m6w6/libmemcached] / libmemcached / do.cc

diff --git a/libmemcached/do.cc b/libmemcached/do.cc
index 99dba559f2b6f2a4fdbb44e4ed91e33a2ed07a3f..a793268dba1dc7c0781a89f91bec8bafcbbbde16 100644 (file)
--- a/libmemcached/do.cc
+++ b/libmemcached/do.cc
@@ -11,33 +11,20 @@
 
 #include <libmemcached/common.h>
 
-memcached_return_t memcached_do(memcached_server_write_instance_st ptr,
-                                const void *command,
-                                size_t command_length,
-                                bool with_flush)
-{
-  assert_msg(command_length, "Programming error, somehow a command had a length of zero");
-  assert_msg(command, "Programming error, somehow a command was NULL");
-
-  libmemcached_io_vector_st vector[1]= { { command, command_length } };
-
-  return memcached_vdo(ptr, vector, 1, with_flush);
-}
-
-memcached_return_t memcached_vdo(memcached_server_write_instance_st ptr,
-                                 const struct libmemcached_io_vector_st *vector,
-                                 size_t count,
-                                 bool with_flush)
+memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
+                                 libmemcached_io_vector_st *vector,
+                                 const size_t count,
+                                 const bool with_flush)
 {
   memcached_return_t rc;
 
   WATCHPOINT_ASSERT(count);
   WATCHPOINT_ASSERT(vector);
 
-  if (memcached_failed(rc= memcached_connect(ptr)))
+  if (memcached_failed(rc= memcached_connect(instance)))
   {
     WATCHPOINT_ERROR(rc);
-    assert_msg(ptr->error_messages, "memcached_connect() returned an error but the memcached_server_write_instance_st showed none.");
+    assert_msg(instance->error_messages, "memcached_connect() returned an error but the memcached_server_write_instance_st showed none.");
     return rc;
   }
 
@@ -46,17 +33,19 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st ptr,
   ** before they start writing, if there is any data in buffer, clear it out,
   ** otherwise we might get a partial write.
   **/
-  if (memcached_is_udp(ptr->root) and with_flush and ptr->write_buffer_offset > UDP_DATAGRAM_HEADER_LENGTH)
+  if (memcached_is_udp(instance->root))
   {
-    if (memcached_io_write(ptr, NULL, 0, true) == -1)
+    size_t write_length= io_vector_total_size(vector, 11) +UDP_DATAGRAM_HEADER_LENGTH;
+
+    if (write_length > MAX_UDP_DATAGRAM_LENGTH - UDP_DATAGRAM_HEADER_LENGTH)
     {
-      memcached_io_reset(ptr);
-      return memcached_set_error(*ptr, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
+      return MEMCACHED_WRITE_FAILURE;
     }
-  }
 
-  ssize_t sent_length= memcached_io_writev(ptr, vector, count, with_flush);
+    return MEMCACHED_NOT_SUPPORTED;
+  }
 
+  ssize_t sent_length= memcached_io_writev(instance, vector, count, with_flush);
   size_t command_length= 0;
   for (uint32_t x= 0; x < count; ++x, vector++)
   {
@@ -69,9 +58,9 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st ptr,
     WATCHPOINT_ERROR(rc);
     WATCHPOINT_ERRNO(errno);
   }
-  else if ((ptr->root->flags.no_reply) == 0)
+  else if (memcached_is_replying(instance->root))
   {
-    memcached_server_response_increment(ptr);
+    memcached_server_response_increment(instance);
   }
 
   return rc;