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

view: De-futurize make_view_update_builder()

Browse Source 
It doesn't sleep, just returns ready future with builder

tests: https://jenkins.scylladb.com/job/releng/job/Scylla-CI/1384
       it's red because e-mail notification is broken (scylla-pkg#2988)

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>
Message-Id: <20220718132529.30751-1-xemul@scylladb.com>
This commit is contained in:
Pavel Emelyanov
2022-07-18 16:25:29 +03:00
committed by Avi Kivity
parent 9afd2dc428
commit 62d95f09de
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
db/view/view.cc
View File

@@ -1078,7 +1078,7 @@ future<stop_iteration> view_update_builder::on_results() {
return stop();
}
future<view_update_builder> make_view_update_builder(
view_update_builder make_view_update_builder(
const schema_ptr& base,
std::vector<view_and_base>&& views_to_update,
flat_mutation_reader_v2&& updates,
@@ -1092,7 +1092,7 @@ future<view_update_builder> make_view_update_builder(
}
return view_updates(std::move(v));
}));
return make_ready_future<view_update_builder>(view_update_builder(base, std::move(vs), std::move(updates), std::move(existings), now));
return view_update_builder(base, std::move(vs), std::move(updates), std::move(existings), now);
}
future<query::clustering_row_ranges> calculate_affected_clustering_ranges(const schema& base,

2
db/view/view.hh
View File

@@ -203,7 +203,7 @@ private:
future<stop_iteration> stop() const;
};
future<view_update_builder> make_view_update_builder(
view_update_builder make_view_update_builder(
const schema_ptr& base,
std::vector<view_and_base>&& views_to_update,
flat_mutation_reader_v2&& updates,

4
replica/table.cc
View File

@@ -1674,7 +1674,7 @@ future<> table::generate_and_propagate_view_updates(const schema_ptr& base,
tracing::trace_state_ptr tr_state,
gc_clock::time_point now) const {
auto base_token = m.token();
db::view::view_update_builder builder = co_await db::view::make_view_update_builder(
db::view::view_update_builder builder = db::view::make_view_update_builder(
base,
std::move(views),
make_flat_mutation_reader_from_mutations_v2(m.schema(), std::move(permit), std::move(m)),
@@ -1809,7 +1809,7 @@ future<> table::populate_views(
flat_mutation_reader_v2&& reader,
gc_clock::time_point now) {
auto schema = reader.schema();
db::view::view_update_builder builder = co_await db::view::make_view_update_builder(
db::view::view_update_builder builder = db::view::make_view_update_builder(
schema,
std::move(views),
std::move(reader),