X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fauto.c;h=017f7f395571ba6e48c2575f9e01788bd7b23db8;hb=05a7455d43e7303d4accb71eba006b8ed70afed9;hp=b7466404e952f7dd6f0d7483cc7fd6e56d7f279c;hpb=7c7750f02368b570353ea109f23a0ea26d226e02;p=m6w6%2Flibmemcached

diff --git a/libmemcached/auto.c b/libmemcached/auto.c
index b7466404..017f7f39 100644
--- a/libmemcached/auto.c
+++ b/libmemcached/auto.c
@@ -21,16 +21,18 @@ static memcached_return_t memcached_auto(memcached_st *ptr,
   size_t send_length;
   memcached_return_t rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
-  unsigned int server_key;
+  uint32_t server_key;
+  memcached_server_instance_st *instance;
   bool no_reply= ptr->flags.no_reply;
 
-  unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0)
+  unlikely (memcached_server_count(ptr) == 0)
     return MEMCACHED_NO_SERVERS;
 
   if (ptr->flags.verify_key && (memcached_key_test((const char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
     return MEMCACHED_BAD_KEY_PROVIDED;
 
   server_key= memcached_generate_hash(ptr, master_key, master_key_length);
+  instance= memcached_server_instance_fetch(ptr, server_key);
 
   send_length= (size_t)snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
                                 "%s %s%.*s %" PRIu64 "%s\r\n", verb,
@@ -40,11 +42,11 @@ static memcached_return_t memcached_auto(memcached_st *ptr,
   unlikely (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
     return MEMCACHED_WRITE_FAILURE;
 
-  rc= memcached_do(&ptr->hosts[server_key], buffer, send_length, 1);
+  rc= memcached_do(instance, buffer, send_length, 1);
   if (no_reply || rc != MEMCACHED_SUCCESS)
     return rc;
 
-  rc= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
+  rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
 
   /*
     So why recheck responce? Because the protocol is brain dead :)
@@ -79,13 +81,15 @@ static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd,
                                            uint32_t expiration,
                                            uint64_t *value)
 {
-  unsigned int server_key;
+  uint32_t server_key;
+  memcached_server_instance_st *instance;
   bool no_reply= ptr->flags.no_reply;
 
-  unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0)
+  unlikely (memcached_server_count(ptr) == 0)
     return MEMCACHED_NO_SERVERS;
 
   server_key= memcached_generate_hash(ptr, master_key, master_key_length);
+  instance= memcached_server_instance_fetch(ptr, server_key);
 
   if (no_reply)
   {
@@ -106,17 +110,17 @@ static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd,
   request.message.body.initial= htonll(initial);
   request.message.body.expiration= htonl((uint32_t) expiration);
 
-  if ((memcached_do(&ptr->hosts[server_key], request.bytes,
+  if ((memcached_do(instance, request.bytes,
                     sizeof(request.bytes), 0)!=MEMCACHED_SUCCESS) ||
-      (memcached_io_write(&ptr->hosts[server_key], key, key_length, 1) == -1))
+      (memcached_io_write(instance, key, key_length, 1) == -1))
   {
-    memcached_io_reset(&ptr->hosts[server_key]);
+    memcached_io_reset(instance);
     return MEMCACHED_WRITE_FAILURE;
   }
 
   if (no_reply)
     return MEMCACHED_SUCCESS;
-  return memcached_response(&ptr->hosts[server_key], (char*)value, sizeof(*value), NULL);
+  return memcached_response(instance, (char*)value, sizeof(*value), NULL);
 }
 
 memcached_return_t memcached_increment(memcached_st *ptr,