Convert intset encoded set before Z*STORE

maxpert · May 12, 2011 · 1ffa5d7 · 1ffa5d7
1 parent a7fa2ba
commit 1ffa5d7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/t_zset.c b/src/t_zset.c
@@ -615,6 +615,10 @@ void zunionInterGenericCommand(redisClient *c, robj *dstkey, int op) {
             if (obj->type == REDIS_ZSET) {
                 src[i].dict = ((zset*)obj->ptr)->dict;
             } else if (obj->type == REDIS_SET) {
+                if (obj->encoding == REDIS_ENCODING_INTSET)
+                    setTypeConvert(obj, REDIS_ENCODING_HT);
+
+                redisAssert(obj->encoding == REDIS_ENCODING_HT);
                 src[i].dict = (obj->ptr);
             } else {
                 zfree(src);