This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 8f21c056e205b5479d95302387c0f6e522d403bf Author: Dmitry Lychagin <[email protected]> AuthorDate: Tue May 25 10:43:01 2021 -0700 [ASTERIXDB-2905] Error when window function used in subquery - user model changes: no - storage format changes: no - interface changes: no Details: - Fix ambiguous alias failure when window function is used by subquery - Add testcase Change-Id: I4011af7e46042b9cb0279d0f182deede8bc178cf Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11624 Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Dmitry Lychagin <[email protected]> --- .../window/misc_01/misc_01.10.query.sqlpp | 34 +++++++++++++++ .../results/window/misc_01/misc_01.10.adm | 4 ++ .../window/misc_01/misc_01.10.ast | 50 ++++++++++++++++++++++ .../SqlppWindowAggregationSugarVisitor.java | 7 ++- 4 files changed, 93 insertions(+), 2 deletions(-) diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/misc_01/misc_01.10.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/misc_01/misc_01.10.query.sqlpp new file mode 100644 index 0000000..57545a6 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/window/misc_01/misc_01.10.query.sqlpp @@ -0,0 +1,34 @@ +/* + * 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 multiple window functions in the same statement + * Expected Res : SUCCESS + */ + +use test; + +select c2, + ( + select nth_value(c2, 3) + over (partition by one order by c2 range between unbounded preceding and unbounded following) + as nth + from t1 x + ) as q1 +from t1 y +order by c2; \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/window/misc_01/misc_01.10.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/window/misc_01/misc_01.10.adm new file mode 100644 index 0000000..8e98bdc --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/window/misc_01/misc_01.10.adm @@ -0,0 +1,4 @@ +{ "q1": [ { "nth": 3 }, { "nth": 3 }, { "nth": 3 }, { "nth": 3 } ], "c2": 1 } +{ "q1": [ { "nth": 3 }, { "nth": 3 }, { "nth": 3 }, { "nth": 3 } ], "c2": 2 } +{ "q1": [ { "nth": 3 }, { "nth": 3 }, { "nth": 3 }, { "nth": 3 } ], "c2": 3 } +{ "q1": [ { "nth": 3 }, { "nth": 3 }, { "nth": 3 }, { "nth": 3 } ], "c2": 4 } \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.10.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.10.ast new file mode 100644 index 0000000..368f261 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/window/misc_01/misc_01.10.ast @@ -0,0 +1,50 @@ +DataverseUse test +Query: +SELECT [ +FieldAccessor [ + Variable [ Name=$y ] + Field=c2 +] +c2 +( + SELECT [ + WINDOW test.nth_value@2[ + Variable [ Name=$c2 ] + LiteralExpr [LONG] [3] + ] + OVER ( + PARTITION BY + FieldAccessor [ + Variable [ Name=$x ] + Field=one + ] + ORDER BY + FieldAccessor [ + Variable [ Name=$x ] + Field=c2 + ] + ASC + range between unbounded preceding and unbounded following exclude no others + ) + nth + ] + FROM [ FunctionCall asterix.dataset@1[ + LiteralExpr [STRING] [test.t1] + ] + AS Variable [ Name=$x ] + ] +) +q1 +] +FROM [ FunctionCall asterix.dataset@1[ + LiteralExpr [STRING] [test.t1] + ] + AS Variable [ Name=$y ] +] +Orderby + FieldAccessor [ + Variable [ Name=$y ] + Field=c2 + ] + ASC + diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppWindowAggregationSugarVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppWindowAggregationSugarVisitor.java index a5f43b6..bed2fed 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppWindowAggregationSugarVisitor.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppWindowAggregationSugarVisitor.java @@ -105,8 +105,11 @@ public class SqlppWindowAggregationSugarVisitor extends AbstractSqlppExpressionS Map<VariableExpr, Set<? extends Scope.SymbolAnnotation>> liveAnnotatedVars = scopeChecker.getCurrentScope().getLiveVariables(); Set<VariableExpr> liveVars = liveAnnotatedVars.keySet(); - Set<VariableExpr> liveContextVars = Scope.findVariablesAnnotatedBy(liveVars, - SqlppVariableAnnotation.CONTEXT_VARIABLE, liveAnnotatedVars, winExpr.getSourceLocation()); + + Map<VariableExpr, Set<? extends Scope.SymbolAnnotation>> localAnnotatedVars = + scopeChecker.getCurrentScope().getLiveVariables(scopeChecker.getPrecedingScope()); + Set<VariableExpr> liveContextVars = Scope.findVariablesAnnotatedBy(localAnnotatedVars.keySet(), + SqlppVariableAnnotation.CONTEXT_VARIABLE, localAnnotatedVars, winExpr.getSourceLocation()); List<Pair<Expression, Identifier>> winFieldList = winExpr.getWindowFieldList(); Map<VariableExpr, Identifier> winVarFieldMap =
