asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buyin...@apache.org
Subject [6/6] asterixdb git commit: Renaming SQL++ core aggregation functions:
Date Mon, 03 Oct 2016 00:32:36 GMT
Renaming SQL++ core aggregation functions:

- array_xxx -> coll_xxx, which considers nulls and missings,
- array_sql_xxx -> array_xxx, which ignores nulls and missings.

Change-Id: Ie58c31af69094b93ba21df54f90f5fad28998a34
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1236
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <tillw@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/ccb14080
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/ccb14080
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/ccb14080

Branch: refs/heads/master
Commit: ccb140807aaf31a0892003286f6902e721698710
Parents: d63cd38
Author: Yingyi Bu <yingyi@couchbase.com>
Authored: Fri Sep 30 18:51:28 2016 -0700
Committer: Yingyi Bu <buyingyi@gmail.com>
Committed: Sun Oct 2 17:31:55 2016 -0700

----------------------------------------------------------------------
 .../queries/aggregate/count-dataset.sqlpp       |  2 +-
 .../aggregate/query-ASTERIXDB-1626-2.sqlpp      |  2 +-
 .../aggregate/query-ASTERIXDB-1626-3.sqlpp      |  2 +-
 .../aggregate/query-ASTERIXDB-1626.sqlpp        |  2 +-
 .../queries/query-ASTERIXDB-159-3.sqlpp         |  2 +-
 .../inlined_q18_large_volume_customer.sqlpp     |  4 +--
 .../queries_sqlpp/nest_aggregate.sqlpp          |  2 +-
 .../queries_sqlpp/orders-aggreg.sqlpp           |  4 +--
 .../q01_pricing_summary_report_nt.sqlpp         | 16 +++++-----
 .../queries_sqlpp/q03_shipping_priority.sqlpp   |  2 +-
 .../q05_local_supplier_volume.sqlpp             |  2 +-
 .../queries_sqlpp/query-issue562.sqlpp          |  6 ++--
 .../queries_sqlpp/query-issue697.sqlpp          |  2 +-
 .../queries_sqlpp/query-issue785.sqlpp          |  2 +-
 .../queries_sqlpp/query-issue810-2.sqlpp        |  2 +-
 .../queries_sqlpp/query-issue810.sqlpp          |  2 +-
 .../queries_sqlpp/query-issue827-2.sqlpp        | 16 +++++-----
 .../queries_sqlpp/split-materialization.sqlpp   |  4 +--
 .../agg_null/agg_null.3.query.sqlpp             |  2 +-
 .../agg_null_rec/agg_null_rec.3.query.sqlpp     | 10 +++---
 .../agg_null_rec_1/agg_null_rec_1.3.query.sqlpp | 10 +++---
 .../agg_number/agg_number.3.query.sqlpp         |  2 +-
 .../agg_number_rec/agg_number_rec.3.query.sqlpp | 10 +++---
 .../avg_double/avg_double.3.query.sqlpp         |  2 +-
 .../avg_double_null.3.query.sqlpp               |  2 +-
 .../avg_empty_01/avg_empty_01.1.ddl.sqlpp       |  2 +-
 .../avg_empty_01/avg_empty_01.2.update.sqlpp    |  2 +-
 .../avg_empty_01/avg_empty_01.3.query.sqlpp     |  4 +--
 .../avg_empty_02/avg_empty_02.1.ddl.sqlpp       |  2 +-
 .../avg_empty_02/avg_empty_02.2.update.sqlpp    |  2 +-
 .../avg_empty_02/avg_empty_02.3.query.sqlpp     |  4 +--
 .../avg_float/avg_float.3.query.sqlpp           |  2 +-
 .../avg_float_null/avg_float_nu.3.query.sqlpp   |  2 +-
 .../avg_int16/avg_int16.3.query.sqlpp           |  2 +-
 .../avg_int16_null/avg_int16_null.3.query.sqlpp |  2 +-
 .../avg_int32/avg_int32.3.query.sqlpp           |  2 +-
 .../avg_int32_null/avg_int32_null.3.query.sqlpp |  2 +-
 .../avg_int64/avg_int64.3.query.sqlpp           |  2 +-
 .../avg_int64_null/avg_int64_null.3.query.sqlpp |  2 +-
 .../avg_int8/avg_int8.3.query.sqlpp             |  2 +-
 .../avg_int8_null/avg_int8_null.3.query.sqlpp   |  2 +-
 .../avg_mixed/avg_mixed.1.ddl.sqlpp             |  2 +-
 .../avg_mixed/avg_mixed.3.query.sqlpp           |  4 +--
 .../count_01/count_01.3.query.sqlpp             |  2 +-
 .../count_empty_01/count_empty_01.1.ddl.sqlpp   |  2 +-
 .../count_empty_01.2.update.sqlpp               |  2 +-
 .../count_empty_01/count_empty_01.3.query.sqlpp |  4 +--
 .../count_empty_02/count_empty_02.1.ddl.sqlpp   |  2 +-
 .../count_empty_02.2.update.sqlpp               |  2 +-
 .../count_empty_02/count_empty_02.3.query.sqlpp |  4 +--
 .../count_null/count_null.3.query.sqlpp         |  2 +-
 .../issue395/issue395.3.query.sqlpp             |  2 +-
 .../issue412_0/issue412_0.3.query.sqlpp         |  2 +-
 .../issue412_1/issue412_1.3.query.sqlpp         |  2 +-
 .../issue425_min_hetero_list.3.query.sqlpp      |  2 +-
 .../issue425_min_hetero_list_1.3.query.sqlpp    |  2 +-
 .../issue425_sum_hetero_list.3.query.sqlpp      |  2 +-
 .../issue425_sum_hetero_list_1.3.query.sqlpp    |  2 +-
 .../issue531_string_min_max.1.ddl.sqlpp         |  4 +--
 .../issue531_string_min_max.2.update.sqlpp      |  4 +--
 .../issue531_string_min_max.3.query.sqlpp       |  8 ++---
 .../max_empty_01/max_empty_01.1.ddl.sqlpp       |  2 +-
 .../max_empty_01/max_empty_01.2.update.sqlpp    |  2 +-
 .../max_empty_01/max_empty_01.3.query.sqlpp     |  4 +--
 .../max_empty_02/max_empty_02.1.ddl.sqlpp       |  2 +-
 .../max_empty_02/max_empty_02.2.update.sqlpp    |  2 +-
 .../max_empty_02/max_empty_02.3.query.sqlpp     |  4 +--
 .../min_empty_01/min_empty_01.1.ddl.sqlpp       |  2 +-
 .../min_empty_01/min_empty_01.2.update.sqlpp    |  2 +-
 .../min_empty_01/min_empty_01.3.query.sqlpp     |  4 +--
 .../min_empty_02/min_empty_02.1.ddl.sqlpp       |  2 +-
 .../min_empty_02/min_empty_02.2.update.sqlpp    |  2 +-
 .../min_empty_02/min_empty_02.3.query.sqlpp     |  4 +--
 .../min_mixed/min_mixed.1.ddl.sqlpp             |  2 +-
 .../min_mixed/min_mixed.3.query.sqlpp           |  4 +--
 .../query-issue400/query-issue400.3.query.sqlpp |  2 +-
 .../scalar_avg/scalar_avg.1.ddl.sqlpp           |  2 +-
 .../scalar_avg/scalar_avg.2.update.sqlpp        |  2 +-
 .../scalar_avg/scalar_avg.3.query.sqlpp         | 14 ++++-----
 .../scalar_avg_empty.1.ddl.sqlpp                |  2 +-
 .../scalar_avg_empty.2.update.sqlpp             |  2 +-
 .../scalar_avg_empty.3.query.sqlpp              |  4 +--
 .../scalar_avg_null/scalar_avg_null.1.ddl.sqlpp |  2 +-
 .../scalar_avg_null.2.update.sqlpp              |  2 +-
 .../scalar_avg_null.3.query.sqlpp               | 14 ++++-----
 .../scalar_count/scalar_count.1.ddl.sqlpp       |  2 +-
 .../scalar_count/scalar_count.2.update.sqlpp    |  2 +-
 .../scalar_count/scalar_count.3.query.sqlpp     | 16 +++++-----
 .../scalar_count_empty.1.ddl.sqlpp              |  2 +-
 .../scalar_count_empty.2.update.sqlpp           |  2 +-
 .../scalar_count_empty.3.query.sqlpp            |  4 +--
 .../scalar_count_null.1.ddl.sqlpp               |  2 +-
 .../scalar_count_null.2.update.sqlpp            |  2 +-
 .../scalar_count_null.3.query.sqlpp             | 16 +++++-----
 .../scalar_max/scalar_max.1.ddl.sqlpp           |  2 +-
 .../scalar_max/scalar_max.2.update.sqlpp        |  2 +-
 .../scalar_max/scalar_max.3.query.sqlpp         | 18 +++++------
 .../scalar_max_empty.1.ddl.sqlpp                |  2 +-
 .../scalar_max_empty.2.update.sqlpp             |  2 +-
 .../scalar_max_empty.3.query.sqlpp              |  4 +--
 .../scalar_max_null/scalar_max_null.1.ddl.sqlpp |  2 +-
 .../scalar_max_null.2.update.sqlpp              |  2 +-
 .../scalar_max_null.3.query.sqlpp               | 18 +++++------
 .../scalar_min/scalar_min.1.ddl.sqlpp           |  2 +-
 .../scalar_min/scalar_min.2.update.sqlpp        |  2 +-
 .../scalar_min/scalar_min.3.query.sqlpp         | 18 +++++------
 .../scalar_min_empty.1.ddl.sqlpp                |  2 +-
 .../scalar_min_empty.2.update.sqlpp             |  2 +-
 .../scalar_min_empty.3.query.sqlpp              |  4 +--
 .../scalar_min_null/scalar_min_null.1.ddl.sqlpp |  2 +-
 .../scalar_min_null.2.update.sqlpp              |  2 +-
 .../scalar_min_null.3.query.sqlpp               | 18 +++++------
 .../scalar_sum/scalar_sum.1.ddl.sqlpp           |  2 +-
 .../scalar_sum/scalar_sum.2.update.sqlpp        |  2 +-
 .../scalar_sum/scalar_sum.3.query.sqlpp         | 14 ++++-----
 .../scalar_sum_empty.1.ddl.sqlpp                |  2 +-
 .../scalar_sum_empty.2.update.sqlpp             |  2 +-
 .../scalar_sum_empty.3.query.sqlpp              |  4 +--
 .../scalar_sum_null/scalar_sum_null.1.ddl.sqlpp |  2 +-
 .../scalar_sum_null.2.update.sqlpp              |  2 +-
 .../scalar_sum_null.3.query.sqlpp               | 14 ++++-----
 .../sum_double/sum_double.3.query.sqlpp         |  2 +-
 .../sum_double_null.3.query.sqlpp               |  2 +-
 .../sum_empty_01/sum_empty_01.1.ddl.sqlpp       |  2 +-
 .../sum_empty_01/sum_empty_01.2.update.sqlpp    |  2 +-
 .../sum_empty_01/sum_empty_01.3.query.sqlpp     |  4 +--
 .../sum_empty_02/sum_empty_02.1.ddl.sqlpp       |  2 +-
 .../sum_empty_02/sum_empty_02.2.update.sqlpp    |  2 +-
 .../sum_empty_02/sum_empty_02.3.query.sqlpp     |  4 +--
 .../sum_float/sum_float.3.query.sqlpp           |  2 +-
 .../sum_float_null/sum_float_null.3.query.sqlpp |  2 +-
 .../sum_int16/sum_int16.3.query.sqlpp           |  2 +-
 .../sum_int16_null/sum_int16_null.3.query.sqlpp |  2 +-
 .../sum_int32/sum_int32.3.query.sqlpp           |  2 +-
 .../sum_int32_null/sum_int32_null.3.query.sqlpp |  2 +-
 .../sum_int64/sum_int64.3.query.sqlpp           |  2 +-
 .../sum_int64_null/sum_int64_null.3.query.sqlpp |  2 +-
 .../sum_int8/sum_int8.3.query.sqlpp             |  2 +-
 .../sum_int8_null/sum_int8_null.3.query.sqlpp   |  2 +-
 .../sum_mixed/sum_mixed.1.ddl.sqlpp             |  2 +-
 .../sum_mixed/sum_mixed.3.query.sqlpp           |  4 +--
 .../sum_null-with-pred.1.ddl.sqlpp              |  4 +--
 .../sum_null-with-pred.2.update.sqlpp           |  4 +--
 .../sum_null-with-pred.3.query.sqlpp            |  6 ++--
 .../sum_numeric_null.1.ddl.sqlpp                |  2 +-
 .../sum_numeric_null.2.update.sqlpp             |  2 +-
 .../sum_numeric_null.3.query.sqlpp              |  4 +--
 .../aggregate/agg_null/agg_null.3.query.sqlpp   |  2 +-
 .../agg_null_rec/agg_null_rec.3.query.sqlpp     | 10 +++---
 .../agg_null_rec_1/agg_null_rec_1.3.query.sqlpp | 10 +++---
 .../agg_number/agg_number.3.query.sqlpp         |  2 +-
 .../agg_number_rec/agg_number_rec.3.query.sqlpp | 10 +++---
 .../avg_double/avg_double.3.query.sqlpp         |  2 +-
 .../avg_double_null.3.query.sqlpp               |  2 +-
 .../avg_empty_01/avg_empty_01.3.query.sqlpp     |  2 +-
 .../avg_empty_02/avg_empty_02.3.query.sqlpp     |  2 +-
 .../aggregate/avg_float/avg_float.3.query.sqlpp |  2 +-
 .../avg_float_null/avg_float_nu.3.query.sqlpp   |  2 +-
 .../aggregate/avg_int16/avg_int16.3.query.sqlpp |  2 +-
 .../avg_int16_null/avg_int16_null.3.query.sqlpp |  2 +-
 .../aggregate/avg_int32/avg_int32.3.query.sqlpp |  2 +-
 .../avg_int32_null/avg_int32_null.3.query.sqlpp |  2 +-
 .../aggregate/avg_int64/avg_int64.3.query.sqlpp |  2 +-
 .../avg_int64_null/avg_int64_null.3.query.sqlpp |  2 +-
 .../aggregate/avg_int8/avg_int8.3.query.sqlpp   |  2 +-
 .../avg_int8_null/avg_int8_null.3.query.sqlpp   |  2 +-
 .../aggregate/avg_mixed/avg_mixed.3.query.sqlpp |  2 +-
 .../aggregate/count_01/count_01.3.query.sqlpp   |  2 +-
 .../count_empty_01/count_empty_01.3.query.sqlpp |  2 +-
 .../count_empty_02/count_empty_02.3.query.sqlpp |  2 +-
 .../count_null/count_null.3.query.sqlpp         |  2 +-
 .../aggregate/issue395/issue395.3.query.sqlpp   |  2 +-
 .../issue412_0/issue412_0.3.query.sqlpp         |  2 +-
 .../issue412_1/issue412_1.3.query.sqlpp         |  2 +-
 .../issue425_min_hetero_list.3.query.sqlpp      |  2 +-
 .../issue425_min_hetero_list_1.3.query.sqlpp    |  2 +-
 .../issue425_sum_hetero_list.3.query.sqlpp      |  2 +-
 .../issue425_sum_hetero_list_1.3.query.sqlpp    |  2 +-
 .../issue531_string_min_max.3.query.sqlpp       |  4 +--
 .../max_empty_01/max_empty_01.3.query.sqlpp     |  2 +-
 .../max_empty_02/max_empty_02.3.query.sqlpp     |  2 +-
 .../min_empty_01/min_empty_01.3.query.sqlpp     |  2 +-
 .../min_empty_02/min_empty_02.3.query.sqlpp     |  2 +-
 .../aggregate/min_mixed/min_mixed.3.query.sqlpp |  2 +-
 .../query-issue400/query-issue400.3.query.sqlpp |  2 +-
 .../scalar_avg/scalar_avg.3.query.sqlpp         | 12 ++++----
 .../scalar_avg_empty.3.query.sqlpp              |  2 +-
 .../scalar_avg_null.3.query.sqlpp               | 12 ++++----
 .../scalar_count/scalar_count.3.query.sqlpp     | 14 ++++-----
 .../scalar_count_empty.3.query.sqlpp            |  2 +-
 .../scalar_count_null.3.query.sqlpp             | 14 ++++-----
 .../scalar_max/scalar_max.3.query.sqlpp         | 16 +++++-----
 .../scalar_max_empty.3.query.sqlpp              |  2 +-
 .../scalar_max_null.3.query.sqlpp               | 16 +++++-----
 .../scalar_min/scalar_min.3.query.sqlpp         | 16 +++++-----
 .../scalar_min_empty.3.query.sqlpp              |  2 +-
 .../scalar_min_null.3.query.sqlpp               | 16 +++++-----
 .../scalar_sum/scalar_sum.3.query.sqlpp         | 12 ++++----
 .../scalar_sum_empty.3.query.sqlpp              |  2 +-
 .../scalar_sum_null.3.query.sqlpp               | 12 ++++----
 .../sum_double/sum_double.3.query.sqlpp         |  2 +-
 .../sum_double_null.3.query.sqlpp               |  2 +-
 .../sum_empty_01/sum_empty_01.3.query.sqlpp     |  2 +-
 .../sum_empty_02/sum_empty_02.3.query.sqlpp     |  2 +-
 .../aggregate/sum_float/sum_float.3.query.sqlpp |  2 +-
 .../sum_float_null/sum_float_null.3.query.sqlpp |  2 +-
 .../aggregate/sum_int16/sum_int16.3.query.sqlpp |  2 +-
 .../sum_int16_null/sum_int16_null.3.query.sqlpp |  2 +-
 .../aggregate/sum_int32/sum_int32.3.query.sqlpp |  2 +-
 .../sum_int32_null/sum_int32_null.3.query.sqlpp |  2 +-
 .../aggregate/sum_int64/sum_int64.3.query.sqlpp |  2 +-
 .../sum_int64_null/sum_int64_null.3.query.sqlpp |  2 +-
 .../aggregate/sum_int8/sum_int8.3.query.sqlpp   |  2 +-
 .../sum_int8_null/sum_int8_null.3.query.sqlpp   |  2 +-
 .../aggregate/sum_mixed/sum_mixed.3.query.sqlpp |  2 +-
 .../sum_null-with-pred.1.ddl.sqlpp              |  2 +-
 .../sum_null-with-pred.2.update.sqlpp           |  2 +-
 .../sum_null-with-pred.3.query.sqlpp            |  4 +--
 .../sum_numeric_null.1.ddl.sqlpp                |  2 +-
 .../sum_numeric_null.2.update.sqlpp             |  2 +-
 .../sum_numeric_null.3.query.sqlpp              |  4 +--
 .../cross-dv03/cross-dv03.3.query.sqlpp         |  2 +-
 .../custord/join_q_06/join_q_06.3.query.sqlpp   |  2 +-
 .../custord/join_q_07/join_q_07.3.query.sqlpp   |  2 +-
 .../query-issue382/query-issue382.3.query.sqlpp |  2 +-
 ...pricing_summary_report_failure.3.query.sqlpp | 16 +++++-----
 .../feeds/feeds_07/feeds_07.3.query.sqlpp       |  2 +-
 .../feeds/feeds_08/feeds_08.3.query.sqlpp       |  2 +-
 .../feeds/feeds_09/feeds_09.3.query.sqlpp       |  2 +-
 .../feeds/feeds_10/feeds_10.3.query.sqlpp       |  2 +-
 .../flwor/grpby01/grpby01.3.query.sqlpp         |  2 +-
 .../flwor/grpby02/grpby02.3.query.sqlpp         |  2 +-
 .../query-ASTERIXDB-883.3.query.sqlpp           |  6 ++--
 .../q06_error/q06_error.3.query.sqlpp           |  2 +-
 .../global-aggregate/q08/q08.3.query.sqlpp      |  2 +-
 .../query-ASTERIXDB-159.3.query.sqlpp           |  2 +-
 .../query-ASTERIXDB-1626-2.3.query.sqlpp        |  2 +-
 .../query-ASTERIXDB-1626.3.query.sqlpp          |  2 +-
 .../group-by/core-01/core-01.3.query.sqlpp      |  2 +-
 .../group-by/core-02/core-02.3.query.sqlpp      |  2 +-
 .../group-by/core-03/core-02.3.query.sqlpp      |  2 +-
 .../group-by/core-05/core-05.3.query.sqlpp      |  2 +-
 .../group-by/having-2/having-2.3.query.sqlpp    |  2 +-
 .../sugar-01-negative.3.query.sqlpp             |  4 +--
 .../hdfs/hdfs_02/hdfs_02.3.query.sqlpp          |  2 +-
 .../hdfs/hdfs_03/hdfs_03.3.query.sqlpp          |  2 +-
 .../hdfs_shortcircuit.3.query.sqlpp             |  2 +-
 .../issue_251_dataset_hint_6.3.query.sqlpp      |  2 +-
 .../list/listify_03/listify_03.3.query.sqlpp    |  4 +--
 .../query-ASTERIXDB-159-2.3.query.sqlpp         |  2 +-
 .../query-ASTERIXDB-159-3.3.query.sqlpp         |  2 +-
 .../issue289_query/issue289_query.3.query.sqlpp |  2 +-
 .../assign-reuse/assign-reuse.3.query.sqlpp     |  4 +--
 .../groupby-orderby-count.3.query.sqlpp         |  4 +--
 .../query-issue258.2.update.sqlpp               |  2 +-
 .../everysat_03/everysat_03.3.query.sqlpp       |  2 +-
 .../somesat_03/somesat_03.3.query.sqlpp         |  2 +-
 .../somesat_04/somesat_04.3.query.sqlpp         |  2 +-
 .../count-nullable/count-nullable.3.query.sqlpp |  2 +-
 ...ell-aggregation-with-filtering.3.query.sqlpp |  2 +-
 .../cell-aggregation.3.query.sqlpp              |  2 +-
 .../relational_division2.3.query.sqlpp          |  2 +-
 .../q01_pricing_summary_report_nt.3.query.sqlpp | 16 +++++-----
 .../temporal/agg_max/agg_max.3.query.sqlpp      | 10 +++---
 .../temporal/agg_min/agg_min.3.query.sqlpp      | 10 +++---
 .../overlap_bins_gby_1.3.query.sqlpp            |  2 +-
 .../overlap_bins_gby_3.3.query.sqlpp            |  4 +--
 .../query-ASTERIXDB-1331.25.query.sqlpp         |  2 +-
 .../tinysocial-suite.14.query.sqlpp             |  2 +-
 .../tinysocial-suite.22.query.sqlpp             |  2 +-
 .../tinysocial-suite.14.query.sqlpp             |  2 +-
 .../tinysocial-suite.22.query.sqlpp             |  2 +-
 .../tinysocial-suite.25.query.sqlpp             |  2 +-
 .../query-ASTERIXDB-1580.3.query.sqlpp          |  2 +-
 .../query-ASTERIXDB-1602.3.query.sqlpp          |  2 +-
 .../q01_pricing_summary_report_nt.3.query.sqlpp | 14 ++++-----
 .../q02_minimum_cost_supplier.3.query.sqlpp     |  2 +-
 .../q03_shipping_priority_nt.3.query.sqlpp      |  2 +-
 .../q04_order_priority.3.query.sqlpp            |  2 +-
 .../q05_local_supplier_volume.3.query.sqlpp     |  2 +-
 .../q07_volume_shipping.3.query.sqlpp           |  2 +-
 .../q08_national_market_share.3.query.sqlpp     |  4 +--
 .../q09_product_type_profit_nt.3.query.sqlpp    |  2 +-
 .../q10_returned_item.3.query.sqlpp             |  2 +-
 .../q10_returned_item_int64.3.query.sqlpp       |  2 +-
 .../q11_important_stock.3.query.sqlpp           |  4 +--
 .../q12_shipping/q12_shipping.3.query.sqlpp     |  4 +--
 .../q13_customer_distribution.3.query.sqlpp     |  4 +--
 .../q14_promotion_effect.3.query.sqlpp          |  4 +--
 .../q15_top_supplier.3.query.sqlpp              |  4 +--
 ...16_parts_supplier_relationship.3.query.sqlpp |  2 +-
 .../q17_large_gby_variant.3.query.sqlpp         | 20 ++++++------
 ...7_small_quantity_order_revenue.3.query.sqlpp |  4 +--
 .../q18_large_volume_customer.3.query.sqlpp     |  4 +--
 .../q19_discounted_revenue.3.query.sqlpp        |  2 +-
 .../q20_potential_part_promotion.3.query.sqlpp  |  2 +-
 ...pliers_who_kept_orders_waiting.3.query.sqlpp | 10 +++---
 .../q22_global_sales_opportunity.3.query.sqlpp  |  4 +--
 .../query-issue601/query-issue601.3.query.sqlpp |  2 +-
 .../query-issue638/query-issue638.3.query.sqlpp |  2 +-
 .../query-issue785-2.3.query.sqlpp              |  2 +-
 .../query-issue785/query-issue785.3.query.sqlpp |  4 +--
 .../query-issue786/query-issue786.3.query.sqlpp |  2 +-
 .../q13_customer_distribution.3.query.sqlpp     |  2 +-
 .../query-issue562/query-issue562.3.query.sqlpp |  2 +-
 .../query-issue810-2.3.query.sqlpp              |  2 +-
 .../query-issue810-3.3.query.sqlpp              |  4 +--
 .../query-issue810/query-issue810.3.query.sqlpp |  4 +--
 .../q13_customer_distribution.3.query.sqlpp     |  2 +-
 .../query-issue562/query-issue562.3.query.sqlpp |  2 +-
 .../query-issue810-2.3.query.sqlpp              |  2 +-
 .../query-issue810-3.3.query.sqlpp              |  4 +--
 .../query-issue810/query-issue810.3.query.sqlpp |  4 +--
 .../nest_aggregate/nest_aggregate.3.query.sqlpp |  2 +-
 .../nest_aggregate2.3.query.sqlpp               |  2 +-
 .../q01_pricing_summary_report_nt.3.query.sqlpp | 14 ++++-----
 .../q02_minimum_cost_supplier.3.query.sqlpp     |  2 +-
 .../q03_shipping_priority_nt.3.query.sqlpp      |  2 +-
 .../q05_local_supplier_volume.3.query.sqlpp     |  2 +-
 .../q06_forecast_revenue_change.3.query.sqlpp   |  2 +-
 .../q07_volume_shipping.3.query.sqlpp           |  2 +-
 .../q08_national_market_share.3.query.sqlpp     |  4 +--
 .../q09_product_type_profit_nt.3.query.sqlpp    |  2 +-
 .../q10_returned_item.3.query.sqlpp             |  2 +-
 .../q10_returned_item_int64.3.query.sqlpp       |  2 +-
 .../q11_important_stock.3.query.sqlpp           |  4 +--
 .../q12_shipping/q12_shipping.3.query.sqlpp     |  4 +--
 .../q13_customer_distribution.3.query.sqlpp     |  4 +--
 .../q14_promotion_effect.3.query.sqlpp          |  4 +--
 .../q15_top_supplier.3.query.sqlpp              |  4 +--
 ...16_parts_supplier_relationship.3.query.sqlpp |  2 +-
 .../q17_large_gby_variant.3.query.sqlpp         | 20 ++++++------
 ...7_small_quantity_order_revenue.3.query.sqlpp |  4 +--
 .../q18_large_volume_customer.3.query.sqlpp     |  4 +--
 .../q19_discounted_revenue.3.query.sqlpp        |  2 +-
 .../q20_potential_part_promotion.3.query.sqlpp  |  2 +-
 ...pliers_who_kept_orders_waiting.3.query.sqlpp |  8 ++---
 .../q22_global_sales_opportunity.3.query.sqlpp  |  4 +--
 .../query-issue562/query-issue562.3.query.sqlpp |  6 ++--
 .../query-issue785-2.3.query.sqlpp              |  2 +-
 .../query-issue785/query-issue785.3.query.sqlpp |  4 +--
 .../query-issue786/query-issue786.3.query.sqlpp |  2 +-
 .../query-issue810-2.3.query.sqlpp              |  2 +-
 .../query-issue810-3.3.query.sqlpp              |  2 +-
 .../query-issue810/query-issue810.3.query.sqlpp |  2 +-
 .../query-issue827-2.3.query.sqlpp              | 16 +++++-----
 .../query-issue827/query-issue827.3.query.sqlpp |  4 +--
 .../nest_aggregate/nest_aggregate.3.query.sqlpp |  2 +-
 .../nest_aggregate2.3.query.sqlpp               |  2 +-
 .../q01_pricing_summary_report_nt.3.query.sqlpp | 16 +++++-----
 .../q02_minimum_cost_supplier.3.query.sqlpp     |  2 +-
 .../q03_shipping_priority_nt.3.query.sqlpp      |  2 +-
 .../q05_local_supplier_volume.3.query.sqlpp     |  2 +-
 .../q06_forecast_revenue_change.3.query.sqlpp   |  2 +-
 .../q07_volume_shipping.3.query.sqlpp           |  2 +-
 .../q08_national_market_share.3.query.sqlpp     |  4 +--
 .../q09_product_type_profit_nt.3.query.sqlpp    |  2 +-
 .../q10_returned_item.3.query.sqlpp             |  2 +-
 .../q10_returned_item_int64.3.query.sqlpp       |  2 +-
 .../q11_important_stock.3.query.sqlpp           |  4 +--
 .../q12_shipping/q12_shipping.3.query.sqlpp     |  4 +--
 .../q13_customer_distribution.3.query.sqlpp     |  4 +--
 .../q14_promotion_effect.3.query.sqlpp          |  4 +--
 .../q15_top_supplier.3.query.sqlpp              |  4 +--
 ...16_parts_supplier_relationship.3.query.sqlpp |  2 +-
 .../q17_large_gby_variant.3.query.sqlpp         | 20 ++++++------
 ...7_small_quantity_order_revenue.3.query.sqlpp |  4 +--
 .../q18_large_volume_customer.3.query.sqlpp     |  4 +--
 .../q19_discounted_revenue.3.query.sqlpp        |  2 +-
 .../q20_potential_part_promotion.3.query.sqlpp  |  2 +-
 ...pliers_who_kept_orders_waiting.3.query.sqlpp |  8 ++---
 .../q22_global_sales_opportunity.3.query.sqlpp  |  4 +--
 .../query-issue562/query-issue562.3.query.sqlpp |  6 ++--
 .../query-issue638/query-issue638.3.query.sqlpp |  2 +-
 .../query-issue785-2.3.query.sqlpp              |  2 +-
 .../query-issue785/query-issue785.3.query.sqlpp |  4 +--
 .../query-issue786/query-issue786.3.query.sqlpp |  2 +-
 .../query-issue810-2.3.query.sqlpp              |  2 +-
 .../query-issue810-3.3.query.sqlpp              |  2 +-
 .../query-issue810/query-issue810.3.query.sqlpp |  2 +-
 .../query-issue827-2.3.query.sqlpp              | 16 +++++-----
 .../query-issue827/query-issue827.3.query.sqlpp |  4 +--
 .../query-issue489/query-issue489.2.query.sqlpp |  2 +-
 .../query-issue489/query-issue489.4.query.sqlpp |  2 +-
 .../lang/sqlpp/util/FunctionMapUtil.java        | 32 ++++++++++++--------
 385 files changed, 746 insertions(+), 740 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/count-dataset.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/count-dataset.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/count-dataset.sqlpp
index 0c69f5b..c54962f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/count-dataset.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/count-dataset.sqlpp
@@ -31,6 +31,6 @@ create type TinySocial.FacebookUserType as
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
-ARRAY_COUNT(FacebookUsers);
+COLL_COUNT(FacebookUsers);
 
 drop dataverse TinySocial;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-2.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-2.sqlpp
index 40f5a48..4247ef9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-2.sqlpp
@@ -31,5 +31,5 @@ create type TinySocial.FacebookUserType as
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
-SELECT count(`friend-ids`) * avg(array_count(`friend-ids`)) AS total
+SELECT count(`friend-ids`) * avg(coll_count(`friend-ids`)) AS total
 FROM  FacebookUsers;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-3.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-3.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-3.sqlpp
index 518afd1..6a81d64 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-3.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-3.sqlpp
@@ -33,5 +33,5 @@ create  dataset FacebookUsers(FacebookUserType) primary key id;
 
 // The plan uses a group-by operator with the groupAll flag be true.
 WITH t AS 1
-SELECT count(`friend-ids`) * avg(array_count(`friend-ids`)) AS total, t
+SELECT count(`friend-ids`) * avg(coll_count(`friend-ids`)) AS total, t
 FROM  FacebookUsers;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626.sqlpp
index ff8c5ba..7a19526 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626.sqlpp
@@ -31,5 +31,5 @@ create type TinySocial.FacebookUserType as
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
-SELECT count(`friend-ids`), avg(array_count(`friend-ids`))
+SELECT count(`friend-ids`), avg(coll_count(`friend-ids`))
 FROM  FacebookUsers;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-159-3.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-159-3.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-159-3.sqlpp
index f85161d..a41fb6d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-159-3.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-159-3.sqlpp
@@ -32,7 +32,7 @@ create  dataset FacebookUsers(FacebookUserType) primary key id;
 SELECT fu1.id id1, fu2.id id2
 FROM FacebookUsers fu1
 LEFT OUTER JOIN FacebookUsers fu2
-ON ARRAY_COUNT(RANGE(fu1.id, fu2.id))>2 AND ARRAY_COUNT(RANGE(fu1.id, fu2.id))<5
+ON COLL_COUNT(RANGE(fu1.id, fu2.id))>2 AND COLL_COUNT(RANGE(fu1.id, fu2.id))<5
 ORDER BY fu1.id DESC, fu2.id DESC
 LIMIT 5;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inlined_q18_large_volume_customer.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inlined_q18_large_volume_customer.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inlined_q18_large_volume_customer.sqlpp
index 12896bc..16b9c89 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inlined_q18_large_volume_customer.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inlined_q18_large_volume_customer.sqlpp
@@ -79,14 +79,14 @@ create  dataset Orders(OrderType) primary key o_orderkey on group1;
 create  dataset Customers(CustomerType) primary key c_custkey on group1;
 
 write output to asterix_nc1:"/tmp/inlined_q18_large_volume_customer.adm"
-select element {'c_name':c_name,'c_custkey':c_custkey,'o_orderkey':o_orderkey,'o_orderdate':o_orderdate,'o_totalprice':o_totalprice,'sum_quantity':inlined_q18_large_volume_customer.array_sum((
+select element {'c_name':c_name,'c_custkey':c_custkey,'o_orderkey':o_orderkey,'o_orderdate':o_orderdate,'o_totalprice':o_totalprice,'sum_quantity':inlined_q18_large_volume_customer.coll_sum((
         select element j.l_quantity
         from  l as j
     ))}
 from  Customers as c,
       Orders as o,
       (
-    select element {'l_orderkey':l_orderkey,'t_sum_quantity':inlined_q18_large_volume_customer.array_sum((
+    select element {'l_orderkey':l_orderkey,'t_sum_quantity':inlined_q18_large_volume_customer.coll_sum((
             select element i.l_quantity
             from  l as i
         ))}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nest_aggregate.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nest_aggregate.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nest_aggregate.sqlpp
index 488aa12..1c2e4c9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nest_aggregate.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nest_aggregate.sqlpp
@@ -124,7 +124,7 @@ select element {'nation_key':nation.n_nationkey,'name':nation.n_name,'aggregates
               Customer as customer
         where ((orders.o_custkey = customer.c_custkey) and (customer.c_nationkey = nation.n_nationkey))
         group by orders.o_orderdate as orderdate
-        with  sum as tpch.array_sum((
+        with  sum as tpch.coll_sum((
               select element o.o_totalprice
               from  orders as o
           ))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp
index 734f80b..2f0230c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp
@@ -40,10 +40,10 @@ create  nodegroup group1 if not exists  on
 create  dataset Orders(OrderType) primary key oid on group1;
 
 write output to asterix_nc1:"/tmp/orders-aggreg.adm"
-select element {'cid':cid,'ordpercust':`orders-aggreg`.array_count(o),'totalcust':`orders-aggreg`.array_sum((
+select element {'cid':cid,'ordpercust':`orders-aggreg`.coll_count(o),'totalcust':`orders-aggreg`.coll_sum((
         select element i.total
         from  o as i
-    )),'avgcust':`orders-aggreg`.array_avg((
+    )),'avgcust':`orders-aggreg`.coll_avg((
         select element i.total
         from  o as i
     ))}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q01_pricing_summary_report_nt.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q01_pricing_summary_report_nt.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q01_pricing_summary_report_nt.sqlpp
index db5e29f..637eb23 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q01_pricing_summary_report_nt.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q01_pricing_summary_report_nt.sqlpp
@@ -48,28 +48,28 @@ create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 load  dataset LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
 write output to asterix_nc1:"rttest/tpch_q1_pricing_summary_report_nt.adm"
-select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'sum_qty':tpch.array_sum((
+select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'sum_qty':tpch.coll_sum((
         select element i.l_quantity
         from  l as i
-    )),'sum_base_price':tpch.array_sum((
+    )),'sum_base_price':tpch.coll_sum((
         select element i.l_extendedprice
         from  l as i
-    )),'sum_disc_price':tpch.array_sum((
+    )),'sum_disc_price':tpch.coll_sum((
         select element (i.l_extendedprice * (1 - i.l_discount))
         from  l as i
-    )),'sum_charge':tpch.array_sum((
+    )),'sum_charge':tpch.coll_sum((
         select element (i.l_extendedprice * (1 - i.l_discount) * (1 + i.l_tax))
         from  l as i
-    )),'ave_qty':tpch.array_avg((
+    )),'ave_qty':tpch.coll_avg((
         select element i.l_quantity
         from  l as i
-    )),'ave_price':tpch.array_avg((
+    )),'ave_price':tpch.coll_avg((
         select element i.l_extendedprice
         from  l as i
-    )),'ave_disc':tpch.array_avg((
+    )),'ave_disc':tpch.coll_avg((
         select element i.l_discount
         from  l as i
-    )),'count_order':tpch.array_count(l)}
+    )),'count_order':tpch.coll_count(l)}
 from  LineItem as l
 where (l.l_shipdate <= '1998-09-02')
 /* +hash */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp
index 6765482..95297b3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp
@@ -86,7 +86,7 @@ from  Customers as c,
 where (((c.c_mktsegment = 'BUILDING') and (c.c_custkey = o.o_custkey)) and ((l.l_orderkey = o.o_orderkey) and (o.o_orderdate < '1995-03-15') and (l.l_shipdate > '1995-03-15')))
 /* +hash */
 group by l.l_orderkey as l_orderkey,o.o_orderdate as o_orderdate,o.o_shippriority as o_shippriority
-with  revenue as q3_shipping_priority.array_sum((
+with  revenue as q3_shipping_priority.coll_sum((
       select element (i.l_extendedprice * (1 - i.l_discount))
       from  l as i
   ))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp
index ae0f070..810d0fb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp
@@ -137,7 +137,7 @@ from  Customers as c,
 where ((c.c_nationkey = o1.s_nationkey) and (c.c_custkey = o1.o_custkey))
 /* +hash */
 group by o1.n_name as n_name
-with  revenue as q5_local_supplier.array_sum((
+with  revenue as q5_local_supplier.coll_sum((
       select element (i.l_extendedprice * (1 - i.l_discount))
       from  o1 as i
   ))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue562.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue562.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue562.sqlpp
index d869b55..7d4e947 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue562.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue562.sqlpp
@@ -86,18 +86,18 @@ declare function q22_customer_tmp() {
     where ((phone_substr = '13') or (phone_substr = '31') or (phone_substr = '23') or (phone_substr = '29') or (phone_substr = '30') or (phone_substr = '18') or (phone_substr = '17'))
 )
 };
-with  avg as tpch.array_avg((
+with  avg as tpch.coll_avg((
       select element c.c_acctbal
       from  Customer as c
       with  phone_substr as tpch.substring(c.c_phone,1,2)
       where ((c.c_acctbal > 0.0) and ((phone_substr = '13') or (phone_substr = '31') or (phone_substr = '23') or (phone_substr = '29') or (phone_substr = '30') or (phone_substr = '18') or (phone_substr = '17')))
   ))
-select element {'cntrycode':cntrycode,'numcust':tpch.array_count(ct),'totacctbal':tpch.array_sum((
+select element {'cntrycode':cntrycode,'numcust':tpch.coll_count(ct),'totacctbal':tpch.coll_sum((
         select element i.c_acctbal
         from  ct as i
     ))}
 from  tpch.q22_customer_tmp() as ct
-where (tpch.array_count((
+where (tpch.coll_count((
     select element o
     from  Orders as o
     where (ct.c_custkey = o.o_custkey)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue697.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue697.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue697.sqlpp
index 63a2489..2e26344 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue697.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue697.sqlpp
@@ -37,7 +37,7 @@ create type test.TestType as
 
 create  dataset test(TestType) primary key key1;
 
-select element {'gid':aid,'avg':test.array_avg((
+select element {'gid':aid,'avg':test.coll_avg((
         select element j.`value`
         from  i as j
         where j.`value` is not null

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue785.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue785.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue785.sqlpp
index 58ac609..7b528f9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue785.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue785.sqlpp
@@ -105,7 +105,7 @@ with  t as (
             Orders as orders
       where ((orders.o_custkey = customer.c_custkey) and (customer.c_nationkey = n.n_nationkey))
       group by orders.o_orderdate as orderdate,n.n_nationkey as nation_key
-      with  sum as tpch.array_sum((
+      with  sum as tpch.coll_sum((
             select element o.o_totalprice
             from  orders as o
         ))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810-2.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810-2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810-2.sqlpp
index 6d0e91f..2b49c5f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810-2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810-2.sqlpp
@@ -51,7 +51,7 @@ create type tpch.LineItemType as
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
-select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'count_cheaps':tpch.array_count(cheaps),'avg_expensive_discounts':tpch.array_avg(expensives),'sum_disc_prices':tpch.array_sum(disc_prices),'total_charges':tpch.array_sum(charges)}
+select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'count_cheaps':tpch.coll_count(cheaps),'avg_expensive_discounts':tpch.coll_avg(expensives),'sum_disc_prices':tpch.coll_sum(disc_prices),'total_charges':tpch.coll_sum(charges)}
 from  LineItem as l
 where (l.l_shipdate <= '1998-09-02')
 /* +hash */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810.sqlpp
index 1210c38..c7ba82c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810.sqlpp
@@ -51,7 +51,7 @@ create type tpch.LineItemType as
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
-select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'count_cheaps':tpch.array_count(cheap),'count_expensives':tpch.array_count(expensive)}
+select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'count_cheaps':tpch.coll_count(cheap),'count_expensives':tpch.coll_count(expensive)}
 from  LineItem as l
 where (l.l_shipdate <= '1998-09-02')
 /* +hash */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue827-2.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue827-2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue827-2.sqlpp
index 4ab1498..6c4f243 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue827-2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue827-2.sqlpp
@@ -51,30 +51,30 @@ create type tpch.LineItemType as
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
-{'sum_qty_partial':tpch.array_sum((
+{'sum_qty_partial':tpch.coll_sum((
     select element i.l_quantity
     from  LineItem as i
     where (i.l_shipdate <= '1998-09-02')
-)),'sum_base_price':tpch.array_sum((
+)),'sum_base_price':tpch.coll_sum((
     select element i.l_extendedprice
     from  LineItem as i
-)),'sum_disc_price':tpch.array_sum((
+)),'sum_disc_price':tpch.coll_sum((
     select element (i.l_extendedprice * (1 - i.l_discount))
     from  LineItem as i
-)),'sum_charge':tpch.array_sum((
+)),'sum_charge':tpch.coll_sum((
     select element (i.l_extendedprice * (1 - i.l_discount) * (1 + i.l_tax))
     from  LineItem as i
-)),'ave_qty':tpch.array_avg((
+)),'ave_qty':tpch.coll_avg((
     select element i.l_quantity
     from  LineItem as i
     where (i.l_shipdate <= '1998-09-02')
-)),'ave_price':tpch.array_avg((
+)),'ave_price':tpch.coll_avg((
     select element i.l_extendedprice
     from  LineItem as i
-)),'ave_disc':tpch.array_avg((
+)),'ave_disc':tpch.coll_avg((
     select element i.l_discount
     from  LineItem as i
-)),'count_order':tpch.array_count((
+)),'count_order':tpch.coll_count((
     select element l
     from  LineItem as l
 ))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/split-materialization.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/split-materialization.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/split-materialization.sqlpp
index abfe634..8d72bc3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/split-materialization.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/split-materialization.sqlpp
@@ -45,12 +45,12 @@ create  dataset FacebookUsers(FacebookUserType) primary key id;
 with  lonelyusers as (
       select element d
       from  FacebookUsers as d
-      where (TinySocial.array_count(d.`friend-ids`) < 2)
+      where (TinySocial.coll_count(d.`friend-ids`) < 2)
   ),
       lonelyusers2 as (
       select element d
       from  FacebookUsers as d
-      where (TinySocial.array_count(d.`friend-ids`) < 2)
+      where (TinySocial.coll_count(d.`friend-ids`) < 2)
   )
 select element {'user1':{'id':l1.id,'name':l1.name},'user2':{'id':l2.id,'name':l2.name}}
 from  lonelyusers as l1,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null/agg_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null/agg_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null/agg_null.3.query.sqlpp
index 882a615..911bb59 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null/agg_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null/agg_null.3.query.sqlpp
@@ -22,4 +22,4 @@
 * Date         : Feb 7th 2014
 */
 
-{'sql-count1':array_sql_count([null]),'average1':array_sql_avg([null]),'sql-sum1':array_sql_sum([null]),'sql-min1':array_sql_min([null]),'sql-max1':array_sql_max([null]),'sql-count2':array_sql_count({{null,null}}),'average2':array_sql_avg({{null,null}}),'sql-sum2':array_sql_sum({{null,null}}),'sql-min2':array_sql_min({{null,null}}),'sql-max2':array_sql_max({{null,null}})};
+{'sql-count1':array_count([null]),'average1':array_avg([null]),'sql-sum1':array_sum([null]),'sql-min1':array_min([null]),'sql-max1':array_max([null]),'sql-count2':array_count({{null,null}}),'average2':array_avg({{null,null}}),'sql-sum2':array_sum({{null,null}}),'sql-min2':array_min({{null,null}}),'sql-max2':array_max({{null,null}})};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.query.sqlpp
index 9993664..1307ccc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.query.sqlpp
@@ -25,19 +25,19 @@
 use test;
 
 
-{'sql-count':test.array_sql_count((
+{'sql-count':test.array_count((
     select element t.valplus
     from  Test as t
-)),'average':test.array_sql_avg((
+)),'average':test.array_avg((
     select element t.valplus
     from  Test as t
-)),'sql-sum':test.array_sql_sum((
+)),'sql-sum':test.array_sum((
     select element t.valplus
     from  Test as t
-)),'sql-min':test.array_sql_min((
+)),'sql-min':test.array_min((
     select element t.valplus
     from  Test as t
-)),'sql-max':test.array_sql_max((
+)),'sql-max':test.array_max((
     select element t.valplus
     from  Test as t
 ))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp
index 0a17057..629a7bb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp
@@ -25,28 +25,28 @@
 use test;
 
 
-{'sql-count':test.array_sql_count((
+{'sql-count':test.array_count((
     select element t
     from  Test as t
-)),'average':test.array_sql_avg((
+)),'average':test.array_avg((
     select element i.val
     from  (
         select element t
         from  Test as t
     ) as i
-)),'sql-sum':test.array_sql_sum((
+)),'sql-sum':test.array_sum((
     select element i.val
     from  (
         select element t
         from  Test as t
     ) as i
-)),'sql-min':test.array_sql_min((
+)),'sql-min':test.array_min((
     select element i.valplus
     from  (
         select element t
         from  Test as t
     ) as i
-)),'sql-max':test.array_sql_max((
+)),'sql-max':test.array_max((
     select element i.valplus
     from  (
         select element t

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number/agg_number.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number/agg_number.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number/agg_number.3.query.sqlpp
index a3308af..cc5aaa0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number/agg_number.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number/agg_number.3.query.sqlpp
@@ -22,4 +22,4 @@
 * Date         : Feb 7th 2014
 */
 
-{'sql-count1':array_sql_count([float('2.0'),double('3.0'),93847382783847382,1]),'average1':array_sql_avg([float('2.0'),double('3.0'),93847382783847382,1]),'sql-sum1':array_sql_sum([float('2.0'),double('3.0'),93847382783847382,1]),'sql-min1':array_sql_min([float('2.0'),double('3.0'),93847382783847382,1]),'sql-max1':array_sql_max([float('2.0'),double('3.0'),93847382783847382,1]),'sql-count2':array_sql_count({{float('2.0'),double('3.0'),93847382783847382,1}}),'average2':array_sql_avg({{float('2.0'),double('3.0'),93847382783847382,1}}),'sql-sum2':array_sql_sum({{float('2.0'),double('3.0'),93847382783847382,1}}),'sql-min2':array_sql_min({{float('2.0'),double('3.0'),93847382783847382,1}}),'sql-max2':array_sql_max({{float('2.0'),double('3.0'),93847382783847382,1}})};
+{'sql-count1':array_count([float('2.0'),double('3.0'),93847382783847382,1]),'average1':array_avg([float('2.0'),double('3.0'),93847382783847382,1]),'sql-sum1':array_sum([float('2.0'),double('3.0'),93847382783847382,1]),'sql-min1':array_min([float('2.0'),double('3.0'),93847382783847382,1]),'sql-max1':array_max([float('2.0'),double('3.0'),93847382783847382,1]),'sql-count2':array_count({{float('2.0'),double('3.0'),93847382783847382,1}}),'average2':array_avg({{float('2.0'),double('3.0'),93847382783847382,1}}),'sql-sum2':array_sum({{float('2.0'),double('3.0'),93847382783847382,1}}),'sql-min2':array_min({{float('2.0'),double('3.0'),93847382783847382,1}}),'sql-max2':array_max({{float('2.0'),double('3.0'),93847382783847382,1}})};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.query.sqlpp
index bd70811..8476060 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.query.sqlpp
@@ -25,19 +25,19 @@
 use test;
 
 
-{'sql-count':test.array_sql_count((
+{'sql-count':test.array_count((
     select element t.valplus
     from  Test as t
-)),'average':test.array_sql_avg((
+)),'average':test.array_avg((
     select element t.valplus
     from  Test as t
-)),'sql-sum':test.array_sql_sum((
+)),'sql-sum':test.array_sum((
     select element t.valplus
     from  Test as t
-)),'sql-min':test.array_sql_min((
+)),'sql-min':test.array_min((
     select element t.valplus
     from  Test as t
-)),'sql-max':test.array_sql_max((
+)),'sql-max':test.array_max((
     select element t.valplus
     from  Test as t
 ))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double/avg_double.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double/avg_double.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double/avg_double.3.query.sqlpp
index 6b2de79..9c8daf3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double/avg_double.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double/avg_double.3.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-select element array_sql_avg((
+select element array_avg((
     select element x
     from  [1.0,2.0,double('3.0')] as x
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.query.sqlpp
index b395904..8d2b48d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.query.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-{'average':test.array_sql_avg((
+{'average':test.array_avg((
     select element x.doubleField
     from  Numeric as x
 ))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.1.ddl.sqlpp
index d61f2fc..a6590c5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that array_sql-avg aggregation correctly returns null for an empty stream,
+ * Description    : Tests that array_avg aggregation correctly returns null for an empty stream,
  *                  without an aggregate combiner.
  * Success        : Yes
  */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.2.update.sqlpp
index cfc4f9e..06819ab 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.2.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that array_sql-avg aggregation correctly returns null for an empty stream,
+ * Description    : Tests that array_avg aggregation correctly returns null for an empty stream,
  *                  without an aggregate combiner.
  * Success        : Yes
  */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.query.sqlpp
index 05e4590..ff74000 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_01/avg_empty_01.3.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that array_sql-avg aggregation correctly returns null for an empty stream,
+ * Description    : Tests that array_avg aggregation correctly returns null for an empty stream,
  *                  without an aggregate combiner.
  * Success        : Yes
  */
@@ -25,7 +25,7 @@
 use test;
 
 
-select element test.array_sql_avg((
+select element test.array_avg((
     select element x
     from  [1,2,3] as x
     where (x > 10)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.1.ddl.sqlpp
index 6659c71..078ea00 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that array_sql-avg aggregation correctly returns null for an empty stream,
+ * Description    : Tests that array_avg aggregation correctly returns null for an empty stream,
  *                  with an aggregate combiner.
  * Success        : Yes
  */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.2.update.sqlpp
index 90dff6a..916439c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.2.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that array_sql-avg aggregation correctly returns null for an empty stream,
+ * Description    : Tests that array_avg aggregation correctly returns null for an empty stream,
  *                  with an aggregate combiner.
  * Success        : Yes
  */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.query.sqlpp
index 2a0b2dc..e2782ec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that array_sql-avg aggregation correctly returns null for an empty stream,
+ * Description    : Tests that array_avg aggregation correctly returns null for an empty stream,
  *                  with an aggregate combiner.
  * Success        : Yes
  */
@@ -25,7 +25,7 @@
 use test;
 
 
-select element test.array_sql_avg((
+select element test.array_avg((
     select element x.val
     from  Test as x
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float/avg_float.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float/avg_float.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float/avg_float.3.query.sqlpp
index dfd8f57..1d6bc90 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float/avg_float.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float/avg_float.3.query.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-select element test.array_sql_avg((
+select element test.array_avg((
     select element x
     from  [test.float('1'),test.float('2'),test.float('3')] as x
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.query.sqlpp
index 0649826..40dd090 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.query.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-{'average':test.array_sql_avg((
+{'average':test.array_avg((
     select element x.floatField
     from  Numeric as x
 ))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16/avg_int16.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16/avg_int16.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16/avg_int16.3.query.sqlpp
index 46ead9e..1ccd597 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16/avg_int16.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16/avg_int16.3.query.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-select element test.array_sql_avg((
+select element test.array_avg((
     select element x
     from  [test.smallint('1'),test.smallint('2'),test.smallint('3')] as x
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.3.query.sqlpp
index ed6289c..69119d7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.3.query.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-{'average':test.array_sql_avg((
+{'average':test.array_avg((
     select element x.int16Field
     from  Numeric as x
 ))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int32/avg_int32.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int32/avg_int32.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int32/avg_int32.3.query.sqlpp
index 17df72d..335e437 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int32/avg_int32.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int32/avg_int32.3.query.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-select element test.array_sql_avg((
+select element test.array_avg((
     select element x
     from  [test.integer('1'),test.integer('2'),test.integer('3')] as x
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.3.query.sqlpp
index 9721836..466ab1e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.3.query.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-{'average':test.array_sql_avg((
+{'average':test.array_avg((
     select element x.int32Field
     from  Numeric as x
 ))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int64/avg_int64.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int64/avg_int64.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int64/avg_int64.3.query.sqlpp
index 53a796f..d6e9502 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int64/avg_int64.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int64/avg_int64.3.query.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-select element test.array_sql_avg((
+select element test.array_avg((
     select element x
     from  [test.bigint('1'),test.bigint('2'),test.bigint('3')] as x
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.3.query.sqlpp
index 978180c..074e9d2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.3.query.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-{'average':test.array_sql_avg((
+{'average':test.array_avg((
     select element x.int64Field
     from  Numeric as x
 ))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int8/avg_int8.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int8/avg_int8.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int8/avg_int8.3.query.sqlpp
index b74f96b..1544c70 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int8/avg_int8.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int8/avg_int8.3.query.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-select element test.array_sql_avg((
+select element test.array_avg((
     select element x
     from  [test.tinyint('1'),test.tinyint('2'),test.tinyint('3')] as x
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.3.query.sqlpp
index 20a5e70..19ad97c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.3.query.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-{'average':test.array_sql_avg((
+{'average':test.array_avg((
     select element x.int8Field
     from  Numeric as x
 ))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_mixed/avg_mixed.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_mixed/avg_mixed.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_mixed/avg_mixed.1.ddl.sqlpp
index 2be8df7..5dc84e2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_mixed/avg_mixed.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_mixed/avg_mixed.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
-* Description  : Run array_sql-avg over an ordered list with mixed types
+* Description  : Run array_avg over an ordered list with mixed types
 * Expected Res : Failure
 * Date         : Feb 7th 2014
 */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_mixed/avg_mixed.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_mixed/avg_mixed.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_mixed/avg_mixed.3.query.sqlpp
index 16a5fee..8df1b09 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_mixed/avg_mixed.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_mixed/avg_mixed.3.query.sqlpp
@@ -17,12 +17,12 @@
  * under the License.
  */
 /*
-* Description  : Run array_sql-avg over an ordered list with mixed types
+* Description  : Run array_avg over an ordered list with mixed types
 * Expected Res : Failure
 * Date         : Feb 7th 2014
 */
 
-select element array_sql_avg((
+select element array_avg((
     select element x
     from  [float('2.0'),'hello world',93847382783847382,date('2013-01-01')] as x
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_01/count_01.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_01/count_01.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_01/count_01.3.query.sqlpp
index 5233bc8..de303d6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_01/count_01.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_01/count_01.3.query.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-select element test.array_sql_count((
+select element test.array_count((
     select element x
     from  [1,2,3] as x
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_01/count_empty_01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_01/count_empty_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_01/count_empty_01.1.ddl.sqlpp
index 27b06da..77708fc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_01/count_empty_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_01/count_empty_01.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that array_sql-count aggregation correctly returns 0 for an empty stream,
+ * Description    : Tests that array_count aggregation correctly returns 0 for an empty stream,
  *                  without an aggregate combiner.
  * Success        : Yes
  */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_01/count_empty_01.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_01/count_empty_01.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_01/count_empty_01.2.update.sqlpp
index 50949f7..0c8303b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_01/count_empty_01.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_01/count_empty_01.2.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that array_sql-count aggregation correctly returns 0 for an empty stream,
+ * Description    : Tests that array_count aggregation correctly returns 0 for an empty stream,
  *                  without an aggregate combiner.
  * Success        : Yes
  */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_01/count_empty_01.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_01/count_empty_01.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_01/count_empty_01.3.query.sqlpp
index 508416e..c6a290c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_01/count_empty_01.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_01/count_empty_01.3.query.sqlpp
@@ -17,12 +17,12 @@
  * under the License.
  */
 /*
- * Description    : Tests that array_sql-count aggregation correctly returns 0 for an empty stream,
+ * Description    : Tests that array_count aggregation correctly returns 0 for an empty stream,
  *                  without an aggregate combiner.
  * Success        : Yes
  */
 
-select element array_sql_count((
+select element array_count((
     select element x
     from  [1,2,3] as x
     where (x > 10)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.1.ddl.sqlpp
index 986b2a7..f198354 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.1.ddl.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that array_sql-count aggregation correctly returns 0 for an empty stream,
+ * Description    : Tests that array_count aggregation correctly returns 0 for an empty stream,
  *                  with an aggregate combiner.
  * Success        : Yes
  */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.2.update.sqlpp
index 60752ba..81deeb5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.2.update.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that array_sql-count aggregation correctly returns 0 for an empty stream,
+ * Description    : Tests that array_count aggregation correctly returns 0 for an empty stream,
  *                  with an aggregate combiner.
  * Success        : Yes
  */

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.query.sqlpp
index b66d996..c9ae713 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that array_sql-count aggregation correctly returns 0 for an empty stream,
+ * Description    : Tests that array_count aggregation correctly returns 0 for an empty stream,
  *                  with an aggregate combiner.
  * Success        : Yes
  */
@@ -25,7 +25,7 @@
 use test;
 
 
-select element test.array_sql_count((
+select element test.array_count((
     select element x.val
     from  Test as x
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_null/count_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_null/count_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_null/count_null.3.query.sqlpp
index e0ed488..c66d793 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_null/count_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_null/count_null.3.query.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-{'sql-count':test.array_sql_count((
+{'sql-count':test.array_count((
     select element x.doubleField
     from  Numeric as x
 ))};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue395/issue395.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue395/issue395.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue395/issue395.3.query.sqlpp
index e0d7476..ec6b4c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue395/issue395.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue395/issue395.3.query.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-select element test.array_sql_count((
+select element test.array_count((
     select element l.name
     from  Employee as l
 ));

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue412_0/issue412_0.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue412_0/issue412_0.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue412_0/issue412_0.3.query.sqlpp
index 7130acd..3acf186 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue412_0/issue412_0.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue412_0/issue412_0.3.query.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-array_sql_count(['ASTERIX','Hyracks',null]);
+array_count(['ASTERIX','Hyracks',null]);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue412_1/issue412_1.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue412_1/issue412_1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue412_1/issue412_1.3.query.sqlpp
index 468f62c..d59db8e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue412_1/issue412_1.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue412_1/issue412_1.3.query.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-{'sql-count':array_sql_count([1,60,null]),'average':array_sql_avg([1,60,null]),'sql-sum':array_sql_sum([1,60,null]),'sql-min':array_sql_min([1,60,null]),'sql-max':array_sql_max([1,60,null])};
+{'sql-count':array_count([1,60,null]),'average':array_avg([1,60,null]),'sql-sum':array_sum([1,60,null]),'sql-min':array_min([1,60,null]),'sql-max':array_max([1,60,null])};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_min_hetero_list/issue425_min_hetero_list.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_min_hetero_list/issue425_min_hetero_list.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_min_hetero_list/issue425_min_hetero_list.3.query.sqlpp
index 5c4ab77..d513717 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_min_hetero_list/issue425_min_hetero_list.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_min_hetero_list/issue425_min_hetero_list.3.query.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-array_sql_min([23,748374857483]);
+array_min([23,748374857483]);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ccb14080/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.query.sqlpp
index 6f12e6c..1445f79 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.query.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-array_sql_min([748374857483,23,0.5]);
+array_min([748374857483,23,0.5]);


Mime
View raw message