Merge branch 'develop' into feature/type-erased-response

Author: anarthal

.github/workflows/coverage.yml

@@ -38,7 +38,6 @@ if (BOOST_REDIS_MAIN_PROJECT)
     align
     context
     core
-    coroutine
     static_assert
     pool
     date_time

CMakeLists.txt

@@ -676,33 +676,51 @@ https://lists.boost.org/Archives/boost/2023/01/253944.php.
 
 ## Changelog
 
+### Boost 1.87
+
+* (Issue [205](https://github.com/boostorg/redis/issues/205))
+  Improves reaction time to disconnection by using `wait_for_one_error`
+  instead of `wait_for_all`. The function `connection::async_run` was
+  also changed to return EOF to the user when that error is received
+  from the server. That is a breaking change.
+
+* (Issue [210](https://github.com/boostorg/redis/issues/210))
+  Fixes the adapter of empty nested reposponses.
+
+* (Issues [211](https://github.com/boostorg/redis/issues/211) and [212](https://github.com/boostorg/redis/issues/212))
+  Fixes the reconnect loop that would hang under certain conditions,
+  see the linked issues for more details.
+
+* (Issue [219](https://github.com/boostorg/redis/issues/219))
+  Changes the default log level from `disabled` to `debug`.
+
 ### Boost 1.85
 
-* ([Issue 170](https://github.com/boostorg/redis/issues/170))
+* (Issue [170](https://github.com/boostorg/redis/issues/170))
   Under load and on low-latency networks it is possible to start
   receiving responses before the write operation completed and while
   the request is still marked as staged and not written. This messes
   up with the heuristics that classifies responses as unsolicied or
   not.
 
-* ([Issue 168](https://github.com/boostorg/redis/issues/168)).
+* (Issue [168](https://github.com/boostorg/redis/issues/168)).
   Provides a way of passing a custom SSL context to the connection.
   The design here differs from that of Boost.Beast and Boost.MySql
   since in Boost.Redis the connection owns the context instead of only
   storing a reference to a user provided one. This is ok so because
   apps need only one connection for their entire application, which
   makes the overhead of one ssl-context per connection negligible.
 
-* ([Issue 181](https://github.com/boostorg/redis/issues/181)).
+* (Issue [181](https://github.com/boostorg/redis/issues/181)).
   See a detailed description of this bug in
   [this](https://github.com/boostorg/redis/issues/181#issuecomment-1913346983)
   comment.
 
-* ([Issue 182](https://github.com/boostorg/redis/issues/182)).
+* (Issue [182](https://github.com/boostorg/redis/issues/182)).
   Sets `"default"` as the default value of `config::username`. This
   makes it simpler to use the `requirepass` configuration in Redis.
 
-* ([Issue 189](https://github.com/boostorg/redis/issues/189)).
+* (Issue [189](https://github.com/boostorg/redis/issues/189)).
   Fixes narrowing convertion by using `std::size_t` instead of
   `std::uint64_t` for the sizes of bulks and aggregates. The code
   relies now on `std::from_chars` returning an error if a value

README.md

@@ -0,0 +1,28 @@
+# Copyright René Ferdinand Rivera Morell 2024
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+require-b2 5.2 ;
+
+constant boost_dependencies :
+    /boost/asio//boost_asio
+    /boost/assert//boost_assert
+    /boost/core//boost_core
+    /boost/mp11//boost_mp11
+    /boost/system//boost_system
+    /boost/throw_exception//boost_throw_exception ;
+
+project /boost/redis
+    : common-requirements
+        <include>include
+    ;
+
+explicit
+    [ alias boost_redis : : : : <library>$(boost_dependencies) ]
+    [ alias all : boost_redis test ]
+    ;
+
+call-if : boost-library redis
+    ;
+

build.jam

@@ -1,5 +1,5 @@
 
-/* Copyright (c) 2018-2023 Marcelo Zimbres Silva ([email protected])
+/* Copyright (c) 2018-2024 Marcelo Zimbres Silva ([email protected])
  *
  * Distributed under the Boost Software License, Version 1.0. (See
  * accompanying file LICENSE.txt)

example/sync_connection.hpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018-2023 Marcelo Zimbres Silva ([email protected])
+/* Copyright (c) 2018-2024 Marcelo Zimbres Silva ([email protected])
  *
  * Distributed under the Boost Software License, Version 1.0. (See
  * accompanying file LICENSE.txt)

include/boost/redis.hpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018-2023 Marcelo Zimbres Silva ([email protected])
+/* Copyright (c) 2018-2024 Marcelo Zimbres Silva ([email protected])
  *
  * Distributed under the Boost Software License, Version 1.0. (See
  * accompanying file LICENSE.txt)

include/boost/redis/adapter/adapt.hpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018-2023 Marcelo Zimbres Silva ([email protected])
+/* Copyright (c) 2018-2024 Marcelo Zimbres Silva ([email protected])
  *
  * Distributed under the Boost Software License, Version 1.0. (See
  * accompanying file LICENSE.txt)

include/boost/redis/adapter/detail/adapters.hpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018-2023 Marcelo Zimbres Silva ([email protected])
+/* Copyright (c) 2018-2024 Marcelo Zimbres Silva ([email protected])
  *
  * Distributed under the Boost Software License, Version 1.0. (See
  * accompanying file LICENSE.txt)

include/boost/redis/adapter/detail/response_traits.hpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018-2023 Marcelo Zimbres Silva ([email protected])
+/* Copyright (c) 2018-2024 Marcelo Zimbres Silva ([email protected])
  *
  * Distributed under the Boost Software License, Version 1.0. (See
  * accompanying file LICENSE.txt)
@@ -102,8 +102,12 @@ class static_aggregate_adapter<result<Tuple>> {
                std::variant>,
          std::tuple_size<Tuple>::value>;
 
+   // Tuple element we are currently on.
    std::size_t i_ = 0;
+
+   // Nested aggregate element counter.
    std::size_t aggregate_size_ = 0;
+
    adapters_array_type adapters_;
    result<Tuple>* res_ = nullptr;
 
@@ -117,36 +121,35 @@ class static_aggregate_adapter<result<Tuple>> {
    }
 
    template <class String>
-   void count(resp3::basic_node<String> const& nd)
+   void count(resp3::basic_node<String> const& elem)
    {
-      if (nd.depth == 1) {
-         if (is_aggregate(nd.data_type))
-            aggregate_size_ = element_multiplicity(nd.data_type) * nd.aggregate_size;
-         else
-            ++i_;
-
-         return;
+      if (elem.depth == 1 && is_aggregate(elem.data_type)) {
+         aggregate_size_ = element_multiplicity(elem.data_type) * elem.aggregate_size;
       }
 
-      if (--aggregate_size_ == 0)
-         ++i_;
+      if (aggregate_size_ == 0) {
+         i_ += 1;
+      } else {
+         aggregate_size_ -= 1;
+      }
    }
 
    template <class String>
-   void operator()(resp3::basic_node<String> const& nd, system::error_code& ec)
+   void operator()(resp3::basic_node<String> const& elem, system::error_code& ec)
    {
       using std::visit;
 
-      if (nd.depth == 0) {
-         auto const real_aggr_size = nd.aggregate_size * element_multiplicity(nd.data_type);
+      if (elem.depth == 0) {
+         auto const multiplicity = element_multiplicity(elem.data_type);
+         auto const real_aggr_size = elem.aggregate_size * multiplicity;
          if (real_aggr_size != std::tuple_size<Tuple>::value)
             ec = redis::error::incompatible_size;
 
          return;
       }
 
-      visit([&](auto& arg){arg(nd, ec);}, adapters_[i_]);
-      count(nd);
+      visit([&](auto& arg){arg(elem, ec);}, adapters_[i_]);
+      count(elem);
    }
 };