This is an automated email from the ASF dual-hosted git repository.
hulk pushed a commit to branch unstable
in repository https://gitbox.apache.org/repos/asf/kvrocks.git
The following commit(s) were added to refs/heads/unstable by this push:
new 8dcbe69f Remove the second parameter of MultiBulkString (#2042)
8dcbe69f is described below
commit 8dcbe69f4790ec13e48fd5a27923350d29cf4940
Author: Twice <[email protected]>
AuthorDate: Tue Jan 23 10:59:52 2024 +0900
Remove the second parameter of MultiBulkString (#2042)
---
src/commands/cmd_hash.cc | 6 +++---
src/commands/cmd_json.cc | 2 +-
src/commands/cmd_list.cc | 4 ++--
src/commands/cmd_server.cc | 4 ++--
src/commands/cmd_zset.cc | 2 +-
src/commands/scan_base.h | 4 ++--
src/server/redis_connection.cc | 5 ++---
src/server/redis_connection.h | 2 +-
8 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/commands/cmd_hash.cc b/src/commands/cmd_hash.cc
index 3eac5ab8..c62aabd5 100644
--- a/src/commands/cmd_hash.cc
+++ b/src/commands/cmd_hash.cc
@@ -284,7 +284,7 @@ class CommandHVals : public Commander {
for (const auto &p : field_values) {
values.emplace_back(p.value);
}
- *output = conn->MultiBulkString(values, false);
+ *output = ArrayOfBulkStrings(values);
return Status::OK();
}
@@ -350,7 +350,7 @@ class CommandHRangeByLex : public Commander {
kv_pairs.emplace_back(p.field);
kv_pairs.emplace_back(p.value);
}
- *output = conn->MultiBulkString(kv_pairs, false);
+ *output = ArrayOfBulkStrings(kv_pairs);
return Status::OK();
}
@@ -417,7 +417,7 @@ class CommandHRandField : public Commander {
if (no_parameters_)
*output = s.IsNotFound() ? conn->NilString() :
redis::BulkString(result_entries[0]);
else
- *output = conn->MultiBulkString(result_entries, false);
+ *output = ArrayOfBulkStrings(result_entries);
return Status::OK();
}
diff --git a/src/commands/cmd_json.cc b/src/commands/cmd_json.cc
index 5377ed31..8cd49c51 100644
--- a/src/commands/cmd_json.cc
+++ b/src/commands/cmd_json.cc
@@ -226,7 +226,7 @@ class CommandJsonObjkeys : public Commander {
*output = redis::MultiLen(results.size());
for (const auto &item : results) {
if (item.has_value()) {
- *output += conn->MultiBulkString(item.value(), false);
+ *output += ArrayOfBulkStrings(item.value());
} else {
*output += conn->NilString();
}
diff --git a/src/commands/cmd_list.cc b/src/commands/cmd_list.cc
index 5470d444..726d2a70 100644
--- a/src/commands/cmd_list.cc
+++ b/src/commands/cmd_list.cc
@@ -536,7 +536,7 @@ class CommandLRange : public Commander {
return {Status::RedisExecErr, s.ToString()};
}
- *output = conn->MultiBulkString(elems, false);
+ *output = ArrayOfBulkStrings(elems);
return Status::OK();
}
@@ -839,7 +839,7 @@ class CommandLPos : public Commander {
for (const auto &index : indexes) {
values.emplace_back(std::to_string(index));
}
- *output = conn->MultiBulkString(values, false);
+ *output = ArrayOfBulkStrings(values);
}
return Status::OK();
}
diff --git a/src/commands/cmd_server.cc b/src/commands/cmd_server.cc
index fb6ca8a4..c86a152c 100644
--- a/src/commands/cmd_server.cc
+++ b/src/commands/cmd_server.cc
@@ -105,7 +105,7 @@ class CommandNamespace : public Commander {
}
namespaces.emplace_back(kDefaultNamespace);
namespaces.emplace_back(config->requirepass);
- *output = conn->MultiBulkString(namespaces, false);
+ *output = ArrayOfBulkStrings(namespaces);
} else {
auto token = srv->GetNamespace()->Get(args_[2]);
if (token.Is<Status::NotFound>()) {
@@ -835,7 +835,7 @@ class CommandScan : public CommandScanBase {
list.emplace_back(redis::BulkString("0"));
}
- list.emplace_back(conn->MultiBulkString(keys, false));
+ list.emplace_back(ArrayOfBulkStrings(keys));
return redis::Array(list);
}
diff --git a/src/commands/cmd_zset.cc b/src/commands/cmd_zset.cc
index a1380265..7d80829d 100644
--- a/src/commands/cmd_zset.cc
+++ b/src/commands/cmd_zset.cc
@@ -1409,7 +1409,7 @@ class CommandZRandMember : public Commander {
if (no_parameters_)
*output = s.IsNotFound() ? conn->NilString() :
redis::BulkString(result_entries[0]);
else
- *output = conn->MultiBulkString(result_entries, false);
+ *output = ArrayOfBulkStrings(result_entries);
return Status::OK();
}
diff --git a/src/commands/scan_base.h b/src/commands/scan_base.h
index bab86e21..5fc345c9 100644
--- a/src/commands/scan_base.h
+++ b/src/commands/scan_base.h
@@ -74,7 +74,7 @@ class CommandScanBase : public Commander {
list.emplace_back(redis::BulkString("0"));
}
- list.emplace_back(conn->MultiBulkString(keys, false));
+ list.emplace_back(ArrayOfBulkStrings(keys));
return redis::Array(list);
}
@@ -129,7 +129,7 @@ class CommandSubkeyScanBase : public CommandScanBase {
fvs.emplace_back(values[i]);
}
}
- list.emplace_back(conn->MultiBulkString(fvs, false));
+ list.emplace_back(ArrayOfBulkStrings(fvs));
return redis::Array(list);
}
diff --git a/src/server/redis_connection.cc b/src/server/redis_connection.cc
index 83e4a198..99d579fe 100644
--- a/src/server/redis_connection.cc
+++ b/src/server/redis_connection.cc
@@ -137,11 +137,10 @@ std::string Connection::Bool(bool b) const {
return Integer(b ? 1 : 0);
}
-std::string Connection::MultiBulkString(const std::vector<std::string> &values,
- bool output_nil_for_empty_string)
const {
+std::string Connection::MultiBulkString(const std::vector<std::string>
&values) const {
std::string result = "*" + std::to_string(values.size()) + CRLF;
for (const auto &value : values) {
- if (value.empty() && output_nil_for_empty_string) {
+ if (value.empty()) {
result += NilString();
} else {
result += BulkString(value);
diff --git a/src/server/redis_connection.h b/src/server/redis_connection.h
index 47b694a0..d05b2e53 100644
--- a/src/server/redis_connection.h
+++ b/src/server/redis_connection.h
@@ -70,7 +70,7 @@ class Connection : public EvbufCallbackBase<Connection> {
}
std::string NilString() const { return redis::NilString(protocol_version_); }
std::string NilArray() const { return protocol_version_ == RESP::v3 ? "_"
CRLF : "*-1" CRLF; }
- std::string MultiBulkString(const std::vector<std::string> &values, bool
output_nil_for_empty_string = true) const;
+ std::string MultiBulkString(const std::vector<std::string> &values) const;
std::string MultiBulkString(const std::vector<std::string> &values,
const std::vector<rocksdb::Status> &statuses)
const;
template <typename T, std::enable_if_t<std::is_integral_v<T>, int> = 0>
