Rooba
/
drogon
mirror of https://github.com/drogonframework/drogon.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow omitting template paremeter in execCommandSync. (#1764)

This commit is contained in:
Nitromelon 2023-08-31 19:19:58 +08:00 committed by GitHub
parent 53c84305b2
commit e2e5d6d57f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nosql_lib/redis/inc/drogon/nosql/RedisClient.h
View File

@ -164,26 +164,40 @@ class DROGON_EXPORT RedisClient
std::string_view command,
Args &&...args)
{
std::shared_ptr<std::promise<T>> pro(new std::promise<T>);
std::future<T> f = pro->get_future();
return execCommandSync<std::decay_t<decltype(processFunc)>>(
std::move(processFunc), command, std::forward<Args>(args)...);
}
/**
* @brief Execute a redis command synchronously
* Return type can be deduced automatically in this version.
*/
template <typename F, typename... Args>
std::invoke_result_t<F, const RedisResult &> execCommandSync(
F &&processFunc,
std::string_view command,
Args &&...args)
{
using Ret = std::invoke_result_t<F, const RedisResult &>;
std::promise<Ret> prom;
execCommandAsync(
[process = std::move(processFunc), pro](const RedisResult &result) {
[&processFunc, &prom](const RedisResult &result) {
try
{
pro->set_value(process(result));
prom.set_value(processFunc(result));
}
catch (...)
{
pro->set_exception(std::current_exception());
prom.set_exception(std::current_exception());
}
},
[pro](const RedisException &err) {
pro->set_exception(std::make_exception_ptr(err));
[&prom](const RedisException &err) {
prom.set_exception(std::make_exception_ptr(err));
},
command,
std::forward<Args>(args)...);
return f.get();
return prom.get_future().get();
}
/**

9
nosql_lib/redis/tests/redis_test.cc
View File

@ -168,11 +168,14 @@ DROGON_TEST(RedisTest)
SUCCESS();
}
// 12. Test omit template parameter
try
{
redisClient->execCommandSync<int>([](const RedisResult &) { return 1; },
"del %s",
"sync_key");
auto i = redisClient->execCommandSync(
[](const RedisResult &r) { return r.asInteger(); },
"del %s",
"sync_key");
MANDATE(i == 1);
}
catch (const RedisException &err)
{