diff --git a/examples/async_all_hashes.cpp b/examples/async_all_hashes.cpp index 90f81ff5..89f83a4f 100644 --- a/examples/async_all_hashes.cpp +++ b/examples/async_all_hashes.cpp @@ -48,7 +48,7 @@ auto make_hset_arg(foo const& p) net::awaitable create_hashes() { std::vector posts(20000); - resp::pipeline p; + resp::request p; p.flushall(); for (auto i = 0; i < std::ssize(posts); ++i) { std::string const name = "posts:" + std::to_string(i); @@ -64,14 +64,14 @@ net::awaitable create_hashes() co_await async_write(socket, buffer(p.payload)); std::string buffer; - resp::response res; + resp::response_ignore res; for (;;) co_await resp::async_read(socket, buffer, res); } net::awaitable read_hashes_coro() { - resp::pipeline p; + resp::request p; p.keys("posts:*"); auto ex = co_await this_coro::executor; @@ -87,8 +87,8 @@ net::awaitable read_hashes_coro() co_await resp::async_read(socket, buffer, keys); //print(keys.result); - // Generates the pipeline to retrieve all hashes. - resp::pipeline pv; + // Generates the request to retrieve all hashes. + resp::request pv; for (auto const& o : keys.result) pv.hvals(o); pv.quit(); @@ -101,13 +101,13 @@ net::awaitable read_hashes_coro() //print(value.result); } - resp::response quit; + resp::response_ignore quit; co_await resp::async_read(socket, buffer, quit); } void read_hashes(net::io_context& ioc) { - resp::pipeline p; + resp::request p; p.keys("posts:*"); tcp::resolver resv(ioc); @@ -121,8 +121,8 @@ void read_hashes(net::io_context& ioc) resp::response_array keys; resp::read(socket, buffer, keys); - // Generates the pipeline to retrieve all hashes. - resp::pipeline pv; + // Generates the request to retrieve all hashes. + resp::request pv; for (auto const& o : keys.result) pv.hvals(o); pv.quit(); @@ -134,7 +134,7 @@ void read_hashes(net::io_context& ioc) resp::read(socket, buffer, value); } - resp::response quit; + resp::response_ignore quit; resp::read(socket, buffer, quit); } diff --git a/examples/async_basic.cpp b/examples/async_basic.cpp index d77daadd..31295528 100644 --- a/examples/async_basic.cpp +++ b/examples/async_basic.cpp @@ -19,7 +19,7 @@ using namespace aedis; net::awaitable example1() { - resp::pipeline p; + resp::request p; p.set("Password", {"12345"}); p.quit(); diff --git a/examples/async_events.cpp b/examples/async_events.cpp index 7b0e5352..e84bec27 100644 --- a/examples/async_events.cpp +++ b/examples/async_events.cpp @@ -25,7 +25,7 @@ enum class myevents net::awaitable example() { try { - resp::pipeline p; + resp::request p; p.rpush("list", {1, 2, 3}); p.lrange("list", 0, -1, myevents::list); p.sadd("set", std::set{3, 4, 5}); @@ -55,7 +55,7 @@ net::awaitable example() } break; default: { - resp::response res; + resp::response_ignore res; co_await resp::async_read(socket, buffer, res); } } diff --git a/examples/async_own_struct.cpp b/examples/async_own_struct.cpp index 6aa9daf1..1827120b 100644 --- a/examples/async_own_struct.cpp +++ b/examples/async_own_struct.cpp @@ -40,7 +40,7 @@ net::awaitable example1() , {"Marcelo", 10, 20, 10} }; - resp::pipeline p; + resp::request p; p.flushall(); p.rpush("kabuff", users); p.lrange("kabuff"); diff --git a/examples/async_pubsub.cpp b/examples/async_pubsub.cpp index 6e5b4306..85cc53a9 100644 --- a/examples/async_pubsub.cpp +++ b/examples/async_pubsub.cpp @@ -29,10 +29,10 @@ net::awaitable publisher() std::string buffer; for (;;) { - resp::pipeline p; + resp::request p; p.publish("channel", "12345"); co_await async_write(socket, net::buffer(p.payload)); - resp::response res; + resp::response_ignore res; co_await resp::async_read(socket, buffer, res); stimer timer(ex); timer.expires_after(std::chrono::seconds{2}); @@ -47,7 +47,7 @@ net::awaitable subscriber() { auto ex = co_await this_coro::executor; try { - resp::pipeline p; + resp::request p; p.subscribe("channel"); tcp::resolver resv(ex); @@ -59,7 +59,7 @@ net::awaitable subscriber() std::string buffer; // Reads the answer to the subscribe. - resp::response res; + resp::response_ignore res; co_await resp::async_read(socket, buffer, res); // Reads published messages. diff --git a/examples/async_reconnect.cpp b/examples/async_reconnect.cpp index 032e22ad..954efd2b 100644 --- a/examples/async_reconnect.cpp +++ b/examples/async_reconnect.cpp @@ -23,7 +23,7 @@ net::awaitable example1() auto ex = co_await this_coro::executor; for (;;) { try { - resp::pipeline p; + resp::request p; p.set("Password", {"12345"}); p.quit(); diff --git a/examples/async_responses.cpp b/examples/async_responses.cpp index 615faa05..40c431d5 100644 --- a/examples/async_responses.cpp +++ b/examples/async_responses.cpp @@ -21,7 +21,7 @@ using namespace aedis; net::awaitable example() { try { - resp::pipeline p; + resp::request p; p.rpush("list", {1, 2, 3}); p.lrange("list"); p.quit(); @@ -45,7 +45,7 @@ net::awaitable example() co_await resp::async_read(socket, buffer, ok); std::cout << ok.result << std::endl; - resp::response noop; + resp::response_ignore noop; co_await resp::async_read(socket, buffer, noop); } catch (std::exception const& e) { diff --git a/examples/sync_basic.cpp b/examples/sync_basic.cpp index eef22440..c9741ae6 100644 --- a/examples/sync_basic.cpp +++ b/examples/sync_basic.cpp @@ -15,7 +15,7 @@ using namespace aedis; int main() { try { - resp::pipeline p; + resp::request p; p.set("Password", {"12345"}); p.quit(); diff --git a/examples/sync_events.cpp b/examples/sync_events.cpp index e11cb97c..3bf83c1e 100644 --- a/examples/sync_events.cpp +++ b/examples/sync_events.cpp @@ -21,7 +21,7 @@ enum class myevents int main() { try { - resp::pipeline p; + resp::request p; p.rpush("list", {1, 2, 3}); p.lrange("list", 0, -1, myevents::list); p.sadd("set", std::set{3, 4, 5}); @@ -51,7 +51,7 @@ int main() } break; default: { - resp::response res; + resp::response_ignore res; resp::read(socket, buffer, res); } } diff --git a/examples/sync_responses.cpp b/examples/sync_responses.cpp index 5733670c..986dd8ea 100644 --- a/examples/sync_responses.cpp +++ b/examples/sync_responses.cpp @@ -15,7 +15,7 @@ using namespace aedis; int main() { try { - resp::pipeline p; + resp::request p; p.rpush("list", {1, 2, 3}); p.lrange("list"); p.quit(); @@ -39,7 +39,7 @@ int main() resp::read(socket, buffer, ok); std::cout << ok.result << std::endl; - resp::response noop; + resp::response_ignore noop; resp::read(socket, buffer, noop); } catch (std::exception const& e) { diff --git a/include/aedis/aedis.hpp b/include/aedis/aedis.hpp index 03a42988..243f6661 100644 --- a/include/aedis/aedis.hpp +++ b/include/aedis/aedis.hpp @@ -7,7 +7,8 @@ #pragma once -#include -#include +#include +#include #include #include +#include diff --git a/include/aedis/resp.hpp b/include/aedis/read.hpp similarity index 100% rename from include/aedis/resp.hpp rename to include/aedis/read.hpp diff --git a/include/aedis/pipeline.hpp b/include/aedis/request.hpp similarity index 99% rename from include/aedis/pipeline.hpp rename to include/aedis/request.hpp index 73bc67d3..5c274c53 100644 --- a/include/aedis/pipeline.hpp +++ b/include/aedis/request.hpp @@ -179,7 +179,7 @@ enum class command enum class event {ignore}; template -struct pipeline { +struct request { std::string payload; std::queue> events; diff --git a/include/aedis/response.hpp b/include/aedis/response.hpp index f6cf88b8..3911fa25 100644 --- a/include/aedis/response.hpp +++ b/include/aedis/response.hpp @@ -48,7 +48,7 @@ void from_string_view(std::string_view s, std::string& r) { r = s; } // The interface required from all response types. -struct response_noop { +struct response_ignore { void pop() {} void select_array(int n) {} void select_push(int n) {} @@ -67,11 +67,9 @@ struct response_noop { void on_verbatim_string(std::string_view s = {}) {} void on_blob_string(std::string_view s = {}) {} void on_streamed_string_part(std::string_view s = {}) {} - ~response_noop() {} + ~response_ignore() {} }; -using response = response_noop; - enum class error { simple_error , blob_error diff --git a/include/aedis/write.hpp b/include/aedis/write.hpp new file mode 100644 index 00000000..e69de29b diff --git a/tests/general.cpp b/tests/general.cpp index 4e5744f2..bfd550c3 100644 --- a/tests/general.cpp +++ b/tests/general.cpp @@ -34,7 +34,7 @@ net::awaitable test_list() { std::list list {1 ,2, 3, 4, 5, 6}; - resp::pipeline p; + resp::request p; p.hello("3"); p.flushall(); p.rpush("a", list); @@ -53,7 +53,7 @@ net::awaitable test_list() std::string buffer; { // hello - resp::response res; + resp::response_ignore res; co_await resp::async_read(socket, buffer, res); } @@ -115,7 +115,7 @@ net::awaitable test_set() tcp_socket socket {ex}; co_await async_connect(socket, rr); - resp::pipeline p; + resp::request p; p.hello("3"); p.flushall(); p.set("s", {test_bulk1}); @@ -130,7 +130,7 @@ net::awaitable test_set() std::string buffer; { // hello, flushall - resp::response res; + resp::response_ignore res; co_await resp::async_read(socket, buffer, res); co_await resp::async_read(socket, buffer, res); }