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

view_info: Add data_dictionary argument to partition_slice() method

Browse Source 
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 <xemul@scylladb.com>
This commit is contained in:
Pavel Emelyanov
2023-04-20 09:30:13 +03:00
parent 0aff55cdb2
commit 4375835cdd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
db/view/view.cc
View File

@@ -109,7 +109,7 @@ cql3::statements::select_statement& view_info::select_statement() const {
return *_select_statement; 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) { if (!_partition_slice) {
_partition_slice = select_statement().make_partition_slice(cql3::query_options({ })); _partition_slice = select_statement().make_partition_slice(cql3::query_options({ }));
} }
@@ -1476,7 +1476,7 @@ future<query::clustering_row_ranges> calculate_affected_clustering_ranges(data_d
view_row_ranges.push_back(nonwrapping_range<clustering_key_prefix_view>::make_open_ended_both_sides()); view_row_ranges.push_back(nonwrapping_range<clustering_key_prefix_view>::make_open_ended_both_sides());
break; 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))); view_row_ranges.push_back(r.transform(std::mem_fn(&clustering_key_prefix::view)));
co_await coroutine::maybe_yield(); co_await coroutine::maybe_yield();
} }

2
view_info.hh
View File

@@ -49,7 +49,7 @@ public:
} }
cql3::statements::select_statement& select_statement() const; 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 schema& base, column_kind kind, column_id base_id) const;
const column_definition* view_column(const column_definition& base_def) const; const column_definition* view_column(const column_definition& base_def) const;
bool has_base_non_pk_columns_in_view_pk() const; bool has_base_non_pk_columns_in_view_pk() const;