Merge pull request #256 from alicebob/luastatus

redis.call() should return a "status_reply" for simple strings

integration/script_test.go

@@ -243,6 +243,15 @@ func TestLuaCall(t *testing.T) {
 		c.Do("EVAL", `return redis.call("GET", "foo")`, "0")
 		c.Do("EVAL", `return redis.call("SET", "foo", 42)`, "0")
 		c.Do("EVAL", `redis.log(redis.LOG_NOTICE, "hello")`, "0")
+		c.Do("EVAL", `local res = redis.call("GET", "foo"); return res['ok']`, "0")
+	})
+
+	testRaw(t, func(c *client) {
+		script := `
+			local result = redis.call('SET', 'mykey', 'myvalue', 'NX');
+			return result['ok'];
+		`
+		c.Do("EVAL", script, "0")
 	})
 
 	// datatype errors

lua.go

@@ -86,6 +86,8 @@ func mkLua(srv *server.Server, c *server.Peer) (map[string]lua.LGFunction, map[s
 					l.Push(lua.LString(string(r)))
 				case []interface{}:
 					l.Push(redisToLua(l, r))
+				case server.Simple:
+					l.Push(luaStatusReply(string(r)))
 				case string:
 					l.Push(lua.LString(r))
 				case error:
@@ -129,8 +131,7 @@ func mkLua(srv *server.Server, c *server.Peer) (map[string]lua.LGFunction, map[s
 				l.Error(lua.LString("wrong number or type of arguments"), 1)
 				return 0
 			}
-			res := &lua.LTable{}
-			res.RawSetString("ok", lua.LString(msg))
+			res := luaStatusReply(string(msg))
 			l.Push(res)
 			return 1
 		},
@@ -170,11 +171,7 @@ func luaToRedis(l *lua.LState, c *server.Peer, value lua.LValue) {
 		c.WriteInt(int(lua.LVAsNumber(value)))
 	case lua.LString:
 		s := lua.LVAsString(value)
-		if s == "OK" {
-			c.WriteInline(s)
-		} else {
-			c.WriteBulk(s)
-		}
+		c.WriteBulk(s)
 	case *lua.LTable:
 		// special case for tables with an 'err' or 'ok' field
 		// note: according to the docs this only counts when 'err' or 'ok' is
@@ -237,3 +234,9 @@ func redisToLua(l *lua.LState, res []interface{}) *lua.LTable {
 	}
 	return rettb
 }
+
+func luaStatusReply(msg string) *lua.LTable {
+	tab := &lua.LTable{}
+	tab.RawSetString("ok", lua.LString(msg))
+	return tab
+}

server/proto.go

@@ -6,6 +6,8 @@ import (
 	"strconv"
 )
 
+type Simple string
+
 // ErrProtocol is the general error for unexpected input
 var ErrProtocol = errors.New("invalid request")
 
@@ -98,7 +100,7 @@ func ParseReply(rd *bufio.Reader) (interface{}, error) {
 		return nil, ErrProtocol
 	case '+':
 		// +: simple string
-		return string(line[1 : len(line)-2]), nil
+		return Simple(line[1 : len(line)-2]), nil
 	case '-':
 		// -: errors
 		return nil, errors.New(string(line[1 : len(line)-2]))

server/proto_test.go

@@ -131,7 +131,7 @@ func TestParseReply(t *testing.T) {
 	for i, c := range []cas{
 		{
 			payload: "+hello world\r\n",
-			res:     "hello world",
+			res:     Simple("hello world"),
 		},
 		{
 			payload: "-some error\r\n",