Convert intset encoded set before Z*STORE

1ffa5d73 · Pieter Noordhuis · antirez · a7fa2baf · 1ffa5d73
隐藏空白更改
内联并排

Showing with 4 addition and 0 deletion

src/t_zset.c src/t_zset.c +4 -0

未找到文件。
--- 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);