Merge branch 'unstable' into feature/tdigest-for-first-pr

apache · Feb 9, 2025 · 75c0361 · 75c0361
2 parents baaf561 + 5055f57
commit 75c0361
Show file tree

Hide file tree

Showing 4 changed files with 220 additions and 210 deletions.
diff --git a/src/commands/cmd_server.cc b/src/commands/cmd_server.cc
@@ -237,7 +237,7 @@ class CommandInfo : public Commander {
   Status Execute([[maybe_unused]] engine::Context &ctx, Server *srv, Connection *conn, std::string *output) override {
     std::vector<std::string> sections;
     for (size_t i = 1; i < args_.size(); ++i) {
-      sections.push_back(util::ToLower(args_[i]));
+      sections.push_back(args_[i]);
     }
     auto info = srv->GetInfo(conn->GetNamespace(), sections);
     *output = conn->VerbatimString("txt", info);
@@ -282,7 +282,7 @@ class CommandRole : public Commander {
  public:
   Status Execute([[maybe_unused]] engine::Context &ctx, Server *srv, [[maybe_unused]] Connection *conn,
                  std::string *output) override {
-    srv->GetRoleInfo(output);
+    *output = srv->GetRoleInfo();
     return Status::OK();
   }
 };

diff --git a/src/common/string_util.h b/src/common/string_util.h
@@ -42,6 +42,11 @@ std::vector<std::string> Split(std::string_view in, std::string_view delim);
 std::vector<std::string> Split2KV(const std::string &in, const std::string &delim);
 bool HasPrefix(const std::string &str, const std::string &prefix);
 
+template <typename Iter>
+Iter FindICase(Iter begin, Iter end, std::string_view expected) {
+  return std::find_if(begin, end, [expected](const auto &v) { return EqualICase(v, expected); });
+}
+
 Status ValidateGlob(std::string_view glob);
 bool StringMatch(std::string_view glob, std::string_view str, bool ignore_case = false);
 std::pair<std::string, std::string> SplitGlob(std::string_view glob);