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

DEL is now a vararg, IMPORTANT: memory leak fixed in loading DB code

Browse Source
This commit is contained in:
antirez
2009-05-09 12:18:32 +02:00
parent efc296a1d6
commit 5109cdff83
4 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
redis.c
View File

@ -367,7 +367,7 @@ static struct redisCommand cmdTable[] = {
{"get",getCommand,2,REDIS_CMD_INLINE},
{"set",setCommand,3,REDIS_CMD_BULK},
{"setnx",setnxCommand,3,REDIS_CMD_BULK},
{"del",delCommand,2,REDIS_CMD_INLINE},
{"del",delCommand,-2,REDIS_CMD_INLINE},
{"exists",existsCommand,2,REDIS_CMD_INLINE},
{"incr",incrCommand,2,REDIS_CMD_INLINE},
{"decr",decrCommand,2,REDIS_CMD_INLINE},
@ -2012,6 +2012,7 @@ static robj *rdbLoadLzfStringObject(FILE*fp, int rdbver) {
if ((val = sdsnewlen(NULL,len)) == NULL) goto err;
if (fread(c,clen,1,fp) == 0) goto err;
if (lzf_decompress(c,clen,val,len) == 0) goto err;
zfree(c);
return createObject(REDIS_STRING,val);
err:
zfree(c);
@ -2305,11 +2306,24 @@ static void decrbyCommand(redisClient *c) {
/* ========================= Type agnostic commands ========================= */
static void delCommand(redisClient *c) {
if (deleteKey(c->db,c->argv[1])) {
server.dirty++;
addReply(c,shared.cone);
} else {
int deleted = 0, j;
for (j = 1; j < c->argc; j++) {
if (deleteKey(c->db,c->argv[j])) {
server.dirty++;
deleted++;
}
}
switch(deleted) {
case 0:
addReply(c,shared.czero);
break;
case 1:
addReply(c,shared.cone);
break;
default:
addReplySds(c,sdscatprintf(sdsempty(),":%d\r\n",deleted));
break;
}
}