Changeset dfab1e

Timestamp:

03/09/08 17:14:01 (4 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

master, ketama-compat

Children:

3760ea

Parents:

2986b7

git-author:

Tomash Brechko <tomash.brechko@…> (03/09/08 17:14:01)

git-committer:

Tomash Brechko <tomash.brechko@…> (03/09/08 17:14:01)

Message:

In the case of collision, add new servers to the end of equal run.

File:

• src/dispatch_key.c (modified) (2 diffs)

src/dispatch_key.c

@@ -186 +186 @@
       if (! array_empty(state->buckets))
         {
+          struct continuum_point *end =
+            array_end(state->buckets, struct continuum_point);
+
           p = dispatch_find_bucket(state, point);
 
@@ -192 +195 @@
               && point > p->point)
             {
-              p = array_end(state->buckets, struct continuum_point);
+              p = end;
             }
           else
             {
-              if (point == p->point)
-                {
-                  /*
-                    Even if there's a server for the same point
-                    already, we have to add ours, because the first
-                    one may be removed later.  But we add ours after
-                    the first server for not to change key
-                    distribution.
-                  */
-                  ++p;
-                }
+              /*
+                Even if there's a server for the same point already,
+                we have to add ours, because the first one may be
+                removed later.  But we add ours after the old servers
+                for not to change key distribution.
+              */
+              while (p != end && p->point == point)
+                ++p;
 
               /* Move the tail one position forward.  */
-              memmove(p + 1, p,
-                      ((array_end(state->buckets, struct continuum_point) - p)
-                       * sizeof(*p)));
+              if (p != end)
+                memmove(p + 1, p, (end - p) * sizeof(*p));
             }
         }