Commit 1ffa5d73 authored by Pieter Noordhuis's avatar Pieter Noordhuis Committed by antirez
Browse files

Convert intset encoded set before Z*STORE

parent a7fa2baf
...@@ -615,6 +615,10 @@ void zunionInterGenericCommand(redisClient *c, robj *dstkey, int op) { ...@@ -615,6 +615,10 @@ void zunionInterGenericCommand(redisClient *c, robj *dstkey, int op) {
if (obj->type == REDIS_ZSET) { if (obj->type == REDIS_ZSET) {
src[i].dict = ((zset*)obj->ptr)->dict; src[i].dict = ((zset*)obj->ptr)->dict;
} else if (obj->type == REDIS_SET) { } 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); src[i].dict = (obj->ptr);
} else { } else {
zfree(src); zfree(src);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment