This is an automated email from the ASF dual-hosted git repository. alsuliman pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit cc2365ae6d621bd2eae3a0c5c076c05b8062c706 Author: Peeyush Gupta <[email protected]> AuthorDate: Wed Feb 22 11:38:32 2023 -0800 [ASTERIXDB-3116][COMP] Incorrect answer with parameters in aggregate functions - user model changes: no - storage format changes: no - interface changes: no Details: With quries involving parameters inside a SQL92 type aggregation functions, incorrect answers were returned. The reason being, during rewriting of SQL92 types aggregate functions to SQL++ aggregate function the external variable references were incorrectly mapped to a field access. Change-Id: I39349b6acd5600d4c0ee3783bd56dfdc1ed729c1 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17393 Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Ali Alsuliman <[email protected]> Reviewed-by: Ian Maxon <[email protected]> --- .../query-ASTERIXDB-3116.1.query.sqlpp | 35 +++++++++++++++++++++ .../query-ASTERIXDB-3116.2.query.sqlpp | 36 ++++++++++++++++++++++ .../query-ASTERIXDB-3116.1.adm | 1 + .../query-ASTERIXDB-3116.2.adm | 1 + .../test/resources/runtimets/testsuite_sqlpp.xml | 5 +++ .../visitor/Sql92AggregateFunctionVisitor.java | 3 +- 6 files changed, 80 insertions(+), 1 deletion(-) diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/statement-params/query-ASTERIXDB-3116/query-ASTERIXDB-3116.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/statement-params/query-ASTERIXDB-3116/query-ASTERIXDB-3116.1.query.sqlpp new file mode 100644 index 0000000000..1e7c32912d --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/statement-params/query-ASTERIXDB-3116/query-ASTERIXDB-3116.1.query.sqlpp @@ -0,0 +1,35 @@ +/* + * 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 in a case expression inside an aggregate function + * Expected Res : Success + * Date : Feb 2023 + */ + +// requesttype=application/json + +// param args:json=[1] + +select value sum(case when t.y > $1 then t.x else 0 end) +from [ + { "x": 10, "y": 1 }, + { "x": 20, "y": 2 }, + { "x": 15, "y": 3 } +] t diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/statement-params/query-ASTERIXDB-3116/query-ASTERIXDB-3116.2.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/statement-params/query-ASTERIXDB-3116/query-ASTERIXDB-3116.2.query.sqlpp new file mode 100644 index 0000000000..93b428155f --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/statement-params/query-ASTERIXDB-3116/query-ASTERIXDB-3116.2.query.sqlpp @@ -0,0 +1,36 @@ +/* + * 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 in a case expression inside an aggregate function + * Expected Res : Success + * Date : Feb 2023 + */ + +// requesttype=application/json + +// param $y1:json=1 +// param $x1:json=5 + +select value sum(case when t.y > $y1 then t.x else $x1 end) +from [ + { "x": 10, "y": 1 }, + { "x": 20, "y": 2 }, + { "x": 15, "y": 3 } +] t diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/statement-params/query-ASTERIXDB-3116/query-ASTERIXDB-3116.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/statement-params/query-ASTERIXDB-3116/query-ASTERIXDB-3116.1.adm new file mode 100644 index 0000000000..597975b413 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/statement-params/query-ASTERIXDB-3116/query-ASTERIXDB-3116.1.adm @@ -0,0 +1 @@ +35 \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/statement-params/query-ASTERIXDB-3116/query-ASTERIXDB-3116.2.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/statement-params/query-ASTERIXDB-3116/query-ASTERIXDB-3116.2.adm new file mode 100644 index 0000000000..86ee83a4a2 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/statement-params/query-ASTERIXDB-3116/query-ASTERIXDB-3116.2.adm @@ -0,0 +1 @@ +40 \ 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 54b4ffc5af..304520b3d7 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml @@ -10411,6 +10411,11 @@ <output-dir compare="Text">query-ASTERIXDB-2413</output-dir> </compilation-unit> </test-case> + <test-case FilePath="statement-params"> + <compilation-unit name="query-ASTERIXDB-3116"> + <output-dir compare="Text">query-ASTERIXDB-3116</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/Sql92AggregateFunctionVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/Sql92AggregateFunctionVisitor.java index f93e843ad4..73f12027a4 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/Sql92AggregateFunctionVisitor.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/Sql92AggregateFunctionVisitor.java @@ -187,7 +187,8 @@ class Sql92AggregateFunctionVisitor extends AbstractSqlppSimpleExpressionVisitor new FieldAccessor(groupItemVar, new VarIdentifier(groupVarFieldMap.get(usedVar).getValue())); fa.setSourceLocation(usedVar.getSourceLocation()); varExprMap.put(usedVar, fa); - } else if (outerVars.contains(usedVar)) { + } else if (outerVars.contains(usedVar) + || SqlppVariableUtil.isExternalVariableIdentifier(usedVar.getVar())) { // Do nothing } else if (preGroupUnmappedVars != null && preGroupUnmappedVars.contains(usedVar)) { throw new CompilationException(ErrorCode.COMPILATION_ILLEGAL_USE_OF_IDENTIFIER,
