Dmitry Lychagin has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/2761
Change subject: [ASTERIXDB-2413][COMP] Error when statement parameter after group by ...................................................................... [ASTERIXDB-2413][COMP] Error when statement parameter after group by - user model changes: no - storage format changes: no - interface changes: no Details: - Fix IllegalStateException in SqlppGroupByAggregationSugarVisitor
 when statement parameter is used after group by Change-Id: I52c948396378e10bf9577109aa8626de52b94d60 --- A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/statement-params/query-ASTERIXDB-2413/query-ASTERIXDB-2413.1.query.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/results/statement-params/query-ASTERIXDB-2413/query-ASTERIXDB-2413.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml M asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupByAggregationSugarVisitor.java M asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java 5 files changed, 50 insertions(+), 0 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/61/2761/1 diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/statement-params/query-ASTERIXDB-2413/query-ASTERIXDB-2413.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/statement-params/query-ASTERIXDB-2413/query-ASTERIXDB-2413.1.query.sqlpp new file mode 100644 index 0000000..e340140 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/statement-params/query-ASTERIXDB-2413/query-ASTERIXDB-2413.1.query.sqlpp @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/* + * Description : Test when statement parameter is used after GROUP BY + * Expected Res : Success + * Date : Jul 2018 + */ + +// requesttype=application/json + +// param args:json=[2] + +from [ + { "x": false, "y": 1 }, + { "x": false, "y": 2 }, + { "x": true, "y": 3 }, + { "x": true, "y": 4 }, + { "x": true, "y": 5 } +] t +group by t.x +having count(t.y) > $1 +select value t.x \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/statement-params/query-ASTERIXDB-2413/query-ASTERIXDB-2413.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/statement-params/query-ASTERIXDB-2413/query-ASTERIXDB-2413.1.adm new file mode 100644 index 0000000..f32a580 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/statement-params/query-ASTERIXDB-2413/query-ASTERIXDB-2413.1.adm @@ -0,0 +1 @@ +true \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml index fd53ea4..bf0c51e 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml @@ -6169,6 +6169,11 @@ <output-dir compare="Text">positional_05</output-dir> </compilation-unit> </test-case> + <test-case FilePath="statement-params"> + <compilation-unit name="query-ASTERIXDB-2413"> + <output-dir compare="Text">query-ASTERIXDB-2413</output-dir> + </compilation-unit> + </test-case> </test-group> <test-group name="string"> <test-case FilePath="string"> diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupByAggregationSugarVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupByAggregationSugarVisitor.java index e133bad..224a879 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupByAggregationSugarVisitor.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppGroupByAggregationSugarVisitor.java @@ -179,6 +179,7 @@ // Gets the final free variables. freeVariables.addAll(freeVariablesInGbyLets); + freeVariables.removeIf(SqlppVariableUtil::isExternalVariableReference); // Gets outer scope variables. Collection<VariableExpr> decorVars = scopeChecker.getCurrentScope().getLiveVariables(); diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java index 3dbdde5..14dfaeb 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java @@ -92,6 +92,10 @@ return varId.getValue().startsWith(EXTERNAL_VAR_PREFIX); } + public static boolean isExternalVariableReference(VariableExpr varExpr) { + return isExternalVariableIdentifier(varExpr.getVar()); + } + public static Collection<VariableExpr> getFreeVariables(ILangExpression langExpr) throws CompilationException { Collection<VariableExpr> freeVars = new HashSet<>(); FreeVariableVisitor visitor = new FreeVariableVisitor(); -- To view, visit https://asterix-gerrit.ics.uci.edu/2761 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52c948396378e10bf9577109aa8626de52b94d60 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Dmitry Lychagin <[email protected]>
