[squash me] change ClusterNode slots parameter to const reference and update GetPeerInfo to return by reference

Author: RiversJin

src/cluster/cluster.cc

@@ -43,13 +43,8 @@
 #include "time_util.h"
 
 ClusterNode::ClusterNode(std::string id, std::string host, int port, int role, std::string master_id,
-                         std::bitset<kClusterSlots> slots)
-    : id(std::move(id)),
-      host(std::move(host)),
-      port(port),
-      role(role),
-      master_id(std::move(master_id)),
-      slots(std::move(slots)) {}
+                         const std::bitset<kClusterSlots> &slots)
+    : id(std::move(id)), host(std::move(host)), port(port), role(role), master_id(std::move(master_id)), slots(slots) {}
 
 Cluster::Cluster(Server *srv, std::vector<std::string> binds, int port)
     : srv_(srv), binds_(std::move(binds)), port_(port) {

src/cluster/cluster.h

@@ -44,7 +44,7 @@
 class ClusterNode {
  public:
   explicit ClusterNode(std::string id, std::string host, int port, int role, std::string master_id,
-                       std::bitset<kClusterSlots> slots);
+                       const std::bitset<kClusterSlots> &slots);
   std::string id;
   std::string host;
   int port;

src/commands/cmd_replication.cc

@@ -67,7 +67,7 @@ class CommandPSync : public Commander {
   }
 
   Status Execute([[maybe_unused]] engine::Context &ctx, Server *srv, Connection *conn, std::string *output) override {
-    auto peer_info = conn->GetPeerInfo()->GetStringView();
+    auto peer_info = conn->GetPeerInfo().ToString();
 
     LOG(INFO) << fmt::format(
         "Slave {} asks for synchronization with next sequence: {} "
@@ -247,7 +247,7 @@ class CommandFetchMeta : public Commander {
   Status Execute([[maybe_unused]] engine::Context &ctx, Server *srv, Connection *conn,
                  [[maybe_unused]] std::string *output) override {
     int repl_fd = conn->GetFD();
-    std::string_view peer_info = conn->GetPeerInfo()->GetStringView();
+    auto peer_info = conn->GetPeerInfo().ToString();
 
     auto s = util::SockSetBlocking(repl_fd, 1);
     if (!s.IsOK()) {
@@ -306,7 +306,7 @@ class CommandFetchFile : public Commander {
     std::vector<std::string> files = util::Split(files_str_, ",");
 
     int repl_fd = conn->GetFD();
-    std::string_view peer_info = conn->GetPeerInfo()->GetStringView();
+    auto peer_info = conn->GetPeerInfo().ToString();
 
     auto s = util::SockSetBlocking(repl_fd, 1);
     if (!s.IsOK()) {

src/server/redis_connection.h

@@ -142,13 +142,13 @@ class Connection : public EvbufCallbackBase<Connection> {
 
   void SetPeerInfo(std::unique_ptr<PeerInfo> &&peer_info) { peer_info_ = std::move(peer_info); }
 
-  const PeerInfo *GetPeerInfo() {
+  const PeerInfo &GetPeerInfo() {
     if (peer_info_) {
-      return peer_info_.get();
+      return *peer_info_;
     }
 
     SetPeerInfo(std::make_unique<PeerInfo>(ip_, port_, "", -1));
-    return peer_info_.get();
+    return *peer_info_;
   }
 
   uint64_t GetClientType() const;
@@ -235,35 +235,30 @@ class PeerInfo {
   ~PeerInfo() = default;
 
   PeerInfo(std::string_view ip, uint32_t port, std::string_view peer_id, int64_t peer_version)
-      : port_(port), peer_version_(peer_version) {
-    if (peer_id.empty()) {
-      str_ = fmt::format("{}:{}", ip, port);
-    } else {
-      str_ = fmt::format("{}:{} ({}@{})", ip, port, peer_id, peer_version);
-    }
-
-    addr_ = std::string_view(str_).substr(0, str_.find(' '));
-    ip_ = std::string_view(str_).substr(0, ip.length());
-
-    if (!peer_id.empty()) {
-      peer_id_ = std::string_view(str_).substr(addr_.length() + 1, peer_id.length());
-    }
+      : ip_(ip), port_(port), peer_id_(peer_id), peer_version_(peer_version) {
+    addr_ = fmt::format("{}:{}", ip, port);
   }
 
-  std::string_view GetIP() const { return ip_; }
+  std::string GetIP() const { return ip_; }
   uint32_t GetPort() const { return port_; }
 
-  std::string_view GetStringView() const { return str_; }
-  std::string_view GetPeerID() const { return peer_id_; }
-  std::string_view GetAddr() const { return addr_; }
+  std::string ToString() const {
+    if (peer_id_.empty()) {
+      return fmt::format("{}:{}", ip_, port_);
+    } else {
+      return fmt::format("{}:{} ({}@{})", ip_, port_, peer_id_, peer_version_);
+    }
+  }
+  std::string GetPeerID() const { return peer_id_; }
+  std::string GetAddr() const { return addr_; }
   int64_t GetPeerVersion() const { return peer_version_; }
 
  private:
-  std::string_view ip_;
-  std::string_view addr_;
+  std::string ip_;
+  std::string addr_;
   uint32_t port_ = 0;
 
-  std::string_view peer_id_;
+  std::string peer_id_;
   int64_t peer_version_ = 0;
 
   std::string str_;