fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-04 08:41:04 +00:00
Code Issues Projects Releases Wiki Activity

call(): don't inherit CLIENT_PREVENT_PROP + minor refactoring.

Browse Source
This commit is contained in:
antirez 2015-10-29 10:44:30 +01:00
parent d37ef7845b
commit 9dd3d2e9bd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/server.c
View File

@ -2171,9 +2171,12 @@ void call(client *c, int flags) {
replicationFeedMonitors(c,server.monitors,c->db->id,c->argv,c->argc); replicationFeedMonitors(c,server.monitors,c->db->id,c->argv,c->argc);
} }
/* Call the command. */ /* Initialization: clear the flags that must be set by the command on
c->flags &= ~(CLIENT_FORCE_AOF|CLIENT_FORCE_REPL); * demand, and initialize the array for additional commands propagation. */
c->flags &= ~(CLIENT_FORCE_AOF|CLIENT_FORCE_REPL|CLIENT_PREVENT_PROP);
redisOpArrayInit(&server.also_propagate); redisOpArrayInit(&server.also_propagate);
/* Call the command. */
dirty = server.dirty; dirty = server.dirty;
start = ustime(); start = ustime();
c->cmd->proc(c); c->cmd->proc(c);
@ -2221,7 +2224,7 @@ void call(client *c, int flags) {
propagate(c->cmd,c->db->id,c->argv,c->argc,flags); propagate(c->cmd,c->db->id,c->argv,c->argc,flags);
} }
/* Restore the old replication flags, since call can be executed /* Restore the old replication flags, since call() can be executed
* recursively. */ * recursively. */
c->flags &= ~(CLIENT_FORCE_AOF|CLIENT_FORCE_REPL|CLIENT_PREVENT_PROP); c->flags &= ~(CLIENT_FORCE_AOF|CLIENT_FORCE_REPL|CLIENT_PREVENT_PROP);
c->flags |= client_old_flags & c->flags |= client_old_flags &