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 80825b62f8f06ca1724885274fc946d7fc22f8ad Merge: 00aa061 fb1431d Author: Michael Blow <[email protected]> AuthorDate: Tue Jan 28 11:32:53 2020 -0500 Merge branch 'gerrit/mad-hatter' Change-Id: I1d286ff8dda0293068e565a2ae02c4d5afb2f6fb .../serial_sum_mixed.3.query.sqlpp | 2 ++ .../sum/sum_mixed/sum_mixed.1.query.sqlpp | 2 ++ .../serial_sum_mixed.3.query.sqlpp | 2 ++ .../sum/sum_mixed/sum_mixed.1.query.sqlpp | 2 ++ .../group-by/policy-05/policy-05.3.query.sqlpp | 2 ++ .../sum/serial_sum_mixed/serial_sum_mixed.1.adm | 2 +- .../aggregate-sql/sum/sum_mixed/sum_mixed.1.adm | 2 +- .../aggregate/sum/sum_mixed/sum_mixed.1.adm | 2 +- .../results/group-by/policy-05/policy-05.1.adm | 3 +++ .../test/resources/runtimets/testsuite_sqlpp.xml | 22 +++++++++++----------- .../AbstractSerializableSumAggregateFunction.java | 18 ++++++++++++++---- .../std/AbstractSumAggregateFunction.java | 19 +++++++++++++++---- .../std/GlobalSqlSumAggregateFunction.java | 14 +++++--------- .../aggregates/std/GlobalSumAggregateFunction.java | 13 +++++-------- .../std/IntermediateSqlSumAggregateFunction.java | 6 +++--- .../std/IntermediateSumAggregateFunction.java | 6 +++--- .../std/LocalSqlSumAggregateFunction.java | 6 +++--- .../aggregates/std/LocalSumAggregateFunction.java | 6 +++--- .../aggregates/std/SqlSumAggregateFunction.java | 14 +++++--------- .../aggregates/std/SumAggregateFunction.java | 13 +++++-------- 20 files changed, 88 insertions(+), 68 deletions(-) diff --cc asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml index 7beeb04,206474a..ae82628 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml @@@ -358,16 -338,16 +358,16 @@@ <expected-error>Type incompatibility: function agg-stddev_pop gets incompatible input values: string and float</expected-error> </compilation-unit> </test-case> - <test-case FilePath="aggregate"> + <test-case FilePath="aggregate" check-warnings="true"> - <compilation-unit name="sum_mixed"> - <output-dir compare="Text">sum_mixed</output-dir> + <compilation-unit name="sum/sum_mixed"> + <output-dir compare="Text">sum/sum_mixed</output-dir> - <expected-error>Invalid item type: function agg-sum cannot process item type string in an input array</expected-error> + <expected-warn>Unsupported type: agg-sum cannot process input type string (in line 27, at column 16)</expected-warn> </compilation-unit> </test-case> - <test-case FilePath="aggregate"> + <test-case FilePath="aggregate" check-warnings="true"> - <compilation-unit name="serial_sum_mixed"> - <output-dir compare="Text">serial_sum_mixed</output-dir> + <compilation-unit name="sum/serial_sum_mixed"> + <output-dir compare="Text">sum/serial_sum_mixed</output-dir> - <expected-error>Invalid item type: function agg-sum cannot process item type string in an input array</expected-error> + <expected-warn>Unsupported type: agg-sum cannot process input type string (in line 29, at column 39)</expected-warn> </compilation-unit> </test-case> <test-case FilePath="aggregate"> @@@ -1552,16 -1532,16 +1552,16 @@@ <expected-error>Type incompatibility: function agg-stddev_pop gets incompatible input values: string and float</expected-error> </compilation-unit> </test-case> - <test-case FilePath="aggregate-sql"> + <test-case FilePath="aggregate-sql" check-warnings="true"> - <compilation-unit name="sum_mixed"> - <output-dir compare="Text">sum_mixed</output-dir> + <compilation-unit name="sum/sum_mixed"> + <output-dir compare="Text">sum/sum_mixed</output-dir> - <expected-error>Invalid item type: function agg-sum cannot process item type string in an input array</expected-error> + <expected-warn>Unsupported type: agg-sum cannot process input type string (in line 27, at column 16)</expected-warn> </compilation-unit> </test-case> - <test-case FilePath="aggregate-sql"> + <test-case FilePath="aggregate-sql" check-warnings="true"> - <compilation-unit name="serial_sum_mixed"> - <output-dir compare="Text">serial_sum_mixed</output-dir> + <compilation-unit name="sum/serial_sum_mixed"> + <output-dir compare="Text">sum/serial_sum_mixed</output-dir> - <expected-error>Invalid item type: function agg-sum cannot process item type string in an input array</expected-error> + <expected-warn>Unsupported type: agg-sum cannot process input type string (in line 29, at column 38)</expected-warn> </compilation-unit> </test-case> <test-case FilePath="aggregate-sql">
