bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

everywhere: Update for deprecated apply functions

Browse Source 
Now apply is only for tuples, for varargs use invoke.

This depends on the seastar changes adding invoke.

Signed-off-by: Rafael Ávila de Espíndola <espindola@scylladb.com>
Message-Id: <20200324163809.93648-1-espindola@scylladb.com>
This commit is contained in:
Rafael Ávila de Espíndola
2020-03-24 09:38:09 -07:00
committed by Avi Kivity
parent 088660680c
commit eca0ac5772
30 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
db/commitlog/commitlog.cc
View File

@@ -1277,7 +1277,7 @@ void db::commitlog::segment_manager::flush_segments(bool force) {
template <typename Func>
static auto close_on_failure(future<file> file_fut, Func func) {
return file_fut.then([func = std::move(func)](file f) {
return futurize_apply(func, f).handle_exception([f] (std::exception_ptr e) mutable {
return futurize_invoke(func, f).handle_exception([f] (std::exception_ptr e) mutable {
return f.close().then_wrapped([f, e = std::move(e)] (future<> x) {
using futurator = futurize<std::result_of_t<Func(file)>>;
return futurator::make_exception_future(e);
@@ -1424,7 +1424,7 @@ future<db::commitlog::segment_manager::sseg_ptr> db::commitlog::segment_manager:
promise<> p;
_segment_allocating.emplace(p.get_future());
auto f = _segment_allocating->get_future(timeout);
futurize_apply([this] {
futurize_invoke([this] {
return with_gate(_gate, [this] {
return new_segment().discard_result().finally([this]() {
_segment_allocating = std::nullopt;