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

raise error on nested MULTI and WATCH inside multi

Browse Source
This commit is contained in:
antirez 2010-05-26 16:47:37 +02:00
parent bc000c1db0
commit 6531c94d28
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
redis.c
View File

@ -2446,7 +2446,10 @@ static int processCommand(redisClient *c) {
} }
/* Exec the command */ /* Exec the command */
if (c->flags & REDIS_MULTI && cmd->proc != execCommand && cmd->proc != discardCommand) { if (c->flags & REDIS_MULTI &&
cmd->proc != execCommand && cmd->proc != discardCommand &&
cmd->proc != multiCommand && cmd->proc != watchCommand)
{
queueMultiCommand(c,cmd); queueMultiCommand(c,cmd);
addReply(c,shared.queued); addReply(c,shared.queued);
} else { } else {
@ -7498,6 +7501,10 @@ static void queueMultiCommand(redisClient *c, struct redisCommand *cmd) {
} }
static void multiCommand(redisClient *c) { static void multiCommand(redisClient *c) {
if (c->flags & REDIS_MULTI) {
addReplySds(c,sdsnew("-ERR MULTI calls can not be nested\r\n"));
return;
}
c->flags |= REDIS_MULTI; c->flags |= REDIS_MULTI;
addReply(c,shared.ok); addReply(c,shared.ok);
} }
@ -10513,6 +10520,10 @@ static void touchWatchedKeysOnFlush(int dbid) {
static void watchCommand(redisClient *c) { static void watchCommand(redisClient *c) {
int j; int j;
if (c->flags & REDIS_MULTI) {
addReplySds(c,sdsnew("-ERR WATCH inside MULTI is not allowed\r\n"));
return;
}
for (j = 1; j < c->argc; j++) for (j = 1; j < c->argc; j++)
watchForKey(c,c->argv[j]); watchForKey(c,c->argv[j]);
addReply(c,shared.ok); addReply(c,shared.ok);