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

Merge branch 'master' into nested-multi

Browse Source
This commit is contained in:
antirez 2010-05-26 17:55:28 +02:00
commit 90fdc82697
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
redis.c
View File

@ -7563,6 +7563,7 @@ static void execCommand(redisClient *c) {
execCommandReplicateMulti(c); execCommandReplicateMulti(c);
/* Exec all the queued commands */ /* Exec all the queued commands */
unwatchAllKeys(c); /* Unwatch ASAP otherwise we'll waste CPU cycles */
orig_argv = c->argv; orig_argv = c->argv;
orig_argc = c->argc; orig_argc = c->argc;
addReplySds(c,sdscatprintf(sdsempty(),"*%d\r\n",c->mstate.count)); addReplySds(c,sdscatprintf(sdsempty(),"*%d\r\n",c->mstate.count));
@ -7575,8 +7576,7 @@ static void execCommand(redisClient *c) {
c->argc = orig_argc; c->argc = orig_argc;
freeClientMultiState(c); freeClientMultiState(c);
initClientMultiState(c); initClientMultiState(c);
c->flags &= (~REDIS_MULTI); c->flags &= ~(REDIS_MULTI|REDIS_DIRTY_CAS);
unwatchAllKeys(c);
/* Make sure the EXEC command is always replicated / AOF, since we /* Make sure the EXEC command is always replicated / AOF, since we
* always send the MULTI command (we can't know beforehand if the * always send the MULTI command (we can't know beforehand if the
* next operations will contain at least a modification to the DB). */ * next operations will contain at least a modification to the DB). */