caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 16:18:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Scripting: cache argv in luaRedisGenericCommand().

Browse Source 
~ 4% consistently measured speed improvement.
This commit is contained in:
antirez 2014-05-06 11:13:00 +02:00
parent 3318b74705
commit 48c49c4851
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/scripting.c
View File

@ -203,10 +203,13 @@ void luaSortArray(lua_State *lua) {
int luaRedisGenericCommand(lua_State *lua, int raise_error) { int luaRedisGenericCommand(lua_State *lua, int raise_error) {
int j, argc = lua_gettop(lua); int j, argc = lua_gettop(lua);
struct redisCommand *cmd; struct redisCommand *cmd;
robj **argv;
redisClient *c = server.lua_client; redisClient *c = server.lua_client;
sds reply; sds reply;
/* Cached across calls. */
static robj **argv = NULL;
static int argv_size = 0;
/* Require at least one argument */ /* Require at least one argument */
if (argc == 0) { if (argc == 0) {
luaPushError(lua, luaPushError(lua,
@ -215,7 +218,13 @@ int luaRedisGenericCommand(lua_State *lua, int raise_error) {
} }
/* Build the arguments vector */ /* Build the arguments vector */
argv = zmalloc(sizeof(robj*)*argc); if (!argv) {
argv = zmalloc(sizeof(robj*)*argc);
} else if (argv_size < argc) {
argv = zrealloc(argv,sizeof(robj*)*argc);
argv_size = argc;
}
for (j = 0; j < argc; j++) { for (j = 0; j < argc; j++) {
if (!lua_isstring(lua,j+1)) break; if (!lua_isstring(lua,j+1)) break;
argv[j] = createStringObject((char*)lua_tostring(lua,j+1), argv[j] = createStringObject((char*)lua_tostring(lua,j+1),
@ -231,7 +240,6 @@ int luaRedisGenericCommand(lua_State *lua, int raise_error) {
decrRefCount(argv[j]); decrRefCount(argv[j]);
j--; j--;
} }
zfree(argv);
luaPushError(lua, luaPushError(lua,
"Lua redis() command arguments must be strings or integers"); "Lua redis() command arguments must be strings or integers");
return 1; return 1;
@ -339,7 +347,10 @@ cleanup:
* argv/argc of the client instead of the local variables. */ * argv/argc of the client instead of the local variables. */
for (j = 0; j < c->argc; j++) for (j = 0; j < c->argc; j++)
decrRefCount(c->argv[j]); decrRefCount(c->argv[j]);
zfree(c->argv); if (c->argv != argv) {
zfree(c->argv);
argv = NULL;
}
if (raise_error) { if (raise_error) {
/* If we are here we should have an error in the stack, in the /* If we are here we should have an error in the stack, in the