Skip to content

Commit ffc4230

Browse files
committed
Fixes documentation.
1 parent 59b5d35 commit ffc4230

File tree

6 files changed

+70
-240
lines changed

6 files changed

+70
-240
lines changed

Makefile.am

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ nobase_include_HEADERS =\
7070
$(top_srcdir)/aedis/resp3/detail/parser.hpp\
7171
$(top_srcdir)/aedis/resp3/type.hpp\
7272
$(top_srcdir)/aedis/resp3/read.hpp\
73-
$(top_srcdir)/aedis/resp3/exec.hpp\
7473
$(top_srcdir)/aedis/resp3/write.hpp\
7574
$(top_srcdir)/aedis/resp3/request.hpp\
7675
$(top_srcdir)/aedis/resp3/detail/impl/parser.ipp\
@@ -88,21 +87,22 @@ EXTRA_DIST += $(top_srcdir)/doc/DoxygenLayout.xml
8887
EXTRA_DIST += $(top_srcdir)/doc/aedis.css
8988
EXTRA_DIST += $(top_srcdir)/doc/htmlfooter.html
9089
EXTRA_DIST += $(top_srcdir)/doc/htmlheader.html
90+
EXTRA_DIST += $(top_srcdir)/benchmarks/benchmarks.md
91+
EXTRA_DIST += $(top_srcdir)/benchmarks/benchmarks.tex
9192
EXTRA_DIST += $(top_srcdir)/benchmarks/c/libuv/echo_server_direct.c
9293
EXTRA_DIST += $(top_srcdir)/benchmarks/c/libuv/README.md
9394
EXTRA_DIST += $(top_srcdir)/benchmarks/go/echo_server_direct.go
94-
EXTRA_DIST += $(top_srcdir)/benchmarks/nodejs/echo_server_direct.js
95-
EXTRA_DIST += $(top_srcdir)/benchmarks/nodejs/echo_server_over_redis.js
96-
EXTRA_DIST += $(top_srcdir)/benchmarks/nodejs/package.json
97-
EXTRA_DIST += $(top_srcdir)/benchmarks/nodejs/package-lock.json
95+
EXTRA_DIST += $(top_srcdir)/benchmarks/nodejs/echo_server_direct/echo_server_direct.js
96+
EXTRA_DIST += $(top_srcdir)/benchmarks/nodejs/echo_server_direct/package.json
97+
EXTRA_DIST += $(top_srcdir)/benchmarks/nodejs/echo_server_over_redis/echo_server_over_redis.js
98+
EXTRA_DIST += $(top_srcdir)/benchmarks/nodejs/echo_server_over_redis/package.json
9899
EXTRA_DIST += $(top_srcdir)/benchmarks/rust/echo_server_direct/Cargo.toml
99100
EXTRA_DIST += $(top_srcdir)/benchmarks/rust/echo_server_direct/src/main.rs
100101
EXTRA_DIST += $(top_srcdir)/benchmarks/rust/echo_server_over_redis/Cargo.toml
101102
EXTRA_DIST += $(top_srcdir)/benchmarks/rust/echo_server_over_redis/src/main.rs
102103

103104
.PHONY: doc
104105
doc:
105-
rm -rf ../aedis-gh-pages/*
106106
doxygen doc/Doxyfile
107107

108108
.PHONY: bench

aedis/aedis.hpp

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <aedis/connection.hpp>
1414
#include <aedis/resp3/read.hpp>
1515
#include <aedis/resp3/write.hpp>
16-
#include <aedis/resp3/exec.hpp>
1716
#include <aedis/resp3/request.hpp>
1817
#include <aedis/adapter/adapt.hpp>
1918

@@ -66,7 +65,7 @@
6665
\endcode
6766
6867
For a detailed comparison of Redis clients and the design
69-
rationale behind Aedis jump to \ref why-aedis.
68+
rationale behind Aedis jump to \ref why-aedis. For benchmarks see [](https://github.com/mzimbres/aedis/blob/master/benchmarks/benchmarks.md)
7069
7170
\section requests Requests
7271
@@ -80,7 +79,7 @@
8079
// Command with variable length of arguments.
8180
req.push("SET", "key", "some value", value, "EX", "2");
8281
83-
// Pushes a set.
82+
// Pushes a list.
8483
std::list<std::string> list
8584
{"channel1", "channel2", "channel3"};
8685
req.push_range("SUBSCRIBE", list);
@@ -176,34 +175,32 @@
176175
subset of the RESP3 specification. Now let us see some examples
177176
178177
@code
179-
auto dbuffer = dynamic_buffer(buffer);
180-
181178
// To ignore the response.
182-
co_await resp3::async_read(socket, dbuffer, adapt());
179+
co_await db->async_exec(req, adapt());
183180
184181
// Read in a std::string e.g. get.
185182
std::string str;
186-
co_await resp3::async_read(socket, dbuffer, adapt(str));
183+
co_await db->async_exec(req, adapt(resp));
187184
188185
// Read in a long long e.g. rpush.
189-
long long number;
190-
co_await resp3::async_read(socket, dbuffer, adapt(number));
186+
long long resp;
187+
co_await db->async_exec(req, adapt(resp));
191188
192189
// Read in a std::set e.g. smembers.
193-
std::set<T, U> set;
194-
co_await resp3::async_read(socket, dbuffer, adapt(set));
190+
std::set<T, U> resp;
191+
co_await db->async_exec(req, adapt(resp));
195192
196193
// Read in a std::map e.g. hgetall.
197-
std::map<T, U> set;
198-
co_await resp3::async_read(socket, dbuffer, adapt(map));
194+
std::map<T, U> resp;
195+
co_await db->async_exec(req, adapt(resp));
199196
200197
// Read in a std::unordered_map e.g. hgetall.
201-
std::unordered_map<T, U> umap;
202-
co_await resp3::async_read(socket, dbuffer, adapt(umap));
198+
std::unordered_map<T, U> resp;
199+
co_await db->async_exec(req, adapt(resp));
203200
204201
// Read in a std::vector e.g. lrange.
205-
std::vector<T> vec;
206-
co_await resp3::async_read(socket, dbuffer, adapt(vec));
202+
std::vector<T> resp;
203+
co_await db->async_exec(req, adapt(resp));
207204
@endcode
208205
209206
In other words, it is straightforward, just pass the result of \c
@@ -219,8 +216,8 @@
219216
wrap your type around \c boost::optional like this
220217
221218
@code
222-
boost::optional<std::unordered_map<T, U>> umap;
223-
co_await resp3::async_read(socket, dynamic_buffer(buffer), adapt(umap));
219+
boost::optional<std::unordered_map<T, U>> resp;
220+
co_await db->async_exec(req, adapt(resp));
224221
@endcode
225222
226223
Everything else stays the same, before accessing data, users will
@@ -261,17 +258,22 @@
261258
can be read in the following way
262259
263260
@code
261+
using trans_type =
262+
std::tuple<
263+
boost::optional<std::string>, // get
264+
boost::optional<std::vector<std::string>>, // lrange
265+
boost::optional<std::map<std::string, std::string>> // hgetall
266+
>;
267+
264268
std::tuple<
265-
boost::optional<std::string>, // Response to get
266-
boost::optional<std::vector<std::string>>, // Response to lrange
267-
boost::optional<std::map<std::string, std::string>> // Response to hgetall
268-
> trans;
269-
270-
co_await resp3::async_read(socket, dynamic_buffer(buffer)); // Ignore multi
271-
co_await resp3::async_read(socket, dynamic_buffer(buffer)); // Ignore get
272-
co_await resp3::async_read(socket, dynamic_buffer(buffer)); // Ignore lrange
273-
co_await resp3::async_read(socket, dynamic_buffer(buffer)); // Ignore hgetall
274-
co_await resp3::async_read(socket, dynamic_buffer(buffer), adapt(trans));
269+
aedis::ignore, // multi
270+
aedis::ignore, // get
271+
aedis::ignore, // lrange
272+
aedis::ignore, // hgetall
273+
trans_type, // exec
274+
> resp;
275+
276+
co_await db->async_exec(req, adapt(resp));
275277
@endcode
276278
277279
Note that above we are not ignoring the response to the commands
@@ -317,7 +319,7 @@
317319
318320
\subsection gen-case The general case
319321
320-
As already mentioned, there are cases where responses to Redis
322+
There are cases where responses to Redis
321323
commands won't fit in the model presented above, some examples are
322324
323325
@li Commands (like \c set) whose response don't have a fixed
@@ -356,11 +358,11 @@
356358
@code
357359
// Receives any RESP3 simple data type.
358360
node<std::string> resp;
359-
co_await resp3::async_read(socket, dynamic_buffer(buffer), adapt(resp));
361+
co_await db->async_exec(req, adapt(resp));
360362
361363
// Receives any RESP3 simple or aggregate data type.
362364
std::vector<node<std::string>> resp;
363-
co_await resp3::async_read(socket, dynamic_buffer(buffer), adapt(resp));
365+
co_await db->async_exec(req, adapt(resp));
364366
@endcode
365367
366368
For example, suppose we want to retrieve a hash data structure

aedis/detail/connection_ops.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <aedis/resp3/type.hpp>
2323
#include <aedis/resp3/detail/parser.hpp>
2424
#include <aedis/resp3/read.hpp>
25-
#include <aedis/resp3/exec.hpp>
2625
#include <aedis/resp3/write.hpp>
2726
#include <aedis/resp3/request.hpp>
2827

aedis/resp3/exec.hpp

Lines changed: 0 additions & 176 deletions
This file was deleted.

0 commit comments

Comments
 (0)