fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-18 16:40:50 +00:00
Code Issues Projects Releases Wiki Activity

Now it is possible to return multi bulks of multi bulks from Lua, just returning tables of tables. The new conversion of the Null bulk and multi bulk type is the Lua false type.

Browse Source
This commit is contained in:
antirez 2011-05-13 16:42:43 +02:00
parent da386cdf33
commit 82c6b8257a
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/scripting.c
View File

@ -68,7 +68,7 @@ char *redisProtocolToLuaType_Bulk(lua_State *lua, char *reply) {
string2ll(reply+1,p-reply-1,&bulklen);
if (bulklen == -1) {
lua_pushnil(lua);
lua_pushboolean(lua,0);
return p+2;
} else {
lua_pushlstring(lua,p+2,bulklen);
@ -104,7 +104,7 @@ char *redisProtocolToLuaType_MultiBulk(lua_State *lua, char *reply) {
string2ll(reply+1,p-reply-1,&mbulklen);
p += 2;
if (mbulklen == -1) {
lua_pushnil(lua);
lua_pushboolean(lua,0);
return p;
}
lua_newtable(lua);
@ -248,17 +248,17 @@ void hashScript(char *digest, char *script, size_t len) {
}
void luaReplyToRedisReply(redisClient *c, lua_State *lua) {
int t = lua_type(lua,1);
int t = lua_type(lua,-1);
switch(t) {
case LUA_TSTRING:
addReplyBulkCBuffer(c,(char*)lua_tostring(lua,1),lua_strlen(lua,1));
addReplyBulkCBuffer(c,(char*)lua_tostring(lua,-1),lua_strlen(lua,-1));
break;
case LUA_TBOOLEAN:
addReply(c,lua_toboolean(lua,1) ? shared.cone : shared.czero);
addReply(c,lua_toboolean(lua,-1) ? shared.cone : shared.nullbulk);
break;
case LUA_TNUMBER:
addReplyLongLong(c,(long long)lua_tonumber(lua,1));
addReplyLongLong(c,(long long)lua_tonumber(lua,-1));
break;
case LUA_TTABLE:
/* We need to check if it is an array, an error, or a status reply.
@ -294,17 +294,9 @@ void luaReplyToRedisReply(redisClient *c, lua_State *lua) {
if (t == LUA_TNIL) {
lua_pop(lua,1);
break;
} else if (t == LUA_TSTRING) {
size_t len;
char *s = (char*) lua_tolstring(lua,-1,&len);
addReplyBulkCBuffer(c,s,len);
mbulklen++;
} else if (t == LUA_TNUMBER) {
addReplyLongLong(c,(long long)lua_tonumber(lua,-1));
mbulklen++;
}
lua_pop(lua,1);
luaReplyToRedisReply(c, lua);
mbulklen++;
}
setDeferredMultiBulkLength(c,replylen,mbulklen);
}