fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-16 02:31:20 +00:00
Code Issues Projects Releases Wiki Activity

Redis.call is now split into two variants of the same function. Redis.call will raise an error by default. Redis.pcall will return the error object instead.

Browse Source
This commit is contained in:
antirez
2011-10-20 16:02:23 +02:00
parent 2f5abbfeb7
commit 9ed32ba083
2 changed files with 58 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/scripting.c
View File

@ -128,7 +128,7 @@ void luaPushError(lua_State *lua, char *error) {
lua_settable(lua,-3);
}
int luaRedisCommand(lua_State *lua) {
int luaRedisGenericCommand(lua_State *lua, int raise_error) {
int j, argc = lua_gettop(lua);
struct redisCommand *cmd;
robj **argv;
@ -205,6 +205,7 @@ int luaRedisCommand(lua_State *lua) {
reply = sdscatlen(reply,o->ptr,sdslen(o->ptr));
listDelNode(c->reply,listFirst(c->reply));
}
if (raise_error && reply[0] != '-') raise_error = 0;
redisProtocolToLuaType(lua,reply);
sdsfree(reply);
@ -215,9 +216,25 @@ cleanup:
decrRefCount(c->argv[j]);
zfree(c->argv);
if (raise_error) {
/* If we are here we should have an error in the stack, in the
* form of a table with an "err" field. Extract the string to
* return the plain error. */
lua_pushstring(lua,"err");
lua_gettable(lua,-2);
return lua_error(lua);
}
return 1;
}
int luaRedisCallCommand(lua_State *lua) {
return luaRedisGenericCommand(lua,1);
}
int luaRedisPCallCommand(lua_State *lua) {
return luaRedisGenericCommand(lua,0);
}
int luaLogCommand(lua_State *lua) {
int j, argc = lua_gettop(lua);
int level;
@ -301,7 +318,12 @@ void scriptingInit(void) {
/* redis.call */
lua_pushstring(lua,"call");
lua_pushcfunction(lua,luaRedisCommand);
lua_pushcfunction(lua,luaRedisCallCommand);
lua_settable(lua,-3);
/* redis.pcall */
lua_pushstring(lua,"pcall");
lua_pushcfunction(lua,luaRedisPCallCommand);
lua_settable(lua,-3);
/* redis.log and log levels. */