X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_hosts.c;h=d7f78dea4061ced1a2883ca195b305acabdae265;hb=f306cdfa6c08283065643edb33da60acff2ec5c4;hp=f0af383ab09b9a500322979812757ae66df48dd8;hpb=ea76388ba6c96a011c49dd3e6d464b574a1e7bb5;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached_hosts.c b/libmemcached/memcached_hosts.c
index f0af383a..d7f78dea 100644
--- a/libmemcached/memcached_hosts.c
+++ b/libmemcached/memcached_hosts.c
@@ -40,6 +40,7 @@ memcached_return run_distribution(memcached_st *ptr)
   {
   case MEMCACHED_DISTRIBUTION_CONSISTENT:
   case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA:
+  case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY:
     return update_continuum(ptr);
   case MEMCACHED_DISTRIBUTION_MODULA:
     if (ptr->flags & MEM_USE_SORT_HOSTS)
@@ -198,43 +199,93 @@ memcached_return update_continuum(memcached_st *ptr)
                pointer_per_server);
 #endif
     }
-    for (pointer_index= 0;
-         pointer_index < pointer_per_server / pointer_per_hash;
-         pointer_index++)
+
+
+    if (ptr->distribution == MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY)
     {
-      char sort_host[MEMCACHED_MAX_HOST_SORT_LENGTH]= "";
-      size_t sort_host_length;
-
-      // Spymemcached ketema key format is: hostname/ip:port-index
-      // If hostname is not available then: /ip:port-index
-      sort_host_length= (size_t) snprintf(sort_host, MEMCACHED_MAX_HOST_SORT_LENGTH,
-                                          "/%s:%d-%d",
-                                          list[host_index].hostname,
-                                          list[host_index].port,
-                                          pointer_index);
+      for (pointer_index= 0;
+           pointer_index < pointer_per_server / pointer_per_hash;
+           pointer_index++)
+      {
+        char sort_host[MEMCACHED_MAX_HOST_SORT_LENGTH]= "";
+        size_t sort_host_length;
+
+        // Spymemcached ketema key format is: hostname/ip:port-index
+        // If hostname is not available then: /ip:port-index
+        sort_host_length= (size_t) snprintf(sort_host, MEMCACHED_MAX_HOST_SORT_LENGTH,
+                                            "/%s:%d-%d",
+                                            list[host_index].hostname,
+                                            list[host_index].port,
+                                            pointer_index);
 #ifdef DEBUG
-      printf("update_continuum: key is %s\n", sort_host);
+        printf("update_continuum: key is %s\n", sort_host);
 #endif
 
-      WATCHPOINT_ASSERT(sort_host_length);
+        WATCHPOINT_ASSERT(sort_host_length);
 
-      if (is_ketama_weighted)
-      {
-        unsigned int i;
-        for (i = 0; i < pointer_per_hash; i++)
+        if (is_ketama_weighted)
+        {
+          unsigned int i;
+          for (i = 0; i < pointer_per_hash; i++)
+          {
+             value= ketama_server_hash(sort_host, (uint32_t) sort_host_length, (int) i);
+             ptr->continuum[continuum_index].index= host_index;
+             ptr->continuum[continuum_index++].value= value;
+          }
+        }
+        else
         {
-          value= ketama_server_hash(sort_host, (uint32_t) sort_host_length, (int) i);
+          value= memcached_generate_hash_value(sort_host, sort_host_length, ptr->hash_continuum);
           ptr->continuum[continuum_index].index= host_index;
           ptr->continuum[continuum_index++].value= value;
         }
       }
-      else
+    }
+    else
+    {
+      for (pointer_index= 1;
+           pointer_index <= pointer_per_server / pointer_per_hash;
+           pointer_index++)
       {
-        value= memcached_generate_hash_value(sort_host, sort_host_length, ptr->hash_continuum);
-        ptr->continuum[continuum_index].index= host_index;
-        ptr->continuum[continuum_index++].value= value;
+        char sort_host[MEMCACHED_MAX_HOST_SORT_LENGTH]= "";
+        size_t sort_host_length;
+
+        if (list[host_index].port == MEMCACHED_DEFAULT_PORT)
+        {
+          sort_host_length= (size_t) snprintf(sort_host, MEMCACHED_MAX_HOST_SORT_LENGTH,
+                                              "%s-%d",
+                                              list[host_index].hostname,
+                                              pointer_index - 1);
+        }
+        else
+        {
+          sort_host_length= (size_t) snprintf(sort_host, MEMCACHED_MAX_HOST_SORT_LENGTH,
+                                              "%s:%d-%d",
+                                              list[host_index].hostname,
+                                              list[host_index].port, pointer_index - 1);
+        }
+
+        WATCHPOINT_ASSERT(sort_host_length);
+
+        if (is_ketama_weighted)
+        {
+          unsigned int i;
+          for (i = 0; i < pointer_per_hash; i++)
+          {
+             value= ketama_server_hash(sort_host, (uint32_t) sort_host_length, (int) i);
+             ptr->continuum[continuum_index].index= host_index;
+             ptr->continuum[continuum_index++].value= value;
+          }
+        }
+        else
+        {
+          value= memcached_generate_hash_value(sort_host, sort_host_length, ptr->hash_continuum);
+          ptr->continuum[continuum_index].index= host_index;
+          ptr->continuum[continuum_index++].value= value;
+        }
       }
     }
+
     pointer_counter+= pointer_per_server;
   }