f

Author: mzimbres

include/boost/redis/connection.hpp

@@ -667,7 +667,7 @@ class basic_connection {
     * @param token Completion token.
     */
    template <class CompletionToken = asio::default_completion_token_t<executor_type>>
-   BOOST_DEPRECATED("Please use async_receive2 instead.")
+   //BOOST_DEPRECATED("Please use async_receive2 instead.")
    auto async_receive(CompletionToken&& token = {})
    {
       return impl_->receive_channel_.async_receive(std::forward<CompletionToken>(token));
@@ -727,7 +727,7 @@ class basic_connection {
     *  @param ec Contains the error if any occurred.
     *  @returns The number of bytes read from the socket.
     */
-   BOOST_DEPRECATED("Please, use async_receive2 instead.")
+   //BOOST_DEPRECATED("Please, use async_receive2 instead.")
    std::size_t receive(system::error_code& ec)
    {
       return impl_->receive(ec);

include/boost/redis/response.hpp

@@ -81,7 +81,7 @@ using generic_flat_response = adapter::result<generic_flat_response_value>;
  * @param r The response to modify.
  * @param ec Will be populated in case of error.
  */
-BOOST_DEPRECATED("This function is not needed anymore to consume server pushes.")
+//BOOST_DEPRECATED("This function is not needed anymore to consume server pushes.")
 void consume_one(generic_response& r, system::error_code& ec);
 
 /**

test/CMakeLists.txt

@@ -55,7 +55,8 @@ make_test(test_run)
 make_test(test_conn_run_cancel)
 make_test(test_conn_check_health)
 make_test(test_conn_exec)
-make_test(test_conn_push)
+make_test(test_conn_push) # Test deprecated async_receive
+make_test(test_conn_push2)
 make_test(test_conn_monitor)
 make_test(test_conn_reconnect)
 make_test(test_conn_exec_cancel)

test/test_conn_push.cpp

@@ -30,7 +30,6 @@ using boost::redis::connection;
 using boost::system::error_code;
 using boost::redis::request;
 using boost::redis::response;
-using boost::redis::generic_flat_response;
 using boost::redis::ignore;
 using boost::redis::ignore_t;
 using boost::system::error_code;
@@ -79,8 +78,8 @@ BOOST_AUTO_TEST_CASE(receives_push_waiting_resps)
 
    run(conn, make_test_config(), {});
 
-   conn->async_receive2([&, conn](error_code ec) {
-      std::cout << "async_receive2" << std::endl;
+   conn->async_receive([&, conn](error_code ec, std::size_t) {
+      std::cout << "async_receive" << std::endl;
       BOOST_TEST(ec == error_code());
       push_received = true;
       conn->cancel();
@@ -99,12 +98,10 @@ BOOST_AUTO_TEST_CASE(push_received1)
    net::io_context ioc;
    auto conn = std::make_shared<connection>(ioc);
 
-   generic_flat_response resp;
-   conn->set_receive_response(resp);
-
    // Trick: Uses SUBSCRIBE because this command has no response or
    // better said, its response is a server push, which is what we
-   // want to test.
+   // want to test. We send two because we want to test both
+   // async_receive and receive.
    request req;
    req.push("SUBSCRIBE", "channel1");
    req.push("SUBSCRIBE", "channel2");
@@ -117,13 +114,25 @@ BOOST_AUTO_TEST_CASE(push_received1)
       BOOST_TEST(ec == error_code());
    });
 
-   conn->async_receive2([&, conn](error_code ec) {
+   conn->async_receive([&, conn](error_code ec, std::size_t) {
       push_received = true;
-      std::cout << "async_receive2" << std::endl;
+      std::cout << "(1) async_receive" << std::endl;
 
       BOOST_TEST(ec == error_code());
 
-      BOOST_CHECK_EQUAL(resp.value().get_total_msgs(), 2u);
+      // Receives the second push synchronously.
+      error_code ec2;
+      std::size_t res = 0;
+      res = conn->receive(ec2);
+      BOOST_TEST(!ec2);
+      BOOST_TEST(res != std::size_t(0));
+
+      // Tries to receive a third push synchronously.
+      ec2 = {};
+      res = conn->receive(ec2);
+      BOOST_CHECK_EQUAL(
+         ec2,
+         boost::redis::make_error_code(boost::redis::error::sync_receive_push_failed));
 
       conn->cancel();
    });
@@ -155,7 +164,7 @@ BOOST_AUTO_TEST_CASE(push_filtered_out)
       BOOST_TEST(ec == error_code());
    });
 
-   conn->async_receive2([&, conn](error_code ec) {
+   conn->async_receive([&, conn](error_code ec, std::size_t) {
       push_received = true;
       BOOST_TEST(ec == error_code());
       conn->cancel(operation::reconnection);
@@ -203,7 +212,7 @@ BOOST_AUTO_TEST_CASE(test_push_adapter)
 
    bool push_received = false, exec_finished = false, run_finished = false;
 
-   conn->async_receive2([&, conn](error_code ec) {
+   conn->async_receive([&, conn](error_code ec, std::size_t) {
       BOOST_CHECK_EQUAL(ec, boost::asio::experimental::error::channel_cancelled);
       push_received = true;
    });
@@ -231,7 +240,7 @@ BOOST_AUTO_TEST_CASE(test_push_adapter)
 
 void launch_push_consumer(std::shared_ptr<connection> conn)
 {
-   conn->async_receive2([conn](error_code ec) {
+   conn->async_receive([conn](error_code ec, std::size_t) {
       if (ec) {
          BOOST_TEST(ec == net::experimental::error::channel_cancelled);
          return;