X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_get.c;h=c7c21d1ee43ad7518700d1c6f026ca1323dcd62a;hb=f580e35770a744c60cb92e1cd581944d9da72205;hp=201cfcdf82d62b9661f838fa7e2fba70e9422573;hpb=a839a04ae135e6a92b8be858e9c6605d7514c394;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index 201cfcdf..c7c21d1e 100644
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -130,14 +130,14 @@ char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
   char *value;
   LIBMEMCACHED_MEMCACHED_GET_START();
 
+  server_key= memcached_generate_hash(ptr, key, key_length);
+
   *value_length= 0;
-  *error= memcached_connect(ptr);
+  *error= memcached_connect(ptr, server_key);
 
   if (*error != MEMCACHED_SUCCESS)
     goto error;
 
-  server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
-
   send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, "get %.*s\r\n", 
                         (int)key_length, key);
 
@@ -195,11 +195,6 @@ memcached_return memcached_mget(memcached_st *ptr,
   ptr->cursor_server= 0;
   memset(buffer, 0, HUGE_STRING_LEN);
 
-  rc= memcached_connect(ptr);
-
-  if (rc != MEMCACHED_SUCCESS)
-    return rc;
-
   cursor_key_exec= (memcached_string_st **)malloc(sizeof(memcached_string_st *) * ptr->number_of_hosts);
   memset(cursor_key_exec, 0, sizeof(memcached_string_st *) * ptr->number_of_hosts);
 
@@ -208,7 +203,7 @@ memcached_return memcached_mget(memcached_st *ptr,
   {
     unsigned int server_key;
 
-    server_key= memcached_generate_hash(keys[x], key_length[x]) % ptr->number_of_hosts;
+    server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
 
     if (cursor_key_exec[server_key])
     {
@@ -240,6 +235,9 @@ memcached_return memcached_mget(memcached_st *ptr,
   {
     if (cursor_key_exec[x])
     {
+      /* We need to doo something about non-connnected hosts in the future */
+      rc= memcached_connect(ptr, x);
+
       memcached_string_st *string= cursor_key_exec[x];
       memcached_string_append(ptr, string, "\r\n", 2);