Fix wrong error message

apache · Jun 15, 2024 · 60cd76b · 60cd76b
1 parent 3684950
commit 60cd76b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/cluster/replication.cc b/src/cluster/replication.cc
@@ -1000,15 +1000,18 @@ Status ReplicationThread::parseWriteBatch(const std::string &batch_string) {
 }
 
 bool ReplicationThread::isRestoringError(std::string_view err) {
-  return err == redis::Error({Status::RedisLoading, redis::errRestoringBackup});
+  // err doesn't contain the CRLF, so cannot use redis::Error here.
+  return err == RESP_PREFIX_ERROR + redis::StatusToRedisError({Status::RedisLoading, redis::errRestoringBackup});
 }
 
 bool ReplicationThread::isWrongPsyncNum(std::string_view err) {
-  return err == redis::Error({Status::NotOK, redis::errWrongNumArguments});
+  // err doesn't contain the CRLF, so cannot use redis::Error here.
+  return err == RESP_PREFIX_ERROR + redis::StatusToRedisError({Status::NotOK, redis::errWrongNumArguments});
 }
 
 bool ReplicationThread::isUnknownOption(std::string_view err) {
-  return err == redis::Error({Status::NotOK, redis::errUnknownOption});
+  // err doesn't contain the CRLF, so cannot use redis::Error here.
+  return err == RESP_PREFIX_ERROR + redis::StatusToRedisError({Status::NotOK, redis::errUnknownOption});
 }
 
 rocksdb::Status WriteBatchHandler::PutCF(uint32_t column_family_id, const rocksdb::Slice &key,

diff --git a/src/server/redis_reply.cc b/src/server/redis_reply.cc
@@ -38,18 +38,18 @@ 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) { return RESP_PREFIX_ERROR + StatusToRedisError(s); }
+std::string Error(const Status &s) { return RESP_PREFIX_ERROR + StatusToRedisError(s) + CRLF; }
 
 std::string StatusToRedisError(const Status &s) {
   CHECK(!s.IsOK());
   std::string prefix = "ERR";
   if (auto it = redisErrorPrefixMapping.find(s.GetCode()); it != redisErrorPrefixMapping.end()) {
     prefix = it->second;
   }
-  if (!prefix.empty()) {
-    prefix = prefix + " ";
+  if (prefix.empty()) {
+    return s.Msg();
   }
-  return prefix + s.Msg() + CRLF;
+  return prefix + " " + s.Msg();
 }
 
 std::string BulkString(const std::string &data) { return "$" + std::to_string(data.length()) + CRLF + data + CRLF; }