mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cql3: Track IN partition-key restrictions

Browse Source 
Add a bool member to statement_restrictions indicating whether any of
the partition columns are restricted by IN, which requires more
complex processing.

Signed-off-by: Dejan Mircevski <dejan@scylladb.com>
This commit is contained in:
Dejan Mircevski
2021-04-28 15:47:32 -04:00
parent 35e733ee88
commit 4661aa0269
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cql3/restrictions/statement_restrictions.cc
View File

@@ -135,6 +135,7 @@ statement_restrictions::statement_restrictions(schema_ptr schema, bool allow_fil
, _partition_key_restrictions(get_initial_partition_key_restrictions(allow_filtering))
, _clustering_columns_restrictions(get_initial_clustering_key_restrictions(allow_filtering))
, _nonprimary_key_restrictions(::make_shared<single_column_restrictions>(schema))
, _partition_range_is_simple(true)
{ }
#if 0
static const column_definition*
@@ -273,7 +274,7 @@ statement_restrictions::statement_restrictions(database& db,
{
if (!where_clause.empty()) {
for (auto&& relation : where_clause) {
if (relation->get_operator() == cql3::expr::oper_t::IS_NOT) {
if (relation->get_operator() == expr::oper_t::IS_NOT) {
single_column_relation* r =
dynamic_cast<single_column_relation*>(relation.get());
// The "IS NOT NULL" restriction is only supported (and
@@ -319,6 +320,7 @@ statement_restrictions::statement_restrictions(database& db,
}
}
_where = _where.has_value() ? make_conjunction(std::move(*_where), restriction->expression) : restriction->expression;
_partition_range_is_simple &= !find(restriction->expression, expr::oper_t::IN);
}
}
}

1
cql3/restrictions/statement_restrictions.hh
View File

@@ -107,6 +107,7 @@ private:
std::optional<expr::expression> _where; ///< The entire WHERE clause.
std::vector<expr::expression> _clustering_prefix_restrictions; ///< Parts of _where defining the clustering slice.
std::vector<expr::expression> _partition_range_restrictions; ///< Parts of _where defining the partition range.
bool _partition_range_is_simple; ///< False iff _partition_range_restrictions imply a Cartesian product.
public:
/**