X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Fstorage.cc;h=079fba1d62ac4a785f85de6115a66be53592a8a6;hb=398f48445cacf12679248142f0c86d3a0d6caab6;hp=558d2ed529904a3197c208fd579c3dbf57ffabc8;hpb=c5bd49aee7b7bcb434cc526ff67d4bccddd4ba90;p=m6w6%2Flibmemcached

diff --git a/libmemcached/storage.cc b/libmemcached/storage.cc
index 558d2ed5..079fba1d 100644
--- a/libmemcached/storage.cc
+++ b/libmemcached/storage.cc
@@ -139,7 +139,7 @@ static inline uint8_t get_com_code(const memcached_storage_action_t verb, const
 }
 
 static memcached_return_t memcached_send_binary(Memcached *ptr,
-                                                org::libmemcached::Instance* server,
+                                                memcached_instance_st* server,
                                                 uint32_t server_key,
                                                 const char *key,
                                                 const size_t key_length,
@@ -192,15 +192,6 @@ static memcached_return_t memcached_send_binary(Memcached *ptr,
   memcached_return_t rc;
   if ((rc= memcached_vdo(server, vector, 5, flush)) != MEMCACHED_SUCCESS)
   {
-    memcached_io_reset(server);
-
-#if 0
-    if (memcached_has_error(ptr))
-    {
-      memcached_set_error(*server, rc, MEMCACHED_AT);
-    }
-#endif
-
     assert(memcached_last_error(server->root) != MEMCACHED_SUCCESS);
     return memcached_last_error(server->root);
   }
@@ -218,13 +209,9 @@ static memcached_return_t memcached_send_binary(Memcached *ptr,
         server_key= 0;
       }
 
-      org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, server_key);
+      memcached_instance_st* instance= memcached_instance_fetch(ptr, server_key);
 
-      if (memcached_vdo(instance, vector, 5, false) != MEMCACHED_SUCCESS)
-      {
-        memcached_io_reset(instance);
-      }
-      else
+      if (memcached_success(memcached_vdo(instance, vector, 5, false)))
       {
         memcached_server_response_decrement(instance);
       }
@@ -246,7 +233,7 @@ static memcached_return_t memcached_send_binary(Memcached *ptr,
 }
 
 static memcached_return_t memcached_send_ascii(Memcached *ptr,
-                                               org::libmemcached::Instance* instance,
+                                               memcached_instance_st* instance,
                                                const char *key,
                                                const size_t key_length,
                                                const char *value,
@@ -335,11 +322,6 @@ static memcached_return_t memcached_send_ascii(Memcached *ptr,
     }
   }
 
-  if (rc == MEMCACHED_WRITE_FAILURE)
-  {
-    memcached_io_reset(instance);
-  }
-
   assert(memcached_failed(rc));
 #if 0
   if (memcached_has_error(ptr) == false)
@@ -373,12 +355,11 @@ static inline memcached_return_t memcached_send(memcached_st *shell,
   }
 
   uint32_t server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length);
-  org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, server_key);
+  memcached_instance_st* instance= memcached_instance_fetch(ptr, server_key);
 
   WATCHPOINT_SET(instance->io_wait_count.read= 0);
   WATCHPOINT_SET(instance->io_wait_count.write= 0);
 
-
   bool flush= true;
   if (memcached_is_buffering(instance->root) and verb == SET_OP)
   {