X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_hash.c;h=9906f5d9be30f5dcd6dde919f36497bbd58b59b3;hb=cfe8176feba42fc63e8f627f9ac613a12a368b92;hp=7e7814e6818be2802c50d8f25929897bac73e2c8;hpb=c119fcae0b2be6b079fa20a661146b108755399c;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_hash.c b/lib/memcached_hash.c
index 7e7814e6..9906f5d9 100644
--- a/lib/memcached_hash.c
+++ b/lib/memcached_hash.c
@@ -17,6 +17,8 @@ unsigned int memcached_generate_hash(memcached_st *ptr, char *key, size_t key_le
   uint64_t hash= 1; /* Just here to remove compile warning */
   unsigned int x;
 
+  WATCHPOINT_ASSERT(ptr->number_of_hosts);
+
   switch (ptr->hash)
   {
   case MEMCACHED_HASH_DEFAULT:
@@ -27,6 +29,8 @@ unsigned int memcached_generate_hash(memcached_st *ptr, char *key, size_t key_le
     break;
   case MEMCACHED_HASH_CRC:
     hash= ((hash_crc32(key, key_length) >> 16) & 0x7fff);
+    if (hash == 0)
+      hash= 1;
     break;
     /* FNV hash'es lifted from Dustin Sallings work */
   case MEMCACHED_HASH_FNV1_64: 
@@ -75,16 +79,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)