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

db,view,table: futurize calculating affected ranges

Browse Source 
In order to avoid stalls on large inputs, calculating
affected ranges is now able to yield.
This commit is contained in:
Piotr Sarna
2021-06-14 12:27:10 +02:00
parent e3fa0246a1
commit f832a30388
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
db/view/view.cc
View File

@@ -54,6 +54,7 @@
#include <boost/algorithm/cxx11/all_of.hpp>
#include <seastar/core/future-util.hh>
#include <seastar/core/coroutine.hh>
#include "database.hh"
#include "clustering_bounds_comparator.hh"
@@ -1053,7 +1054,7 @@ future<std::vector<frozen_mutation_and_schema>> generate_view_updates(
});
}
query::clustering_row_ranges calculate_affected_clustering_ranges(const schema& base,
future<query::clustering_row_ranges> calculate_affected_clustering_ranges(const schema& base,
const dht::decorated_key& key,
const mutation_partition& mp,
const std::vector<view_and_base>& views,
@@ -1070,6 +1071,7 @@ query::clustering_row_ranges calculate_affected_clustering_ranges(const schema&
}
for (auto&& r : v.view->view_info()->partition_slice().default_row_ranges()) {
view_row_ranges.push_back(r.transform(std::mem_fn(&clustering_key_prefix::view)));
co_await make_ready_future<>(); // yield if needed
}
}
}
@@ -1086,6 +1088,7 @@ query::clustering_row_ranges calculate_affected_clustering_ranges(const schema&
if (overlap) {
row_ranges.push_back(std::move(overlap).value());
}
co_await make_ready_future<>(); // yield if needed
}
}
}
@@ -1094,6 +1097,7 @@ query::clustering_row_ranges calculate_affected_clustering_ranges(const schema&
if (update_requires_read_before_write(base, views, key, row, now)) {
row_ranges.emplace_back(row.key());
}
co_await make_ready_future<>(); // yield if needed
}
// Note that the views could have restrictions on regular columns,
@@ -1104,7 +1108,7 @@ query::clustering_row_ranges calculate_affected_clustering_ranges(const schema&
// this mutation.
//FIXME: Unfortunate copy.
return boost::copy_range<query::clustering_row_ranges>(
co_return boost::copy_range<query::clustering_row_ranges>(
nonwrapping_range<clustering_key_prefix_view>::deoverlap(std::move(row_ranges), cmp)
| boost::adaptors::transformed([] (auto&& v) {
return std::move(v).transform([] (auto&& ckv) { return clustering_key_prefix(ckv); });

2
db/view/view.hh
View File

@@ -141,7 +141,7 @@ future<std::vector<frozen_mutation_and_schema>> generate_view_updates(
flat_mutation_reader_opt&& existings,
gc_clock::time_point now);
query::clustering_row_ranges calculate_affected_clustering_ranges(
future<query::clustering_row_ranges> calculate_affected_clustering_ranges(
const schema& base,
const dht::decorated_key& key,
const mutation_partition& mp,