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

scanGenericCommand() refactoring and handling of integer encoded elements.

Browse Source 
This commit fixes issue #1354.
This commit is contained in:
antirez 2013-10-31 10:32:33 +01:00
parent e6bb738b87
commit 8fc85a1218
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/db.c
View File

@ -480,15 +480,28 @@ void scanGenericCommand(redisClient *c, robj *o) {
while (node) {
robj *kobj = listNodeValue(node);
nextnode = listNextNode(node);
int filter = 0;
/* Keep key iff pattern matches and, if we are iterating the key
* space, check that the key hasn't expired. */
if ((patnoop ||
stringmatchlen(pat, patlen, kobj->ptr, sdslen(kobj->ptr), 0)) &&
(o != NULL || expireIfNeeded(c->db, kobj) == 0))
{
/* Keep */
} else {
/* Filter element if it does not match the pattern. */
if (!filter && !patnoop) {
if (sdsEncodedObject(kobj)) {
if (!stringmatchlen(pat, patlen, kobj->ptr, sdslen(kobj->ptr), 0))
filter = 1;
} else {
char buf[REDIS_LONGSTR_SIZE];
int len;
redisAssert(kobj->encoding == REDIS_ENCODING_INT);
len = ll2string(buf,sizeof(buf),(long)kobj->ptr);
if (!stringmatchlen(pat, patlen, buf, len, 0)) filter = 1;
}
}
/* Filter element if it is an expired key. */
if (!filter && o == NULL && expireIfNeeded(c->db, kobj)) filter = 1;
/* Remove the element and its associted value if needed. */
if (filter) {
decrRefCount(kobj);
listDelNode(keys, node);
/* Also remove the value for hashes and sorted sets. */