Fix wrong message in Lua

apache · Jun 13, 2024 · e618aee · e618aee
1 parent d700038
commit e618aee
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/server/redis_connection.cc b/src/server/redis_connection.cc
@@ -507,7 +507,7 @@ void Connection::ExecuteCommands(std::deque<CommandTokens> *to_process_cmds) {
       s = srv_->cluster->CanExecByMySelf(attributes, cmd_tokens, this);
       if (!s.IsOK()) {
         if (is_multi_exec) multi_error_ = true;
-        Reply(redis::Error({ErrorKind::None, s.Msg()}));
+        Reply(redis::Error(s));
         continue;
       }
     }

diff --git a/src/server/redis_reply.cc b/src/server/redis_reply.cc
@@ -28,15 +28,17 @@ void Reply(evbuffer *output, const std::string &data) { evbuffer_add(output, dat
 
 std::string SimpleString(const std::string &data) { return "+" + data + CRLF; }
 
-std::string Error(const Status &s) {
+std::string Error(const Status &s) { return RESP_PREFIX_ERROR + StatusToRedisError(s); }
+
+std::string StatusToRedisError(const Status &s) {
   CHECK(!s.IsOK());
   if (!s.Is<Status::RedisError>()) {
-    return "-ERR " + s.Msg() + CRLF;
+    return "ERR " + s.Msg() + CRLF;
   }
   if (auto iter = ErrorKindMap.find(s.GetErrorKind()); iter != ErrorKindMap.end()) {
-    return "-" + iter->second + " " + s.Msg() + CRLF;
+    return iter->second + " " + s.Msg() + CRLF;
   }
-  return "-" + s.Msg() + CRLF;
+  return s.Msg() + CRLF;
 }
 
 std::string BulkString(const std::string &data) { return "$" + std::to_string(data.length()) + CRLF + data + CRLF; }

diff --git a/src/server/redis_reply.h b/src/server/redis_reply.h
@@ -39,6 +39,7 @@ void Reply(evbuffer *output, const std::string &data);
 std::string SimpleString(const std::string &data);
 
 std::string Error(const Status &s);
+std::string StatusToRedisError(const Status &s);
 
 template <typename T, std::enable_if_t<std::is_integral_v<T>, int> = 0>
 std::string Integer(T data) {

diff --git a/src/storage/scripting.cc b/src/storage/scripting.cc
@@ -754,7 +754,7 @@ int RedisGenericCommand(lua_State *lua, int raise_error) {
   if (config->cluster_enabled) {
     auto s = srv->cluster->CanExecByMySelf(attributes, args, conn);
     if (!s.IsOK()) {
-      PushError(lua, s.Msg().c_str());
+      PushError(lua, redis::StatusToRedisError(s).c_str());
       return raise_error ? RaiseError(lua) : 1;
     }
   }