From 4ae5b5e1633caffeb513c98dfd5f12364491182b Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Sun, 1 May 2011 13:07:44 +0200
Subject: [PATCH] pupulate the Lua global tables KEYS and ARGV before executing
the script
---
src/scripting.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/src/scripting.c b/src/scripting.c
index d3c18663..09686ed3 100644
--- a/src/scripting.c
+++ b/src/scripting.c
@@ -110,9 +110,31 @@ void luaReplyToRedisReply(redisClient *c, lua_State *lua) {
lua_pop(lua,1);
}
+/* Set an array of Redis String Objects as a Lua array (table) stored into a
+ * global variable. */
+void luaSetGlobalArray(lua_State *lua, char *var, robj **elev, int elec) {
+ int j;
+
+ lua_newtable(lua);
+ for (j = 0; j < elec; j++) {
+ lua_pushlstring(lua,(char*)elev[j]->ptr,sdslen(elev[j]->ptr));
+ lua_rawseti(lua,-2,j+1);
+ }
+ lua_setglobal(lua,var);
+}
+
void evalCommand(redisClient *c) {
lua_State *lua = server.lua;
char funcname[43];
+ long long numkeys;
+
+ /* Get the number of arguments that are keys */
+ if (getLongLongFromObjectOrReply(c,c->argv[2],&numkeys,NULL) != REDIS_OK)
+ return;
+ if (numkeys > (c->argc - 3)) {
+ addReplyError(c,"Number of keys can't be greater than number of args");
+ return;
+ }
/* We obtain the script SHA1, then check if this function is already
* defined into the Lua state */
@@ -148,6 +170,11 @@ void evalCommand(redisClient *c) {
}
lua_getglobal(lua, funcname);
}
+
+ /* Populate the argv and keys table accordingly to the arguments that
+ * EVAL received. */
+ luaSetGlobalArray(lua,"KEYS",c->argv+3,numkeys);
+ luaSetGlobalArray(lua,"ARGV",c->argv+3+numkeys,c->argc-3-numkeys);
/* At this point whatever this script was never seen before or if it was
* already defined, we can call it. We have zero arguments and expect