caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 08:08:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try lazyfree temp zset in ZUNION / ZINTER / ZDIFF and optimize ZINTERCARD to avoid create temp zset (#12229)

Browse Source 
We check lazyfree_lazy_server_del in sunionDiffGenericCommand
to see if we need to lazyfree the temp set. Now do the same in
zunionInterDiffGenericCommand to lazyfree the temp zset.

This is a minor change, follow #5903. Also improved the comments.

Additionally, avoid creating unused zset object in ZINTERCARD,
results in some 10% performance improvement.
This commit is contained in:
Binbin 2023-05-29 14:55:17 +08:00 committed by GitHub
parent 2764dc3768
commit 32f45215c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/t_set.c
View File

@ -1540,8 +1540,8 @@ void sunionDiffGenericCommand(client *c, robj **setkeys, int setnum,
}
}
/* We need a temp set object to store our union. If the dstkey
* is not NULL (that is, we are inside an SUNIONSTORE operation) then
/* We need a temp set object to store our union/diff. If the dstkey
* is not NULL (that is, we are inside an SUNIONSTORE/SDIFFSTORE operation) then
* this set object will be the resulting object to set into the target key*/
dstset = createIntsetObject();

18
src/t_zset.c
View File

@ -2575,8 +2575,8 @@ void zunionInterDiffGenericCommand(client *c, robj *dstkey, int numkeysIndex, in
zsetopval zval;
sds tmp;
size_t maxelelen = 0, totelelen = 0;
robj *dstobj;
zset *dstzset;
robj *dstobj = NULL;
zset *dstzset = NULL;
zskiplistNode *znode;
int withscores = 0;
unsigned long cardinality = 0;
@ -2686,8 +2686,14 @@ void zunionInterDiffGenericCommand(client *c, robj *dstkey, int numkeysIndex, in
qsort(src,setnum,sizeof(zsetopsrc),zuiCompareByCardinality);
}
dstobj = createZsetObject();
dstzset = dstobj->ptr;
/* We need a temp zset object to store our union/inter/diff. If the dstkey
* is not NULL (that is, we are inside an ZUNIONSTORE/ZINTERSTORE/ZDIFFSTORE operation) then
* this zset object will be the resulting object to zset into the target key.
* In SINTERCARD case, we don't need the temp obj, so we can avoid creating it. */
if (!cardinality_only) {
dstobj = createZsetObject();
dstzset = dstobj->ptr;
}
memset(&zval, 0, sizeof(zval));
if (op == SET_OP_INTER) {
@ -2826,6 +2832,7 @@ void zunionInterDiffGenericCommand(client *c, robj *dstkey, int numkeysIndex, in
server.dirty++;
}
}
decrRefCount(dstobj);
} else if (cardinality_only) {
addReplyLongLong(c, cardinality);
} else {
@ -2846,8 +2853,9 @@ void zunionInterDiffGenericCommand(client *c, robj *dstkey, int numkeysIndex, in
if (withscores) addReplyDouble(c,zn->score);
zn = zn->level[0].forward;
}
server.lazyfree_lazy_server_del ? freeObjAsync(NULL, dstobj, -1) :
decrRefCount(dstobj);
}
decrRefCount(dstobj);
zfree(src);
}