mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-06-03 13:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

cql3: Reimplement _clustering_columns_restrictions->get_column_defs() using expressions

Browse Source 
Signed-off-by: Jan Ciolek <jan.ciolek@scylladb.com>
This commit is contained in:
Jan Ciolek
2022-07-14 11:20:22 +02:00
parent 88da7ae0dc
commit 92df275868
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cql3/restrictions/statement_restrictions.cc
View File

@@ -617,7 +617,7 @@ std::vector<const column_definition*> statement_restrictions::get_column_defs_fo
if (pk_has_unrestricted_components || _clustering_columns_restrictions->needs_filtering(*_schema)) {
column_id first_filtering_id = pk_has_unrestricted_components ? 0 : _schema->clustering_key_columns().begin()->id +
_clustering_columns_restrictions->num_prefix_columns_that_need_not_be_filtered();
for (auto&& cdef : _clustering_columns_restrictions->get_column_defs()) {
for (auto&& cdef : expr::get_sorted_column_defs(_new_clustering_columns_restrictions)) {
const expr::expression* single_col_restr = nullptr;
if (single_ck_restrs) {
auto it = single_ck_restrs->restrictions().find(cdef);
@@ -901,7 +901,7 @@ void statement_restrictions::process_clustering_columns_restrictions(bool for_vi
_uses_secondary_indexing = true;
} else if (!allow_filtering && !for_view) {
auto clustering_columns_iter = _schema->clustering_key_columns().begin();
for (auto&& restricted_column : _clustering_columns_restrictions->get_column_defs()) {
for (auto&& restricted_column : expr::get_sorted_column_defs(_new_clustering_columns_restrictions)) {
const column_definition* clustering_column = &(*clustering_columns_iter);
++clustering_columns_iter;
if (clustering_column != restricted_column) {