Moves read functions from resp3:: to redis::.

Author: mzimbres

examples/cpp17_low_level_sync.cpp

@@ -9,10 +9,11 @@
 
 #include <boost/asio/connect.hpp>
 #include <boost/redis.hpp>
+#include <boost/redis/write.hpp>
 #include <boost/redis/src.hpp>
 
 namespace net = boost::asio;
-namespace resp3 = boost::redis::resp3;
+namespace redis = boost::redis;
 using boost::redis::adapter::adapt2;
 using boost::redis::request;
 using boost::redis::adapter::result;
@@ -39,16 +40,16 @@ auto main(int argc, char * argv[]) -> int
       req.push("HELLO", 3);
       req.push("PING", "Hello world");
       req.push("QUIT");
-      resp3::write(socket, req);
+      redis::write(socket, req);
 
       std::string buffer;
       result<std::string> resp;
 
       // Reads the responses to all commands in the request.
       auto dbuffer = net::dynamic_buffer(buffer);
-      resp3::read(socket, dbuffer);
-      resp3::read(socket, dbuffer, adapt2(resp));
-      resp3::read(socket, dbuffer);
+      redis::read(socket, dbuffer);
+      redis::read(socket, dbuffer, adapt2(resp));
+      redis::read(socket, dbuffer);
 
       std::cout << "Ping: " << resp.value() << std::endl;
 

examples/cpp20_low_level_async.cpp

@@ -7,11 +7,12 @@
 #include <boost/asio.hpp>
 #if defined(BOOST_ASIO_HAS_CO_AWAIT)
 #include <boost/redis.hpp>
+#include <boost/redis/write.hpp>
 #include <string>
 #include <iostream>
 
 namespace net = boost::asio;
-namespace resp3 = boost::redis::resp3;
+namespace redis = boost::redis;
 using resolver = net::use_awaitable_t<>::as_default_on_t<net::ip::tcp::resolver>;
 using tcp_socket = net::use_awaitable_t<>::as_default_on_t<net::ip::tcp::socket>;
 using boost::redis::adapter::adapt2;
@@ -33,17 +34,17 @@ auto co_main(std::string host, std::string port) -> net::awaitable<void>
    req.push("HELLO", 3);
    req.push("PING", "Hello world");
    req.push("QUIT");
-   co_await resp3::async_write(socket, req);
+   co_await redis::async_write(socket, req);
 
    // Responses
    std::string buffer;
    result<std::string> resp;
 
    // Reads the responses to all commands in the request.
    auto dbuffer = net::dynamic_buffer(buffer);
-   co_await resp3::async_read(socket, dbuffer);
-   co_await resp3::async_read(socket, dbuffer, adapt2(resp));
-   co_await resp3::async_read(socket, dbuffer);
+   co_await redis::async_read(socket, dbuffer);
+   co_await redis::async_read(socket, dbuffer, adapt2(resp));
+   co_await redis::async_read(socket, dbuffer);
 
    std::cout << "Ping: " << resp.value() << std::endl;
 }

include/boost/redis/adapter/adapt.hpp

@@ -7,13 +7,38 @@
 #ifndef BOOST_REDIS_ADAPTER_ADAPT_HPP
 #define BOOST_REDIS_ADAPTER_ADAPT_HPP
 
+#include <boost/redis/resp3/node.hpp>
+#include <boost/redis/response.hpp>
+#include <boost/redis/adapter/detail/result_traits.hpp>
 #include <boost/redis/adapter/detail/response_traits.hpp>
+#include <boost/mp11.hpp>
+#include <boost/system.hpp>
+
+#include <tuple>
+#include <limits>
+#include <string_view>
+#include <variant>
 
 namespace boost::redis::adapter
 {
 
-template <class T>
-using adapter_t = typename detail::adapter_t<T>;
+/** @brief Adapts a type to be used as a response.
+ *
+ *  The type T must be either
+ *
+ *  1. a response<T1, T2, T3, ...> or
+ *  2. std::vector<node<String>>
+ *
+ *  The types T1, T2, etc can be any STL container, any integer type
+ *  and `std::string`.
+ *
+ *  @param t Tuple containing the responses.
+ */
+template<class T>
+auto boost_redis_adapt(T& t) noexcept
+{
+   return detail::response_traits<T>::adapt(t);
+}
 
 /** @brief Adapts user data to read operations.
  *  @ingroup low-level-api
@@ -48,7 +73,7 @@ using adapter_t = typename detail::adapter_t<T>;
  */
 template<class T>
 auto adapt2(T& t = redis::ignore) noexcept
-   { return detail::response_traits<T>::adapt(t); }
+   { return detail::result_traits<T>::adapt(t); }
 
 } // boost::redis::adapter
 

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

@@ -10,7 +10,6 @@
 #include <boost/redis/error.hpp>
 #include <boost/redis/resp3/type.hpp>
 #include <boost/redis/resp3/serialization.hpp>
-#include <boost/redis/resp3/detail/parser.hpp>
 #include <boost/redis/resp3/node.hpp>
 #include <boost/redis/adapter/result.hpp>
 #include <boost/redis/adapter/ignore.hpp>