gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

key deletion on empty value fix + some refactoring

Browse Source
This commit is contained in:
antirez 2010-03-23 12:29:35 +01:00
parent 3ea27d37d1
commit d36c4e97e5
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
redis.c
View File

@ -4790,17 +4790,14 @@ static void sinterGenericCommand(redisClient *c, robj **setskeys, unsigned long
if (dictSize((dict*)dstset->ptr) > 0) { if (dictSize((dict*)dstset->ptr) > 0) {
dictAdd(c->db->dict,dstkey,dstset); dictAdd(c->db->dict,dstkey,dstset);
incrRefCount(dstkey); incrRefCount(dstkey);
addReplyLong(c,dictSize((dict*)dstset->ptr));
} else { } else {
decrRefCount(dstset); decrRefCount(dstset);
addReply(c,shared.czero);
} }
}
if (!dstkey) {
lenobj->ptr = sdscatprintf(sdsempty(),"*%lu\r\n",cardinality);
} else {
addReplySds(c,sdscatprintf(sdsempty(),":%lu\r\n",
dictSize((dict*)dstset->ptr)));
server.dirty++; server.dirty++;
} else {
lenobj->ptr = sdscatprintf(sdsempty(),"*%lu\r\n",cardinality);
} }
zfree(dv); zfree(dv);
} }
@ -4873,7 +4870,8 @@ static void sunionDiffGenericCommand(redisClient *c, robj **setskeys, int setsnu
} }
dictReleaseIterator(di); dictReleaseIterator(di);
if (op == REDIS_OP_DIFF && cardinality == 0) break; /* result set is empty */ /* result set is empty? Exit asap. */
if (op == REDIS_OP_DIFF && cardinality == 0) break;
} }
/* Output the content of the resulting set, if not in STORE mode */ /* Output the content of the resulting set, if not in STORE mode */
@ -4887,6 +4885,7 @@ static void sunionDiffGenericCommand(redisClient *c, robj **setskeys, int setsnu
addReplyBulk(c,ele); addReplyBulk(c,ele);
} }
dictReleaseIterator(di); dictReleaseIterator(di);
decrRefCount(dstset);
} else { } else {
/* If we have a target key where to store the resulting set /* If we have a target key where to store the resulting set
* create this key with the result set inside */ * create this key with the result set inside */
@ -4894,17 +4893,11 @@ static void sunionDiffGenericCommand(redisClient *c, robj **setskeys, int setsnu
if (dictSize((dict*)dstset->ptr) > 0) { if (dictSize((dict*)dstset->ptr) > 0) {
dictAdd(c->db->dict,dstkey,dstset); dictAdd(c->db->dict,dstkey,dstset);
incrRefCount(dstkey); incrRefCount(dstkey);
addReplyLong(c,dictSize((dict*)dstset->ptr));
} else { } else {
decrRefCount(dstset); decrRefCount(dstset);
addReply(c,shared.czero);
} }
}
/* Cleanup */
if (!dstkey) {
decrRefCount(dstset);
} else {
addReplySds(c,sdscatprintf(sdsempty(),":%lu\r\n",
dictSize((dict*)dstset->ptr)));
server.dirty++; server.dirty++;
} }
zfree(dv); zfree(dv);