Merge in changes around setting up better syntax for distribution.

[awesomized/libmemcached] / libmemcached / hash.c

diff --git a/libmemcached/hash.c b/libmemcached/hash.c
index d1515f69b5da9224e50c91ae60c86943243fd30e..9cb02b076ed34752892a88812fdb18f6b32a3117 100644 (file)
--- a/libmemcached/hash.c
+++ b/libmemcached/hash.c
@@ -27,16 +27,17 @@ static uint32_t dispatch_host(const memcached_st *ptr, uint32_t hash)
   switch (ptr->distribution)
   {
   case MEMCACHED_DISTRIBUTION_CONSISTENT:
+  case MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED:
   case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA:
   case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY:
     {
-      uint32_t num= ptr->continuum_points_counter;
+      uint32_t num= ptr->ketama.continuum_points_counter;
       WATCHPOINT_ASSERT(ptr->continuum);
 
       hash= hash;
       memcached_continuum_item_st *begin, *end, *left, *right, *middle;
-      begin= left= ptr->continuum;
-      end= right= ptr->continuum + num;
+      begin= left= ptr->ketama.continuum;
+      end= right= ptr->ketama.continuum + num;
 
       while (left < right)
       {
@@ -70,7 +71,7 @@ static inline uint32_t _generate_hash_wrapper(const memcached_st *ptr, const cha
   WATCHPOINT_ASSERT(memcached_server_count(ptr));
 
   if (memcached_server_count(ptr) == 1)
-    return EXIT_SUCCESS;
+    return 0;
 
   if (ptr->flags.hash_with_prefix_key)
   {
@@ -78,7 +79,7 @@ static inline uint32_t _generate_hash_wrapper(const memcached_st *ptr, const cha
     char temp[temp_length];
 
     if (temp_length > MEMCACHED_MAX_KEY -1)
-      return EXIT_SUCCESS;
+      return 0;
 
     strncpy(temp, memcached_array_string(ptr->prefix_key), memcached_array_size(ptr->prefix_key));
     strncpy(temp + memcached_array_size(ptr->prefix_key), key, key_length);
@@ -93,12 +94,12 @@ static inline uint32_t _generate_hash_wrapper(const memcached_st *ptr, const cha
 
 static inline void _regen_for_auto_eject(memcached_st *ptr)
 {
-  if (_is_auto_eject_host(ptr) && ptr->next_distribution_rebuild)
+  if (_is_auto_eject_host(ptr) && ptr->ketama.next_distribution_rebuild)
   {
     struct timeval now;
 
     if (gettimeofday(&now, NULL) == 0 &&
-        now.tv_sec > ptr->next_distribution_rebuild)
+        now.tv_sec > ptr->ketama.next_distribution_rebuild)
     {
       run_distribution(ptr);
     }