From 4375835cddf3a3759b528da6d7c3d44b0289e7b2 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Thu, 20 Apr 2023 09:30:13 +0300 Subject: [PATCH] view_info: Add data_dictionary argument to partition_slice() method The caller is calculate_affected_clustering_ranges() with dictionary arg, the method needs dictionary to call view_info::select_statement() later. Signed-off-by: Pavel Emelyanov --- db/view/view.cc | 4 ++-- view_info.hh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db/view/view.cc b/db/view/view.cc index 7ed9d3fc54..bb45187cd7 100644 --- a/db/view/view.cc +++ b/db/view/view.cc @@ -109,7 +109,7 @@ cql3::statements::select_statement& view_info::select_statement() const { return *_select_statement; } -const query::partition_slice& view_info::partition_slice() const { +const query::partition_slice& view_info::partition_slice(data_dictionary::database db) const { if (!_partition_slice) { _partition_slice = select_statement().make_partition_slice(cql3::query_options({ })); } @@ -1476,7 +1476,7 @@ future calculate_affected_clustering_ranges(data_d view_row_ranges.push_back(nonwrapping_range::make_open_ended_both_sides()); break; } - for (auto&& r : v.view->view_info()->partition_slice().default_row_ranges()) { + for (auto&& r : v.view->view_info()->partition_slice(db).default_row_ranges()) { view_row_ranges.push_back(r.transform(std::mem_fn(&clustering_key_prefix::view))); co_await coroutine::maybe_yield(); } diff --git a/view_info.hh b/view_info.hh index 123164db7c..dfccf3458c 100644 --- a/view_info.hh +++ b/view_info.hh @@ -49,7 +49,7 @@ public: } cql3::statements::select_statement& select_statement() const; - const query::partition_slice& partition_slice() const; + const query::partition_slice& partition_slice(data_dictionary::database) const; const column_definition* view_column(const schema& base, column_kind kind, column_id base_id) const; const column_definition* view_column(const column_definition& base_def) const; bool has_base_non_pk_columns_in_view_pk() const;