You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by ht...@apache.org on 2019/12/18 10:00:15 UTC
[asterixdb] branch master updated: [NO ISSUE][TEST] Consolidate sum
test cases in a single folder
This is an automated email from the ASF dual-hosted git repository.
htowaileb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new 9e789f5 [NO ISSUE][TEST] Consolidate sum test cases in a single folder
9e789f5 is described below
commit 9e789f57870a4f3490bfa993899e993c5c2c7b49
Author: Hussain Towaileb <Hu...@Couchbase.com>
AuthorDate: Tue Dec 17 16:14:36 2019 +0300
[NO ISSUE][TEST] Consolidate sum test cases in a single folder
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Consolidated all the sum test cases into a single
folder for ease of maintainability.
- Removed empty test files and re-numbered the files.
Change-Id: I611bbbb9021ffdaea4b72450272ef3d266e265b1
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/4483
Contrib: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Hussain Towaileb <hu...@gmail.com>
Reviewed-by: Till Westmann <ti...@apache.org>
---
.../issue425_sum_hetero_list.1.ddl.sqlpp | 19 --
.../issue425_sum_hetero_list.2.update.sqlpp | 19 --
.../issue425_sum_hetero_list_1.1.ddl.sqlpp | 19 --
.../issue425_sum_hetero_list_1.2.update.sqlpp | 19 --
.../scalar_sum/scalar_sum.2.update.sqlpp | 23 --
.../scalar_sum_empty.2.update.sqlpp | 23 --
.../scalar_sum_null/scalar_sum_null.2.update.sqlpp | 23 --
.../serial_sum_empty.2.update.sqlpp | 18 --
.../serial_sum_empty.3.query.sqlpp | 25 --
.../issue425_sum_hetero_list.1.query.sqlpp} | 0
.../issue425_sum_hetero_list_1.1.query.sqlpp} | 0
.../{ => sum}/scalar_sum/scalar_sum.1.ddl.sqlpp | 0
.../scalar_sum/scalar_sum.2.query.sqlpp} | 0
.../scalar_sum_empty/scalar_sum_empty.1.ddl.sqlpp | 0
.../scalar_sum_empty.2.query.sqlpp} | 0
.../scalar_sum_null/scalar_sum_null.1.ddl.sqlpp | 0
.../scalar_sum_null/scalar_sum_null.2.query.sqlpp} | 0
.../serial_sum_double.1.ddl.sqlpp | 0
.../serial_sum_double.2.update.sqlpp | 0
.../serial_sum_double.3.query.sqlpp | 0
.../serial_sum_double_null.1.ddl.sqlpp | 0
.../serial_sum_double_null.2.update.sqlpp | 0
.../serial_sum_double_null.3.query.sqlpp | 0
.../serial_sum_empty/serial_sum_empty.1.ddl.sqlpp | 0
.../serial_sum_empty.2.query.sqlpp} | 0
.../serial_sum_float/serial_sum_float.1.ddl.sqlpp | 0
.../serial_sum_float.2.update.sqlpp | 0
.../serial_sum_float.3.query.sqlpp | 0
.../serial_sum_float_null.1.ddl.sqlpp | 0
.../serial_sum_float_null.2.update.sqlpp | 0
.../serial_sum_float_null.3.query.sqlpp | 0
.../serial_sum_int16/serial_sum_int16.1.ddl.sqlpp | 0
.../serial_sum_int16.2.update.sqlpp | 0
.../serial_sum_int16.3.query.sqlpp | 0
.../serial_sum_int16_null.1.ddl.sqlpp | 0
.../serial_sum_int16_null.2.update.sqlpp | 0
.../serial_sum_int16_null.3.query.sqlpp | 0
.../serial_sum_int32/serial_sum_int32.1.ddl.sqlpp | 0
.../serial_sum_int32.2.update.sqlpp | 0
.../serial_sum_int32.3.query.sqlpp | 0
.../serial_sum_int32_null.1.ddl.sqlpp | 0
.../serial_sum_int32_null.2.update.sqlpp | 0
.../serial_sum_int32_null.3.query.sqlpp | 0
.../serial_sum_int64/serial_sum_int64.1.ddl.sqlpp | 0
.../serial_sum_int64.2.update.sqlpp | 0
.../serial_sum_int64.3.query.sqlpp | 0
.../serial_sum_int64_null.1.ddl.sqlpp | 0
.../serial_sum_int64_null.2.update.sqlpp | 0
.../serial_sum_int64_null.3.query.sqlpp | 0
.../serial_sum_int64_overflow.1.ddl.sqlpp | 0
.../serial_sum_int64_overflow.2.update.sqlpp | 0
.../serial_sum_int64_overflow.3.query.sqlpp | 0
.../serial_sum_int8/serial_sum_int8.1.ddl.sqlpp | 0
.../serial_sum_int8/serial_sum_int8.2.update.sqlpp | 0
.../serial_sum_int8/serial_sum_int8.3.query.sqlpp | 0
.../serial_sum_int8_null.1.ddl.sqlpp | 0
.../serial_sum_int8_null.2.update.sqlpp | 0
.../serial_sum_int8_null.3.query.sqlpp | 0
.../serial_sum_mixed/serial_sum_mixed.1.ddl.sqlpp | 0
.../serial_sum_mixed.2.update.sqlpp | 0
.../serial_sum_mixed.3.query.sqlpp | 0
.../sum_distinct/sum_distinct.1.query.sqlpp | 0
.../sum}/sum_double/sum_double.1.ddl.sqlpp | 0
.../sum_double/sum_double.2.query.sqlpp} | 0
.../sum_double_null/sum_double_null.1.ddl.sqlpp | 0
.../sum_double_null/sum_double_null.2.query.sqlpp} | 0
.../sum_empty_01/sum_empty_01.1.ddl.sqlpp | 0
.../sum_empty_01/sum_empty_01.2.query.sqlpp} | 0
.../sum_empty_02/sum_empty_02.1.ddl.sqlpp | 0
.../sum_empty_02/sum_empty_02.2.query.sqlpp} | 0
.../sum}/sum_float/sum_float.1.ddl.sqlpp | 0
.../sum_float/sum_float.2.query.sqlpp} | 0
.../sum_float_null/sum_float_null.1.ddl.sqlpp | 0
.../sum_float_null/sum_float_null.2.query.sqlpp} | 0
.../sum}/sum_int16/sum_int16.1.ddl.sqlpp | 0
.../sum_int16/sum_int16.2.query.sqlpp} | 0
.../sum_int16_null/sum_int16_null.1.ddl.sqlpp | 0
.../sum_int16_null/sum_int16_null.2.query.sqlpp} | 0
.../sum}/sum_int32/sum_int32.1.ddl.sqlpp | 0
.../sum_int32/sum_int32.2.query.sqlpp} | 0
.../sum_int32_null/sum_int32_null.1.ddl.sqlpp | 0
.../sum_int32_null/sum_int32_null.2.query.sqlpp} | 0
.../sum}/sum_int64/sum_int64.1.ddl.sqlpp | 0
.../sum_int64/sum_int64.2.query.sqlpp} | 0
.../sum_int64_null/sum_int64_null.1.ddl.sqlpp | 0
.../sum_int64_null/sum_int64_null.2.query.sqlpp} | 0
.../sum_int64_overflow.1.ddl.sqlpp | 0
.../sum_int64_overflow.2.query.sqlpp} | 0
.../sum}/sum_int8/sum_int8.1.ddl.sqlpp | 0
.../sum_int8/sum_int8.2.query.sqlpp} | 0
.../sum_int8_null/sum_int8_null.1.ddl.sqlpp | 0
.../sum_int8_null/sum_int8_null.2.query.sqlpp} | 0
.../sum_mixed/sum_mixed.1.query.sqlpp} | 0
.../sum_null-with-pred.1.ddl.sqlpp | 0
.../sum_null-with-pred.2.update.sqlpp | 0
.../sum_null-with-pred.3.query.sqlpp | 0
.../sum_numeric_null/sum_numeric_null.1.ddl.sqlpp | 0
.../sum_numeric_null.2.update.sqlpp | 0
.../sum_numeric_null.3.query.sqlpp | 0
.../sum_double/sum_double.2.update.sqlpp | 19 --
.../sum_double_null/sum_double_null.2.update.sqlpp | 19 --
.../sum_empty_01/sum_empty_01.2.update.sqlpp | 24 --
.../sum_empty_02/sum_empty_02.2.update.sqlpp | 24 --
.../sum_float/sum_float.2.update.sqlpp | 19 --
.../sum_float_null/sum_float_null.2.update.sqlpp | 19 --
.../sum_int16/sum_int16.2.update.sqlpp | 19 --
.../sum_int16_null/sum_int16_null.2.update.sqlpp | 19 --
.../sum_int32/sum_int32.2.update.sqlpp | 19 --
.../sum_int32_null/sum_int32_null.2.update.sqlpp | 19 --
.../sum_int64/sum_int64.2.update.sqlpp | 19 --
.../sum_int64_null/sum_int64_null.2.update.sqlpp | 19 --
.../sum_int64_overflow.2.update.sqlpp | 19 --
.../aggregate-sql/sum_int8/sum_int8.2.update.sqlpp | 19 --
.../sum_int8_null/sum_int8_null.2.update.sqlpp | 19 --
.../aggregate-sql/sum_mixed/sum_mixed.1.ddl.sqlpp | 24 --
.../sum_mixed/sum_mixed.2.update.sqlpp | 19 --
.../issue425_sum_hetero_list.1.ddl.sqlpp | 19 --
.../issue425_sum_hetero_list.2.update.sqlpp | 19 --
.../issue425_sum_hetero_list_1.1.ddl.sqlpp | 19 --
.../issue425_sum_hetero_list_1.2.update.sqlpp | 19 --
.../aggregate/scalar_sum/scalar_sum.2.update.sqlpp | 23 --
.../scalar_sum_empty.2.update.sqlpp | 23 --
.../scalar_sum_null/scalar_sum_null.2.update.sqlpp | 23 --
.../serial_sum_empty.2.update.sqlpp | 18 --
.../serial_sum_empty.3.query.sqlpp | 25 --
.../issue425_sum_hetero_list.1.query.sqlpp} | 0
.../issue425_sum_hetero_list_1.1.query.sqlpp} | 0
.../{ => sum}/scalar_sum/scalar_sum.1.ddl.sqlpp | 0
.../scalar_sum/scalar_sum.2.query.sqlpp} | 0
.../scalar_sum_empty/scalar_sum_empty.1.ddl.sqlpp | 0
.../scalar_sum_empty.2.query.sqlpp} | 0
.../scalar_sum_null/scalar_sum_null.1.ddl.sqlpp | 0
.../scalar_sum_null/scalar_sum_null.2.query.sqlpp} | 0
.../serial_sum_double.1.ddl.sqlpp | 0
.../serial_sum_double.2.update.sqlpp | 0
.../serial_sum_double.3.query.sqlpp | 0
.../serial_sum_double_null.1.ddl.sqlpp | 0
.../serial_sum_double_null.2.update.sqlpp | 0
.../serial_sum_double_null.3.query.sqlpp | 0
.../serial_sum_empty/serial_sum_empty.1.ddl.sqlpp | 0
.../serial_sum_empty.2.query.sqlpp} | 0
.../serial_sum_float/serial_sum_float.1.ddl.sqlpp | 0
.../serial_sum_float.2.update.sqlpp | 0
.../serial_sum_float.3.query.sqlpp | 0
.../serial_sum_float_null.1.ddl.sqlpp | 0
.../serial_sum_float_null.2.update.sqlpp | 0
.../serial_sum_float_null.3.query.sqlpp | 0
.../serial_sum_int16/serial_sum_int16.1.ddl.sqlpp | 0
.../serial_sum_int16.2.update.sqlpp | 0
.../serial_sum_int16.3.query.sqlpp | 0
.../serial_sum_int16_null.1.ddl.sqlpp | 0
.../serial_sum_int16_null.2.update.sqlpp | 0
.../serial_sum_int16_null.3.query.sqlpp | 0
.../serial_sum_int32/serial_sum_int32.1.ddl.sqlpp | 0
.../serial_sum_int32.2.update.sqlpp | 0
.../serial_sum_int32.3.query.sqlpp | 0
.../serial_sum_int32_null.1.ddl.sqlpp | 0
.../serial_sum_int32_null.2.update.sqlpp | 0
.../serial_sum_int32_null.3.query.sqlpp | 0
.../serial_sum_int64/serial_sum_int64.1.ddl.sqlpp | 0
.../serial_sum_int64.2.update.sqlpp | 0
.../serial_sum_int64.3.query.sqlpp | 0
.../serial_sum_int64_null.1.ddl.sqlpp | 0
.../serial_sum_int64_null.2.update.sqlpp | 0
.../serial_sum_int64_null.3.query.sqlpp | 0
.../serial_sum_int64_overflow.1.ddl.sqlpp | 0
.../serial_sum_int64_overflow.2.update.sqlpp | 0
.../serial_sum_int64_overflow.3.query.sqlpp | 0
.../serial_sum_int8/serial_sum_int8.1.ddl.sqlpp | 0
.../serial_sum_int8/serial_sum_int8.2.update.sqlpp | 0
.../serial_sum_int8/serial_sum_int8.3.query.sqlpp | 0
.../serial_sum_int8_null.1.ddl.sqlpp | 0
.../serial_sum_int8_null.2.update.sqlpp | 0
.../serial_sum_int8_null.3.query.sqlpp | 0
.../serial_sum_mixed/serial_sum_mixed.1.ddl.sqlpp | 0
.../serial_sum_mixed.2.update.sqlpp | 0
.../serial_sum_mixed.3.query.sqlpp | 0
.../sum_distinct/sum_distinct.1.query.sqlpp | 0
.../sum}/sum_double/sum_double.1.ddl.sqlpp | 0
.../sum_double/sum_double.2.query.sqlpp} | 0
.../sum_double_null/sum_double_null.1.ddl.sqlpp | 0
.../sum_double_null/sum_double_null.2.query.sqlpp} | 0
.../sum_empty_01/sum_empty_01.1.ddl.sqlpp | 0
.../sum_empty_01/sum_empty_01.2.query.sqlpp} | 0
.../sum_empty_02/sum_empty_02.1.ddl.sqlpp | 0
.../sum_empty_02/sum_empty_02.2.query.sqlpp} | 0
.../sum}/sum_float/sum_float.1.ddl.sqlpp | 0
.../sum_float/sum_float.2.query.sqlpp} | 0
.../sum_float_null/sum_float_null.1.ddl.sqlpp | 0
.../sum_float_null/sum_float_null.2.query.sqlpp} | 0
.../sum}/sum_int16/sum_int16.1.ddl.sqlpp | 0
.../sum_int16/sum_int16.2.query.sqlpp} | 0
.../sum_int16_null/sum_int16_null.1.ddl.sqlpp | 0
.../sum_int16_null/sum_int16_null.2.query.sqlpp} | 0
.../sum}/sum_int32/sum_int32.1.ddl.sqlpp | 0
.../sum_int32/sum_int32.2.query.sqlpp} | 0
.../sum_int32_null/sum_int32_null.1.ddl.sqlpp | 0
.../sum_int32_null/sum_int32_null.2.query.sqlpp} | 0
.../sum}/sum_int64/sum_int64.1.ddl.sqlpp | 0
.../sum_int64/sum_int64.2.query.sqlpp} | 0
.../sum_int64_null/sum_int64_null.1.ddl.sqlpp | 0
.../sum_int64_null/sum_int64_null.2.query.sqlpp} | 0
.../sum_int64_overflow.1.ddl.sqlpp | 0
.../sum_int64_overflow.2.query.sqlpp} | 0
.../sum}/sum_int8/sum_int8.1.ddl.sqlpp | 0
.../sum_int8/sum_int8.2.query.sqlpp} | 0
.../sum_int8_null/sum_int8_null.1.ddl.sqlpp | 0
.../sum_int8_null/sum_int8_null.2.query.sqlpp} | 0
.../sum_mixed/sum_mixed.1.query.sqlpp} | 0
.../sum_null-with-pred.1.ddl.sqlpp | 0
.../sum_null-with-pred.2.update.sqlpp | 0
.../sum_null-with-pred.3.query.sqlpp | 0
.../sum_numeric_null/sum_numeric_null.1.ddl.sqlpp | 0
.../sum_numeric_null.2.update.sqlpp | 0
.../sum_numeric_null.3.query.sqlpp | 0
.../aggregate/sum_double/sum_double.2.update.sqlpp | 19 --
.../sum_double_null/sum_double_null.2.update.sqlpp | 19 --
.../sum_empty_01/sum_empty_01.2.update.sqlpp | 24 --
.../sum_empty_02/sum_empty_02.2.update.sqlpp | 24 --
.../aggregate/sum_float/sum_float.2.update.sqlpp | 19 --
.../sum_float_null/sum_float_null.2.update.sqlpp | 19 --
.../aggregate/sum_int16/sum_int16.2.update.sqlpp | 19 --
.../sum_int16_null/sum_int16_null.2.update.sqlpp | 19 --
.../aggregate/sum_int32/sum_int32.2.update.sqlpp | 19 --
.../sum_int32_null/sum_int32_null.2.update.sqlpp | 19 --
.../aggregate/sum_int64/sum_int64.2.update.sqlpp | 19 --
.../sum_int64_null/sum_int64_null.2.update.sqlpp | 19 --
.../sum_int64_overflow.2.update.sqlpp | 19 --
.../aggregate/sum_int8/sum_int8.2.update.sqlpp | 19 --
.../sum_int8_null/sum_int8_null.2.update.sqlpp | 19 --
.../aggregate/sum_mixed/sum_mixed.1.ddl.sqlpp | 24 --
.../aggregate/sum_mixed/sum_mixed.2.update.sqlpp | 19 --
.../issue425_sum_hetero_list.1.adm | 0
.../issue425_sum_hetero_list_1.1.adm | 0
.../sum}/scalar_sum/scalar_sum.1.adm | 0
.../sum}/scalar_sum_empty/scalar_sum_empty.1.adm | 0
.../scalar_sum_null/scalar_sum_null.1.adm | 0
.../sum}/serial_sum_double/serial_sum_double.1.adm | 0
.../serial_sum_double_null.1.adm | 0
.../sum}/serial_sum_empty/serial_sum_empty.1.adm | 0
.../sum}/serial_sum_float/serial_sum_float.1.adm | 0
.../serial_sum_float_null.1.adm | 0
.../sum}/serial_sum_int16/serial_sum_int16.1.adm | 0
.../serial_sum_int16_null.1.adm | 0
.../sum}/serial_sum_int32/serial_sum_int32.1.adm | 0
.../serial_sum_int32_null.1.adm | 0
.../sum}/serial_sum_int64/serial_sum_int64.1.adm | 0
.../serial_sum_int64_null.1.adm | 0
.../sum}/serial_sum_int8/serial_sum_int8.1.adm | 0
.../serial_sum_int8_null.1.adm | 0
.../sum}/serial_sum_mixed/serial_sum_mixed.1.adm | 0
.../{ => sum}/sum_distinct/sum_distinct.1.adm | 0
.../sum}/sum_double/sum_double.1.adm | 0
.../sum_double_null/sum_double_null.1.adm | 0
.../sum}/sum_empty_01/sum_empty_01.1.adm | 0
.../sum}/sum_empty_02/sum_empty_02.1.adm | 0
.../sum}/sum_float/sum_float.1.adm | 0
.../{ => sum}/sum_float_null/sum_float_null.1.adm | 0
.../sum}/sum_int16/sum_int16.1.adm | 0
.../{ => sum}/sum_int16_null/sum_int16_null.1.adm | 0
.../sum}/sum_int32/sum_int32.1.adm | 0
.../{ => sum}/sum_int32_null/sum_int32_null.1.adm | 0
.../sum}/sum_int64/sum_int64.1.adm | 0
.../{ => sum}/sum_int64_null/sum_int64_null.1.adm | 0
.../sum}/sum_int8/sum_int8.1.adm | 0
.../{ => sum}/sum_int8_null/sum_int8_null.1.adm | 0
.../sum}/sum_mixed/sum_mixed.1.adm | 0
.../sum_null-with-pred/sum_null-with-pred.1.adm | 0
.../sum_numeric_null/sum_numeric_null.1.adm | 0
.../issue425_sum_hetero_list.1.adm | 0
.../issue425_sum_hetero_list_1.1.adm | 0
.../sum}/scalar_sum/scalar_sum.1.adm | 0
.../sum}/scalar_sum_empty/scalar_sum_empty.1.adm | 0
.../scalar_sum_null/scalar_sum_null.1.adm | 0
.../sum}/serial_sum_double/serial_sum_double.1.adm | 0
.../serial_sum_double_null.1.adm | 0
.../sum}/serial_sum_empty/serial_sum_empty.1.adm | 0
.../sum}/serial_sum_float/serial_sum_float.1.adm | 0
.../serial_sum_float_null.1.adm | 0
.../sum}/serial_sum_int16/serial_sum_int16.1.adm | 0
.../serial_sum_int16_null.1.adm | 0
.../sum}/serial_sum_int32/serial_sum_int32.1.adm | 0
.../serial_sum_int32_null.1.adm | 0
.../sum}/serial_sum_int64/serial_sum_int64.1.adm | 0
.../serial_sum_int64_null.1.adm | 0
.../sum}/serial_sum_int8/serial_sum_int8.1.adm | 0
.../serial_sum_int8_null.1.adm | 0
.../sum}/serial_sum_mixed/serial_sum_mixed.1.adm | 0
.../{ => sum}/sum_distinct/sum_distinct.1.adm | 0
.../sum}/sum_double/sum_double.1.adm | 0
.../sum_double_null/sum_double_null.1.adm | 0
.../sum}/sum_empty_01/sum_empty_01.1.adm | 0
.../sum}/sum_empty_02/sum_empty_02.1.adm | 0
.../sum}/sum_float/sum_float.1.adm | 0
.../{ => sum}/sum_float_null/sum_float_null.1.adm | 0
.../sum}/sum_int16/sum_int16.1.adm | 0
.../{ => sum}/sum_int16_null/sum_int16_null.1.adm | 0
.../sum}/sum_int32/sum_int32.1.adm | 0
.../{ => sum}/sum_int32_null/sum_int32_null.1.adm | 0
.../sum}/sum_int64/sum_int64.1.adm | 0
.../{ => sum}/sum_int64_null/sum_int64_null.1.adm | 0
.../sum}/sum_int8/sum_int8.1.adm | 0
.../{ => sum}/sum_int8_null/sum_int8_null.1.adm | 0
.../sum}/sum_mixed/sum_mixed.1.adm | 0
.../sum_null-with-pred/sum_null-with-pred.1.adm | 0
.../sum_numeric_null/sum_numeric_null.1.adm | 0
.../test/resources/runtimets/testsuite_sqlpp.xml | 316 ++++++++++-----------
307 files changed, 158 insertions(+), 1210 deletions(-)
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.1.ddl.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.1.ddl.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.1.ddl.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.1.ddl.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum/scalar_sum.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum/scalar_sum.2.update.sqlpp
deleted file mode 100644
index 6e0c838..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum/scalar_sum.2.update.sqlpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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 : Tests the scalar version of array_sum without nulls.
- * Success : Yes
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.2.update.sqlpp
deleted file mode 100644
index 521aa8d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.2.update.sqlpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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 : Tests the scalar version of array_sum with an empty list.
- * Success : Yes
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.2.update.sqlpp
deleted file mode 100644
index 0ecf264..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.2.update.sqlpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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 : Tests the scalar version of array_sum with nulls.
- * Success : Yes
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_empty/serial_sum_empty.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_empty/serial_sum_empty.2.update.sqlpp
deleted file mode 100644
index 042f3ce..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_empty/serial_sum_empty.2.update.sqlpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * 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.
- */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_empty/serial_sum_empty.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_empty/serial_sum_empty.3.query.sqlpp
deleted file mode 100644
index 4259ca2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_empty/serial_sum_empty.3.query.sqlpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.
- */
-
-use test;
-
-select gid, sum(t.val) as sum
-from Test as t
-/* +hash */
-group by t.gid as gid;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/issue425_sum_hetero_list/issue425_sum_hetero_list.1.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/issue425_sum_hetero_list/issue425_sum_hetero_list.1.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.1.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.1.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum/scalar_sum.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/scalar_sum/scalar_sum.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum/scalar_sum.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/scalar_sum/scalar_sum.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/scalar_sum/scalar_sum.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/scalar_sum/scalar_sum.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/scalar_sum_empty/scalar_sum_empty.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/scalar_sum_empty/scalar_sum_empty.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/scalar_sum_empty/scalar_sum_empty.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/scalar_sum_empty/scalar_sum_empty.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/scalar_sum_null/scalar_sum_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/scalar_sum_null/scalar_sum_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/scalar_sum_null/scalar_sum_null.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/scalar_sum_null/scalar_sum_null.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_double/serial_sum_double.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_double/serial_sum_double.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_double/serial_sum_double.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_double/serial_sum_double.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_double/serial_sum_double.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_double/serial_sum_double.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_double/serial_sum_double.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_double/serial_sum_double.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_double/serial_sum_double.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_double/serial_sum_double.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_double/serial_sum_double.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_double/serial_sum_double.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_double_null/serial_sum_double_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_double_null/serial_sum_double_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_double_null/serial_sum_double_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_double_null/serial_sum_double_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_double_null/serial_sum_double_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_double_null/serial_sum_double_null.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_double_null/serial_sum_double_null.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_double_null/serial_sum_double_null.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_double_null/serial_sum_double_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_double_null/serial_sum_double_null.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_double_null/serial_sum_double_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_double_null/serial_sum_double_null.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_empty/serial_sum_empty.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_empty/serial_sum_empty.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_empty/serial_sum_empty.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_empty/serial_sum_empty.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int8/serial_sum_int8.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_empty/serial_sum_empty.2.query.sqlpp
similarity index 100%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int8/serial_sum_int8.3.query.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_empty/serial_sum_empty.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_float/serial_sum_float.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_float/serial_sum_float.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_float/serial_sum_float.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_float/serial_sum_float.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_float/serial_sum_float.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_float/serial_sum_float.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_float/serial_sum_float.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_float/serial_sum_float.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_float/serial_sum_float.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_float/serial_sum_float.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_float/serial_sum_float.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_float/serial_sum_float.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_float_null/serial_sum_float_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_float_null/serial_sum_float_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_float_null/serial_sum_float_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_float_null/serial_sum_float_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_float_null/serial_sum_float_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_float_null/serial_sum_float_null.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_float_null/serial_sum_float_null.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_float_null/serial_sum_float_null.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_float_null/serial_sum_float_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_float_null/serial_sum_float_null.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_float_null/serial_sum_float_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_float_null/serial_sum_float_null.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int16/serial_sum_int16.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int16/serial_sum_int16.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int16/serial_sum_int16.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int16/serial_sum_int16.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int16/serial_sum_int16.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int16/serial_sum_int16.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int16/serial_sum_int16.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int16/serial_sum_int16.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int16/serial_sum_int16.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int16/serial_sum_int16.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int16/serial_sum_int16.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int16/serial_sum_int16.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int16_null/serial_sum_int16_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int16_null/serial_sum_int16_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int16_null/serial_sum_int16_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int16_null/serial_sum_int16_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int16_null/serial_sum_int16_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int16_null/serial_sum_int16_null.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int16_null/serial_sum_int16_null.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int16_null/serial_sum_int16_null.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int16_null/serial_sum_int16_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int16_null/serial_sum_int16_null.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int16_null/serial_sum_int16_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int16_null/serial_sum_int16_null.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int32/serial_sum_int32.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int32/serial_sum_int32.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int32/serial_sum_int32.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int32/serial_sum_int32.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int32/serial_sum_int32.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int32/serial_sum_int32.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int32/serial_sum_int32.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int32/serial_sum_int32.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int32/serial_sum_int32.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int32/serial_sum_int32.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int32/serial_sum_int32.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int32/serial_sum_int32.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int32_null/serial_sum_int32_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int32_null/serial_sum_int32_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int32_null/serial_sum_int32_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int32_null/serial_sum_int32_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int32_null/serial_sum_int32_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int32_null/serial_sum_int32_null.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int32_null/serial_sum_int32_null.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int32_null/serial_sum_int32_null.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int32_null/serial_sum_int32_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int32_null/serial_sum_int32_null.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int32_null/serial_sum_int32_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int32_null/serial_sum_int32_null.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int64/serial_sum_int64.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int64/serial_sum_int64.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int64/serial_sum_int64.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int64/serial_sum_int64.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int64/serial_sum_int64.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int64/serial_sum_int64.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int64/serial_sum_int64.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int64/serial_sum_int64.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int64/serial_sum_int64.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int64/serial_sum_int64.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int64/serial_sum_int64.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int64/serial_sum_int64.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int64_null/serial_sum_int64_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int64_null/serial_sum_int64_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int64_null/serial_sum_int64_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int64_null/serial_sum_int64_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int64_null/serial_sum_int64_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int64_null/serial_sum_int64_null.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int64_null/serial_sum_int64_null.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int64_null/serial_sum_int64_null.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int64_null/serial_sum_int64_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int64_null/serial_sum_int64_null.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int64_null/serial_sum_int64_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int64_null/serial_sum_int64_null.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int64_overflow/serial_sum_int64_overflow.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int64_overflow/serial_sum_int64_overflow.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int64_overflow/serial_sum_int64_overflow.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int64_overflow/serial_sum_int64_overflow.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int64_overflow/serial_sum_int64_overflow.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int64_overflow/serial_sum_int64_overflow.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int64_overflow/serial_sum_int64_overflow.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int64_overflow/serial_sum_int64_overflow.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int64_overflow/serial_sum_int64_overflow.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int64_overflow/serial_sum_int64_overflow.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int64_overflow/serial_sum_int64_overflow.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int64_overflow/serial_sum_int64_overflow.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int8/serial_sum_int8.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int8/serial_sum_int8.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int8/serial_sum_int8.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int8/serial_sum_int8.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int8/serial_sum_int8.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int8/serial_sum_int8.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int8/serial_sum_int8.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int8/serial_sum_int8.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int8/serial_sum_int8.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int8/serial_sum_int8.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int8/serial_sum_int8.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int8/serial_sum_int8.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int8_null/serial_sum_int8_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int8_null/serial_sum_int8_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int8_null/serial_sum_int8_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int8_null/serial_sum_int8_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int8_null/serial_sum_int8_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int8_null/serial_sum_int8_null.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int8_null/serial_sum_int8_null.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int8_null/serial_sum_int8_null.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int8_null/serial_sum_int8_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int8_null/serial_sum_int8_null.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int8_null/serial_sum_int8_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_int8_null/serial_sum_int8_null.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_mixed/serial_sum_mixed.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_mixed/serial_sum_mixed.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_mixed/serial_sum_mixed.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_mixed/serial_sum_mixed.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_mixed/serial_sum_mixed.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_mixed/serial_sum_mixed.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_mixed/serial_sum_mixed.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_mixed/serial_sum_mixed.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_mixed/serial_sum_mixed.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_mixed/serial_sum_mixed.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_mixed/serial_sum_mixed.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/serial_sum_mixed/serial_sum_mixed.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_distinct/sum_distinct.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_distinct/sum_distinct.1.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_distinct/sum_distinct.1.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_distinct/sum_distinct.1.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_double/sum_double.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_double/sum_double.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_double/sum_double.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_double/sum_double.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double/sum_double.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_double/sum_double.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double/sum_double.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_double/sum_double.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_double_null/sum_double_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_double_null/sum_double_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_double_null/sum_double_null.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_double_null/sum_double_null.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_empty_01/sum_empty_01.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_empty_01/sum_empty_01.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_empty_01/sum_empty_01.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_empty_01/sum_empty_01.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_empty_02/sum_empty_02.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_empty_02/sum_empty_02.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_empty_02/sum_empty_02.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_empty_02/sum_empty_02.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_float/sum_float.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_float/sum_float.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_float/sum_float.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_float/sum_float.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float/sum_float.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_float/sum_float.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float/sum_float.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_float/sum_float.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_float_null/sum_float_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_float_null/sum_float_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_float_null/sum_float_null.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_float_null/sum_float_null.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int16/sum_int16.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int16/sum_int16.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int16/sum_int16.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int16/sum_int16.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16/sum_int16.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int16/sum_int16.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16/sum_int16.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int16/sum_int16.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int16_null/sum_int16_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int16_null/sum_int16_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int16_null/sum_int16_null.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int16_null/sum_int16_null.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int32/sum_int32.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int32/sum_int32.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int32/sum_int32.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int32/sum_int32.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32/sum_int32.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int32/sum_int32.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32/sum_int32.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int32/sum_int32.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int32_null/sum_int32_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int32_null/sum_int32_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int32_null/sum_int32_null.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int32_null/sum_int32_null.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64/sum_int64.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int64/sum_int64.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64/sum_int64.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int64/sum_int64.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64/sum_int64.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int64/sum_int64.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64/sum_int64.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int64/sum_int64.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int64_null/sum_int64_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int64_null/sum_int64_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int64_null/sum_int64_null.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int64_null/sum_int64_null.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64_overflow/sum_int64_overflow.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int64_overflow/sum_int64_overflow.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64_overflow/sum_int64_overflow.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int64_overflow/sum_int64_overflow.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_overflow/sum_int64_overflow.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int64_overflow/sum_int64_overflow.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_overflow/sum_int64_overflow.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int64_overflow/sum_int64_overflow.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int8/sum_int8.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int8/sum_int8.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int8/sum_int8.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int8/sum_int8.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8/sum_int8.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int8/sum_int8.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8/sum_int8.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int8/sum_int8.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int8_null/sum_int8_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int8_null/sum_int8_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int8_null/sum_int8_null.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_int8_null/sum_int8_null.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_mixed/sum_mixed.1.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_mixed/sum_mixed.1.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_numeric_null/sum_numeric_null.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_numeric_null/sum_numeric_null.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_numeric_null/sum_numeric_null.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum/sum_numeric_null/sum_numeric_null.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double/sum_double.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double/sum_double.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double/sum_double.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.2.update.sqlpp
deleted file mode 100644
index 490617a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.2.update.sqlpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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 : Tests that array_sum aggregation correctly returns null for an empty stream,
- * without an aggregate combiner.
- * Success : Yes
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.2.update.sqlpp
deleted file mode 100644
index edf32f1..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.2.update.sqlpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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 : Tests that array_sum aggregation correctly returns null for an empty stream,
- * with an aggregate combiner.
- * Success : Yes
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float/sum_float.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float/sum_float.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float/sum_float.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16/sum_int16.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16/sum_int16.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16/sum_int16.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32/sum_int32.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32/sum_int32.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32/sum_int32.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64/sum_int64.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64/sum_int64.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64/sum_int64.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_overflow/sum_int64_overflow.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_overflow/sum_int64_overflow.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_overflow/sum_int64_overflow.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8/sum_int8.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8/sum_int8.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8/sum_int8.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_mixed/sum_mixed.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_mixed/sum_mixed.1.ddl.sqlpp
deleted file mode 100644
index 22584bd..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_mixed/sum_mixed.1.ddl.sqlpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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 : Run array_sum over an ordered list with mixed types
-* Expected Res : Failure
-* Date : Feb 7th 2014
-*/
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_mixed/sum_mixed.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_mixed/sum_mixed.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_mixed/sum_mixed.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.1.ddl.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.1.ddl.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.1.ddl.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.1.ddl.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum/scalar_sum.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum/scalar_sum.2.update.sqlpp
deleted file mode 100644
index e685823..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum/scalar_sum.2.update.sqlpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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 : Tests the scalar version of sum without nulls.
- * Success : Yes
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum_empty/scalar_sum_empty.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum_empty/scalar_sum_empty.2.update.sqlpp
deleted file mode 100644
index 6efe5ae..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum_empty/scalar_sum_empty.2.update.sqlpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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 : Tests the scalar version of sum with an empty list.
- * Success : Yes
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.2.update.sqlpp
deleted file mode 100644
index 40673ec..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.2.update.sqlpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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 : Tests the scalar version of sum with nulls.
- * Success : Yes
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_empty/serial_sum_empty.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_empty/serial_sum_empty.2.update.sqlpp
deleted file mode 100644
index 042f3ce..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_empty/serial_sum_empty.2.update.sqlpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * 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.
- */
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_empty/serial_sum_empty.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_empty/serial_sum_empty.3.query.sqlpp
deleted file mode 100644
index f027a24..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_empty/serial_sum_empty.3.query.sqlpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.
- */
-
-use test;
-
-select gid, strict_sum((select value g.val from g)) as sum
-from Test as t
-/* +hash */
-group by t.gid as gid group as g(val as val);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/issue425_sum_hetero_list/issue425_sum_hetero_list.1.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/issue425_sum_hetero_list/issue425_sum_hetero_list.1.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.1.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.1.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum/scalar_sum.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/scalar_sum/scalar_sum.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum/scalar_sum.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/scalar_sum/scalar_sum.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum/scalar_sum.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/scalar_sum/scalar_sum.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum/scalar_sum.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/scalar_sum/scalar_sum.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum_empty/scalar_sum_empty.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/scalar_sum_empty/scalar_sum_empty.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum_empty/scalar_sum_empty.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/scalar_sum_empty/scalar_sum_empty.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum_empty/scalar_sum_empty.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/scalar_sum_empty/scalar_sum_empty.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum_empty/scalar_sum_empty.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/scalar_sum_empty/scalar_sum_empty.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/scalar_sum_null/scalar_sum_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/scalar_sum_null/scalar_sum_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/scalar_sum_null/scalar_sum_null.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_sum_null/scalar_sum_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/scalar_sum_null/scalar_sum_null.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_double/serial_sum_double.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_double/serial_sum_double.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_double/serial_sum_double.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_double/serial_sum_double.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_double/serial_sum_double.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_double/serial_sum_double.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_double/serial_sum_double.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_double/serial_sum_double.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_double/serial_sum_double.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_double/serial_sum_double.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_double/serial_sum_double.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_double/serial_sum_double.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_double_null/serial_sum_double_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_double_null/serial_sum_double_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_double_null/serial_sum_double_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_double_null/serial_sum_double_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_double_null/serial_sum_double_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_double_null/serial_sum_double_null.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_double_null/serial_sum_double_null.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_double_null/serial_sum_double_null.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_double_null/serial_sum_double_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_double_null/serial_sum_double_null.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_double_null/serial_sum_double_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_double_null/serial_sum_double_null.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_empty/serial_sum_empty.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_empty/serial_sum_empty.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_empty/serial_sum_empty.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_empty/serial_sum_empty.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int8/serial_sum_int8.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_empty/serial_sum_empty.2.query.sqlpp
similarity index 100%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int8/serial_sum_int8.3.query.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_empty/serial_sum_empty.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_float/serial_sum_float.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_float/serial_sum_float.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_float/serial_sum_float.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_float/serial_sum_float.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_float/serial_sum_float.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_float/serial_sum_float.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_float/serial_sum_float.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_float/serial_sum_float.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_float/serial_sum_float.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_float/serial_sum_float.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_float/serial_sum_float.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_float/serial_sum_float.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_float_null/serial_sum_float_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_float_null/serial_sum_float_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_float_null/serial_sum_float_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_float_null/serial_sum_float_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_float_null/serial_sum_float_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_float_null/serial_sum_float_null.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_float_null/serial_sum_float_null.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_float_null/serial_sum_float_null.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_float_null/serial_sum_float_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_float_null/serial_sum_float_null.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_float_null/serial_sum_float_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_float_null/serial_sum_float_null.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int16/serial_sum_int16.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int16/serial_sum_int16.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int16/serial_sum_int16.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int16/serial_sum_int16.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int16/serial_sum_int16.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int16/serial_sum_int16.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int16/serial_sum_int16.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int16/serial_sum_int16.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int16/serial_sum_int16.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int16/serial_sum_int16.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int16/serial_sum_int16.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int16/serial_sum_int16.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int16_null/serial_sum_int16_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int16_null/serial_sum_int16_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int16_null/serial_sum_int16_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int16_null/serial_sum_int16_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int16_null/serial_sum_int16_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int16_null/serial_sum_int16_null.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int16_null/serial_sum_int16_null.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int16_null/serial_sum_int16_null.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int16_null/serial_sum_int16_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int16_null/serial_sum_int16_null.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int16_null/serial_sum_int16_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int16_null/serial_sum_int16_null.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int32/serial_sum_int32.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int32/serial_sum_int32.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int32/serial_sum_int32.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int32/serial_sum_int32.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int32/serial_sum_int32.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int32/serial_sum_int32.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int32/serial_sum_int32.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int32/serial_sum_int32.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int32/serial_sum_int32.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int32/serial_sum_int32.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int32/serial_sum_int32.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int32/serial_sum_int32.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int32_null/serial_sum_int32_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int32_null/serial_sum_int32_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int32_null/serial_sum_int32_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int32_null/serial_sum_int32_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int32_null/serial_sum_int32_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int32_null/serial_sum_int32_null.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int32_null/serial_sum_int32_null.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int32_null/serial_sum_int32_null.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int32_null/serial_sum_int32_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int32_null/serial_sum_int32_null.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int32_null/serial_sum_int32_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int32_null/serial_sum_int32_null.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int64/serial_sum_int64.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int64/serial_sum_int64.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int64/serial_sum_int64.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int64/serial_sum_int64.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int64/serial_sum_int64.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int64/serial_sum_int64.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int64/serial_sum_int64.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int64/serial_sum_int64.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int64/serial_sum_int64.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int64/serial_sum_int64.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int64/serial_sum_int64.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int64/serial_sum_int64.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int64_null/serial_sum_int64_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int64_null/serial_sum_int64_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int64_null/serial_sum_int64_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int64_null/serial_sum_int64_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int64_null/serial_sum_int64_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int64_null/serial_sum_int64_null.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int64_null/serial_sum_int64_null.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int64_null/serial_sum_int64_null.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int64_null/serial_sum_int64_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int64_null/serial_sum_int64_null.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int64_null/serial_sum_int64_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int64_null/serial_sum_int64_null.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int64_overflow/serial_sum_int64_overflow.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int64_overflow/serial_sum_int64_overflow.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int64_overflow/serial_sum_int64_overflow.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int64_overflow/serial_sum_int64_overflow.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int64_overflow/serial_sum_int64_overflow.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int64_overflow/serial_sum_int64_overflow.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int64_overflow/serial_sum_int64_overflow.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int64_overflow/serial_sum_int64_overflow.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int64_overflow/serial_sum_int64_overflow.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int64_overflow/serial_sum_int64_overflow.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int64_overflow/serial_sum_int64_overflow.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int64_overflow/serial_sum_int64_overflow.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int8/serial_sum_int8.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int8/serial_sum_int8.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int8/serial_sum_int8.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int8/serial_sum_int8.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int8/serial_sum_int8.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int8/serial_sum_int8.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int8/serial_sum_int8.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int8/serial_sum_int8.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int8/serial_sum_int8.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int8/serial_sum_int8.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int8/serial_sum_int8.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int8/serial_sum_int8.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int8_null/serial_sum_int8_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int8_null/serial_sum_int8_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int8_null/serial_sum_int8_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int8_null/serial_sum_int8_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int8_null/serial_sum_int8_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int8_null/serial_sum_int8_null.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_int8_null/serial_sum_int8_null.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int8_null/serial_sum_int8_null.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int8_null/serial_sum_int8_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int8_null/serial_sum_int8_null.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_int8_null/serial_sum_int8_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_int8_null/serial_sum_int8_null.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_mixed/serial_sum_mixed.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_mixed/serial_sum_mixed.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/serial_sum_mixed/serial_sum_mixed.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_mixed/serial_sum_mixed.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_mixed/serial_sum_mixed.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_mixed/serial_sum_mixed.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_mixed/serial_sum_mixed.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_mixed/serial_sum_mixed.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_mixed/serial_sum_mixed.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_mixed/serial_sum_mixed.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/serial_sum_mixed/serial_sum_mixed.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/serial_sum_mixed/serial_sum_mixed.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_distinct/sum_distinct.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_distinct/sum_distinct.1.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_distinct/sum_distinct.1.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_distinct/sum_distinct.1.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double/sum_double.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_double/sum_double.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double/sum_double.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_double/sum_double.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_double/sum_double.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_double/sum_double.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_double/sum_double.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_double/sum_double.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_double_null/sum_double_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_double_null/sum_double_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_double_null/sum_double_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_double_null/sum_double_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_double_null/sum_double_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_double_null/sum_double_null.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_double_null/sum_double_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_double_null/sum_double_null.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_empty_01/sum_empty_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_empty_01/sum_empty_01.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_empty_01/sum_empty_01.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_empty_01/sum_empty_01.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_empty_01/sum_empty_01.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_empty_01/sum_empty_01.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_empty_01/sum_empty_01.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_empty_01/sum_empty_01.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_empty_02/sum_empty_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_empty_02/sum_empty_02.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_empty_02/sum_empty_02.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_empty_02/sum_empty_02.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_empty_02/sum_empty_02.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_empty_02/sum_empty_02.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_empty_02/sum_empty_02.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_empty_02/sum_empty_02.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float/sum_float.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_float/sum_float.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float/sum_float.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_float/sum_float.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_float/sum_float.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_float/sum_float.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_float/sum_float.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_float/sum_float.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_float_null/sum_float_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_float_null/sum_float_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_float_null/sum_float_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_float_null/sum_float_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_float_null/sum_float_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_float_null/sum_float_null.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_float_null/sum_float_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_float_null/sum_float_null.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16/sum_int16.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int16/sum_int16.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16/sum_int16.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int16/sum_int16.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int16/sum_int16.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int16/sum_int16.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int16/sum_int16.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int16/sum_int16.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int16_null/sum_int16_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int16_null/sum_int16_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int16_null/sum_int16_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int16_null/sum_int16_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int16_null/sum_int16_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int16_null/sum_int16_null.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int16_null/sum_int16_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int16_null/sum_int16_null.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32/sum_int32.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int32/sum_int32.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32/sum_int32.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int32/sum_int32.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int32/sum_int32.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int32/sum_int32.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int32/sum_int32.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int32/sum_int32.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int32_null/sum_int32_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int32_null/sum_int32_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int32_null/sum_int32_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int32_null/sum_int32_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int32_null/sum_int32_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int32_null/sum_int32_null.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int32_null/sum_int32_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int32_null/sum_int32_null.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64/sum_int64.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int64/sum_int64.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64/sum_int64.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int64/sum_int64.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64/sum_int64.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int64/sum_int64.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64/sum_int64.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int64/sum_int64.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64_null/sum_int64_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int64_null/sum_int64_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64_null/sum_int64_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int64_null/sum_int64_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64_null/sum_int64_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int64_null/sum_int64_null.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64_null/sum_int64_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int64_null/sum_int64_null.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_overflow/sum_int64_overflow.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int64_overflow/sum_int64_overflow.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_overflow/sum_int64_overflow.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int64_overflow/sum_int64_overflow.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64_overflow/sum_int64_overflow.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int64_overflow/sum_int64_overflow.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64_overflow/sum_int64_overflow.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int64_overflow/sum_int64_overflow.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8/sum_int8.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int8/sum_int8.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8/sum_int8.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int8/sum_int8.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int8/sum_int8.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int8/sum_int8.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int8/sum_int8.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int8/sum_int8.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int8_null/sum_int8_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int8_null/sum_int8_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int8_null/sum_int8_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int8_null/sum_int8_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int8_null/sum_int8_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int8_null/sum_int8_null.2.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int8_null/sum_int8_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_int8_null/sum_int8_null.2.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_mixed/sum_mixed.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_mixed/sum_mixed.1.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_mixed/sum_mixed.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_mixed/sum_mixed.1.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_numeric_null/sum_numeric_null.2.update.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_numeric_null/sum_numeric_null.2.update.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_numeric_null/sum_numeric_null.3.query.sqlpp
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum/sum_numeric_null/sum_numeric_null.3.query.sqlpp
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_double/sum_double.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_double/sum_double.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_double/sum_double.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_double_null/sum_double_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_double_null/sum_double_null.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_double_null/sum_double_null.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_empty_01/sum_empty_01.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_empty_01/sum_empty_01.2.update.sqlpp
deleted file mode 100644
index 1bd16cb..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_empty_01/sum_empty_01.2.update.sqlpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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 : Tests that sum aggregation correctly returns null for an empty stream,
- * without an aggregate combiner.
- * Success : Yes
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_empty_02/sum_empty_02.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_empty_02/sum_empty_02.2.update.sqlpp
deleted file mode 100644
index 02b7327..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_empty_02/sum_empty_02.2.update.sqlpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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 : Tests that sum aggregation correctly returns null for an empty stream,
- * with an aggregate combiner.
- * Success : Yes
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_float/sum_float.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_float/sum_float.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_float/sum_float.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_float_null/sum_float_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_float_null/sum_float_null.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_float_null/sum_float_null.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int16/sum_int16.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int16/sum_int16.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int16/sum_int16.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int16_null/sum_int16_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int16_null/sum_int16_null.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int16_null/sum_int16_null.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int32/sum_int32.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int32/sum_int32.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int32/sum_int32.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int32_null/sum_int32_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int32_null/sum_int32_null.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int32_null/sum_int32_null.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64/sum_int64.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64/sum_int64.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64/sum_int64.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64_null/sum_int64_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64_null/sum_int64_null.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64_null/sum_int64_null.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64_overflow/sum_int64_overflow.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64_overflow/sum_int64_overflow.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64_overflow/sum_int64_overflow.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int8/sum_int8.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int8/sum_int8.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int8/sum_int8.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int8_null/sum_int8_null.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int8_null/sum_int8_null.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int8_null/sum_int8_null.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_mixed/sum_mixed.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_mixed/sum_mixed.1.ddl.sqlpp
deleted file mode 100644
index cf91051..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_mixed/sum_mixed.1.ddl.sqlpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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 : Run sum over an ordered list with mixed types
-* Expected Res : Failure
-* Date : Jun 2nd 2013
-*/
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_mixed/sum_mixed.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_mixed/sum_mixed.2.update.sqlpp
deleted file mode 100644
index bd244d0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_mixed/sum_mixed.2.update.sqlpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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.
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/issue425_sum_hetero_list/issue425_sum_hetero_list.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/issue425_sum_hetero_list/issue425_sum_hetero_list.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_sum/scalar_sum.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/scalar_sum/scalar_sum.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_sum/scalar_sum.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/scalar_sum/scalar_sum.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_sum_empty/scalar_sum_empty.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/scalar_sum_empty/scalar_sum_empty.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_sum_empty/scalar_sum_empty.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/scalar_sum_empty/scalar_sum_empty.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/scalar_sum_null/scalar_sum_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/scalar_sum_null/scalar_sum_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/scalar_sum_null/scalar_sum_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/scalar_sum_null/scalar_sum_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_double/serial_sum_double.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_double/serial_sum_double.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_double/serial_sum_double.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_double/serial_sum_double.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_double_null/serial_sum_double_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_double_null/serial_sum_double_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_double_null/serial_sum_double_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_double_null/serial_sum_double_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_empty/serial_sum_empty.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_empty/serial_sum_empty.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_empty/serial_sum_empty.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_empty/serial_sum_empty.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_float/serial_sum_float.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_float/serial_sum_float.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_float/serial_sum_float.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_float/serial_sum_float.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_float_null/serial_sum_float_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_float_null/serial_sum_float_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_float_null/serial_sum_float_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_float_null/serial_sum_float_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_int16/serial_sum_int16.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_int16/serial_sum_int16.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_int16/serial_sum_int16.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_int16/serial_sum_int16.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_int16_null/serial_sum_int16_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_int16_null/serial_sum_int16_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_int16_null/serial_sum_int16_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_int16_null/serial_sum_int16_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_int32/serial_sum_int32.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_int32/serial_sum_int32.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_int32/serial_sum_int32.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_int32/serial_sum_int32.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_int32_null/serial_sum_int32_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_int32_null/serial_sum_int32_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_int32_null/serial_sum_int32_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_int32_null/serial_sum_int32_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_int64/serial_sum_int64.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_int64/serial_sum_int64.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_int64/serial_sum_int64.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_int64/serial_sum_int64.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_int64_null/serial_sum_int64_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_int64_null/serial_sum_int64_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_int64_null/serial_sum_int64_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_int64_null/serial_sum_int64_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_int8/serial_sum_int8.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_int8/serial_sum_int8.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_int8/serial_sum_int8.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_int8/serial_sum_int8.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_int8_null/serial_sum_int8_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_int8_null/serial_sum_int8_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_int8_null/serial_sum_int8_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_int8_null/serial_sum_int8_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_mixed/serial_sum_mixed.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_mixed/serial_sum_mixed.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_mixed/serial_sum_mixed.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/serial_sum_mixed/serial_sum_mixed.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_distinct/sum_distinct.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_distinct/sum_distinct.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_distinct/sum_distinct.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_distinct/sum_distinct.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_double/sum_double.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_double/sum_double.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_double/sum_double.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_double/sum_double.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_double_null/sum_double_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_double_null/sum_double_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_double_null/sum_double_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_double_null/sum_double_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_empty_01/sum_empty_01.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_empty_01/sum_empty_01.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_empty_01/sum_empty_01.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_empty_01/sum_empty_01.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_empty_02/sum_empty_02.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_empty_02/sum_empty_02.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_empty_02/sum_empty_02.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_empty_02/sum_empty_02.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_float/sum_float.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_float/sum_float.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_float/sum_float.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_float/sum_float.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_float_null/sum_float_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_float_null/sum_float_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_float_null/sum_float_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_float_null/sum_float_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int16/sum_int16.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_int16/sum_int16.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int16/sum_int16.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_int16/sum_int16.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_int16_null/sum_int16_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_int16_null/sum_int16_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_int16_null/sum_int16_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_int16_null/sum_int16_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int32/sum_int32.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_int32/sum_int32.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int32/sum_int32.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_int32/sum_int32.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_int32_null/sum_int32_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_int32_null/sum_int32_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_int32_null/sum_int32_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_int32_null/sum_int32_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int64/sum_int64.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_int64/sum_int64.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int64/sum_int64.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_int64/sum_int64.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_int64_null/sum_int64_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_int64_null/sum_int64_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_int64_null/sum_int64_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_int64_null/sum_int64_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int8/sum_int8.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_int8/sum_int8.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int8/sum_int8.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_int8/sum_int8.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_int8_null/sum_int8_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_int8_null/sum_int8_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_int8_null/sum_int8_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_int8_null/sum_int8_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_mixed/sum_mixed.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_mixed/sum_mixed.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_mixed/sum_mixed.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_mixed/sum_mixed.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_null-with-pred/sum_null-with-pred.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_null-with-pred/sum_null-with-pred.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_null-with-pred/sum_null-with-pred.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_null-with-pred/sum_null-with-pred.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_numeric_null/sum_numeric_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_numeric_null/sum_numeric_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_numeric_null/sum_numeric_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum/sum_numeric_null/sum_numeric_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/issue425_sum_hetero_list/issue425_sum_hetero_list.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/issue425_sum_hetero_list/issue425_sum_hetero_list.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/scalar_sum/scalar_sum.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/scalar_sum/scalar_sum.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/scalar_sum/scalar_sum.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/scalar_sum/scalar_sum.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/scalar_sum_empty/scalar_sum_empty.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/scalar_sum_empty/scalar_sum_empty.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/scalar_sum_empty/scalar_sum_empty.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/scalar_sum_empty/scalar_sum_empty.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_sum_null/scalar_sum_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/scalar_sum_null/scalar_sum_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/scalar_sum_null/scalar_sum_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/scalar_sum_null/scalar_sum_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_double/serial_sum_double.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_double/serial_sum_double.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_double/serial_sum_double.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_double/serial_sum_double.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_double_null/serial_sum_double_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_double_null/serial_sum_double_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_double_null/serial_sum_double_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_double_null/serial_sum_double_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_empty/serial_sum_empty.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_empty/serial_sum_empty.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_empty/serial_sum_empty.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_empty/serial_sum_empty.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_float/serial_sum_float.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_float/serial_sum_float.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_float/serial_sum_float.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_float/serial_sum_float.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_float_null/serial_sum_float_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_float_null/serial_sum_float_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_float_null/serial_sum_float_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_float_null/serial_sum_float_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_int16/serial_sum_int16.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_int16/serial_sum_int16.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_int16/serial_sum_int16.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_int16/serial_sum_int16.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_int16_null/serial_sum_int16_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_int16_null/serial_sum_int16_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_int16_null/serial_sum_int16_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_int16_null/serial_sum_int16_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_int32/serial_sum_int32.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_int32/serial_sum_int32.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_int32/serial_sum_int32.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_int32/serial_sum_int32.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_int32_null/serial_sum_int32_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_int32_null/serial_sum_int32_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_int32_null/serial_sum_int32_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_int32_null/serial_sum_int32_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_int64/serial_sum_int64.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_int64/serial_sum_int64.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_int64/serial_sum_int64.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_int64/serial_sum_int64.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_int64_null/serial_sum_int64_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_int64_null/serial_sum_int64_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_int64_null/serial_sum_int64_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_int64_null/serial_sum_int64_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_int8/serial_sum_int8.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_int8/serial_sum_int8.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_int8/serial_sum_int8.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_int8/serial_sum_int8.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_int8_null/serial_sum_int8_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_int8_null/serial_sum_int8_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/serial_sum_int8_null/serial_sum_int8_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_int8_null/serial_sum_int8_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_mixed/serial_sum_mixed.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_mixed/serial_sum_mixed.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/serial_sum_mixed/serial_sum_mixed.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/serial_sum_mixed/serial_sum_mixed.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_distinct/sum_distinct.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_distinct/sum_distinct.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_distinct/sum_distinct.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_distinct/sum_distinct.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_double/sum_double.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_double/sum_double.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_double/sum_double.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_double/sum_double.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_double_null/sum_double_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_double_null/sum_double_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_double_null/sum_double_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_double_null/sum_double_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_empty_01/sum_empty_01.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_empty_01/sum_empty_01.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_empty_01/sum_empty_01.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_empty_01/sum_empty_01.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_empty_02/sum_empty_02.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_empty_02/sum_empty_02.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_empty_02/sum_empty_02.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_empty_02/sum_empty_02.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_float/sum_float.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_float/sum_float.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_float/sum_float.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_float/sum_float.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_float_null/sum_float_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_float_null/sum_float_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_float_null/sum_float_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_float_null/sum_float_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_int16/sum_int16.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_int16/sum_int16.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_int16/sum_int16.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_int16/sum_int16.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int16_null/sum_int16_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_int16_null/sum_int16_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int16_null/sum_int16_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_int16_null/sum_int16_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_int32/sum_int32.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_int32/sum_int32.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_int32/sum_int32.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_int32/sum_int32.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int32_null/sum_int32_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_int32_null/sum_int32_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int32_null/sum_int32_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_int32_null/sum_int32_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_int64/sum_int64.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_int64/sum_int64.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_int64/sum_int64.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_int64/sum_int64.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int64_null/sum_int64_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_int64_null/sum_int64_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int64_null/sum_int64_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_int64_null/sum_int64_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_int8/sum_int8.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_int8/sum_int8.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_int8/sum_int8.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_int8/sum_int8.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int8_null/sum_int8_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_int8_null/sum_int8_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_int8_null/sum_int8_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_int8_null/sum_int8_null.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_mixed/sum_mixed.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_mixed/sum_mixed.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_mixed/sum_mixed.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_mixed/sum_mixed.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_null-with-pred/sum_null-with-pred.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_null-with-pred/sum_null-with-pred.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate-sql/sum_null-with-pred/sum_null-with-pred.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_null-with-pred/sum_null-with-pred.1.adm
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_numeric_null/sum_numeric_null.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_numeric_null/sum_numeric_null.1.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum_numeric_null/sum_numeric_null.1.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/aggregate/sum/sum_numeric_null/sum_numeric_null.1.adm
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 128a443..bf16d65 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -359,14 +359,14 @@
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <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>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <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>
</compilation-unit>
</test-case>
@@ -434,13 +434,13 @@
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="issue425_sum_hetero_list_1">
- <output-dir compare="Text">issue425_sum_hetero_list_1</output-dir>
+ <compilation-unit name="sum/issue425_sum_hetero_list_1">
+ <output-dir compare="Text">sum/issue425_sum_hetero_list_1</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="issue425_sum_hetero_list">
- <output-dir compare="Text">issue425_sum_hetero_list</output-dir>
+ <compilation-unit name="sum/issue425_sum_hetero_list">
+ <output-dir compare="Text">sum/issue425_sum_hetero_list</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
@@ -779,18 +779,18 @@
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="scalar_sum">
- <output-dir compare="Text">scalar_sum</output-dir>
+ <compilation-unit name="sum/scalar_sum">
+ <output-dir compare="Text">sum/scalar_sum</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="scalar_sum_empty">
- <output-dir compare="Text">scalar_sum_empty</output-dir>
+ <compilation-unit name="sum/scalar_sum_empty">
+ <output-dir compare="Text">sum/scalar_sum_empty</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="scalar_sum_null">
- <output-dir compare="Text">scalar_sum_null</output-dir>
+ <compilation-unit name="sum/scalar_sum_null">
+ <output-dir compare="Text">sum/scalar_sum_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
@@ -1004,74 +1004,74 @@
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="serial_sum_double">
- <output-dir compare="Text">serial_sum_double</output-dir>
+ <compilation-unit name="sum/serial_sum_double">
+ <output-dir compare="Text">sum/serial_sum_double</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="serial_sum_double_null">
- <output-dir compare="Text">serial_sum_double_null</output-dir>
+ <compilation-unit name="sum/serial_sum_double_null">
+ <output-dir compare="Text">sum/serial_sum_double_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="serial_sum_empty">
- <output-dir compare="Text">serial_sum_empty</output-dir>
+ <compilation-unit name="sum/serial_sum_empty">
+ <output-dir compare="Text">sum/serial_sum_empty</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="serial_sum_float">
- <output-dir compare="Text">serial_sum_float</output-dir>
+ <compilation-unit name="sum/serial_sum_float">
+ <output-dir compare="Text">sum/serial_sum_float</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="serial_sum_float_null">
- <output-dir compare="Text">serial_sum_float_null</output-dir>
+ <compilation-unit name="sum/serial_sum_float_null">
+ <output-dir compare="Text">sum/serial_sum_float_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="serial_sum_int16">
- <output-dir compare="Text">serial_sum_int16</output-dir>
+ <compilation-unit name="sum/serial_sum_int16">
+ <output-dir compare="Text">sum/serial_sum_int16</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="serial_sum_int16_null">
- <output-dir compare="Text">serial_sum_int16_null</output-dir>
+ <compilation-unit name="sum/serial_sum_int16_null">
+ <output-dir compare="Text">sum/serial_sum_int16_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="serial_sum_int32">
- <output-dir compare="Text">serial_sum_int32</output-dir>
+ <compilation-unit name="sum/serial_sum_int32">
+ <output-dir compare="Text">sum/serial_sum_int32</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="serial_sum_int32_null">
- <output-dir compare="Text">serial_sum_int32_null</output-dir>
+ <compilation-unit name="sum/serial_sum_int32_null">
+ <output-dir compare="Text">sum/serial_sum_int32_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="serial_sum_int64">
- <output-dir compare="Text">serial_sum_int64</output-dir>
+ <compilation-unit name="sum/serial_sum_int64">
+ <output-dir compare="Text">sum/serial_sum_int64</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="serial_sum_int64_null">
- <output-dir compare="Text">serial_sum_int64_null</output-dir>
+ <compilation-unit name="sum/serial_sum_int64_null">
+ <output-dir compare="Text">sum/serial_sum_int64_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="serial_sum_int64_overflow">
- <output-dir compare="Text">serial_sum_int64_overflow</output-dir>
+ <compilation-unit name="sum/serial_sum_int64_overflow">
+ <output-dir compare="Text">sum/serial_sum_int64_overflow</output-dir>
<expected-error>Overflow in agg-sum</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="serial_sum_int8">
- <output-dir compare="Text">serial_sum_int8</output-dir>
+ <compilation-unit name="sum/serial_sum_int8">
+ <output-dir compare="Text">sum/serial_sum_int8</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="serial_sum_int8_null">
- <output-dir compare="Text">serial_sum_int8_null</output-dir>
+ <compilation-unit name="sum/serial_sum_int8_null">
+ <output-dir compare="Text">sum/serial_sum_int8_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
@@ -1300,99 +1300,99 @@
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_double">
- <output-dir compare="Text">sum_double</output-dir>
+ <compilation-unit name="sum/sum_double">
+ <output-dir compare="Text">sum/sum_double</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_double_null">
- <output-dir compare="Text">sum_double_null</output-dir>
+ <compilation-unit name="sum/sum_double_null">
+ <output-dir compare="Text">sum/sum_double_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_empty_01">
- <output-dir compare="Text">sum_empty_01</output-dir>
+ <compilation-unit name="sum/sum_empty_01">
+ <output-dir compare="Text">sum/sum_empty_01</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_empty_02">
- <output-dir compare="Text">sum_empty_02</output-dir>
+ <compilation-unit name="sum/sum_empty_02">
+ <output-dir compare="Text">sum/sum_empty_02</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_float">
- <output-dir compare="Text">sum_float</output-dir>
+ <compilation-unit name="sum/sum_float">
+ <output-dir compare="Text">sum/sum_float</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_float_null">
- <output-dir compare="Text">sum_float_null</output-dir>
+ <compilation-unit name="sum/sum_float_null">
+ <output-dir compare="Text">sum/sum_float_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_int16">
- <output-dir compare="Text">sum_int16</output-dir>
+ <compilation-unit name="sum/sum_int16">
+ <output-dir compare="Text">sum/sum_int16</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_int16_null">
- <output-dir compare="Text">sum_int16_null</output-dir>
+ <compilation-unit name="sum/sum_int16_null">
+ <output-dir compare="Text">sum/sum_int16_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_int32">
- <output-dir compare="Text">sum_int32</output-dir>
+ <compilation-unit name="sum/sum_int32">
+ <output-dir compare="Text">sum/sum_int32</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_int32_null">
- <output-dir compare="Text">sum_int32_null</output-dir>
+ <compilation-unit name="sum/sum_int32_null">
+ <output-dir compare="Text">sum/sum_int32_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_int64">
- <output-dir compare="Text">sum_int64</output-dir>
+ <compilation-unit name="sum/sum_int64">
+ <output-dir compare="Text">sum/sum_int64</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_int64_null">
- <output-dir compare="Text">sum_int64_null</output-dir>
+ <compilation-unit name="sum/sum_int64_null">
+ <output-dir compare="Text">sum/sum_int64_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_int64_null">
- <output-dir compare="Text">sum_int64_null</output-dir>
+ <compilation-unit name="sum/sum_int64_null">
+ <output-dir compare="Text">sum/sum_int64_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_int64_overflow">
- <output-dir compare="Text">sum_int64_overflow</output-dir>
+ <compilation-unit name="sum/sum_int64_overflow">
+ <output-dir compare="Text">sum/sum_int64_overflow</output-dir>
<expected-error>Overflow in agg-sum</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_int8">
- <output-dir compare="Text">sum_int8</output-dir>
+ <compilation-unit name="sum/sum_int8">
+ <output-dir compare="Text">sum/sum_int8</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_int8_null">
- <output-dir compare="Text">sum_int8_null</output-dir>
+ <compilation-unit name="sum/sum_int8_null">
+ <output-dir compare="Text">sum/sum_int8_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_null-with-pred">
- <output-dir compare="Text">sum_null-with-pred</output-dir>
+ <compilation-unit name="sum/sum_null-with-pred">
+ <output-dir compare="Text">sum/sum_null-with-pred</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_numeric_null">
- <output-dir compare="Text">sum_numeric_null</output-dir>
+ <compilation-unit name="sum/sum_numeric_null">
+ <output-dir compare="Text">sum/sum_numeric_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
- <compilation-unit name="sum_distinct">
- <output-dir compare="Text">sum_distinct</output-dir>
+ <compilation-unit name="sum/sum_distinct">
+ <output-dir compare="Text">sum/sum_distinct</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate">
@@ -1553,14 +1553,14 @@
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <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>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <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>
</compilation-unit>
</test-case>
@@ -1616,13 +1616,13 @@
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="issue425_sum_hetero_list_1">
- <output-dir compare="Text">issue425_sum_hetero_list_1</output-dir>
+ <compilation-unit name="sum/issue425_sum_hetero_list_1">
+ <output-dir compare="Text">sum/issue425_sum_hetero_list_1</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="issue425_sum_hetero_list">
- <output-dir compare="Text">issue425_sum_hetero_list</output-dir>
+ <compilation-unit name="sum/issue425_sum_hetero_list">
+ <output-dir compare="Text">sum/issue425_sum_hetero_list</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
@@ -1971,18 +1971,18 @@
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="scalar_sum">
- <output-dir compare="Text">scalar_sum</output-dir>
+ <compilation-unit name="sum/scalar_sum">
+ <output-dir compare="Text">sum/scalar_sum</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="scalar_sum_empty">
- <output-dir compare="Text">scalar_sum_empty</output-dir>
+ <compilation-unit name="sum/scalar_sum_empty">
+ <output-dir compare="Text">sum/scalar_sum_empty</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="scalar_sum_null">
- <output-dir compare="Text">scalar_sum_null</output-dir>
+ <compilation-unit name="sum/scalar_sum_null">
+ <output-dir compare="Text">sum/scalar_sum_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
@@ -2196,74 +2196,74 @@
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="serial_sum_double">
- <output-dir compare="Text">serial_sum_double</output-dir>
+ <compilation-unit name="sum/serial_sum_double">
+ <output-dir compare="Text">sum/serial_sum_double</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="serial_sum_double_null">
- <output-dir compare="Text">serial_sum_double_null</output-dir>
+ <compilation-unit name="sum/serial_sum_double_null">
+ <output-dir compare="Text">sum/serial_sum_double_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="serial_sum_empty">
- <output-dir compare="Text">serial_sum_empty</output-dir>
+ <compilation-unit name="sum/serial_sum_empty">
+ <output-dir compare="Text">sum/serial_sum_empty</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="serial_sum_float">
- <output-dir compare="Text">serial_sum_float</output-dir>
+ <compilation-unit name="sum/serial_sum_float">
+ <output-dir compare="Text">sum/serial_sum_float</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="serial_sum_float_null">
- <output-dir compare="Text">serial_sum_float_null</output-dir>
+ <compilation-unit name="sum/serial_sum_float_null">
+ <output-dir compare="Text">sum/serial_sum_float_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="serial_sum_int16">
- <output-dir compare="Text">serial_sum_int16</output-dir>
+ <compilation-unit name="sum/serial_sum_int16">
+ <output-dir compare="Text">sum/serial_sum_int16</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="serial_sum_int16_null">
- <output-dir compare="Text">serial_sum_int16_null</output-dir>
+ <compilation-unit name="sum/serial_sum_int16_null">
+ <output-dir compare="Text">sum/serial_sum_int16_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="serial_sum_int32">
- <output-dir compare="Text">serial_sum_int32</output-dir>
+ <compilation-unit name="sum/serial_sum_int32">
+ <output-dir compare="Text">sum/serial_sum_int32</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="serial_sum_int32_null">
- <output-dir compare="Text">serial_sum_int32_null</output-dir>
+ <compilation-unit name="sum/serial_sum_int32_null">
+ <output-dir compare="Text">sum/serial_sum_int32_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="serial_sum_int64">
- <output-dir compare="Text">serial_sum_int64</output-dir>
+ <compilation-unit name="sum/serial_sum_int64">
+ <output-dir compare="Text">sum/serial_sum_int64</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="serial_sum_int64_null">
- <output-dir compare="Text">serial_sum_int64_null</output-dir>
+ <compilation-unit name="sum/serial_sum_int64_null">
+ <output-dir compare="Text">sum/serial_sum_int64_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="serial_sum_int64_overflow">
- <output-dir compare="Text">serial_sum_int64_overflow</output-dir>
+ <compilation-unit name="sum/serial_sum_int64_overflow">
+ <output-dir compare="Text">sum/serial_sum_int64_overflow</output-dir>
<expected-error>Overflow in agg-sum</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="serial_sum_int8">
- <output-dir compare="Text">serial_sum_int8</output-dir>
+ <compilation-unit name="sum/serial_sum_int8">
+ <output-dir compare="Text">sum/serial_sum_int8</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="serial_sum_int8_null">
- <output-dir compare="Text">serial_sum_int8_null</output-dir>
+ <compilation-unit name="sum/serial_sum_int8_null">
+ <output-dir compare="Text">sum/serial_sum_int8_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
@@ -2492,94 +2492,94 @@
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="sum_double">
- <output-dir compare="Text">sum_double</output-dir>
+ <compilation-unit name="sum/sum_double">
+ <output-dir compare="Text">sum/sum_double</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="sum_double_null">
- <output-dir compare="Text">sum_double_null</output-dir>
+ <compilation-unit name="sum/sum_double_null">
+ <output-dir compare="Text">sum/sum_double_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="sum_empty_01">
- <output-dir compare="Text">sum_empty_01</output-dir>
+ <compilation-unit name="sum/sum_empty_01">
+ <output-dir compare="Text">sum/sum_empty_01</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="sum_empty_02">
- <output-dir compare="Text">sum_empty_02</output-dir>
+ <compilation-unit name="sum/sum_empty_02">
+ <output-dir compare="Text">sum/sum_empty_02</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="sum_float">
- <output-dir compare="Text">sum_float</output-dir>
+ <compilation-unit name="sum/sum_float">
+ <output-dir compare="Text">sum/sum_float</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="sum_float_null">
- <output-dir compare="Text">sum_float_null</output-dir>
+ <compilation-unit name="sum/sum_float_null">
+ <output-dir compare="Text">sum/sum_float_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="sum_int16">
- <output-dir compare="Text">sum_int16</output-dir>
+ <compilation-unit name="sum/sum_int16">
+ <output-dir compare="Text">sum/sum_int16</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="sum_int16_null">
- <output-dir compare="Text">sum_int16_null</output-dir>
+ <compilation-unit name="sum/sum_int16_null">
+ <output-dir compare="Text">sum/sum_int16_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="sum_int32">
- <output-dir compare="Text">sum_int32</output-dir>
+ <compilation-unit name="sum/sum_int32">
+ <output-dir compare="Text">sum/sum_int32</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="sum_int32_null">
- <output-dir compare="Text">sum_int32_null</output-dir>
+ <compilation-unit name="sum/sum_int32_null">
+ <output-dir compare="Text">sum/sum_int32_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="sum_int64">
- <output-dir compare="Text">sum_int64</output-dir>
+ <compilation-unit name="sum/sum_int64">
+ <output-dir compare="Text">sum/sum_int64</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="sum_int64_null">
- <output-dir compare="Text">sum_int64_null</output-dir>
+ <compilation-unit name="sum/sum_int64_null">
+ <output-dir compare="Text">sum/sum_int64_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="sum_int64_overflow">
- <output-dir compare="Text">sum_int64_overflow</output-dir>
+ <compilation-unit name="sum/sum_int64_overflow">
+ <output-dir compare="Text">sum/sum_int64_overflow</output-dir>
<expected-error>Overflow in agg-sum</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="sum_int8">
- <output-dir compare="Text">sum_int8</output-dir>
+ <compilation-unit name="sum/sum_int8">
+ <output-dir compare="Text">sum/sum_int8</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="sum_int8_null">
- <output-dir compare="Text">sum_int8_null</output-dir>
+ <compilation-unit name="sum/sum_int8_null">
+ <output-dir compare="Text">sum/sum_int8_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="sum_null-with-pred">
- <output-dir compare="Text">sum_null-with-pred</output-dir>
+ <compilation-unit name="sum/sum_null-with-pred">
+ <output-dir compare="Text">sum/sum_null-with-pred</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="sum_numeric_null">
- <output-dir compare="Text">sum_numeric_null</output-dir>
+ <compilation-unit name="sum/sum_numeric_null">
+ <output-dir compare="Text">sum/sum_numeric_null</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">
- <compilation-unit name="sum_distinct">
- <output-dir compare="Text">sum_distinct</output-dir>
+ <compilation-unit name="sum/sum_distinct">
+ <output-dir compare="Text">sum/sum_distinct</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="aggregate-sql">