fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-03 08:11:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix SINTER/UNIONSTORE to allow for &=/|= style operations (i.e. SINTERSTORE set1 set1 set2)

Browse Source
This commit is contained in:
Aman Gupta 2009-05-17 14:16:24 -07:00
parent 51829ed3f0
commit 83cdfe182f
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
redis.c
View File

@ -3013,9 +3013,6 @@ static void sinterGenericCommand(redisClient *c, robj **setskeys, int setsnum, r
/* 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 an empty set inside */ * create this key with an empty set inside */
dstset = createSetObject(); dstset = createSetObject();
deleteKey(c->db,dstkey);
dictAdd(c->db->dict,dstkey,dstset);
incrRefCount(dstkey);
} }
/* Iterate all the elements of the first (smallest) set, and test /* Iterate all the elements of the first (smallest) set, and test
@ -3044,6 +3041,13 @@ static void sinterGenericCommand(redisClient *c, robj **setskeys, int setsnum, r
} }
dictReleaseIterator(di); dictReleaseIterator(di);
if (dstkey) {
/* Store the resulting set into the target */
deleteKey(c->db,dstkey);
dictAdd(c->db->dict,dstkey,dstset);
incrRefCount(dstkey);
}
if (!dstkey) { if (!dstkey) {
lenobj->ptr = sdscatprintf(sdsempty(),"*%d\r\n",cardinality); lenobj->ptr = sdscatprintf(sdsempty(),"*%d\r\n",cardinality);
} else { } else {
@ -3095,20 +3099,6 @@ static void sunionDiffGenericCommand(redisClient *c, robj **setskeys, int setsnu
* this set object will be the resulting object to set into the target key*/ * this set object will be the resulting object to set into the target key*/
dstset = createSetObject(); dstset = createSetObject();
/* The first thing we should output is the total number of elements...
* since this is a multi-bulk write, but at this stage we don't know
* the intersection set size, so we use a trick, append an empty object
* to the output list and save the pointer to later modify it with the
* right length */
if (dstkey) {
/* If we have a target key where to store the resulting set
* create this key with an empty set inside */
deleteKey(c->db,dstkey);
dictAdd(c->db->dict,dstkey,dstset);
incrRefCount(dstkey);
server.dirty++;
}
/* Iterate all the elements of all the sets, add every element a single /* Iterate all the elements of all the sets, add every element a single
* time to the result set */ * time to the result set */
for (j = 0; j < setsnum; j++) { for (j = 0; j < setsnum; j++) {
@ -3154,6 +3144,13 @@ static void sunionDiffGenericCommand(redisClient *c, robj **setskeys, int setsnu
addReply(c,shared.crlf); addReply(c,shared.crlf);
} }
dictReleaseIterator(di); dictReleaseIterator(di);
} else {
/* If we have a target key where to store the resulting set
* create this key with the result set inside */
deleteKey(c->db,dstkey);
dictAdd(c->db->dict,dstkey,dstset);
incrRefCount(dstkey);
server.dirty++;
} }
/* Cleanup */ /* Cleanup */

10
test-redis.tcl
View File

@ -481,6 +481,11 @@ proc main {server port} {
lsort [$r smembers setres] lsort [$r smembers setres]
} [lsort -uniq "[$r smembers set1] [$r smembers set2]"] } [lsort -uniq "[$r smembers set1] [$r smembers set2]"]
test {SUNIONSTORE with same src and dest} {
$r sunionstore set1 set1 set1
$r scard set1
} {1000}
test {SINTER against three sets} { test {SINTER against three sets} {
$r sadd set3 999 $r sadd set3 999
$r sadd set3 995 $r sadd set3 995
@ -494,6 +499,11 @@ proc main {server port} {
lsort [$r smembers setres] lsort [$r smembers setres]
} {995 999} } {995 999}
test {SINTERSTORE with same src and dest} {
$r sinterstore set1 set1 set1
$r scard set1
} {1000}
test {SUNION with non existing keys} { test {SUNION with non existing keys} {
lsort [$r sunion nokey1 set1 set2 nokey2] lsort [$r sunion nokey1 set1 set2 nokey2]
} [lsort -uniq "[$r smembers set1] [$r smembers set2]"] } [lsort -uniq "[$r smembers set1] [$r smembers set2]"]