mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-12 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

utils/loading_shared_values: Allow Loader to return non-future result

Browse Source
This commit is contained in:
Tomasz Grabiec
2017-10-12 16:55:08 +02:00
parent 6fccf7f4d0
commit f7a7e97095
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/loading_shared_values.hh
View File

@@ -214,7 +214,7 @@ public:
/// The loader object does not survive deferring, so the caller must deal with its liveness.
template<typename Loader>
future<entry_ptr> get_or_load(const key_type& key, Loader&& loader) noexcept {
static_assert(std::is_same<future<value_type>, std::result_of_t<Loader(const key_type&)>>::value, "Bad Loader signature");
static_assert(std::is_same<future<value_type>, typename futurize<std::result_of_t<Loader(const key_type&)>>::type>::value, "Bad Loader signature");
try {
auto i = _set.find(key, Hash(), typename entry::key_eq());
lw_shared_ptr<entry> e;
@@ -233,7 +233,7 @@ public:
_set.insert(*e);
// get_shared_future() may throw, so make sure to call it before invoking the loader(key)
f = e->loaded().get_shared_future();
loader(key).then_wrapped([e](future<value_type>&& val_fut) mutable {
futurize_apply([&] { return loader(key); }).then_wrapped([e](future<value_type>&& val_fut) mutable {
if (val_fut.failed()) {
e->loaded().set_exception(val_fut.get_exception());
} else {