mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-04-23 01:50:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

cql3: statement_restrictions: replace restr bridge variable with pred.filter

Browse Source 
The constructor loop no longer needs to extract a binary_operator
reference from each predicate. All remaining uses (make_conjunction,
get_columns_in_commons, assignment to accumulated restriction members,
_where.push_back, and error formatting) accept expression directly,
which is what pred.filter already is. This eliminates the unnecessary
as<binary_operator> cast at the top of the loop.
This commit is contained in:
Avi Kivity
2026-03-15 12:26:26 +02:00
parent 44b18f3399
commit d4ff613c0a
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cql3/restrictions/statement_restrictions.cc
View File

@@ -1384,7 +1384,6 @@ statement_restrictions::statement_restrictions(private_tag,
}
for (auto& pred : predicates) {
auto& restr = expr::as<expr::binary_operator>(pred.filter);
if (pred.is_not_null_single_column) {
auto* col = require_on_single_column(pred);
_not_null_columns.insert(col);
@@ -1395,7 +1394,7 @@ statement_restrictions::statement_restrictions(private_tag,
} else if (pred.is_multi_column) {
// Multi column restrictions are only allowed on clustering columns
if (is_empty_restriction(_clustering_columns_restrictions)) {
_clustering_columns_restrictions = restr;
_clustering_columns_restrictions = pred.filter;
} else {
if (!find_binop(_clustering_columns_restrictions, [] (const expr::binary_operator& b) {
@@ -1406,14 +1405,14 @@ statement_restrictions::statement_restrictions(private_tag,
if (pred.equality) {
throw exceptions::invalid_request_exception(format("{} cannot be restricted by more than one relation if it includes an Equal",
expr::get_columns_in_commons(_clustering_columns_restrictions, restr)));
expr::get_columns_in_commons(_clustering_columns_restrictions, pred.filter)));
} else if (pred.is_in) {
throw exceptions::invalid_request_exception(format("{} cannot be restricted by more than one relation if it includes a IN",
expr::get_columns_in_commons(_clustering_columns_restrictions, restr)));
expr::get_columns_in_commons(_clustering_columns_restrictions, pred.filter)));
} else if (pred.is_slice) {
if (!expr::has_slice(_clustering_columns_restrictions)) {
throw exceptions::invalid_request_exception(format("Column \"{}\" cannot be restricted by both an equality and an inequality relation",
expr::get_columns_in_commons(_clustering_columns_restrictions, restr)));
expr::get_columns_in_commons(_clustering_columns_restrictions, pred.filter)));
}
const expr::binary_operator* other_slice = expr::find_in_expression<expr::binary_operator>(_clustering_columns_restrictions, [](const expr::binary_operator){return true;});
@@ -1436,18 +1435,18 @@ statement_restrictions::statement_restrictions(private_tag,
if (pred.is_lower_bound && is_lower_bound(*other_slice)) {
throw exceptions::invalid_request_exception(format(
"More than one restriction was found for the start bound on {}",
expr::get_columns_in_commons(restr, *other_slice)));
expr::get_columns_in_commons(pred.filter, *other_slice)));
}
if (pred.is_upper_bound && is_upper_bound(*other_slice)) {
throw exceptions::invalid_request_exception(format(
"More than one restriction was found for the end bound on {}",
expr::get_columns_in_commons(restr, *other_slice)));
expr::get_columns_in_commons(pred.filter, *other_slice)));
}
_clustering_columns_restrictions = expr::make_conjunction(_clustering_columns_restrictions, restr);
_clustering_columns_restrictions = expr::make_conjunction(_clustering_columns_restrictions, pred.filter);
} else {
throw exceptions::invalid_request_exception(format("Unsupported multi-column relation: ", restr));
throw exceptions::invalid_request_exception(format("Unsupported multi-column relation: ", pred.filter));
}
}
} else if (std::holds_alternative<on_partition_key_token>(pred.on)) {
@@ -1462,7 +1461,7 @@ statement_restrictions::statement_restrictions(private_tag,
", ")));
}
_partition_key_restrictions = expr::make_conjunction(_partition_key_restrictions, restr);
_partition_key_restrictions = expr::make_conjunction(_partition_key_restrictions, pred.filter);
} else if (std::holds_alternative<on_column>(pred.on)) {
const column_definition* def = std::get<on_column>(pred.on).column;
if (def->is_partition_key()) {
@@ -1482,7 +1481,7 @@ statement_restrictions::statement_restrictions(private_tag,
", ")));
}
_partition_key_restrictions = expr::make_conjunction(_partition_key_restrictions, restr);
_partition_key_restrictions = expr::make_conjunction(_partition_key_restrictions, pred.filter);
_partition_range_is_simple &= !pred.is_in;
} else if (def->is_clustering_key()) {
if (find_binop(_clustering_columns_restrictions, [] (const expr::binary_operator& b) {
@@ -1509,16 +1508,16 @@ statement_restrictions::statement_restrictions(private_tag,
}
}
_clustering_columns_restrictions = expr::make_conjunction(_clustering_columns_restrictions, restr);
_clustering_columns_restrictions = expr::make_conjunction(_clustering_columns_restrictions, pred.filter);
} else {
_nonprimary_key_restrictions = expr::make_conjunction(_nonprimary_key_restrictions, restr);
_nonprimary_key_restrictions = expr::make_conjunction(_nonprimary_key_restrictions, pred.filter);
}
} else {
throw exceptions::invalid_request_exception(format("Unhandled restriction: {}", pred.filter));
}
if (!pred.is_not_null_single_column) {
_where.push_back(restr);
_where.push_back(pred.filter);
}
}
if (!_where.empty()) {