Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
90fdc826
Commit
90fdc826
authored
May 26, 2010
by
antirez
Browse files
Merge branch 'master' into nested-multi
parents
6531c94d
1ad4d316
Changes
1
Hide whitespace changes
Inline
Side-by-side
redis.c
View file @
90fdc826
...
@@ -7563,6 +7563,7 @@ static void execCommand(redisClient *c) {
...
@@ -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) {
...
@@ -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). */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment