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

Transactions: Use CMD_CLAL_NOQUEUE now that call() handles +QUEUED.

Browse Source
This commit is contained in:
antirez 2018-10-09 11:01:41 +02:00
parent 71c37605d0
commit 4834969032
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/multi.c
View File

@ -158,7 +158,7 @@ void execCommand(client *c) {
must_propagate = 1; must_propagate = 1;
} }
call(c,CMD_CALL_FULL); call(c,CMD_CALL_FULL|CMD_CALL_NOQUEUE);
/* Commands may alter argc/argv, restore mstate. */ /* Commands may alter argc/argv, restore mstate. */
c->mstate.commands[j].argc = c->argc; c->mstate.commands[j].argc = c->argc;

2
src/scripting.c
View File

@ -560,7 +560,7 @@ int luaRedisGenericCommand(lua_State *lua, int raise_error) {
} }
/* Run the command */ /* Run the command */
int call_flags = CMD_CALL_SLOWLOG | CMD_CALL_STATS; int call_flags = CMD_CALL_SLOWLOG | CMD_CALL_STATS | CMD_CALL_NOQUEUE;
if (server.lua_replicate_commands) { if (server.lua_replicate_commands) {
/* Set flags according to redis.set_repl() settings. */ /* Set flags according to redis.set_repl() settings. */
if (server.lua_repl & PROPAGATE_AOF) if (server.lua_repl & PROPAGATE_AOF)

11
src/server.c
View File

@ -2421,8 +2421,15 @@ void call(client *c, int flags) {
/* If the client is in the context of a transaction, reply with /* If the client is in the context of a transaction, reply with
* +QUEUED and just accumulate the command in the client transaction * +QUEUED and just accumulate the command in the client transaction
* commands vector. */ * commands vector.
if (c->flags & CLIENT_MULTI && *
* Note that CALL_NOQUEUE can override this check and execute the command
* straight away even if the client is in "MULTI" state. This is useful
* every time we want to actually execute commands even if the client is
* in MULTI state, like in scripting.c or in the implementation of EXEC
* itself. */
if (!(flags & CMD_CALL_NOQUEUE) &&
c->flags & CLIENT_MULTI &&
c->cmd->proc != execCommand && c->cmd->proc != discardCommand && c->cmd->proc != execCommand && c->cmd->proc != discardCommand &&
c->cmd->proc != multiCommand && c->cmd->proc != watchCommand) c->cmd->proc != multiCommand && c->cmd->proc != watchCommand)
{ {

3
src/server.h
View File

@ -416,6 +416,9 @@ typedef long long mstime_t; /* millisecond time type. */
#define CMD_CALL_PROPAGATE_REPL (1<<3) #define CMD_CALL_PROPAGATE_REPL (1<<3)
#define CMD_CALL_PROPAGATE (CMD_CALL_PROPAGATE_AOF|CMD_CALL_PROPAGATE_REPL) #define CMD_CALL_PROPAGATE (CMD_CALL_PROPAGATE_AOF|CMD_CALL_PROPAGATE_REPL)
#define CMD_CALL_FULL (CMD_CALL_SLOWLOG | CMD_CALL_STATS | CMD_CALL_PROPAGATE) #define CMD_CALL_FULL (CMD_CALL_SLOWLOG | CMD_CALL_STATS | CMD_CALL_PROPAGATE)
/* --- call() special semantics that can be requested by the caller
* --- but are not included in CALL_FULL. */
#define CMD_CALL_NOQUEUE (1<<4)
/* Command propagation flags, see propagate() function */ /* Command propagation flags, see propagate() function */
#define PROPAGATE_NONE 0 #define PROPAGATE_NONE 0