chore: Remove ReqSerializer

dranikpg · Sep 16, 2024 · e02ed56 · e02ed56
1 parent 93de559
commit e02ed56
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 40 deletions.
diff --git a/src/facade/reply_builder.cc b/src/facade/reply_builder.cc
@@ -847,13 +847,6 @@ void RedisReplyBuilder::SendStringArrInternal(
   Send(vec.data(), vec_indx + 1);
 }
 
-void ReqSerializer::SendCommand(std::string_view str) {
-  VLOG(2) << "SendCommand: " << str;
-
-  iovec v[] = {IoVec(str), IoVec(kCRLF)};
-  ec_ = sink_->Write(v, ABSL_ARRAYSIZE(v));
-}
-
 void RedisReplyBuilder2Base::SendNull() {
   ReplyScope scope(this);
   resp3_ ? WritePieces(kNullStringR3) : WritePieces(kNullStringR2);
@@ -955,6 +948,10 @@ void RedisReplyBuilder2Base::SendVerbatimString(std::string_view str, VerbatimFo
   WritePieces(kCRLF);
 }
 
+std::string RedisReplyBuilder2Base::SerializeCommand(std::string_view command) {
+  return string{command} + kCRLF;
+}
+
 void RedisReplyBuilder2::SendSimpleStrArr2(const facade::ArgRange& strs) {
   ReplyScope scope(this);
   StartArray(strs.Size());

diff --git a/src/facade/reply_builder.h b/src/facade/reply_builder.h
@@ -415,9 +415,11 @@ class RedisReplyBuilder2Base : public SinkReplyBuilder2, public RedisReplyBuilde
   void SendError(std::string_view str, std::string_view type = {}) override;
   void SendProtocolError(std::string_view str) override;
 
-  static char* FormatDouble(double d, char* dest, unsigned len);
   virtual void SendVerbatimString(std::string_view str, VerbatimFormat format = TXT) override;
 
+  static char* FormatDouble(double d, char* dest, unsigned len);
+  static std::string SerializeCommand(std::string_view command);
+
   bool IsResp3() const override {
     return resp3_;
   }
@@ -489,24 +491,6 @@ class RedisReplyBuilder2 : public RedisReplyBuilder2Base {
 
   // TODO: Remove
   void SendMGetResponse(SinkReplyBuilder::MGetResponse resp) override;
-
-  static std::string SerializeCommmand(std::string_view cmd);
-};
-
-class ReqSerializer {
- public:
-  explicit ReqSerializer(::io::Sink* stream) : sink_(stream) {
-  }
-
-  void SendCommand(std::string_view str);
-
-  std::error_code ec() const {
-    return ec_;
-  }
-
- private:
-  ::io::Sink* sink_;
-  std::error_code ec_;
 };
 
 }  // namespace facade
diff --git a/src/server/protocol_client.cc b/src/server/protocol_client.cc
@@ -209,7 +209,6 @@ error_code ProtocolClient::ConnectAndAuth(std::chrono::milliseconds connect_time
       } else {
         sock_.reset(mythread->CreateSocket());
       }
-      serializer_ = std::make_unique<ReqSerializer>(sock_.get());
     } else {
       return cntx->GetError();
     }
@@ -385,11 +384,10 @@ bool ProtocolClient::CheckRespFirstTypes(initializer_list<RespExpr::Type> types)
 }
 
 error_code ProtocolClient::SendCommand(string_view command) {
-  serializer_->SendCommand(command);
-  error_code ec = serializer_->ec();
-  if (!ec) {
+  string formatted_command = RedisReplyBuilder2Base::SerializeCommand(command);
+  auto ec = sock_->Write(io::View(formatted_command));
+  if (!ec)
     TouchIoTime();
-  }
   return ec;
 }
 

diff --git a/src/server/protocol_client.h b/src/server/protocol_client.h
@@ -20,10 +20,6 @@
 #include <openssl/ssl.h>
 #endif
 
-namespace facade {
-class ReqSerializer;
-};  // namespace facade
-
 namespace dfly {
 
 class Service;
@@ -117,7 +113,6 @@ class ProtocolClient {
  private:
   ServerContext server_context_;
 
-  std::unique_ptr<facade::ReqSerializer> serializer_;
   std::unique_ptr<facade::RedisParser> parser_;
   facade::RespVec resp_args_;
   base::IoBuf resp_buf_;

diff --git a/src/server/replica.h b/src/server/replica.h
@@ -20,10 +20,6 @@
 #include "server/version.h"
 #include "util/fiber_socket_base.h"
 
-namespace facade {
-class ReqSerializer;
-};  // namespace facade
-
 namespace dfly {
 
 class Service;