X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fauto.c;h=608324df23ff8d99acde7960997ab74cd8c824a1;hb=9979e3f8206c764a881550dda41a444f005206f3;hp=5e3e026111ae42e39c5b74e868cc0450f4a3bca1;hpb=e7561db4b56f2e78948710a0f360f65f5703a8e6;p=m6w6%2Flibmemcached

diff --git a/libmemcached/auto.c b/libmemcached/auto.c
index 5e3e0261..608324df 100644
--- a/libmemcached/auto.c
+++ b/libmemcached/auto.c
@@ -11,7 +11,7 @@
 
 #include "common.h"
 
-static memcached_return_t memcached_auto(memcached_st *ptr,
+static memcached_return_t text_incr_decr(memcached_st *ptr,
                                          const char *verb,
                                          const char *master_key, size_t master_key_length,
                                          const char *key, size_t key_length,
@@ -21,30 +21,33 @@ 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 || memcached_server_count(ptr) == 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,
+                                "%s %.*s%.*s %" PRIu64 "%s\r\n", verb,
+                                (int)ptr->prefix_key_length,
                                 ptr->prefix_key,
                                 (int)key_length, key,
                                 offset, no_reply ? " noreply" : "");
   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, true);
   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 +82,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 || memcached_server_count(ptr) == 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 +111,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,
-                    sizeof(request.bytes), 0)!=MEMCACHED_SUCCESS) ||
-      (memcached_io_write(&ptr->hosts[server_key], key, key_length, 1) == -1))
+  if ((memcached_do(instance, request.bytes,
+                    sizeof(request.bytes), false) != MEMCACHED_SUCCESS) ||
+      (memcached_io_write(instance, key, key_length, true) == -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,
@@ -155,7 +160,7 @@ memcached_return_t memcached_increment_by_key(memcached_st *ptr,
   }
   else
   {
-     rc= memcached_auto(ptr, "incr", master_key, master_key_length, key, key_length, offset, value);
+     rc= text_incr_decr(ptr, "incr", master_key, master_key_length, key, key_length, offset, value);
   }
 
   LIBMEMCACHED_MEMCACHED_INCREMENT_END();
@@ -175,12 +180,16 @@ memcached_return_t memcached_decrement_by_key(memcached_st *ptr,
 
   LIBMEMCACHED_MEMCACHED_DECREMENT_START();
   if (ptr->flags.binary_protocol)
+  {
     rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_DECREMENT,
                          master_key, master_key_length, key, key_length,
                          (uint64_t)offset, 0, MEMCACHED_EXPIRATION_NOT_ADD,
                          value);
+  }
   else
-    rc= memcached_auto(ptr, "decr", master_key, master_key_length, key, key_length, offset, value);
+  {
+    rc= text_incr_decr(ptr, "decr", master_key, master_key_length, key, key_length, offset, value);
+  }
 
   LIBMEMCACHED_MEMCACHED_DECREMENT_END();