Skip to content

Commit 765d74b

Browse files
mzimbresmzimbres
committed
More fixes
1 parent bf414cd commit 765d74b

File tree

6 files changed

+51
-56
lines changed

6 files changed

+51
-56
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2018-2024 Marcelo Zimbres Silva (mzimbres@gmail.com)
1+
/* Copyright (c) 2018-2025 Marcelo Zimbres Silva (mzimbres@gmail.com)
22
*
33
* Distributed under the Boost Software License, Version 1.0. (See
44
* accompanying file LICENSE.txt)
@@ -12,7 +12,7 @@
1212
#include <boost/redis/resp3/node.hpp>
1313
#include <boost/redis/resp3/serialization.hpp>
1414
#include <boost/redis/resp3/type.hpp>
15-
#include <boost/redis/generic_flat_response_value.hpp>
15+
#include <boost/redis/resp3/flat_response.hpp>
1616

1717
#include <boost/assert.hpp>
1818

@@ -178,12 +178,12 @@ class general_aggregate {
178178
};
179179

180180
template <>
181-
class general_aggregate<result<generic_flat_response_value>> {
181+
class general_aggregate<result<resp3::flat_response>> {
182182
private:
183-
result<generic_flat_response_value>* result_ = nullptr;
183+
result<resp3::flat_response>* result_ = nullptr;
184184

185185
public:
186-
explicit general_aggregate(result<generic_flat_response_value>* c = nullptr)
186+
explicit general_aggregate(result<resp3::flat_response>* c = nullptr)
187187
: result_(c)
188188
{ }
189189

‎include/boost/redis/impl/generic_flat_response_value.ipp‎ renamed to ‎include/boost/redis/impl/flat_response.ipp‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@
66
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
77
//
88

9-
#include <boost/redis/error.hpp>
10-
#include <boost/redis/generic_flat_response_value.hpp>
11-
9+
#include <boost/redis/resp3/flat_response.hpp>
1210
#include <boost/assert.hpp>
1311

14-
namespace boost::redis {
12+
namespace boost::redis::resp3 {
1513

16-
generic_flat_response_value::generic_flat_response_value(generic_flat_response_value const& other)
14+
flat_response::flat_response(flat_response const& other)
1715
: data_{other.data_}
1816
, view_resp_{other.view_resp_}
1917
, ranges_{other.ranges_}
@@ -25,21 +23,21 @@ generic_flat_response_value::generic_flat_response_value(generic_flat_response_v
2523
set_views();
2624
}
2725

28-
generic_flat_response_value&
29-
generic_flat_response_value::operator=(generic_flat_response_value other)
26+
flat_response&
27+
flat_response::operator=(flat_response other)
3028
{
3129
swap(*this, other);
3230
return *this;
3331
}
3432

35-
void generic_flat_response_value::reserve(std::size_t bytes, std::size_t nodes)
33+
void flat_response::reserve(std::size_t bytes, std::size_t nodes)
3634
{
3735
data_.reserve(bytes);
3836
view_resp_.reserve(nodes);
3937
ranges_.reserve(nodes);
4038
}
4139

42-
void generic_flat_response_value::clear()
40+
void flat_response::clear()
4341
{
4442
pos_ = 0u;
4543
total_msgs_ = 0u;
@@ -49,7 +47,7 @@ void generic_flat_response_value::clear()
4947
ranges_.clear();
5048
}
5149

52-
void generic_flat_response_value::set_views()
50+
void flat_response::set_views()
5351
{
5452
BOOST_ASSERT_MSG(pos_ < view_resp_.size(), "notify_done called but no nodes added.");
5553
BOOST_ASSERT_MSG(view_resp_.size() == ranges_.size(), "Incompatible sizes.");
@@ -60,13 +58,13 @@ void generic_flat_response_value::set_views()
6058
}
6159
}
6260

63-
void generic_flat_response_value::notify_done()
61+
void flat_response::notify_done()
6462
{
6563
total_msgs_ += 1;
6664
set_views();
6765
}
6866

69-
void generic_flat_response_value::push(resp3::node_view const& node)
67+
void flat_response::push(node_view const& node)
7068
{
7169
auto data_before = data_.data();
7270
add_node_impl(node);
@@ -78,7 +76,7 @@ void generic_flat_response_value::push(resp3::node_view const& node)
7876
}
7977
}
8078

81-
void generic_flat_response_value::add_node_impl(resp3::node_view const& node)
79+
void flat_response::add_node_impl(node_view const& node)
8280
{
8381
ranges_.push_back({data_.size(), node.value.size()});
8482

@@ -88,7 +86,7 @@ void generic_flat_response_value::add_node_impl(resp3::node_view const& node)
8886
view_resp_.push_back(node);
8987
}
9088

91-
void swap(generic_flat_response_value& a, generic_flat_response_value& b)
89+
void swap(flat_response& a, flat_response& b)
9290
{
9391
using std::swap;
9492

@@ -102,13 +100,13 @@ void swap(generic_flat_response_value& a, generic_flat_response_value& b)
102100

103101
bool
104102
operator==(
105-
generic_flat_response_value::range const& a,
106-
generic_flat_response_value::range const& b)
103+
flat_response::range const& a,
104+
flat_response::range const& b)
107105
{
108106
return a.offset == b.offset && a.size == b.size;
109107
}
110108

111-
bool operator==(generic_flat_response_value const& a, generic_flat_response_value const& b)
109+
bool operator==(flat_response const& a, flat_response const& b)
112110
{
113111
return
114112
a.data_ == b.data_ &&
@@ -119,7 +117,7 @@ bool operator==(generic_flat_response_value const& a, generic_flat_response_valu
119117
a.total_msgs_ == b.total_msgs_;
120118
}
121119

122-
bool operator!=(generic_flat_response_value const& a, generic_flat_response_value const& b)
120+
bool operator!=(flat_response const& a, flat_response const& b)
123121
{
124122
return !(a == b);
125123
}

‎include/boost/redis/generic_flat_response_value.hpp‎ renamed to ‎include/boost/redis/resp3/flat_response.hpp‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
#ifndef BOOST_REDIS_FLAT_RESPONSE_HPP
1010
#define BOOST_REDIS_FLAT_RESPONSE_HPP
1111

12-
#include <boost/redis/adapter/result.hpp>
1312
#include <boost/redis/resp3/node.hpp>
14-
1513
#include <boost/system/error_code.hpp>
1614

1715
#include <string>
@@ -23,35 +21,34 @@ namespace adapter::detail {
2321
template <class> class general_aggregate;
2422
}
2523

24+
namespace resp3 {
25+
2626
/** @brief A generic-response that stores data contiguously
2727
*
28-
* Similar to the @ref boost::redis::generic_response but data is
28+
* Similar to the @ref boost::redis::resp3::response but data is
2929
* stored contiguously.
3030
*/
31-
struct generic_flat_response_value {
31+
struct flat_response {
3232
public:
3333
/// Default constructor
34-
generic_flat_response_value() = default;
34+
flat_response() = default;
3535

3636
/// Move constructor
37-
generic_flat_response_value(generic_flat_response_value&&) noexcept = default;
38-
39-
/// Move assignment
40-
generic_flat_response_value& operator=(generic_flat_response_value&&) noexcept = default;
37+
flat_response(flat_response&&) noexcept = default;
4138

4239
/// Copy constructor
43-
generic_flat_response_value(generic_flat_response_value const& other);
40+
flat_response(flat_response const& other);
4441

4542
/// Copy assignment
46-
generic_flat_response_value& operator=(generic_flat_response_value other);
43+
flat_response& operator=(flat_response other);
4744

48-
friend void swap(generic_flat_response_value&, generic_flat_response_value&);
45+
friend void swap(flat_response&, flat_response&);
4946

5047
friend
51-
bool operator==(generic_flat_response_value const&, generic_flat_response_value const&);
48+
bool operator==(flat_response const&, flat_response const&);
5249

5350
friend
54-
bool operator!=(generic_flat_response_value const&, generic_flat_response_value const&);
51+
bool operator!=(flat_response const&, flat_response const&);
5552

5653
/** @brief Reserve capacity
5754
*
@@ -64,7 +61,7 @@ struct generic_flat_response_value {
6461

6562
/** @brief Clear both the data and the node buffers
6663
*
67-
* @Note: A `boost::redis:.generic_flat_response` can contain the
64+
* @Note: A `boost::redis:.flat_response` can contain the
6865
* response to multiple Redis commands and server pushes. Calling
6966
* this function will erase everything contained in it.
7067
*/
@@ -75,7 +72,7 @@ struct generic_flat_response_value {
7572
{ return data_.size(); }
7673

7774
/// Returns the RESP3 response
78-
auto get_view() const -> resp3::view_response const&
75+
auto get_view() const -> view_response const&
7976
{ return view_resp_; }
8077

8178
/** @brief Returns the number of times reallocation took place
@@ -97,9 +94,9 @@ struct generic_flat_response_value {
9794
void notify_done();
9895

9996
// Push a new node to the response
100-
void push(resp3::node_view const& node);
97+
void push(node_view const& node);
10198

102-
void add_node_impl(resp3::node_view const& node);
99+
void add_node_impl(node_view const& node);
103100

104101
void set_views();
105102

@@ -112,22 +109,23 @@ struct generic_flat_response_value {
112109
friend bool operator==(range const&, range const&);
113110

114111
std::string data_;
115-
resp3::view_response view_resp_;
112+
view_response view_resp_;
116113
std::vector<range> ranges_;
117114
std::size_t pos_ = 0u;
118115
std::size_t reallocs_ = 0u;
119116
std::size_t total_msgs_ = 0u;
120117
};
121118

122119
/// Swaps two responses
123-
void swap(generic_flat_response_value&, generic_flat_response_value&);
120+
void swap(flat_response&, flat_response&);
124121

125122
/// Equality operator
126-
bool operator==(generic_flat_response_value const&, generic_flat_response_value const&);
123+
bool operator==(flat_response const&, flat_response const&);
127124

128125
/// Inequality operator
129-
bool operator!=(generic_flat_response_value const&, generic_flat_response_value const&);
126+
bool operator!=(flat_response const&, flat_response const&);
130127

131-
} // namespace boost::redis
128+
} // resp3
129+
} // namespace boost::redis
132130

133131
#endif // BOOST_REDIS_FLAT_RESPONSE_HPP

‎include/boost/redis/response.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <boost/redis/adapter/result.hpp>
1111
#include <boost/redis/resp3/node.hpp>
12-
#include <boost/redis/generic_flat_response_value.hpp>
12+
#include <boost/redis/resp3/flat_response.hpp>
1313

1414
#include <boost/system/error_code.hpp>
1515

@@ -40,7 +40,7 @@ using generic_response = adapter::result<resp3::response>;
4040
* contiguously, this helps reducing memory allocations and improves
4141
* memory reuse.
4242
*/
43-
using generic_flat_response = adapter::result<generic_flat_response_value>;
43+
using generic_flat_response = adapter::result<resp3::flat_response>;
4444

4545
/** @brief (Deprecated) Consume on response from a generic response
4646
*

‎include/boost/redis/src.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <boost/redis/impl/response.ipp>
1818
#include <boost/redis/impl/run_fsm.ipp>
1919
#include <boost/redis/impl/writer_fsm.ipp>
20-
#include <boost/redis/impl/generic_flat_response_value.ipp>
20+
#include <boost/redis/impl/flat_response.ipp>
2121
#include <boost/redis/resp3/impl/parser.ipp>
2222
#include <boost/redis/resp3/impl/serialization.ipp>
2323
#include <boost/redis/resp3/impl/type.ipp>

‎test/test_low_level_sync_sans_io.cpp‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ using boost::redis::adapter::adapt2;
2424
using boost::redis::adapter::result;
2525
using boost::redis::generic_response;
2626
using boost::redis::generic_flat_response;
27-
using boost::redis::generic_flat_response_value;
27+
using boost::redis::resp3::flat_response;
2828
using boost::redis::ignore_t;
2929
using boost::redis::resp3::detail::deserialize;
3030
using boost::redis::resp3::node;
@@ -34,6 +34,8 @@ using boost::redis::response;
3434
using boost::redis::any_adapter;
3535
using boost::system::error_code;
3636

37+
namespace resp3 = boost::redis::resp3;
38+
3739
#define RESP3_SET_PART1 "~6\r\n+orange\r"
3840
#define RESP3_SET_PART2 "\n+apple\r\n+one"
3941
#define RESP3_SET_PART3 "\r\n+two\r"
@@ -364,7 +366,6 @@ BOOST_AUTO_TEST_CASE(generic_flat_resps_views_are_set)
364366
{
365367
using boost::redis::resp3::node_view;
366368
using boost::redis::resp3::type;
367-
using boost::redis::resp3::view_response;
368369

369370
generic_response resp1;
370371
generic_flat_response fresp;
@@ -387,7 +388,6 @@ BOOST_AUTO_TEST_CASE(generic_flat_resp_reuse)
387388
{
388389
using boost::redis::resp3::node_view;
389390
using boost::redis::resp3::type;
390-
using boost::redis::resp3::view_response;
391391

392392
generic_flat_response tmp;
393393

@@ -415,7 +415,6 @@ BOOST_AUTO_TEST_CASE(generic_flat_resp_copy_assign)
415415
{
416416
using boost::redis::resp3::node_view;
417417
using boost::redis::resp3::type;
418-
using boost::redis::resp3::view_response;
419418

420419
generic_flat_response resp;
421420

@@ -425,13 +424,13 @@ BOOST_AUTO_TEST_CASE(generic_flat_resp_copy_assign)
425424
auto const& ref = resp.value();
426425

427426
// Copy
428-
generic_flat_response_value copy1{ref};
427+
resp3::flat_response copy1{ref};
429428

430429
// Copy assignment
431-
generic_flat_response_value copy2 = ref;
430+
resp3::flat_response copy2 = ref;
432431

433432
// Assignment
434-
generic_flat_response_value copy3;
433+
resp3::flat_response copy3;
435434
copy3 = ref;
436435

437436
BOOST_TEST((copy1 == ref));

0 commit comments

Comments
 (0)