Merge pull request #109 from boostorg/103-cant-read-response-of-hello-+-ping-+-hello

Removes payload rotation from request.

Author: mzimbres

examples/boost_redis.cpp

@@ -4,11 +4,4 @@
  * accompanying file LICENSE.txt)
  */
 
-#include <boost/redis/config.hpp>
-#include <boost/redis/connection.hpp>
-#include <boost/redis/request.hpp>
-#include <boost/asio/detached.hpp>
-#include <boost/asio/deferred.hpp>
-#include <boost/asio/consign.hpp>
-
 #include <boost/redis/src.hpp>

include/boost/redis/request.hpp

@@ -99,6 +99,7 @@ class request {
    {
       payload_.clear();
       commands_ = 0;
+      has_hello_priority_ = false;
    }
 
    /// Calls std::string::reserve on the internal storage.
@@ -139,14 +140,12 @@ class request {
    template <class... Ts>
    void push(std::string_view cmd, Ts const&... args)
    {
-      auto const size_before = std::size(payload_);
       auto constexpr pack_size = sizeof...(Ts);
       resp3::add_header(payload_, resp3::type::array, 1 + pack_size);
       resp3::add_bulk(payload_, cmd);
       resp3::add_bulk(payload_, std::tie(std::forward<Ts const&>(args)...));
-      auto const size_after = std::size(payload_);
 
-      check_cmd(cmd, size_after - size_before);
+      check_cmd(cmd);
    }
 
    /** @brief Appends a new command to the end of the request.
@@ -194,7 +193,6 @@ class request {
       if (begin == end)
          return;
 
-      auto const size_before = std::size(payload_);
       auto constexpr size = resp3::bulk_counter<value_type>::size;
       auto const distance = std::distance(begin, end);
       resp3::add_header(payload_, resp3::type::array, 2 + size * distance);
@@ -204,9 +202,7 @@ class request {
       for (; begin != end; ++begin)
 	 resp3::add_bulk(payload_, *begin);
 
-      auto const size_after = std::size(payload_);
-
-      check_cmd(cmd, size_after - size_before);
+      check_cmd(cmd);
    }
 
    /** @brief Appends a new command to the end of the request.
@@ -249,7 +245,6 @@ class request {
       if (begin == end)
          return;
 
-      auto const size_before = std::size(payload_);
       auto constexpr size = resp3::bulk_counter<value_type>::size;
       auto const distance = std::distance(begin, end);
       resp3::add_header(payload_, resp3::type::array, 1 + size * distance);
@@ -258,9 +253,7 @@ class request {
       for (; begin != end; ++begin)
 	 resp3::add_bulk(payload_, *begin);
 
-      auto const size_after = std::size(payload_);
-
-      check_cmd(cmd, size_after - size_before);
+      check_cmd(cmd);
    }
 
    /** @brief Appends a new command to the end of the request.
@@ -308,18 +301,13 @@ class request {
    }
 
 private:
-   void check_cmd(std::string_view cmd, std::size_t n)
+   void check_cmd(std::string_view cmd)
    {
       if (!detail::has_response(cmd))
          ++commands_;
 
-      if (cmd == "HELLO") {
+      if (cmd == "HELLO")
          has_hello_priority_ = cfg_.hello_with_priority;
-         if (has_hello_priority_) {
-            auto const shift = std::size(payload_) - n;
-            std::rotate(std::begin(payload_), std::begin(payload_) + shift, std::end(payload_));
-         }
-      }
    }
 
    config cfg_;