You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by bu...@apache.org on 2016/09/26 15:47:36 UTC
[2/2] asterixdb git commit: ASTERIXDB-1539: add function mapping for
AQL.
ASTERIXDB-1539: add function mapping for AQL.
- allow all SQL++/AQL functions to be "_"-based;
- still accept "-"-based functions.
Change-Id: I6ab87a02c8c270535059bdec8281c72801418551
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1210
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/635d7037
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/635d7037
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/635d7037
Branch: refs/heads/master
Commit: 635d70375fc03c1c03feae0d1ee4e241fd895782
Parents: 63fdfae
Author: Yingyi Bu <yi...@couchbase.com>
Authored: Sun Sep 25 23:29:46 2016 -0700
Committer: Yingyi Bu <bu...@gmail.com>
Committed: Mon Sep 26 08:47:05 2016 -0700
----------------------------------------------------------------------
.../q07_volume_shipping.3.query.aql | 46 ++--
.../q08_national_market_share.3.query.aql | 34 +--
.../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 +-
.../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.3.query.sqlpp | 2 +-
.../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 +-
.../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 +-
.../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 +-
.../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.3.query.sqlpp | 2 +-
.../sum_null-with-pred.3.query.sqlpp | 2 +-
.../sum_numeric_null.3.query.sqlpp | 2 +-
.../q07_volume_shipping.3.query.sqlpp | 2 +-
.../q08_national_market_share.3.query.sqlpp | 2 +-
.../q09_product_type_profit_nt.3.query.sqlpp | 2 +-
.../query-issue638/query-issue638.3.query.sqlpp | 2 +-
.../lang/aql/rewrites/AqlQueryRewriter.java | 14 +-
.../AqlBuiltinFunctionRewriteVisitor.java | 47 ++++
.../AbstractAqlSimpleExpressionVisitor.java | 225 +++++++++++++++++++
.../lang/common/util/CommonFunctionMapUtil.java | 76 +++++++
.../lang/sqlpp/util/FunctionMapUtil.java | 60 ++---
81 files changed, 562 insertions(+), 234 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries/tpch/q07_volume_shipping/q07_volume_shipping.3.query.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/tpch/q07_volume_shipping/q07_volume_shipping.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/tpch/q07_volume_shipping/q07_volume_shipping.3.query.aql
index 6471872..3c61193 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/tpch/q07_volume_shipping/q07_volume_shipping.3.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/tpch/q07_volume_shipping/q07_volume_shipping.3.query.aql
@@ -19,13 +19,13 @@
use dataverse tpch;
declare function q7_volume_shipping_tmp() {
- for $n1 in dataset('Nation')
+ for $n1 in dataset('Nation')
for $n2 in dataset('Nation')
- where $n2.n_name='GERMANY' or $n1.n_name='GERMANY'
+ where $n2.n_name='GERMANY' or $n1.n_name='GERMANY'
return {
- "supp_nation": $n1.n_name,
- "cust_nation": $n2.n_name,
- "s_nationkey": $n1.n_nationkey,
+ "supp_nation": $n1.n_name,
+ "cust_nation": $n2.n_name,
+ "s_nationkey": $n1.n_nationkey,
"c_nationkey": $n2.n_nationkey
}
}
@@ -35,47 +35,47 @@ for $locs in (
for $lo in (
for $l in dataset('LineItem')
for $o in dataset('Orders')
- where $o.o_orderkey = $l.l_orderkey and $l.l_shipdate >= '1992-01-01'
+ where $o.o_orderkey = $l.l_orderkey and $l.l_shipdate >= '1992-01-01'
and $l.l_shipdate <= '1996-12-31'
return {
- "l_shipdate": $l.l_shipdate,
- "l_extendedprice": $l.l_extendedprice,
- "l_discount": $l.l_discount,
- "l_suppkey": $l.l_suppkey,
- "o_custkey": $o.o_custkey
+ "l_shipdate": $l.l_shipdate,
+ "l_extendedprice": $l.l_extendedprice,
+ "l_discount": $l.l_discount,
+ "l_suppkey": $l.l_suppkey,
+ "o_custkey": $o.o_custkey
}
)
for $c in dataset('Customer')
where $c.c_custkey = $lo.o_custkey
return {
- "l_shipdate": $lo.l_shipdate,
- "l_extendedprice": $lo.l_extendedprice,
- "l_discount": $lo.l_discount,
- "l_suppkey": $lo.l_suppkey,
- "c_nationkey": $c.c_nationkey
+ "l_shipdate": $lo.l_shipdate,
+ "l_extendedprice": $lo.l_extendedprice,
+ "l_discount": $lo.l_discount,
+ "l_suppkey": $lo.l_suppkey,
+ "c_nationkey": $c.c_nationkey
}
)
for $s in dataset('Supplier')
where $s.s_suppkey = $loc.l_suppkey
return {
- "l_shipdate": $loc.l_shipdate,
- "l_extendedprice": $loc.l_extendedprice,
- "l_discount": $loc.l_discount,
- "c_nationkey": $loc.c_nationkey,
+ "l_shipdate": $loc.l_shipdate,
+ "l_extendedprice": $loc.l_extendedprice,
+ "l_discount": $loc.l_discount,
+ "c_nationkey": $loc.c_nationkey,
"s_nationkey": $s.s_nationkey
}
)
for $t in q7_volume_shipping_tmp()
where $locs.c_nationkey = $t.c_nationkey
and $locs.s_nationkey = $t.s_nationkey
-let $l_year0 := get-year($locs.l_shipdate)
+let $l_year0 := get_year($locs.l_shipdate)
group by $supp_nation := $t.supp_nation, $cust_nation := $t.cust_nation, $l_year := $l_year0
with $locs
let $revenue := sum(for $i in $locs return $i.l_extendedprice * (1 - $i.l_discount))
order by $supp_nation, $cust_nation, $l_year
return {
- "supp_nation": $supp_nation,
- "cust_nation": $cust_nation,
+ "supp_nation": $supp_nation,
+ "cust_nation": $cust_nation,
"l_year": $l_year,
"revenue": $revenue
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries/tpch/q08_national_market_share/q08_national_market_share.3.query.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/tpch/q08_national_market_share/q08_national_market_share.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/tpch/q08_national_market_share/q08_national_market_share.3.query.aql
index b8afdf4..bb57a0d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/tpch/q08_national_market_share/q08_national_market_share.3.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/tpch/q08_national_market_share/q08_national_market_share.3.query.aql
@@ -39,42 +39,42 @@ for $t in (
)
where $nrc.c_custkey = $o.o_custkey
return {
- "o_orderdate" : $o.o_orderdate,
- "o_orderkey": $o.o_orderkey
+ "o_orderdate" : $o.o_orderdate,
+ "o_orderkey": $o.o_orderkey
}
)
where $l.l_orderkey = $nrco.o_orderkey
- and $nrco.o_orderdate >= '1995-01-01'
+ and $nrco.o_orderdate >= '1995-01-01'
and $nrco.o_orderdate < '1996-12-31'
return {
- "o_orderdate": $nrco.o_orderdate,
- "l_partkey": $l.l_partkey,
- "l_discount": $l.l_discount,
- "l_extendedprice": $l.l_extendedprice,
+ "o_orderdate": $nrco.o_orderdate,
+ "l_partkey": $l.l_partkey,
+ "l_discount": $l.l_discount,
+ "l_extendedprice": $l.l_extendedprice,
"l_suppkey": $l.l_suppkey
}
)
for $p in dataset("Part")
where $p.p_partkey = $lnrco.l_partkey and $p.p_type = 'ECONOMY ANODIZED STEEL'
return {
- "o_orderdate": $lnrco.o_orderdate,
- "l_discount": $lnrco.l_discount,
- "l_extendedprice": $lnrco.l_extendedprice,
- "l_suppkey": $lnrco.l_suppkey
+ "o_orderdate": $lnrco.o_orderdate,
+ "l_discount": $lnrco.l_discount,
+ "l_extendedprice": $lnrco.l_extendedprice,
+ "l_suppkey": $lnrco.l_suppkey
}
)
where $s.s_suppkey = $lnrcop.l_suppkey
return {
- "o_orderdate": $lnrcop.o_orderdate,
- "l_discount": $lnrcop.l_discount,
- "l_extendedprice": $lnrcop.l_extendedprice,
- "l_suppkey": $lnrcop.l_suppkey,
+ "o_orderdate": $lnrcop.o_orderdate,
+ "l_discount": $lnrcop.l_discount,
+ "l_extendedprice": $lnrcop.l_extendedprice,
+ "l_suppkey": $lnrcop.l_suppkey,
"s_nationkey": $s.s_nationkey
}
)
for $n2 in dataset('Nation')
where $slnrcop.s_nationkey = $n2.n_nationkey
- let $o_year := get-year($slnrcop.o_orderdate)
+ let $o_year := GET_YEAR($slnrcop.o_orderdate)
return {
"year": $o_year,
"revenue": $slnrcop.l_extendedprice *(1-$slnrcop.l_discount),
@@ -85,7 +85,7 @@ group by $year := $t.year with $t
order by $year
return {
"year": $year,
- "mkt_share": sum(for $i in $t return switch-case($i.s_name='BRAZIL', true, $i.revenue, false, 0.0))/
+ "mkt_share": sum(for $i in $t return switch-case($i.s_name='BRAZIL', true, $i.revenue, false, 0.0))/
sum(for $i in $t return $i.revenue)
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 eef6201..882a615 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_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}})};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 7d20368..9993664 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_sql_count((
select element t.valplus
from Test as t
-)),'average':test.`array_sql-avg`((
+)),'average':test.array_sql_avg((
select element t.valplus
from Test as t
-)),'sql-sum':test.`array_sql-sum`((
+)),'sql-sum':test.array_sql_sum((
select element t.valplus
from Test as t
-)),'sql-min':test.`array_sql-min`((
+)),'sql-min':test.array_sql_min((
select element t.valplus
from Test as t
-)),'sql-max':test.`array_sql-max`((
+)),'sql-max':test.array_sql_max((
select element t.valplus
from Test as t
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 b0c4f39..0a17057 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_sql_count((
select element t
from Test as t
-)),'average':test.`array_sql-avg`((
+)),'average':test.array_sql_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_sql_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_sql_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_sql_max((
select element i.valplus
from (
select element t
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 407f237..a3308af 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_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}})};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 85fe388..bd70811 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_sql_count((
select element t.valplus
from Test as t
-)),'average':test.`array_sql-avg`((
+)),'average':test.array_sql_avg((
select element t.valplus
from Test as t
-)),'sql-sum':test.`array_sql-sum`((
+)),'sql-sum':test.array_sql_sum((
select element t.valplus
from Test as t
-)),'sql-min':test.`array_sql-min`((
+)),'sql-min':test.array_sql_min((
select element t.valplus
from Test as t
-)),'sql-max':test.`array_sql-max`((
+)),'sql-max':test.array_sql_max((
select element t.valplus
from Test as t
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 20f441e..6b2de79 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_sql_avg((
select element x
from [1.0,2.0,double('3.0')] as x
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 6b96901..b395904 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_sql_avg((
select element x.doubleField
from Numeric as x
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 afde53e..05e4590 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
@@ -25,7 +25,7 @@
use test;
-select element test.`array_sql-avg`((
+select element test.array_sql_avg((
select element x
from [1,2,3] as x
where (x > 10)
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 9f72341..2a0b2dc 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
@@ -25,7 +25,7 @@
use test;
-select element test.`array_sql-avg`((
+select element test.array_sql_avg((
select element x.val
from Test as x
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 cd83470..dfd8f57 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_sql_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/635d7037/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 b0c982e..0649826 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_sql_avg((
select element x.floatField
from Numeric as x
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 5e29f15..46ead9e 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_sql_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/635d7037/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 74174f4..ed6289c 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_sql_avg((
select element x.int16Field
from Numeric as x
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 f08fbad..17df72d 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_sql_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/635d7037/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 32f2405..9721836 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_sql_avg((
select element x.int32Field
from Numeric as x
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 1017a69..53a796f 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_sql_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/635d7037/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 48ac889..978180c 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_sql_avg((
select element x.int64Field
from Numeric as x
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 60303ea..b74f96b 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_sql_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/635d7037/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 84894d0..20a5e70 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_sql_avg((
select element x.int8Field
from Numeric as x
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 c930673..16a5fee 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
@@ -22,7 +22,7 @@
* Date : Feb 7th 2014
*/
-select element `array_sql-avg`((
+select element array_sql_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/635d7037/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 65ed13e..5233bc8 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_sql_count((
select element x
from [1,2,3] as x
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 924d044..508416e 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
@@ -22,7 +22,7 @@
* Success : Yes
*/
-select element `array_sql-count`((
+select element array_sql_count((
select element x
from [1,2,3] as x
where (x > 10)
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 42efee1..b66d996 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
@@ -25,7 +25,7 @@
use test;
-select element test.`array_sql-count`((
+select element test.array_sql_count((
select element x.val
from Test as x
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 4ba13fe..e0ed488 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_sql_count((
select element x.doubleField
from Numeric as x
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 cabe2ad..e0d7476 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_sql_count((
select element l.name
from Employee as l
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 e739362..7130acd 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_sql_count(['ASTERIX','Hyracks',null]);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 d69d8e6..468f62c 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_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])};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 3c65903..5c4ab77 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_sql_min([23,748374857483]);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/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 1e90742..6f12e6c 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_sql_min([748374857483,23,0.5]);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.3.query.sqlpp
index 8dedad9..efea5db 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list/issue425_sum_hetero_list.3.query.sqlpp
@@ -17,4 +17,4 @@
* under the License.
*/
-`array_sql-sum`([23,748374857483]);
+array_sql_sum([23,748374857483]);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/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-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.query.sqlpp
index 1530a94..6a86473 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.query.sqlpp
@@ -17,4 +17,4 @@
* under the License.
*/
-`array_sql-sum`([748374857483,23,0.5]);
+array_sql_sum([748374857483,23,0.5]);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.query.sqlpp
index 9387a43..0913cf3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.query.sqlpp
@@ -27,10 +27,10 @@
use test;
-select element {'sql-min':test.`array_sql-min`((
+select element {'sql-min':test.array_sql_min((
select element l.name
from t1 as l
- )),'sql-max':test.`array_sql-max`((
+ )),'sql-max':test.array_sql_max((
select element l.name
from t1 as l
))};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/max_empty_01/max_empty_01.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/max_empty_01/max_empty_01.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/max_empty_01/max_empty_01.3.query.sqlpp
index ea844a9..788352c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/max_empty_01/max_empty_01.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/max_empty_01/max_empty_01.3.query.sqlpp
@@ -25,7 +25,7 @@
use test;
-select element test.`array_sql-max`((
+select element test.array_sql_max((
select element x
from [1,2,3] as x
where (x > 10)
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.query.sqlpp
index c0a6062..02b028f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.query.sqlpp
@@ -25,7 +25,7 @@
use test;
-select element test.`array_sql-max`((
+select element test.array_sql_max((
select element x.val
from Test as x
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_empty_01/min_empty_01.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_empty_01/min_empty_01.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_empty_01/min_empty_01.3.query.sqlpp
index 330bd4d..07a8b68 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_empty_01/min_empty_01.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_empty_01/min_empty_01.3.query.sqlpp
@@ -25,7 +25,7 @@
use test;
-select element test.`array_sql-min`((
+select element test.array_sql_min((
select element x
from [1,2,3] as x
where (x > 10)
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.query.sqlpp
index 8362863..885a01c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.query.sqlpp
@@ -25,7 +25,7 @@
use test;
-select element test.`array_sql-min`((
+select element test.array_sql_min((
select element x.val
from Test as x
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_mixed/min_mixed.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_mixed/min_mixed.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_mixed/min_mixed.3.query.sqlpp
index 36aea5e..9549c75 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_mixed/min_mixed.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_mixed/min_mixed.3.query.sqlpp
@@ -22,7 +22,7 @@
* Date : Feb 7th 2014
*/
-select element `array_sql-min`((
+select element array_sql_min((
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/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/query-issue400/query-issue400.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/query-issue400/query-issue400.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/query-issue400/query-issue400.3.query.sqlpp
index 044009b..ac63d3f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/query-issue400/query-issue400.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/query-issue400/query-issue400.3.query.sqlpp
@@ -17,6 +17,6 @@
* under the License.
*/
-`array_sql-count`((select element i
+array_sql_count((select element i
from [[1,2,3,4,5],[6,7,8,9]] as i
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_avg/scalar_avg.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_avg/scalar_avg.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_avg/scalar_avg.3.query.sqlpp
index db8740d..f4b35d7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_avg/scalar_avg.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_avg/scalar_avg.3.query.sqlpp
@@ -24,12 +24,12 @@
use test;
-with i8 as test.`array_sql-avg`([test.tinyint('1'),test.tinyint('2'),test.tinyint('3')]),
- i16 as test.`array_sql-avg`([test.smallint('1'),test.smallint('2'),test.smallint('3')]),
- i32 as test.`array_sql-avg`([test.integer('1'),test.integer('2'),test.integer('3')]),
- i64 as test.`array_sql-avg`([test.bigint('1'),test.bigint('2'),test.bigint('3')]),
- f as test.`array_sql-avg`([test.float('1'),test.float('2'),test.float('3')]),
- d as test.`array_sql-avg`([test.double('1'),test.double('2'),test.double('3')])
+with i8 as test.array_sql_avg([test.tinyint('1'),test.tinyint('2'),test.tinyint('3')]),
+ i16 as test.array_sql_avg([test.smallint('1'),test.smallint('2'),test.smallint('3')]),
+ i32 as test.array_sql_avg([test.integer('1'),test.integer('2'),test.integer('3')]),
+ i64 as test.array_sql_avg([test.bigint('1'),test.bigint('2'),test.bigint('3')]),
+ f as test.array_sql_avg([test.float('1'),test.float('2'),test.float('3')]),
+ d as test.array_sql_avg([test.double('1'),test.double('2'),test.double('3')])
select element i
from [i8,i16,i32,i64,f,d] as i
;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_avg_empty/scalar_avg_empty.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_avg_empty/scalar_avg_empty.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_avg_empty/scalar_avg_empty.3.query.sqlpp
index dfbd07b..d2378c8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_avg_empty/scalar_avg_empty.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_avg_empty/scalar_avg_empty.3.query.sqlpp
@@ -21,4 +21,4 @@
* Success : Yes
*/
-select element `array_sql-avg`([]);
+select element array_sql_avg([]);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.query.sqlpp
index 5cac403..d22c356 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_avg_null/scalar_avg_null.3.query.sqlpp
@@ -24,12 +24,12 @@
use test;
-with i8 as test.`array_sql-avg`([test.tinyint('1'),test.tinyint('2'),test.tinyint('3'),null]),
- i16 as test.`array_sql-avg`([test.smallint('1'),test.smallint('2'),test.smallint('3'),null]),
- i32 as test.`array_sql-avg`([test.integer('1'),test.integer('2'),test.integer('3'),null]),
- i64 as test.`array_sql-avg`([test.bigint('1'),test.bigint('2'),test.bigint('3'),null]),
- f as test.`array_sql-avg`([test.float('1'),test.float('2'),test.float('3'),null]),
- d as test.`array_sql-avg`([test.double('1'),test.double('2'),test.double('3'),null])
+with i8 as test.array_sql_avg([test.tinyint('1'),test.tinyint('2'),test.tinyint('3'),null]),
+ i16 as test.array_sql_avg([test.smallint('1'),test.smallint('2'),test.smallint('3'),null]),
+ i32 as test.array_sql_avg([test.integer('1'),test.integer('2'),test.integer('3'),null]),
+ i64 as test.array_sql_avg([test.bigint('1'),test.bigint('2'),test.bigint('3'),null]),
+ f as test.array_sql_avg([test.float('1'),test.float('2'),test.float('3'),null]),
+ d as test.array_sql_avg([test.double('1'),test.double('2'),test.double('3'),null])
select element i
from [i8,i16,i32,i64,f,d] as i
;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_count/scalar_count.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_count/scalar_count.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_count/scalar_count.3.query.sqlpp
index b47850b..caae087 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_count/scalar_count.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_count/scalar_count.3.query.sqlpp
@@ -24,13 +24,13 @@
use test;
-with i8 as test.`array_sql-count`([test.tinyint('1'),test.tinyint('2'),test.tinyint('3')]),
- i16 as test.`array_sql-count`([test.smallint('1'),test.smallint('2'),test.smallint('3')]),
- i32 as test.`array_sql-count`([test.integer('1'),test.integer('2'),test.integer('3')]),
- i64 as test.`array_sql-count`([test.bigint('1'),test.bigint('2'),test.bigint('3')]),
- f as test.`array_sql-count`([test.float('1'),test.float('2'),test.float('3')]),
- d as test.`array_sql-count`([test.double('1'),test.double('2'),test.double('3')]),
- s as test.`array_sql-count`(['a','b','c'])
+with i8 as test.array_sql_count([test.tinyint('1'),test.tinyint('2'),test.tinyint('3')]),
+ i16 as test.array_sql_count([test.smallint('1'),test.smallint('2'),test.smallint('3')]),
+ i32 as test.array_sql_count([test.integer('1'),test.integer('2'),test.integer('3')]),
+ i64 as test.array_sql_count([test.bigint('1'),test.bigint('2'),test.bigint('3')]),
+ f as test.array_sql_count([test.float('1'),test.float('2'),test.float('3')]),
+ d as test.array_sql_count([test.double('1'),test.double('2'),test.double('3')]),
+ s as test.array_sql_count(['a','b','c'])
select element i
from [i8,i16,i32,i64,f,d,s] as i
;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_count_empty/scalar_count_empty.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_count_empty/scalar_count_empty.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_count_empty/scalar_count_empty.3.query.sqlpp
index 2bcc954..3a0d1e9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_count_empty/scalar_count_empty.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_count_empty/scalar_count_empty.3.query.sqlpp
@@ -24,4 +24,4 @@
use test;
-select element test.`array_sql-count`([]);
+select element test.array_sql_count([]);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_count_null/scalar_count_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_count_null/scalar_count_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_count_null/scalar_count_null.3.query.sqlpp
index 0c910aa..820c503 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_count_null/scalar_count_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_count_null/scalar_count_null.3.query.sqlpp
@@ -24,13 +24,13 @@
use test;
-with i8 as test.`array_sql-count`([test.tinyint('1'),test.tinyint('2'),test.tinyint('3'),null]),
- i16 as test.`array_sql-count`([test.smallint('1'),test.smallint('2'),test.smallint('3'),null]),
- i32 as test.`array_sql-count`([test.integer('1'),test.integer('2'),test.integer('3'),null]),
- i64 as test.`array_sql-count`([test.bigint('1'),test.bigint('2'),test.bigint('3'),null]),
- f as test.`array_sql-count`([test.float('1'),test.float('2'),test.float('3'),null]),
- d as test.`array_sql-count`([test.double('1'),test.double('2'),test.double('3'),null]),
- s as test.`array_sql-count`(['a','b','c',null])
+with i8 as test.array_sql_count([test.tinyint('1'),test.tinyint('2'),test.tinyint('3'),null]),
+ i16 as test.array_sql_count([test.smallint('1'),test.smallint('2'),test.smallint('3'),null]),
+ i32 as test.array_sql_count([test.integer('1'),test.integer('2'),test.integer('3'),null]),
+ i64 as test.array_sql_count([test.bigint('1'),test.bigint('2'),test.bigint('3'),null]),
+ f as test.array_sql_count([test.float('1'),test.float('2'),test.float('3'),null]),
+ d as test.array_sql_count([test.double('1'),test.double('2'),test.double('3'),null]),
+ s as test.array_sql_count(['a','b','c',null])
select element i
from [i8,i16,i32,i64,f,d,s] as i
;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_max/scalar_max.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_max/scalar_max.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_max/scalar_max.3.query.sqlpp
index 5a7f1ab..8b47d5f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_max/scalar_max.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_max/scalar_max.3.query.sqlpp
@@ -24,14 +24,14 @@
use test;
-with i8 as test.`array_sql-max`([test.tinyint('1'),test.tinyint('2'),test.tinyint('3')]),
- i16 as test.`array_sql-max`([test.smallint('1'),test.smallint('2'),test.smallint('3')]),
- i32 as test.`array_sql-max`([test.integer('1'),test.integer('2'),test.integer('3')]),
- i64 as test.`array_sql-max`([test.bigint('1'),test.bigint('2'),test.bigint('3')]),
- f as test.`array_sql-max`([test.float('1'),test.float('2'),test.float('3')]),
- d as test.`array_sql-max`([test.double('1'),test.double('2'),test.double('3')]),
- s as test.`array_sql-max`(['foo','bar','world']),
- dt as test.`array_sql-max`([test.datetime('2012-03-01T00:00:00Z'),test.datetime('2012-01-01T00:00:00Z'),test.datetime('2012-02-01T00:00:00Z')])
+with i8 as test.array_sql_max([test.tinyint('1'),test.tinyint('2'),test.tinyint('3')]),
+ i16 as test.array_sql_max([test.smallint('1'),test.smallint('2'),test.smallint('3')]),
+ i32 as test.array_sql_max([test.integer('1'),test.integer('2'),test.integer('3')]),
+ i64 as test.array_sql_max([test.bigint('1'),test.bigint('2'),test.bigint('3')]),
+ f as test.array_sql_max([test.float('1'),test.float('2'),test.float('3')]),
+ d as test.array_sql_max([test.double('1'),test.double('2'),test.double('3')]),
+ s as test.array_sql_max(['foo','bar','world']),
+ dt as test.array_sql_max([test.datetime('2012-03-01T00:00:00Z'),test.datetime('2012-01-01T00:00:00Z'),test.datetime('2012-02-01T00:00:00Z')])
select element i
from [i8,i16,i32,i64,f,d,s,dt] as i
;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_max_empty/scalar_max_empty.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_max_empty/scalar_max_empty.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_max_empty/scalar_max_empty.3.query.sqlpp
index 16d2409..00e54f5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_max_empty/scalar_max_empty.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_max_empty/scalar_max_empty.3.query.sqlpp
@@ -24,4 +24,4 @@
use test;
-select element test.`array_sql-max`([]);
+select element test.array_sql_max([]);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_max_null/scalar_max_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_max_null/scalar_max_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_max_null/scalar_max_null.3.query.sqlpp
index 8eb40d8..5150934 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_max_null/scalar_max_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_max_null/scalar_max_null.3.query.sqlpp
@@ -24,14 +24,14 @@
use test;
-with i8 as test.`array_sql-max`([test.tinyint('1'),test.tinyint('2'),test.tinyint('3'),null]),
- i16 as test.`array_sql-max`([test.smallint('1'),test.smallint('2'),test.smallint('3'),null]),
- i32 as test.`array_sql-max`([test.integer('1'),test.integer('2'),test.integer('3'),null]),
- i64 as test.`array_sql-max`([test.bigint('1'),test.bigint('2'),test.bigint('3'),null]),
- f as test.`array_sql-max`([test.float('1'),test.float('2'),test.float('3'),null]),
- d as test.`array_sql-max`([test.double('1'),test.double('2'),test.double('3'),null]),
- s as test.`array_sql-max`(['foo','bar','world',null]),
- dt as test.`array_sql-max`([test.datetime('2012-03-01T00:00:00Z'),test.datetime('2012-01-01T00:00:00Z'),test.datetime('2012-02-01T00:00:00Z'),null])
+with i8 as test.array_sql_max([test.tinyint('1'),test.tinyint('2'),test.tinyint('3'),null]),
+ i16 as test.array_sql_max([test.smallint('1'),test.smallint('2'),test.smallint('3'),null]),
+ i32 as test.array_sql_max([test.integer('1'),test.integer('2'),test.integer('3'),null]),
+ i64 as test.array_sql_max([test.bigint('1'),test.bigint('2'),test.bigint('3'),null]),
+ f as test.array_sql_max([test.float('1'),test.float('2'),test.float('3'),null]),
+ d as test.array_sql_max([test.double('1'),test.double('2'),test.double('3'),null]),
+ s as test.array_sql_max(['foo','bar','world',null]),
+ dt as test.array_sql_max([test.datetime('2012-03-01T00:00:00Z'),test.datetime('2012-01-01T00:00:00Z'),test.datetime('2012-02-01T00:00:00Z'),null])
select element i
from [i8,i16,i32,i64,f,d,s,dt] as i
;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_min/scalar_min.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_min/scalar_min.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_min/scalar_min.3.query.sqlpp
index 91491b6..c2157b3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_min/scalar_min.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_min/scalar_min.3.query.sqlpp
@@ -24,14 +24,14 @@
use test;
-with i8 as test.`array_sql-min`([test.tinyint('1'),test.tinyint('2'),test.tinyint('3')]),
- i16 as test.`array_sql-min`([test.smallint('1'),test.smallint('2'),test.smallint('3')]),
- i32 as test.`array_sql-min`([test.integer('1'),test.integer('2'),test.integer('3')]),
- i64 as test.`array_sql-min`([test.bigint('1'),test.bigint('2'),test.bigint('3')]),
- f as test.`array_sql-min`([test.float('1'),test.float('2'),test.float('3')]),
- d as test.`array_sql-min`([test.double('1'),test.double('2'),test.double('3')]),
- s as test.`array_sql-min`(['foo','bar','world']),
- dt as test.`array_sql-min`([test.datetime('2012-03-01T00:00:00Z'),test.datetime('2012-01-01T00:00:00Z'),test.datetime('2012-02-01T00:00:00Z')])
+with i8 as test.array_sql_min([test.tinyint('1'),test.tinyint('2'),test.tinyint('3')]),
+ i16 as test.array_sql_min([test.smallint('1'),test.smallint('2'),test.smallint('3')]),
+ i32 as test.array_sql_min([test.integer('1'),test.integer('2'),test.integer('3')]),
+ i64 as test.array_sql_min([test.bigint('1'),test.bigint('2'),test.bigint('3')]),
+ f as test.array_sql_min([test.float('1'),test.float('2'),test.float('3')]),
+ d as test.array_sql_min([test.double('1'),test.double('2'),test.double('3')]),
+ s as test.array_sql_min(['foo','bar','world']),
+ dt as test.array_sql_min([test.datetime('2012-03-01T00:00:00Z'),test.datetime('2012-01-01T00:00:00Z'),test.datetime('2012-02-01T00:00:00Z')])
select element i
from [i8,i16,i32,i64,f,d,s,dt] as i
;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_min_empty/scalar_min_empty.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_min_empty/scalar_min_empty.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_min_empty/scalar_min_empty.3.query.sqlpp
index 54765c2..8a7049a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_min_empty/scalar_min_empty.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_min_empty/scalar_min_empty.3.query.sqlpp
@@ -24,4 +24,4 @@
use test;
-select element test.`array_sql-min`([]);
+select element test.array_sql_min([]);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_min_null/scalar_min_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_min_null/scalar_min_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_min_null/scalar_min_null.3.query.sqlpp
index 88804c6..24403c2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_min_null/scalar_min_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_min_null/scalar_min_null.3.query.sqlpp
@@ -24,14 +24,14 @@
use test;
-with i8 as test.`array_sql-min`([test.tinyint('1'),test.tinyint('2'),test.tinyint('3'),null]),
- i16 as test.`array_sql-min`([test.smallint('1'),test.smallint('2'),test.smallint('3'),null]),
- i32 as test.`array_sql-min`([test.integer('1'),test.integer('2'),test.integer('3'),null]),
- i64 as test.`array_sql-min`([test.bigint('1'),test.bigint('2'),test.bigint('3'),null]),
- f as test.`array_sql-min`([test.float('1'),test.float('2'),test.float('3'),null]),
- d as test.`array_sql-min`([test.double('1'),test.double('2'),test.double('3'),null]),
- s as test.`array_sql-min`(['foo','bar','world',null]),
- dt as test.`array_sql-min`([test.datetime('2012-03-01T00:00:00Z'),test.datetime('2012-01-01T00:00:00Z'),test.datetime('2012-02-01T00:00:00Z'),null])
+with i8 as test.array_sql_min([test.tinyint('1'),test.tinyint('2'),test.tinyint('3'),null]),
+ i16 as test.array_sql_min([test.smallint('1'),test.smallint('2'),test.smallint('3'),null]),
+ i32 as test.array_sql_min([test.integer('1'),test.integer('2'),test.integer('3'),null]),
+ i64 as test.array_sql_min([test.bigint('1'),test.bigint('2'),test.bigint('3'),null]),
+ f as test.array_sql_min([test.float('1'),test.float('2'),test.float('3'),null]),
+ d as test.array_sql_min([test.double('1'),test.double('2'),test.double('3'),null]),
+ s as test.array_sql_min(['foo','bar','world',null]),
+ dt as test.array_sql_min([test.datetime('2012-03-01T00:00:00Z'),test.datetime('2012-01-01T00:00:00Z'),test.datetime('2012-02-01T00:00:00Z'),null])
select element i
from [i8,i16,i32,i64,f,d,s,dt] as i
;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.query.sqlpp
index 46675c4..6fee4af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum/scalar_sum.3.query.sqlpp
@@ -24,12 +24,12 @@
use test;
-with i8 as test.`array_sql-sum`([test.tinyint('1'),test.tinyint('2'),test.tinyint('3')]),
- i16 as test.`array_sql-sum`([test.smallint('1'),test.smallint('2'),test.smallint('3')]),
- i32 as test.`array_sql-sum`([test.integer('1'),test.integer('2'),test.integer('3')]),
- i64 as test.`array_sql-sum`([test.bigint('1'),test.bigint('2'),test.bigint('3')]),
- f as test.`array_sql-sum`([test.float('1'),test.float('2'),test.float('3')]),
- d as test.`array_sql-sum`([test.double('1'),test.double('2'),test.double('3')])
+with i8 as test.array_sql_sum([test.tinyint('1'),test.tinyint('2'),test.tinyint('3')]),
+ i16 as test.array_sql_sum([test.smallint('1'),test.smallint('2'),test.smallint('3')]),
+ i32 as test.array_sql_sum([test.integer('1'),test.integer('2'),test.integer('3')]),
+ i64 as test.array_sql_sum([test.bigint('1'),test.bigint('2'),test.bigint('3')]),
+ f as test.array_sql_sum([test.float('1'),test.float('2'),test.float('3')]),
+ d as test.array_sql_sum([test.double('1'),test.double('2'),test.double('3')])
select element i
from [i8,i16,i32,i64,f,d] as i
;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.3.query.sqlpp
index 0317b33..a595c57 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.3.query.sqlpp
@@ -24,4 +24,4 @@
use test;
-select element test.`array_sql-sum`([]);
+select element test.array_sql_sum([]);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.query.sqlpp
index 64c32fe..418d7cf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.query.sqlpp
@@ -24,12 +24,12 @@
use test;
-with i8 as test.`array_sql-sum`([test.tinyint('1'),test.tinyint('2'),test.tinyint('3'),null]),
- i16 as test.`array_sql-sum`([test.smallint('1'),test.smallint('2'),test.smallint('3'),null]),
- i32 as test.`array_sql-sum`([test.integer('1'),test.integer('2'),test.integer('3'),null]),
- i64 as test.`array_sql-sum`([test.bigint('1'),test.bigint('2'),test.bigint('3'),null]),
- f as test.`array_sql-sum`([test.float('1'),test.float('2'),test.float('3'),null]),
- d as test.`array_sql-sum`([test.double('1'),test.double('2'),test.double('3'),null])
+with i8 as test.array_sql_sum([test.tinyint('1'),test.tinyint('2'),test.tinyint('3'),null]),
+ i16 as test.array_sql_sum([test.smallint('1'),test.smallint('2'),test.smallint('3'),null]),
+ i32 as test.array_sql_sum([test.integer('1'),test.integer('2'),test.integer('3'),null]),
+ i64 as test.array_sql_sum([test.bigint('1'),test.bigint('2'),test.bigint('3'),null]),
+ f as test.array_sql_sum([test.float('1'),test.float('2'),test.float('3'),null]),
+ d as test.array_sql_sum([test.double('1'),test.double('2'),test.double('3'),null])
select element i
from [i8,i16,i32,i64,f,d] as i
;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double/sum_double.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double/sum_double.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double/sum_double.3.query.sqlpp
index f7463a0..e9915a5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double/sum_double.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double/sum_double.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-select element test.`array_sql-sum`((
+select element test.array_sql_sum((
select element x
from [1.0,2.0,3.0] as x
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.query.sqlpp
index c0e45e0..cec8ca6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-select element test.`array_sql-sum`((
+select element test.array_sql_sum((
select element x.doubleField
from Numeric as x
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.query.sqlpp
index 4241dc0..f26d615 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.query.sqlpp
@@ -25,7 +25,7 @@
use test;
-select element test.`array_sql-sum`((
+select element test.array_sql_sum((
select element x
from [1,2,3] as x
where (x > 10)
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.query.sqlpp
index 482174e..46eb3d5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.query.sqlpp
@@ -25,7 +25,7 @@
use test;
-select element test.`array_sql-sum`((
+select element test.array_sql_sum((
select element x.val
from Test as x
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float/sum_float.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float/sum_float.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float/sum_float.3.query.sqlpp
index 9e72462..0efa33e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float/sum_float.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float/sum_float.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-select element test.`array_sql-sum`((
+select element test.array_sql_sum((
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/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.query.sqlpp
index f28aae1..0e31530 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-select element test.`array_sql-sum`((
+select element test.array_sql_sum((
select element x.floatField
from Numeric as x
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16/sum_int16.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16/sum_int16.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16/sum_int16.3.query.sqlpp
index b37b86c..799066a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16/sum_int16.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16/sum_int16.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-select element test.`array_sql-sum`((
+select element test.array_sql_sum((
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/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.query.sqlpp
index e351f2f..a18eb9e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-select element test.`array_sql-sum`((
+select element test.array_sql_sum((
select element x.int16Field
from Numeric as x
));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/635d7037/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32/sum_int32.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32/sum_int32.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32/sum_int32.3.query.sqlpp
index 3ffa0dc..929b4b6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32/sum_int32.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32/sum_int32.3.query.sqlpp
@@ -20,7 +20,7 @@
use test;
-select element test.`array_sql-sum`((
+select element test.array_sql_sum((
select element x
from [test.integer('1'),test.integer('2'),test.integer('3')] as x
));