Fix for always sort.

[awesomized/libmemcached] / libmemcached / memcached_hosts.c

diff --git a/libmemcached/memcached_hosts.c b/libmemcached/memcached_hosts.c
index c62c3b41984402665b324b097f3717ef930a1a01..f816dd5be8d294bf37c19a48969d4f3b400fb150 100644 (file)
--- a/libmemcached/memcached_hosts.c
+++ b/libmemcached/memcached_hosts.c
@@ -116,7 +116,7 @@ memcached_return memcached_server_push(memcached_st *ptr, memcached_server_st *l
   }
   ptr->hosts[0].count= ptr->number_of_hosts;
 
-  if (ptr->number_of_hosts > 1)
+  if (ptr->number_of_hosts > 1 && ptr->flags & MEMCACHED_BEHAVIOR_SORT_HOSTS)
     qsort(ptr->hosts, ptr->number_of_hosts, sizeof(memcached_server_st), compare_servers);
 
   rebalance_wheel(ptr);
@@ -179,11 +179,12 @@ static memcached_return server_add(memcached_st *ptr, char *hostname,
 
   host_reset(ptr, &ptr->hosts[ptr->number_of_hosts], hostname, port, type);
   ptr->number_of_hosts++;
-  ptr->hosts[0].count++;
 
-  if (ptr->number_of_hosts > 1)
+  if (ptr->number_of_hosts > 1 && ptr->flags & MEMCACHED_BEHAVIOR_SORT_HOSTS)
     qsort(ptr->hosts, ptr->number_of_hosts, sizeof(memcached_server_st), compare_servers);
 
+  ptr->hosts[0].count= ptr->number_of_hosts;
+
   rebalance_wheel(ptr);
 
   LIBMEMCACHED_MEMCACHED_SERVER_ADD_END();
@@ -221,16 +222,8 @@ memcached_server_st *memcached_server_list_append(memcached_server_st *ptr,
   host_reset(NULL, &new_host_list[count-1], hostname, port, MEMCACHED_CONNECTION_TCP);
 
   /* Backwards compatibility hack */
-  new_host_list[0].count++;
-
-  count= new_host_list[0].count;
-
-  if (new_host_list[0].count > 1)
-    qsort(new_host_list, count, sizeof(memcached_server_st), compare_servers);
-
   new_host_list[0].count= count;
 
-
   *error= MEMCACHED_SUCCESS;
   return new_host_list;
 }