Renames request flag.

Author: mzimbres

include/aedis/detail/connection_base.hpp

@@ -104,7 +104,6 @@ class connection_base {
       return ret;
    }
 
-   // Remove requests that have the flag cancel_if_not_sent_when_connection_lost set
    auto cancel_on_conn_lost() -> std::size_t
    {
       // Must return false if the request should be removed.
@@ -113,7 +112,7 @@ class connection_base {
          BOOST_ASSERT(ptr != nullptr);
 
          if (ptr->is_written()) {
-            return ptr->get_request().get_config().retry_on_connection_lost;
+            return !ptr->get_request().get_config().cancel_if_unresponded;
          } else {
             return !ptr->get_request().get_config().cancel_on_connection_lost;
          }
@@ -248,8 +247,8 @@ class connection_base {
       [[nodiscard]] auto get_request() const noexcept -> auto const&
          { return *req_; }
 
-      [[nodiscard]] auto get_action() const noexcept
-         { return action_;}
+      [[nodiscard]] auto stop_requested() const noexcept
+         { return action_ == action::stop;}
 
       template <class CompletionToken>
       auto async_wait(CompletionToken token)

include/aedis/detail/connection_ops.hpp

@@ -131,7 +131,7 @@ struct exec_op {
          yield info->async_wait(std::move(self));
          BOOST_ASSERT(ec == boost::asio::error::operation_aborted);
 
-         if (info->get_action() == Conn::req_info::action::stop) {
+         if (info->stop_requested()) {
             // Don't have to call remove_request as it has already
             // been by cancel(exec).
             return self.complete(ec, 0);
@@ -141,7 +141,7 @@ struct exec_op {
             if (info->is_written()) {
                using c_t = boost::asio::cancellation_type;
                auto const c = self.get_cancellation_state().cancelled();
-               if ((c & (c_t::total | c_t::terminal)) != c_t::none) {
+               if ((c & c_t::terminal) != c_t::none) {
                   // Cancellation requires closing the connection
                   // otherwise it stays in inconsistent state.
                   conn->cancel(operation::run);

include/aedis/resp3/request.hpp

@@ -192,7 +192,7 @@ class request {
        * requests that have been written to the socket but remained
        * unresponded when `aedis::connection::async_run` completed.
        */
-      bool retry_on_connection_lost = false;
+      bool cancel_if_unresponded = true;
 
       /** \brief If this request has a HELLO command and this flag is
        * true, the `aedis::connection` will move it to the front of
@@ -208,7 +208,7 @@ class request {
     *  \param resource Memory resource.
     */
     explicit
-    request(config cfg = config{true, true, false, false, true},
+    request(config cfg = config{true, true, false, true, true},
             std::pmr::memory_resource* resource = std::pmr::get_default_resource())
     : cfg_{cfg}, payload_(resource) {}
 

tests/conn_exec.cpp

@@ -139,7 +139,7 @@ BOOST_AUTO_TEST_CASE(request_retry_false)
    resp3::request req2;
    req2.get_config().coalesce = true;
    req2.get_config().cancel_on_connection_lost = false;
-   req2.get_config().retry_on_connection_lost = false;
+   req2.get_config().cancel_if_unresponded = true;
    req2.push("PING");
 
    net::io_context ioc;
@@ -191,13 +191,13 @@ BOOST_AUTO_TEST_CASE(request_retry_true)
    resp3::request req2;
    req2.get_config().coalesce = true;
    req2.get_config().cancel_on_connection_lost = false;
-   req2.get_config().retry_on_connection_lost = true;
+   req2.get_config().cancel_if_unresponded = false;
    req2.push("PING");
 
    resp3::request req3;
    req3.get_config().coalesce = true;
    req3.get_config().cancel_on_connection_lost = true;
-   req3.get_config().retry_on_connection_lost = false;
+   req3.get_config().cancel_if_unresponded = true;
    req3.push("QUIT");
 
    net::io_context ioc;

tests/conn_exec_cancel.cpp

@@ -136,7 +136,7 @@ auto cancel_of_req_written_on_run_canceled() -> net::awaitable<void>
 
    resp3::request req1;
    req1.get_config().cancel_on_connection_lost = true;
-   req1.get_config().retry_on_connection_lost = false;
+   req1.get_config().cancel_if_unresponded = true;
    req1.push("BLPOP", "any", 0);
 
    auto ex = co_await net::this_coro::executor;

tests/conn_reconnect.cpp

@@ -73,7 +73,7 @@ auto async_test_reconnect_timeout() -> net::awaitable<void>
    resp3::request req1;
    req1.get_config().cancel_if_not_connected = false;
    req1.get_config().cancel_on_connection_lost = true;
-   req1.get_config().retry_on_connection_lost = false;
+   req1.get_config().cancel_if_unresponded = true;
    req1.push("HELLO", 3);
    req1.push("BLPOP", "any", 0);
 
@@ -92,7 +92,7 @@ auto async_test_reconnect_timeout() -> net::awaitable<void>
    resp3::request req2;
    req2.get_config().cancel_if_not_connected = false;
    req2.get_config().cancel_on_connection_lost = true;
-   req2.get_config().retry_on_connection_lost= false;
+   req2.get_config().cancel_if_unresponded= true;
    req2.push("HELLO", 3);
    req2.push("QUIT");