bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

select_statement: Propagate for_view argument

Browse Source 
This patch propagates the for_view argument, used by
statement_restrictions to ensure IS NOT NULL can be used when creating
a materialized view.

Signed-off-by: Duarte Nunes <duarte@scylladb.com>
This commit is contained in:
Duarte Nunes
2016-12-07 11:40:42 +01:00
parent 65535b3444
commit a9c17b0a52
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cql3/statements/raw/select_statement.hh
View File

@@ -100,13 +100,17 @@ public:
std::vector<::shared_ptr<relation>> where_clause,
::shared_ptr<term::raw> limit);
virtual ::shared_ptr<prepared> prepare(database& db,cql_stats& stats) override;
virtual ::shared_ptr<prepared> prepare(database& db, cql_stats& stats) override {
return prepare(db, stats, false);
}
::shared_ptr<prepared> prepare(database& db, cql_stats& stats, bool for_view);
private:
::shared_ptr<restrictions::statement_restrictions> prepare_restrictions(
database& db,
schema_ptr schema,
::shared_ptr<variable_specifications> bound_names,
::shared_ptr<selection::selection> selection);
::shared_ptr<selection::selection> selection,
bool for_view = false);
/** Returns a ::shared_ptr<term> for the limit or null if no limit is set */
::shared_ptr<term> prepare_limit(database& db, ::shared_ptr<variable_specifications> bound_names);

10
cql3/statements/select_statement.cc
View File

@@ -396,7 +396,7 @@ select_statement::select_statement(::shared_ptr<cf_name> cf_name,
, _limit(std::move(limit))
{ }
::shared_ptr<prepared_statement> select_statement::prepare(database& db, cql_stats& stats) {
::shared_ptr<prepared_statement> select_statement::prepare(database& db, cql_stats& stats, bool for_view) {
schema_ptr schema = validation::validate_column_family(db, keyspace(), column_family());
auto bound_names = get_bound_variables();
@@ -404,7 +404,7 @@ select_statement::select_statement(::shared_ptr<cf_name> cf_name,
? selection::selection::wildcard(schema)
: selection::selection::from_selectors(db, schema, _select_clause);
auto restrictions = prepare_restrictions(db, schema, bound_names, selection);
auto restrictions = prepare_restrictions(db, schema, bound_names, selection, for_view);
if (_parameters->is_distinct()) {
validate_distinct_selection(schema, selection, restrictions);
@@ -414,6 +414,7 @@ select_statement::select_statement(::shared_ptr<cf_name> cf_name,
bool is_reversed_ = false;
if (!_parameters->orderings().empty()) {
assert(!for_view);
verify_ordering_is_allowed(restrictions);
ordering_comparator = get_ordering_comparator(schema, selection, restrictions);
is_reversed_ = is_reversed(schema);
@@ -438,11 +439,12 @@ select_statement::select_statement(::shared_ptr<cf_name> cf_name,
select_statement::prepare_restrictions(database& db,
schema_ptr schema,
::shared_ptr<variable_specifications> bound_names,
::shared_ptr<selection::selection> selection)
::shared_ptr<selection::selection> selection,
bool for_view)
{
try {
return ::make_shared<restrictions::statement_restrictions>(db, schema, std::move(_where_clause), bound_names,
selection->contains_only_static_columns(), selection->contains_a_collection());
selection->contains_only_static_columns(), selection->contains_a_collection(), for_view);
} catch (const exceptions::unrecognized_entity_exception& e) {
if (contains_alias(e.entity)) {
throw exceptions::invalid_request_exception(sprint("Aliases aren't allowed in the where clause ('%s')", e.relation->to_string()));