Bind redis parser to dragonfly connection

server/dragonfly_connection.cc

@@ -9,6 +9,7 @@
 #include "base/io_buf.h"
 #include "base/logging.h"
 #include "server/main_service.h"
+#include "server/redis_parser.h"
 #include "util/fiber_sched_algo.h"
 
 using namespace util;
@@ -41,6 +42,7 @@ struct Connection::Shutdown {
 
 Connection::Connection(Service* service)
     : service_(service) {
+  redis_parser_.reset(new RedisParser);
 }
 
 Connection::~Connection() {
@@ -84,7 +86,7 @@ void Connection::HandleRequests() {
 
 void Connection::InputLoop(FiberSocketBase* peer) {
   base::IoBuf io_buf{kMinReadSize};
-
+  ParserStatus status = OK;
   std::error_code ec;
 
   do {
@@ -93,13 +95,17 @@ void Connection::InputLoop(FiberSocketBase* peer) {
 
     if (!recv_sz) {
       ec = recv_sz.error();
+      status = OK;
       break;
     }
 
     io_buf.CommitWrite(*recv_sz);
-    ec = peer->Write(io_buf.InputBuffer());
-    if (ec)
+    status = ParseRedis(&io_buf, peer);
+     if (status == NEED_MORE) {
+      status = OK;
+    } else if (status != OK) {
       break;
+    }
   } while (peer->IsOpen());
 
   if (ec && !FiberSocketBase::IsConnClosed(ec)) {
@@ -107,4 +113,37 @@ void Connection::InputLoop(FiberSocketBase* peer) {
   }
 }
 
+auto Connection::ParseRedis(base::IoBuf* io_buf, util::FiberSocketBase* peer) -> ParserStatus {
+  RespVec args;
+  uint32_t consumed = 0;
+
+  RedisParser::Result result = RedisParser::OK;
+  error_code ec;
+  do {
+    result = redis_parser_->Parse(io_buf->InputBuffer(), &consumed, &args);
+
+    if (result == RedisParser::OK && !args.empty()) {
+      RespExpr& first = args.front();
+      if (first.type == RespExpr::STRING) {
+        DVLOG(2) << "Got Args with first token " << ToSV(first.GetBuf());
+      }
+
+      CHECK_EQ(RespExpr::STRING, first.type);  // TODO
+      string_view sv = ToSV(first.GetBuf());
+      if (sv == "PING") {
+        ec = peer->Write(io::Buffer("PONG\r\n"));
+      }
+    }
+    io_buf->ConsumeInput(consumed);
+  } while (RedisParser::OK == result && !ec);
+
+  parser_error_ = result;
+  if (result == RedisParser::OK)
+    return OK;
+
+  if (result == RedisParser::INPUT_PENDING)
+    return NEED_MORE;
+
+  return ERROR;
+}
 }  // namespace dfly

server/dragonfly_connection.h

@@ -6,9 +6,12 @@
 
 #include "util/connection.h"
 
+#include "base/io_buf.h"
+
 namespace dfly {
 
 class Service;
+class RedisParser;
 
 class Connection : public util::Connection {
  public:
@@ -26,13 +29,17 @@ class Connection : public util::Connection {
   void OnShutdown() override;
 
  private:
+  enum ParserStatus { OK, NEED_MORE, ERROR };
+
   void HandleRequests() final;
 
   void InputLoop(util::FiberSocketBase* peer);
-  void DispatchFiber(util::FiberSocketBase* peer);
 
+  ParserStatus ParseRedis(base::IoBuf* buf, util::FiberSocketBase* peer);
+
+  std::unique_ptr<RedisParser> redis_parser_;
   Service* service_;
-
+  unsigned parser_error_ = 0;
   struct Shutdown;
   std::unique_ptr<Shutdown> shutdown_;
 };

server/resp_expr.cc

@@ -32,14 +32,14 @@ namespace std {
 
 ostream& operator<<(ostream& os, const dfly::RespExpr& e) {
   using dfly::RespExpr;
-  using dfly::ToAbsl;
+  using dfly::ToSV;
 
   switch (e.type) {
     case RespExpr::INT64:
       os << "i" << get<int64_t>(e.u);
       break;
     case RespExpr::STRING:
-      os << "'" << ToAbsl(get<RespExpr::Buffer>(e.u)) << "'";
+      os << "'" << ToSV(e.GetBuf()) << "'";
       break;
     case RespExpr::NIL:
       os << "nil";
@@ -51,7 +51,7 @@ ostream& operator<<(ostream& os, const dfly::RespExpr& e) {
       os << dfly::RespSpan{*get<RespExpr::Vec*>(e.u)};
       break;
     case RespExpr::ERROR:
-      os << "e(" << ToAbsl(get<RespExpr::Buffer>(e.u)) << ")";
+      os << "e(" << ToSV(e.GetBuf()) << ")";
       break;
   }
 

server/resp_expr.h

@@ -39,7 +39,7 @@ class RespExpr {
 using RespVec = RespExpr::Vec;
 using RespSpan = absl::Span<const RespExpr>;
 
-inline std::string_view ToAbsl(const absl::Span<uint8_t>& s) {
+inline std::string_view ToSV(const absl::Span<uint8_t>& s) {
   return std::string_view{reinterpret_cast<char*>(s.data()), s.size()};
 }
 

server/test_utils.cc

@@ -103,7 +103,7 @@ vector<int64_t> ToIntArr(const RespVec& vec) {
   vector<int64_t> res;
   for (auto a : vec) {
     int64_t val;
-    std::string_view s = ToAbsl(a.GetBuf());
+    std::string_view s = ToSV(a.GetBuf());
     CHECK(absl::SimpleAtoi(s, &val)) << s;
     res.push_back(val);
   }

server/test_utils.h

@@ -74,7 +74,7 @@ inline ::testing::PolymorphicMatcher<RespTypeMatcher> ArgType(RespExpr::Type t)
 }
 
 inline bool operator==(const RespExpr& left, const char* s) {
-  return left.type == RespExpr::STRING && ToAbsl(left.GetBuf()) == s;
+  return left.type == RespExpr::STRING && ToSV(left.GetBuf()) == s;
 }
 
 void PrintTo(const RespExpr::Vec& vec, std::ostream* os);