Skip to content

Simplifies setup_request_utils.hpp #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anarthal merged 1 commit into from
Oct 23, 2025
Merged

Simplifies setup_request_utils.hpp #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion include/boost/redis/connection.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
25 changes: 0 additions & 25 deletions include/boost/redis/detail/setup_request_utils.hpp
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion include/boost/redis/impl/run_fsm.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
19 changes: 9 additions & 10 deletions .../boost/redis/impl/setup_request_utils.ipp → .../boost/redis/impl/setup_request_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 changes: 3 additions & 4 deletions include/boost/redis/src.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 35 deletions test/test_setup_request_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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 {
Expand Down Expand Up @@ -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()
Expand All @@ -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();
}