cql3: Reimplement uses of _nonprimary_key_restrictions using expression

All parts of the code that use _nonprimary_key_restrictions
are changed to use _new_nonprimary_key_restrictions instead.
I decided not to split this into multiple commits,
as there isn't a lot of changes and they are
analogous to the ones done before for partition
and clustering columns.

Signed-off-by: Jan Ciolek <jan.ciolek@scylladb.com>
This commit is contained in:
Jan Ciolek
2022-07-18 15:28:49 +02:00
parent 2c28554390
commit 9d1ba07471
5 changed files with 16 additions and 20 deletions

View File

@@ -346,7 +346,7 @@ public:
// FIXME: pass dummy_options as nullptr
auto dummy_options = cql3::query_options({});
return cql3::expr::is_satisfied_by(
r->expression,
r,
cql3::expr::evaluation_inputs{
.partition_key = &_pk,
.clustering_key = &ck,