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

Add DISCARD command to discard queued MULTI commands.

Browse Source
This commit is contained in:
Damian Janowski 2010-02-27 23:36:19 -03:00 committed by antirez
parent c8c72447f6
commit 18b6cb7643
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
redis.c
View File

@ -653,6 +653,7 @@ static void zscoreCommand(redisClient *c);
static void zremrangebyscoreCommand(redisClient *c); static void zremrangebyscoreCommand(redisClient *c);
static void multiCommand(redisClient *c); static void multiCommand(redisClient *c);
static void execCommand(redisClient *c); static void execCommand(redisClient *c);
static void discardCommand(redisClient *c);
static void blpopCommand(redisClient *c); static void blpopCommand(redisClient *c);
static void brpopCommand(redisClient *c); static void brpopCommand(redisClient *c);
static void appendCommand(redisClient *c); static void appendCommand(redisClient *c);
@ -733,6 +734,7 @@ static struct redisCommand cmdTable[] = {
{"type",typeCommand,2,REDIS_CMD_INLINE,1,1,1}, {"type",typeCommand,2,REDIS_CMD_INLINE,1,1,1},
{"multi",multiCommand,1,REDIS_CMD_INLINE,0,0,0}, {"multi",multiCommand,1,REDIS_CMD_INLINE,0,0,0},
{"exec",execCommand,1,REDIS_CMD_INLINE,0,0,0}, {"exec",execCommand,1,REDIS_CMD_INLINE,0,0,0},
{"discard",discardCommand,1,REDIS_CMD_INLINE,0,0,0},
{"sync",syncCommand,1,REDIS_CMD_INLINE,0,0,0}, {"sync",syncCommand,1,REDIS_CMD_INLINE,0,0,0},
{"flushdb",flushdbCommand,1,REDIS_CMD_INLINE,0,0,0}, {"flushdb",flushdbCommand,1,REDIS_CMD_INLINE,0,0,0},
{"flushall",flushallCommand,1,REDIS_CMD_INLINE,0,0,0}, {"flushall",flushallCommand,1,REDIS_CMD_INLINE,0,0,0},
@ -2141,7 +2143,7 @@ static int processCommand(redisClient *c) {
} }
/* Exec the command */ /* Exec the command */
if (c->flags & REDIS_MULTI && cmd->proc != execCommand) { if (c->flags & REDIS_MULTI && cmd->proc != execCommand && cmd->proc != discardCommand) {
queueMultiCommand(c,cmd); queueMultiCommand(c,cmd);
addReply(c,shared.queued); addReply(c,shared.queued);
} else { } else {
@ -6051,6 +6053,18 @@ static void multiCommand(redisClient *c) {
addReply(c,shared.ok); addReply(c,shared.ok);
} }
static void discardCommand(redisClient *c) {
if (!(c->flags & REDIS_MULTI)) {
addReplySds(c,sdsnew("-ERR DISCARD without MULTI\r\n"));
return;
}
freeClientMultiState(c);
initClientMultiState(c);
c->flags &= (~REDIS_MULTI);
addReply(c,shared.ok);
}
static void execCommand(redisClient *c) { static void execCommand(redisClient *c) {
int j; int j;
robj **orig_argv; robj **orig_argv;

12
test-redis.tcl
View File

@ -1663,6 +1663,18 @@ proc main {server port} {
list $v1 $v2 $v3 list $v1 $v2 $v3
} {QUEUED QUEUED {{a b c} PONG}} } {QUEUED QUEUED {{a b c} PONG}}
test {DISCARD} {
$r del mylist
$r rpush mylist a
$r rpush mylist b
$r rpush mylist c
$r multi
set v1 [$r del mylist]
set v2 [$r discard]
set v3 [$r lrange mylist 0 -1]
list $v1 $v2 $v3
} {QUEUED OK {a b c}}
test {APPEND basics} { test {APPEND basics} {
list [$r append foo bar] [$r get foo] \ list [$r append foo bar] [$r get foo] \
[$r append foo 100] [$r get foo] [$r append foo 100] [$r get foo]