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 c605728cdc8502c56d1cee0a3dbe21d2c44b9141 Merge: c10b6ab fb1431d Author: Michael Blow <[email protected]> AuthorDate: Thu Jan 30 17:26:00 2020 -0500 Merge branch 'gerrit/mad-hatter' Change-Id: I7490beb22c002cba1515a5bbcf6267208a44e117 .../serial_sum_mixed.3.query.sqlpp | 2 ++ .../sum_mixed/sum_mixed.3.query.sqlpp | 2 ++ .../serial_sum_mixed.3.query.sqlpp | 2 ++ .../aggregate/sum_mixed/sum_mixed.3.query.sqlpp | 2 ++ .../group-by/policy-05/policy-05.3.query.sqlpp | 2 ++ .../serial_sum_mixed/serial_sum_mixed.1.adm | 2 +- .../aggregate-sql/sum_mixed/sum_mixed.1.adm | 2 +- .../results/aggregate/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(-)
