upstream/KeyDB
2
0 Fork 1
mirror of https://github.com/Snapchat/KeyDB.git synced 2026-11-13 12:22:10 -05:00
Code Releases 1 Activity

Merge tag '6.0-rc3' into redis_6_merge

Browse Source 
Redis 6.0 RC3.


Former-commit-id: b2cb10de5f
This commit is contained in:
John Sully committed 2020-04-14 22:56:19 -04:00
2 parents f7a49753a8 5f98065e52
commit f69c169c04
17 files changed
+486 -75
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/module.cpp
+2 -9
View File
@@ -3402,13 +3402,8 @@ RedisModuleCallReply *RM_Call(RedisModuleCtx *ctx, const char *cmdname, const ch
* a Lua script in the context of AOF and slaves. */
if (replicate) moduleReplicateMultiIfNeeded(ctx);
if (ctx->client->flags & CLIENT_MULTI ||
ctx->flags & REDISMODULE_CTX_MULTI_EMITTED) {
c->flags |= CLIENT_MULTI;
}
/* Run the command */
call_flags = CMD_CALL_SLOWLOG | CMD_CALL_STATS;
call_flags = CMD_CALL_SLOWLOG | CMD_CALL_STATS | CMD_CALL_NOWRAP;
if (replicate) {
if (!(flags & REDISMODULE_ARGV_NO_AOF))
call_flags |= CMD_CALL_PROPAGATE_AOF;
@@ -3417,9 +3412,7 @@ RedisModuleCallReply *RM_Call(RedisModuleCtx *ctx, const char *cmdname, const ch
}
call(c,call_flags);
/* Convert the result of the Redis command into a suitable Lua type.
* The first thing we need is to create a single string from the client
* output buffers. */
/* Convert the result of the Redis command into a module reply. */
proto = sdsnewlen(c->buf,c->bufpos);
c->bufpos = 0;
while(listLength(c->reply)) {