X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_hash.c;h=87c59d510ae55cbc32cff6def7d1817acd8104b6;hb=2dce97932fbd574db1179add7bc3facc0318186c;hp=33c1055bbfd70ffd60aa1e902739367136b08705;hpb=131622cdc2710ecd9ad554ce7d08c6003fbdcf6e;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_hash.c b/lib/memcached_hash.c
index 33c1055b..87c59d51 100644
--- a/lib/memcached_hash.c
+++ b/lib/memcached_hash.c
@@ -77,16 +77,27 @@ unsigned int memcached_generate_hash(memcached_st *ptr, char *key, size_t key_le
       hash= internal_generate_ketama_md5(key, key_length);
       break;
     }
+    case MEMCACHED_HASH_HSIEH:
+    {
+      hash= hsieh_hash(key, key_length);
+      break;
+    }
   }
 
   WATCHPOINT_ASSERT(hash);
-  if (ptr->flags & MEM_USE_KETAMA)
+
+  if (ptr->distribution == MEMCACHED_DISTRIBUTION_MODULA)
   {
-    WATCHPOINT_ASSERT(0);
-    return 0;
+    return hash % ptr->number_of_hosts;
   }
   else
-    return hash % ptr->number_of_hosts;
+  {
+    unsigned int server_key;
+
+    server_key= hash % MEMCACHED_WHEEL_SIZE;
+
+    return ptr->wheel[server_key];
+  }
 }
 
 static uint64_t internal_generate_hash(char *key, size_t key_length)