You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by ti...@apache.org on 2018/06/09 04:08:03 UTC
[5/5] asterixdb git commit: [ASTERIXDB-2399][SQL][FUN] Rename COLL_
aggregate functions
[ASTERIXDB-2399][SQL][FUN] Rename COLL_ aggregate functions
Rename to COLL_ functions to use the prefix STRICT_ to reduce the
confusion about which functions implement a strict NULL handling.
Change-Id: I5c103dbe7fa42bf5c4e2bfa53592b2041084aa8f
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2691
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Dmitry Lychagin <dm...@couchbase.com>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/3fd1f236
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/3fd1f236
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/3fd1f236
Branch: refs/heads/master
Commit: 3fd1f2361e98b273859a13a58b8922895f4ef751
Parents: 4dad013
Author: Till Westmann <ti...@apache.org>
Authored: Fri Jun 8 17:51:13 2018 -0700
Committer: Till Westmann <ti...@apache.org>
Committed: Fri Jun 8 21:07:27 2018 -0700
----------------------------------------------------------------------
.../queries/aggregate/count-dataset.sqlpp | 4 +-
.../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 +-
.../queries/query-ASTERIXDB-810-2.sqlpp | 4 +-
.../queries/query-ASTERIXDB-810-3.sqlpp | 4 +-
.../queries/query-ASTERIXDB-810.sqlpp | 4 +-
.../queries/split-materialization.sqlpp | 4 +-
.../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 +-
.../sum_null-with-pred.1.ddl.sqlpp | 2 +-
.../sum_null-with-pred.2.update.sqlpp | 2 +-
.../sum_null-with-pred.3.query.sqlpp | 2 +-
.../sum_numeric_null.1.ddl.sqlpp | 2 +-
.../sum_numeric_null.2.update.sqlpp | 2 +-
.../sum_numeric_null.3.query.sqlpp | 2 +-
.../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_distinct/avg_distinct.1.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_distinct/count_distinct.1.query.sqlpp | 10 +--
.../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_distinct/max_distinct.1.query.sqlpp | 10 +--
.../max_empty_01/max_empty_01.3.query.sqlpp | 2 +-
.../max_empty_02/max_empty_02.3.query.sqlpp | 2 +-
.../min_distinct/min_distinct.1.query.sqlpp | 10 +--
.../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_distinct/sum_distinct.1.query.sqlpp | 10 +--
.../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 +-
.../feeds/feeds_07/feeds_07.3.query.sqlpp | 4 +-
.../feeds/feeds_08/feeds_08.3.query.sqlpp | 2 +-
.../feeds/feeds_09/feeds_09.3.query.sqlpp | 4 +-
.../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 +-
.../core-01-error/core-01-error.3.query.sqlpp | 4 +-
.../group-by/core-01/core-01.3.query.sqlpp | 2 +-
.../core-02-error/core-02-error.3.query.sqlpp | 4 +-
.../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 +-
.../query-issue456/query-issue456.3.query.sqlpp | 2 +-
.../enforced-type-delete.5.query.sqlpp | 2 +-
.../enforced-type-upsert.5.query.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 +-
.../fullyqualified2.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 +-
.../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 | 4 +-
.../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 +-
.../queries_sqlpp/tpcds/q88/q88.3.query.sqlpp | 18 ++---
.../query-ASTERIXDB-1580.3.query.sqlpp | 2 +-
.../query-ASTERIXDB-1602.3.query.sqlpp | 4 +-
.../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 +-
.../q07_volume_shipping.3.query.sqlpp | 2 +-
.../q08_national_market_share.3.query.sqlpp | 6 +-
.../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 | 6 +-
.../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 | 22 +++----
...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 | 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 | 6 +-
.../q15_top_supplier.3.query.sqlpp | 4 +-
...16_parts_supplier_relationship.3.query.sqlpp | 2 +-
.../q17_large_gby_variant.3.query.sqlpp | 22 +++----
...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-issue562/query-issue562.3.query.sqlpp | 6 +-
.../query-issue601/query-issue601.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 +-
.../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 | 22 +++----
...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-issue562/query-issue562.3.query.sqlpp | 6 +-
.../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 +-
.../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 +-
.../resources/benchmarks/tpch/queries/q13.sqlpp | 2 +-
.../main/markdown/builtins/9_aggregate_sql.md | 26 ++++----
.../src/main/markdown/sqlpp/3_query.md | 10 +--
.../lang/sqlpp/util/FunctionMapUtil.java | 69 ++++++++------------
280 files changed, 592 insertions(+), 603 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/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 88f8cd8..48e3a73 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;
-COLL_COUNT(FacebookUsers);
+STRICT_COUNT(FacebookUsers);
-drop dataverse TinySocial;
\ No newline at end of file
+drop dataverse TinySocial;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/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 01a85d8..ae31568 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(coll_count(`friend-ids`)) AS total
+SELECT count(`friend-ids`) * avg(strict_count(`friend-ids`)) AS total
FROM FacebookUsers;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/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 50b799e..57ead72 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(coll_count(`friend-ids`)) AS total, t
+SELECT count(`friend-ids`) * avg(strict_count(`friend-ids`)) AS total, t
FROM FacebookUsers;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/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 8f7a024..d49c51a 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(coll_count(`friend-ids`))
+SELECT count(`friend-ids`), avg(strict_count(`friend-ids`))
FROM FacebookUsers;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/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 8da16a0..a46d514 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 COLL_COUNT(RANGE(fu1.id, fu2.id))>2 AND COLL_COUNT(RANGE(fu1.id, fu2.id))<5
+ON STRICT_COUNT(RANGE(fu1.id, fu2.id))>2 AND STRICT_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/3fd1f236/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810-2.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810-2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810-2.sqlpp
index a05087b..942f39b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810-2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810-2.sqlpp
@@ -53,8 +53,8 @@ CREATE DATASET LineItem(LineItemType) PRIMARY KEY l_orderkey,l_linenumber;
SELECT l_returnflag AS l_returnflag,
l_linestatus AS l_linestatus,
- coll_count(cheap) AS count_cheaps,
- coll_count(expensive) AS count_expensives
+ strict_count(cheap) AS count_cheaps,
+ strict_count(expensive) AS count_expensives
FROM LineItem AS l
/* +hash */
GROUP BY l.l_returnflag AS l_returnflag,l.l_linestatus AS l_linestatus
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810-3.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810-3.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810-3.sqlpp
index 4b94bf6..7dbbab9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810-3.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810-3.sqlpp
@@ -53,8 +53,8 @@ CREATE DATASET LineItem(LineItemType) PRIMARY KEY l_orderkey,l_linenumber;
SELECT l_returnflag AS l_returnflag,
l_linestatus AS l_linestatus,
- coll_count(cheap) AS count_cheaps,
- coll_count(expensive) AS count_expensives
+ strict_count(cheap) AS count_cheaps,
+ strict_count(expensive) AS count_expensives
FROM LineItem AS l
/* +hash */
GROUP BY l.l_returnflag AS l_returnflag,l.l_linestatus AS l_linestatus
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810.sqlpp
index 0a46e9a..4084992 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810.sqlpp
@@ -53,8 +53,8 @@ CREATE DATASET LineItem(LineItemType) PRIMARY KEY l_orderkey,l_linenumber;
SELECT l_returnflag AS l_returnflag,
l_linestatus AS l_linestatus,
- coll_count(cheap) AS count_cheaps,
- coll_count(expensive) AS count_expensives
+ strict_count(cheap) AS count_cheaps,
+ strict_count(expensive) AS count_expensives
FROM LineItem AS l
/* +hash */
GROUP BY l.l_returnflag AS l_returnflag,l.l_linestatus AS l_linestatus
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/optimizerts/queries/split-materialization.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/split-materialization.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/split-materialization.sqlpp
index a32530a..c77559a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/split-materialization.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/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.coll_count(d.`friend-ids`) < 2)
+ where (TinySocial.strict_count(d.`friend-ids`) < 2)
),
lonelyusers2 as (
select element d
from FacebookUsers as d
- where (TinySocial.coll_count(d.`friend-ids`) < 2)
+ where (TinySocial.strict_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/3fd1f236/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 7819959..8d97b03 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.coll_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.strict_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.coll_sum((
+ select element {'l_orderkey':l_orderkey,'t_sum_quantity':inlined_q18_large_volume_customer.strict_sum((
select element i.l_quantity
from l as i
))}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/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 174856f..c7f5afa 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.coll_sum((
+ with sum as tpch.strict_sum((
select element o.o_totalprice
from orders as o
))
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/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 cca0211..5ef7be6 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`.coll_count(g),'totalcust':`orders-aggreg`.coll_sum((
+select element {'cid':cid,'ordpercust':`orders-aggreg`.strict_count(g),'totalcust':`orders-aggreg`.strict_sum((
select element i.o.total
from g as i
- )),'avgcust':`orders-aggreg`.coll_avg((
+ )),'avgcust':`orders-aggreg`.strict_avg((
select element i.o.total
from g as i
))}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/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 6497eea..db8d8cd 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.coll_sum((
+select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'sum_qty':tpch.strict_sum((
select element i.l.l_quantity
from g as i
- )),'sum_base_price':tpch.coll_sum((
+ )),'sum_base_price':tpch.strict_sum((
select element i.l.l_extendedprice
from g as i
- )),'sum_disc_price':tpch.coll_sum((
+ )),'sum_disc_price':tpch.strict_sum((
select element (i.l.l_extendedprice * (1 - i.l.l_discount))
from g as i
- )),'sum_charge':tpch.coll_sum((
+ )),'sum_charge':tpch.strict_sum((
select element (i.l.l_extendedprice * (1 - i.l.l_discount) * (1 + i.l.l_tax))
from g as i
- )),'ave_qty':tpch.coll_avg((
+ )),'ave_qty':tpch.strict_avg((
select element i.l.l_quantity
from g as i
- )),'ave_price':tpch.coll_avg((
+ )),'ave_price':tpch.strict_avg((
select element i.l.l_extendedprice
from g as i
- )),'ave_disc':tpch.coll_avg((
+ )),'ave_disc':tpch.strict_avg((
select element i.l.l_discount
from g as i
- )),'count_order':tpch.coll_count(g)}
+ )),'count_order':tpch.strict_count(g)}
from LineItem as l
where (l.l_shipdate <= '1998-09-02')
/* +hash */
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/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 9c33b03..509ed18 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.coll_sum((
+with revenue as q3_shipping_priority.strict_sum((
select element (i.l_extendedprice * (1 - i.l_discount))
from l as i
))
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/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 b90b3ed..fd520e2 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.coll_sum((
+with revenue as q5_local_supplier.strict_sum((
select element (i.l_extendedprice * (1 - i.l_discount))
from o1 as i
))
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/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 22bff52..d058dd3 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.coll_avg((
+with avg as tpch.strict_avg((
select element c.c_acctbal
from Customer as c
with phone_substr as tpch.substring(c.c_phone,0,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.coll_count(g),'totacctbal':tpch.coll_sum((
+select element {'cntrycode':cntrycode,'numcust':tpch.strict_count(g),'totacctbal':tpch.strict_sum((
select element i.ct.c_acctbal
from g as i
))}
from tpch.q22_customer_tmp() as ct
-where (tpch.coll_count((
+where (tpch.strict_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/3fd1f236/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 2ce1638..eb73380 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.coll_avg((
+select element {'gid':aid,'avg':test.strict_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/3fd1f236/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 ec19977..ee054f4 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.coll_sum((
+ with sum as tpch.strict_sum((
select element o.o_totalprice
from orders as o
))
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/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 a43ca13..bb54619 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.coll_count(cheaps),'avg_expensive_discounts':tpch.coll_avg(expensives),'sum_disc_prices':tpch.coll_sum(disc_prices),'total_charges':tpch.coll_sum(charges)}
+select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'count_cheaps':tpch.strict_count(cheaps),'avg_expensive_discounts':tpch.strict_avg(expensives),'sum_disc_prices':tpch.strict_sum(disc_prices),'total_charges':tpch.strict_sum(charges)}
from LineItem as l
where (l.l_shipdate <= '1998-09-02')
/* +hash */
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/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 aacbb72..0accf10 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.coll_count(cheap),'count_expensives':tpch.coll_count(expensive)}
+select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'count_cheaps':tpch.strict_count(cheap),'count_expensives':tpch.strict_count(expensive)}
from LineItem as l
where (l.l_shipdate <= '1998-09-02')
/* +hash */
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/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 e1d8b97..cc7231f 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.coll_sum((
+{'sum_qty_partial':tpch.strict_sum((
select element i.l_quantity
from LineItem as i
where (i.l_shipdate <= '1998-09-02')
-)),'sum_base_price':tpch.coll_sum((
+)),'sum_base_price':tpch.strict_sum((
select element i.l_extendedprice
from LineItem as i
-)),'sum_disc_price':tpch.coll_sum((
+)),'sum_disc_price':tpch.strict_sum((
select element (i.l_extendedprice * (1 - i.l_discount))
from LineItem as i
-)),'sum_charge':tpch.coll_sum((
+)),'sum_charge':tpch.strict_sum((
select element (i.l_extendedprice * (1 - i.l_discount) * (1 + i.l_tax))
from LineItem as i
-)),'ave_qty':tpch.coll_avg((
+)),'ave_qty':tpch.strict_avg((
select element i.l_quantity
from LineItem as i
where (i.l_shipdate <= '1998-09-02')
-)),'ave_price':tpch.coll_avg((
+)),'ave_price':tpch.strict_avg((
select element i.l_extendedprice
from LineItem as i
-)),'ave_disc':tpch.coll_avg((
+)),'ave_disc':tpch.strict_avg((
select element i.l_discount
from LineItem as i
-)),'count_order':tpch.coll_count((
+)),'count_order':tpch.strict_count((
select element l
from LineItem as l
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/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 a32530a..c77559a 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.coll_count(d.`friend-ids`) < 2)
+ where (TinySocial.strict_count(d.`friend-ids`) < 2)
),
lonelyusers2 as (
select element d
from FacebookUsers as d
- where (TinySocial.coll_count(d.`friend-ids`) < 2)
+ where (TinySocial.strict_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/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/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.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp
index ed067b2..ca84a8b 100644
--- 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_null-with-pred/sum_null-with-pred.1.ddl.sqlpp
@@ -17,7 +17,7 @@
* under the License.
*/
/*
- * Description : sql-coll_sum() aggregate function must return the numeric array_sum, when non null values are given as input to sql-coll_sum().
+ * Description : sql-strict_sum() aggregate function must return the numeric array_sum, when non null values are given as input to sql-strict_sum().
* : Get the array_sum for those tuples which are non null for salary fields.
* Expected result : Success
* Date : July 20th 2012
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/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.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp
index 9b0eb7d..3faf34f 100644
--- 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_null-with-pred/sum_null-with-pred.2.update.sqlpp
@@ -17,7 +17,7 @@
* under the License.
*/
/*
- * Description : sql-coll_sum() aggregate function must return the numeric array_sum, when non null values are given as input to sql-coll_sum().
+ * Description : sql-strict_sum() aggregate function must return the numeric array_sum, when non null values are given as input to sql-strict_sum().
* : Get the array_sum for those tuples which are non null for salary fields.
* Expected result : Success
* Date : July 20th 2012
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/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_null-with-pred/sum_null-with-pred.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp
index 53f0cdb..fe6d3cd 100644
--- 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_null-with-pred/sum_null-with-pred.3.query.sqlpp
@@ -17,7 +17,7 @@
* under the License.
*/
/*
- * Description : sql-coll_sum() aggregate function must return the numeric array_sum, when non null values are given as input to sql-coll_sum().
+ * Description : sql-strict_sum() aggregate function must return the numeric array_sum, when non null values are given as input to sql-strict_sum().
* : Get the array_sum for those tuples which are non null for salary fields.
* Expected result : Success
* Date : July 20th 2012
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/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.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp
index 9b412c3..98b06a8 100644
--- 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_numeric_null/sum_numeric_null.1.ddl.sqlpp
@@ -17,7 +17,7 @@
* under the License.
*/
/*
- * Description : Add numeric values with a null value, sql-coll_sum() aggregate function must return null.
+ * Description : Add numeric values with a null value, sql-strict_sum() aggregate function must return null.
* Expected result : Success
* Date : July 20th 2012
*/
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/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.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.2.update.sqlpp
index 00f93a4..7cdf71b 100644
--- 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_numeric_null/sum_numeric_null.2.update.sqlpp
@@ -17,7 +17,7 @@
* under the License.
*/
/*
- * Description : Add numeric values with a null value, sql-coll_sum() aggregate function must return null.
+ * Description : Add numeric values with a null value, sql-strict_sum() aggregate function must return null.
* Expected result : Success
* Date : July 20th 2012
*/
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.3.query.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_numeric_null/sum_numeric_null.3.query.sqlpp
index 9424486..c8e7cf8 100644
--- 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_numeric_null/sum_numeric_null.3.query.sqlpp
@@ -17,7 +17,7 @@
* under the License.
*/
/*
- * Description : Add numeric values with a null value, sql-coll_sum() aggregate function must return null.
+ * Description : Add numeric values with a null value, sql-strict_sum() aggregate function must return null.
* Expected result : Success
* Date : July 20th 2012
*/
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null/agg_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null/agg_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null/agg_null.3.query.sqlpp
index 38c0972..947d19b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null/agg_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null/agg_null.3.query.sqlpp
@@ -22,4 +22,4 @@
* Date : Jun 2nd 2013
*/
-{'count1':coll_count([null]),'average1':coll_avg([null]),'sum1':coll_sum([null]),'min1':coll_min([null]),'max1':coll_max([null]),'count2':coll_count({{null,null}}),'average2':coll_avg({{null,null}}),'sum2':coll_sum({{null,null}}),'min2':coll_min({{null,null}}),'max2':coll_max({{null,null}})};
+{'count1':strict_count([null]),'average1':strict_avg([null]),'sum1':strict_sum([null]),'min1':strict_min([null]),'max1':strict_max([null]),'count2':strict_count({{null,null}}),'average2':strict_avg({{null,null}}),'sum2':strict_sum({{null,null}}),'min2':strict_min({{null,null}}),'max2':strict_max({{null,null}})};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.query.sqlpp
index 9ada73b..62506cc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.query.sqlpp
@@ -25,19 +25,19 @@
use test;
-{'count':test.coll_count((
+{'count':test.strict_count((
select element t.valplus
from Test as t
-)),'average':test.coll_avg((
+)),'average':test.strict_avg((
select element t.valplus
from Test as t
-)),'sum':test.coll_sum((
+)),'sum':test.strict_sum((
select element t.valplus
from Test as t
-)),'min':test.coll_min((
+)),'min':test.strict_min((
select element t.valplus
from Test as t
-)),'max':test.coll_max((
+)),'max':test.strict_max((
select element t.valplus
from Test as t
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp
index 3643901..47887d9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp
@@ -25,28 +25,28 @@
use test;
-{'count':test.coll_count((
+{'count':test.strict_count((
select element t
from Test as t
-)),'average':test.coll_avg((
+)),'average':test.strict_avg((
select element i.val
from (
select element t
from Test as t
) as i
-)),'sum':test.coll_sum((
+)),'sum':test.strict_sum((
select element i.val
from (
select element t
from Test as t
) as i
-)),'min':test.coll_min((
+)),'min':test.strict_min((
select element i.valplus
from (
select element t
from Test as t
) as i
-)),'max':test.coll_max((
+)),'max':test.strict_max((
select element i.valplus
from (
select element t
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number/agg_number.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number/agg_number.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number/agg_number.3.query.sqlpp
index c90641b..5577347 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number/agg_number.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number/agg_number.3.query.sqlpp
@@ -22,4 +22,4 @@
* Date : Jun 2nd 2013
*/
-{'count1':coll_count([float('2.0'),double('3.0'),93847382783847382,1]),'average1':coll_avg([float('2.0'),double('3.0'),93847382783847382,1]),'sum1':coll_sum([float('2.0'),double('3.0'),93847382783847382,1]),'min1':coll_min([float('2.0'),double('3.0'),93847382783847382,1]),'max1':coll_max([float('2.0'),double('3.0'),93847382783847382,1]),'count2':coll_count({{float('2.0'),double('3.0'),93847382783847382,1}}),'average2':coll_avg({{float('2.0'),double('3.0'),93847382783847382,1}}),'sum2':coll_sum({{float('2.0'),double('3.0'),93847382783847382,1}}),'min2':coll_min({{float('2.0'),double('3.0'),93847382783847382,1}}),'max2':coll_max({{float('2.0'),double('3.0'),93847382783847382,1}})};
+{'count1':strict_count([float('2.0'),double('3.0'),93847382783847382,1]),'average1':strict_avg([float('2.0'),double('3.0'),93847382783847382,1]),'sum1':strict_sum([float('2.0'),double('3.0'),93847382783847382,1]),'min1':strict_min([float('2.0'),double('3.0'),93847382783847382,1]),'max1':strict_max([float('2.0'),double('3.0'),93847382783847382,1]),'count2':strict_count({{float('2.0'),double('3.0'),93847382783847382,1}}),'average2':strict_avg({{float('2.0'),double('3.0'),93847382783847382,1}}),'sum2':strict_sum({{float('2.0'),double('3.0'),93847382783847382,1}}),'min2':strict_min({{float('2.0'),double('3.0'),93847382783847382,1}}),'max2':strict_max({{float('2.0'),double('3.0'),93847382783847382,1}})};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.query.sqlpp
index 42306d8..c7d7eb1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.query.sqlpp
@@ -25,19 +25,19 @@
use test;
-{'count':test.coll_count((
+{'count':test.strict_count((
select element t.valplus
from Test as t
-)),'average':test.coll_avg((
+)),'average':test.strict_avg((
select element t.valplus
from Test as t
-)),'sum':test.coll_sum((
+)),'sum':test.strict_sum((
select element t.valplus
from Test as t
-)),'min':test.coll_min((
+)),'min':test.strict_min((
select element t.valplus
from Test as t
-)),'max':test.coll_max((
+)),'max':test.strict_max((
select element t.valplus
from Test as t
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_distinct/avg_distinct.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_distinct/avg_distinct.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_distinct/avg_distinct.1.query.sqlpp
index c9a79fb..816f452 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_distinct/avg_distinct.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_distinct/avg_distinct.1.query.sqlpp
@@ -17,8 +17,8 @@
* under the License.
*/
{
- 't1': to_bigint(coll_avg(distinct [10,20,30,10,20,30,10])),
- 't2': to_bigint(coll_avg(distinct [null,missing,null,missing])),
- 't3': to_bigint(coll_avg(distinct [40,null,missing,50,40,null,missing,50,40])),
- 't4': to_bigint(coll_avg(distinct []))
- }
\ No newline at end of file
+ 't1': to_bigint(strict_avg(distinct [10,20,30,10,20,30,10])),
+ 't2': to_bigint(strict_avg(distinct [null,missing,null,missing])),
+ 't3': to_bigint(strict_avg(distinct [40,null,missing,50,40,null,missing,50,40])),
+ 't4': to_bigint(strict_avg(distinct []))
+ }
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double/avg_double.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double/avg_double.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double/avg_double.3.query.sqlpp
index ae1b1eb..a10da57 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double/avg_double.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double/avg_double.3.query.sqlpp
@@ -17,7 +17,7 @@
* under the License.
*/
-select element coll_avg((
+select element strict_avg((
select element x
from [1.0,2.0,double('3.0')] as x
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double_null/avg_double_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double_null/avg_double_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double_null/avg_double_null.3.query.sqlpp
index 4c10066..a6a4537 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double_null/avg_double_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double_null/avg_double_null.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-{'average':test.coll_avg((
+{'average':test.strict_avg((
select element x.doubleField
from Numeric as x
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.query.sqlpp
index d7a5263..05d6092 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.query.sqlpp
@@ -25,7 +25,7 @@
use test;
-select element test.coll_avg((
+select element test.strict_avg((
select element x
from [1,2,3] as x
where (x > 10)
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.query.sqlpp
index 8d2359f..7eb6e35 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.query.sqlpp
@@ -25,7 +25,7 @@
use test;
-select element test.coll_avg((
+select element test.strict_avg((
select element x.val
from Test as x
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float/avg_float.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float/avg_float.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float/avg_float.3.query.sqlpp
index 14c4bc5..c13d9a1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float/avg_float.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float/avg_float.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-select element test.coll_avg((
+select element test.strict_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/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float_null/avg_float_nu.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float_null/avg_float_nu.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float_null/avg_float_nu.3.query.sqlpp
index c8c3774..a694993 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float_null/avg_float_nu.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float_null/avg_float_nu.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-{'average':test.coll_avg((
+{'average':test.strict_avg((
select element x.floatField
from Numeric as x
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16/avg_int16.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16/avg_int16.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16/avg_int16.3.query.sqlpp
index 6883fa8..90f54cf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16/avg_int16.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16/avg_int16.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-select element test.coll_avg((
+select element test.strict_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/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.query.sqlpp
index d50b0d1..4e2e8c4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-{'average':test.coll_avg((
+{'average':test.strict_avg((
select element x.int16Field
from Numeric as x
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32/avg_int32.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32/avg_int32.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32/avg_int32.3.query.sqlpp
index a235c84..d52ebde 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32/avg_int32.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32/avg_int32.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-select element test.coll_avg((
+select element test.strict_avg((
select element x
from [1,2,3] as x
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.query.sqlpp
index 9618d2d..34c5c68 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-{'average':test.coll_avg((
+{'average':test.strict_avg((
select element x.int32Field
from Numeric as x
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64/avg_int64.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64/avg_int64.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64/avg_int64.3.query.sqlpp
index 813c9a6..5afa4e6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64/avg_int64.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64/avg_int64.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-select element test.coll_avg((
+select element test.strict_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/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.query.sqlpp
index 8c063d3..230913f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-{'average':test.coll_avg((
+{'average':test.strict_avg((
select element x.int64Field
from Numeric as x
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8/avg_int8.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8/avg_int8.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8/avg_int8.3.query.sqlpp
index 3d2c5ba..57ffb31 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8/avg_int8.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8/avg_int8.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-select element test.coll_avg((
+select element test.strict_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/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.query.sqlpp
index 74fb4c4..64b91ea 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-{'average':test.coll_avg((
+{'average':test.strict_avg((
select element x.int8Field
from Numeric as x
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_mixed/avg_mixed.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_mixed/avg_mixed.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_mixed/avg_mixed.3.query.sqlpp
index 4043084..0085e3f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_mixed/avg_mixed.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_mixed/avg_mixed.3.query.sqlpp
@@ -22,7 +22,7 @@
* Date : Jun 2nd 2013
*/
-select element coll_avg((
+select element strict_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/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_01/count_01.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_01/count_01.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_01/count_01.3.query.sqlpp
index fa90f85..2bf8960 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_01/count_01.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_01/count_01.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-select element test.coll_count((
+select element test.strict_count((
select element x
from [1,2,3] as x
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_distinct/count_distinct.1.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_distinct/count_distinct.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_distinct/count_distinct.1.query.sqlpp
index a7d9b90..403f8b5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_distinct/count_distinct.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_distinct/count_distinct.1.query.sqlpp
@@ -17,8 +17,8 @@
* under the License.
*/
{
- 't1': coll_count(distinct [10,20,30,10,20,30,10]),
- 't2': coll_count(distinct [null,missing,null,missing]),
- 't3': coll_count(distinct [40,null,missing,50,40,null,missing,50,40]),
- 't4': coll_count(distinct [])
- }
\ No newline at end of file
+ 't1': strict_count(distinct [10,20,30,10,20,30,10]),
+ 't2': strict_count(distinct [null,missing,null,missing]),
+ 't3': strict_count(distinct [40,null,missing,50,40,null,missing,50,40]),
+ 't4': strict_count(distinct [])
+ }
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_01/count_empty_01.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_01/count_empty_01.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_01/count_empty_01.3.query.sqlpp
index 383671d..312bfe0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_01/count_empty_01.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_01/count_empty_01.3.query.sqlpp
@@ -22,7 +22,7 @@
* Success : Yes
*/
-select element coll_count((
+select element strict_count((
select element x
from [1,2,3] as x
where (x > 10)
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_02/count_empty_02.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_02/count_empty_02.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_02/count_empty_02.3.query.sqlpp
index 67e6e77..a324793 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_02/count_empty_02.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_02/count_empty_02.3.query.sqlpp
@@ -25,7 +25,7 @@
use test;
-select element test.coll_count((
+select element test.strict_count((
select element x.val
from Test as x
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_null/count_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_null/count_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_null/count_null.3.query.sqlpp
index ec84f7c..406a0c0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_null/count_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_null/count_null.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-{'count':test.coll_count((
+{'count':test.strict_count((
select element x.doubleField
from Numeric as x
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue395/issue395.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue395/issue395.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue395/issue395.3.query.sqlpp
index feea992..cb308cd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue395/issue395.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue395/issue395.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-select element test.coll_count((
+select element test.strict_count((
select element l.name
from Employee as l
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_0/issue412_0.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_0/issue412_0.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_0/issue412_0.3.query.sqlpp
index deaa68a..1af45c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_0/issue412_0.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_0/issue412_0.3.query.sqlpp
@@ -17,4 +17,4 @@
* under the License.
*/
-coll_count(['ASTERIX','Hyracks',null]);
+strict_count(['ASTERIX','Hyracks',null]);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_1/issue412_1.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_1/issue412_1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_1/issue412_1.3.query.sqlpp
index 9da7811..b1e3de5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_1/issue412_1.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_1/issue412_1.3.query.sqlpp
@@ -17,4 +17,4 @@
* under the License.
*/
-{'count':coll_count([1,60,null]),'average':coll_avg([1,60,null]),'sum':coll_sum([1,60,null]),'min':coll_min([1,60,null]),'max':coll_max([1,60,null])};
+{'count':strict_count([1,60,null]),'average':strict_avg([1,60,null]),'sum':strict_sum([1,60,null]),'min':strict_min([1,60,null]),'max':strict_max([1,60,null])};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_min_hetero_list/issue425_min_hetero_list.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_min_hetero_list/issue425_min_hetero_list.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_min_hetero_list/issue425_min_hetero_list.3.query.sqlpp
index b2c6c66..9ecf906 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_min_hetero_list/issue425_min_hetero_list.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_min_hetero_list/issue425_min_hetero_list.3.query.sqlpp
@@ -17,4 +17,4 @@
* under the License.
*/
-coll_min([23,748374857483]);
+strict_min([23,748374857483]);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/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/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.query.sqlpp
index e12e644..a0134a6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.query.sqlpp
@@ -17,4 +17,4 @@
* under the License.
*/
-coll_min([748374857483,23,0.5]);
+strict_min([748374857483,23,0.5]);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.3.query.sqlpp
----------------------------------------------------------------------
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/issue425_sum_hetero_list/issue425_sum_hetero_list.3.query.sqlpp
index 770b7dc..0f82177 100644
--- 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/issue425_sum_hetero_list/issue425_sum_hetero_list.3.query.sqlpp
@@ -17,4 +17,4 @@
* under the License.
*/
-coll_sum([23,748374857483]);
+strict_sum([23,748374857483]);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.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/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.query.sqlpp
index 3932e23..f6a1989 100644
--- 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/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.query.sqlpp
@@ -17,4 +17,4 @@
* under the License.
*/
-coll_sum([748374857483,23,0.5]);
+strict_sum([748374857483,23,0.5]);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3fd1f236/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.query.sqlpp
index 2a3312e..25cef91 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.query.sqlpp
@@ -27,10 +27,10 @@
use test;
-select element {'min':test.coll_min((
+select element {'min':test.strict_min((
select element l.name
from t1 as l
- )),'max':test.coll_max((
+ )),'max':test.strict_max((
select element l.name
from t1 as l
))};