Update cursor

[m6w6/libmemcached] / libmemcached / quit.cc

diff --git a/libmemcached/quit.cc b/libmemcached/quit.cc
index 9aadd605f71ea802009686c1b20bb897507b2203..77924fb4930ee277bf4c3a506e8bd6d0ca78884c 100644 (file)
--- a/libmemcached/quit.cc
+++ b/libmemcached/quit.cc
@@ -46,7 +46,7 @@
   will force data to be completed.
 */
 
-void memcached_quit_server(memcached_server_st *ptr, bool io_death)
+void memcached_quit_server(org::libmemcached::Instance* ptr, bool io_death)
 {
   if (ptr->fd != INVALID_SOCKET)
   {
@@ -58,7 +58,9 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death)
       if (ptr->root->flags.binary_protocol)
       {
         protocol_binary_request_quit request= {}; // = {.bytes= {0}};
-        request.message.header.request.magic = PROTOCOL_BINARY_REQ;
+
+        initialize_binary_request(ptr, request.message.header);
+
         request.message.header.request.opcode = PROTOCOL_BINARY_CMD_QUIT;
         request.message.header.request.datatype = PROTOCOL_BINARY_RAW_BYTES;
 
@@ -79,8 +81,6 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death)
         rc= memcached_vdo(ptr, vector, 1, true);
       }
 
-      WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_FETCH_NOTFINISHED);
-
       /* read until socket is closed, or there is an error
        * closing the socket before all data is read
        * results in server throwing away all data which is
@@ -89,11 +89,18 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death)
        * In .40 we began to only do this if we had been doing buffered
        * requests of had replication enabled.
        */
-      if (ptr->root->flags.buffer_requests or ptr->root->number_of_replicas)
+      if (memcached_success(rc) and (ptr->root->flags.buffer_requests or ptr->root->number_of_replicas))
       {
-        memcached_return_t rc_slurp;
-        while (memcached_continue(rc_slurp= memcached_io_slurp(ptr))) {} ;
-        WATCHPOINT_ASSERT(rc_slurp == MEMCACHED_CONNECTION_FAILURE);
+        if (0)
+        {
+          memcached_return_t rc_slurp;
+          while (memcached_continue(rc_slurp= memcached_io_slurp(ptr))) {} ;
+          WATCHPOINT_ASSERT(rc_slurp == MEMCACHED_CONNECTION_FAILURE);
+        }
+        else
+        {
+          memcached_io_slurp(ptr);
+        }
       }
 
       /*
@@ -109,7 +116,7 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death)
   }
 
   ptr->state= MEMCACHED_SERVER_STATE_NEW;
-  ptr->cursor_active= 0;
+  ptr->cursor_active_= 0;
   ptr->io_bytes_sent= 0;
   ptr->write_buffer_offset= size_t(ptr->root and memcached_is_udp(ptr->root) ? UDP_DATAGRAM_HEADER_LENGTH : 0);
   ptr->read_buffer_length= 0;
@@ -131,8 +138,7 @@ void send_quit(memcached_st *ptr)
 {
   for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
   {
-    memcached_server_write_instance_st instance=
-      memcached_server_instance_fetch(ptr, x);
+    org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
 
     memcached_quit_server(instance, false);
   }