boost/redis
2
0
Fork 0
mirror of https://github.com/boostorg/redis.git synced 2026-01-19 04:42:09 +00:00
Code Issues Projects Releases Wiki Activity

Simplifies setup_request_utils.hpp (#338)

Browse Source 
Removes unused clear_response
Removes include in connection.hpp
Moves the header to impl/ and makes functions inline
This commit is contained in:
Anarthal (Rubén Pérez)
2025-10-23 22:37:50 +02:00
committed by GitHub
parent 033f6aaa62
commit 0460b38e14
6 changed files with 14 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/boost/redis/connection.hpp
View File

@@ -16,7 +16,6 @@
#include <boost/redis/detail/reader_fsm.hpp>
#include <boost/redis/detail/redis_stream.hpp>
#include <boost/redis/detail/run_fsm.hpp>
#include <boost/redis/detail/setup_request_utils.hpp>
#include <boost/redis/detail/writer_fsm.hpp>
#include <boost/redis/error.hpp>
#include <boost/redis/logger.hpp>

25
include/boost/redis/detail/setup_request_utils.hpp
View File

@@ -1,25 +0,0 @@
/* Copyright (c) 2018-2024 Marcelo Zimbres Silva (mzimbres@gmail.com)
*
* Distributed under the Boost Software License, Version 1.0. (See
* accompanying file LICENSE.txt)
*/
#ifndef BOOST_REDIS_SETUP_REQUEST_UTILS_HPP
#define BOOST_REDIS_SETUP_REQUEST_UTILS_HPP
#include <boost/redis/config.hpp>
#include <boost/redis/request.hpp>
#include <boost/redis/response.hpp>
namespace boost::redis::detail {
// Modifies config::setup to make a request suitable to be sent
// to the server using async_exec
void compose_setup_request(config& cfg);
// Completely clears a response
void clear_response(generic_response& res);
} // namespace boost::redis::detail
#endif // BOOST_REDIS_RUNNER_HPP

2
include/boost/redis/impl/run_fsm.ipp
View File

@@ -12,9 +12,9 @@
#include <boost/redis/detail/coroutine.hpp>
#include <boost/redis/detail/multiplexer.hpp>
#include <boost/redis/detail/run_fsm.hpp>
#include <boost/redis/detail/setup_request_utils.hpp>
#include <boost/redis/impl/is_terminal_cancel.hpp>
#include <boost/redis/impl/log_utils.hpp>
#include <boost/redis/impl/setup_request_utils.hpp>
#include <boost/asio/cancellation_type.hpp>
#include <boost/asio/error.hpp>

19
include/boost/redis/impl/setup_request_utils.ipp → include/boost/redis/impl/setup_request_utils.hpp
View File

@@ -4,13 +4,18 @@
* accompanying file LICENSE.txt)
*/
#ifndef BOOST_REDIS_SETUP_REQUEST_UTILS_HPP
#define BOOST_REDIS_SETUP_REQUEST_UTILS_HPP
#include <boost/redis/config.hpp>
#include <boost/redis/detail/setup_request_utils.hpp>
#include <boost/redis/request.hpp>
#include <boost/redis/response.hpp>
namespace boost::redis::detail {
void compose_setup_request(config& cfg)
// Modifies config::setup to make a request suitable to be sent
// to the server using async_exec
inline void compose_setup_request(config& cfg)
{
if (!cfg.use_setup) {
// We're not using the setup request as-is, but should compose one based on
@@ -49,12 +54,6 @@ void compose_setup_request(config& cfg)
cfg.setup.get_config().cancel_on_connection_lost = true;
}
void clear_response(generic_response& res)
{
if (res.has_value())
res->clear();
else
res.emplace();
}
} // namespace boost::redis::detail
#endif // BOOST_REDIS_RUNNER_HPP

7
include/boost/redis/src.hpp
View File

@@ -4,20 +4,19 @@
* accompanying file LICENSE.txt)
*/
#include <boost/redis/impl/connect_fsm.ipp>
#include <boost/redis/impl/connection.ipp>
#include <boost/redis/impl/error.ipp>
#include <boost/redis/impl/exec_fsm.ipp>
#include <boost/redis/impl/connect_fsm.ipp>
#include <boost/redis/impl/ignore.ipp>
#include <boost/redis/impl/logger.ipp>
#include <boost/redis/impl/multiplexer.ipp>
#include <boost/redis/impl/read_buffer.ipp>
#include <boost/redis/impl/writer_fsm.ipp>
#include <boost/redis/impl/reader_fsm.ipp>
#include <boost/redis/impl/run_fsm.ipp>
#include <boost/redis/impl/request.ipp>
#include <boost/redis/impl/setup_request_utils.ipp>
#include <boost/redis/impl/response.ipp>
#include <boost/redis/impl/run_fsm.ipp>
#include <boost/redis/impl/writer_fsm.ipp>
#include <boost/redis/resp3/impl/parser.ipp>
#include <boost/redis/resp3/impl/serialization.ipp>
#include <boost/redis/resp3/impl/type.ipp>

36
test/test_setup_request_utils.cpp
View File

@@ -8,8 +8,8 @@
#include <boost/redis/adapter/result.hpp>
#include <boost/redis/config.hpp>
#include <boost/redis/detail/setup_request_utils.hpp>
#include <boost/redis/error.hpp>
#include <boost/redis/impl/setup_request_utils.hpp>
#include <boost/redis/request.hpp>
#include <boost/redis/resp3/type.hpp>
#include <boost/redis/response.hpp>
@@ -21,7 +21,6 @@
namespace asio = boost::asio;
namespace redis = boost::redis;
using redis::detail::compose_setup_request;
using redis::detail::clear_response;
using boost::system::error_code;
namespace {
@@ -179,35 +178,6 @@ void test_compose_setup_use_setup_flags()
BOOST_TEST(cfg.setup.get_config().cancel_on_connection_lost);
}
// clear response
void test_clear_response_empty()
{
redis::generic_response resp;
clear_response(resp);
BOOST_TEST(resp.has_value());
BOOST_TEST_EQ(resp.value().size(), 0u);
}
void test_clear_response_nonempty()
{
redis::generic_response resp;
resp->push_back({});
clear_response(resp);
BOOST_TEST(resp.has_value());
BOOST_TEST_EQ(resp.value().size(), 0u);
}
void test_clear_response_error()
{
redis::generic_response resp{
boost::system::in_place_error,
redis::adapter::error{redis::resp3::type::blob_error, "message"}
};
clear_response(resp);
BOOST_TEST(resp.has_value());
BOOST_TEST_EQ(resp.value().size(), 0u);
}
} // namespace
int main()
@@ -222,9 +192,5 @@ int main()
test_compose_setup_use_setup_no_hello();
test_compose_setup_use_setup_flags();
test_clear_response_empty();
test_clear_response_nonempty();
test_clear_response_error();
return boost::report_errors();
}