Merge from Mikki

[m6w6/libmemcached] / libmemcached / memcached_get.c

diff --git a/libmemcached/memcached_get.c b/libmemcached/memcached_get.c
index 6c730093c9cd14d8407b36f7f6a2b6d45c15f551..0aa0f44c108d4e4ebe4dad8b1a5908201dc65427 100644 (file)
--- a/libmemcached/memcached_get.c
+++ b/libmemcached/memcached_get.c
@@ -432,13 +432,11 @@ static memcached_return replication_binary_mget(memcached_st *ptr,
                                                 size_t number_of_keys)
 {
   memcached_return rc= MEMCACHED_NOTFOUND;
-  uint32_t x, start = 0;
-  uint64_t randomize_read = memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ);
+  uint32_t x, start= 0;
+  uint64_t randomize_read= memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ);
 
-  if (randomize_read) {
-    srandom((uint32_t) time(NULL));
-    start = (uint32_t)(random() % (ptr->number_of_replicas + 1));
-  }
+  if (randomize_read) 
+    start= (uint32_t)(random() % (ptr->number_of_replicas + 1));
 
   /* Loop for each replica */
   for (uint32_t replica= 0; replica <= ptr->number_of_replicas; ++replica)
@@ -447,19 +445,14 @@ static memcached_return replication_binary_mget(memcached_st *ptr,
  
     for (x= 0; x < number_of_keys; ++x)
     {
-      uint32_t server;
-      
       if (hash[x] == ptr->number_of_hosts)
         continue; /* Already successfully sent */
 
-      server= hash[x] + replica;
+      uint32_t server= hash[x] + replica;
 
       /* In case of randomized reads */
-      if (randomize_read) {
-        if ((server + start) <= (hash[x] + ptr->number_of_replicas)) {
-          server += start;
-        }
-      }
+      if (randomize_read && ((server + start) <= (hash[x] + ptr->number_of_replicas)))
+        server += start;
       
       while (server >= ptr->number_of_hosts)
         server -= ptr->number_of_hosts;