Changeset aedaaa

Timestamp:

02/01/09 15:38:20 (3 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

master-v0.7, master-v0.6, memcached_hash, upstream_count_limit

Children:

6c857c, fb0da1, f54237

Parents:

321c4d

git-author:

Tomash Brechko <tomash.brechko@…> (02/01/09 15:38:20)

git-committer:

Tomash Brechko <tomash.brechko@…> (02/01/09 15:38:20)

Message:

Better distribution of ketama points.

Feed previous point instead of sequential index.

File:

• memcached_hash/ngx_http_upstream_memcached_hash_module.c (modified) (4 diffs)

memcached_hash/ngx_http_upstream_memcached_hash_module.c

@@ -344 +344 @@
           u_char *host, *port;
           size_t len, port_len = 0;
-          unsigned int crc32, count, j;
+          unsigned int crc32, point, count, j;
 
           host = server[i].name.data;
@@ -372 +372 @@
           ngx_crc32_update(&crc32, (u_char *) &delim, 1);
           ngx_crc32_update(&crc32, port, port_len);
+          point = 0;
 
           count = (memd->ketama_points * server[i].weight
@@ -378 +379 @@
             {
               u_char buf[4];
-              unsigned int point = crc32, bucket;
+              unsigned int new_point = crc32, bucket;
 
               /*
@@ -384 +385 @@
                 hardcode size of int as 4 8-bit bytes.
               */
-              buf[0] = j & 0xff;
-              buf[1] = (j >> 8) & 0xff;
-              buf[2] = (j >> 16) & 0xff;
-              buf[3] = (j >> 24) & 0xff;
-
-              ngx_crc32_update(&point, buf, 4);
-              ngx_crc32_final(point);
+              buf[0] = point & 0xff;
+              buf[1] = (point >> 8) & 0xff;
+              buf[2] = (point >> 16) & 0xff;
+              buf[3] = (point >> 24) & 0xff;
+
+              ngx_crc32_update(&new_point, buf, 4);
+              ngx_crc32_final(new_point);
+              point = new_point;
 
               if (memd->buckets_count > 0)