mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-06-02 21:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

cql3: statement_restrictions: set op on all binary-operator-derived predicates

Browse Source 
The to_predicates() function had fallthrough paths for operators like
LIKE and NOT_IN that created predicates without setting the op field.
This meant predicate-based checks like 'p.op && needs_filtering(*p.op)'
would miss these operators.

Fix by inlining the predicate construction at the fallthrough points
(instead of using cannot_solve_on_column) and setting .op = oper.op.
This ensures all predicates derived from binary operators carry their
operator type, enabling reliable predicate-based analysis.

The cannot_solve_on_column helper is now unused and removed.
This commit is contained in:
Avi Kivity
2026-05-12 19:07:21 +03:00
parent 091e3f5191
commit 240d9be5e2
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cql3/restrictions/statement_restrictions.cc
View File

@@ -302,13 +302,6 @@ to_predicates(
.on = on_row{},
});
};
static auto cannot_solve_on_column = [] (const expression& e, const column_definition* cdef) -> std::vector<predicate> {
return to_vector(predicate{
.solve_for = nullptr,
.filter = e,
.on = on_column{cdef},
});
};
return expr::visit(overloaded_functor{
[] (const constant& constant_val) -> std::vector<predicate> {
std::optional<bool> bool_val = get_bool_value(constant_val);
@@ -402,7 +395,12 @@ to_predicates(
.op = oper.op,
});
}
return cannot_solve_on_column(oper, col.col);
return to_vector(predicate{
.solve_for = nullptr,
.filter = oper,
.on = on_column{col.col},
.op = oper.op,
});
},
[&] (const subscript& s) -> std::vector<predicate> {
const column_value& col = get_subscripted_column(s);
@@ -433,7 +431,13 @@ to_predicates(
.is_subscript = true,
});
}
return cannot_solve_on_column(oper, col.col);
return to_vector(predicate{
.solve_for = nullptr,
.filter = oper,
.on = on_column{col.col},
.op = oper.op,
.is_subscript = true,
});
},
[&] (const tuple_constructor& tuple) -> std::vector<predicate> {
auto columns = tuple.elements