fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-19 20:21:21 +00:00
Code Issues Projects Releases Wiki Activity

Convert intset encoded set before Z*STORE

Browse Source
This commit is contained in:
Pieter Noordhuis
2011-05-12 15:53:38 +02:00
committed by antirez
parent a7fa2baf06
commit 1ffa5d73ed
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/t_zset.c
View File

@ -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);