Merge remote branch 'pietern/unstable-replnonblock' into unstable

[redis.git] / src / t_zset.c

diff --git a/src/t_zset.c b/src/t_zset.c
index 1c55cb97a575e3a7ae3819cb64dcb29533767ad4..a5dc27c7685e7677f0f138d9284ddc41b25a68ab 100644 (file)
--- a/src/t_zset.c
+++ b/src/t_zset.c
@@ -1521,7 +1521,7 @@ void zunionInterGenericCommand(redisClient *c, robj *dstkey, int op) {
 
                 score = src[0].weight * zval.score;
                 for (j = 1; j < setnum; j++) {
 
                 score = src[0].weight * zval.score;
                 for (j = 1; j < setnum; j++) {

-                    /* It is not safe to access the hash we zset we are
+                    /* It is not safe to access the zset we are

                      * iterating, so explicitly check for equal object. */
                     if (src[j].subject == src[0].subject) {
                         value = zval.score*src[j].weight;
                      * iterating, so explicitly check for equal object. */
                     if (src[j].subject == src[0].subject) {
                         value = zval.score*src[j].weight;


@@ -1550,7 +1550,7 @@ void zunionInterGenericCommand(redisClient *c, robj *dstkey, int op) {
         }
     } else if (op == REDIS_OP_UNION) {
         for (i = 0; i < setnum; i++) {
         }
     } else if (op == REDIS_OP_UNION) {
         for (i = 0; i < setnum; i++) {

-            if (zuiLength(&src[0]) == 0)
+            if (zuiLength(&src[i]) == 0)

                 continue;
 
             while (zuiNext(&src[i],&zval)) {
                 continue;
 
             while (zuiNext(&src[i],&zval)) {


@@ -1566,7 +1566,7 @@ void zunionInterGenericCommand(redisClient *c, robj *dstkey, int op) {
                 /* Because the inputs are sorted by size, it's only possible
                  * for sets at larger indices to hold this element. */
                 for (j = (i+1); j < setnum; j++) {
                 /* Because the inputs are sorted by size, it's only possible
                  * for sets at larger indices to hold this element. */
                 for (j = (i+1); j < setnum; j++) {

-                    /* It is not safe to access the hash we zset we are
+                    /* It is not safe to access the zset we are

                      * iterating, so explicitly check for equal object. */
                     if(src[j].subject == src[i].subject) {
                         value = zval.score*src[j].weight;
                      * iterating, so explicitly check for equal object. */
                     if(src[j].subject == src[i].subject) {
                         value = zval.score*src[j].weight;