Return-Path: X-Original-To: apmail-asterixdb-commits-archive@minotaur.apache.org Delivered-To: apmail-asterixdb-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C70E9198F6 for ; Tue, 5 Apr 2016 03:40:52 +0000 (UTC) Received: (qmail 75016 invoked by uid 500); 5 Apr 2016 03:40:52 -0000 Delivered-To: apmail-asterixdb-commits-archive@asterixdb.apache.org Received: (qmail 74977 invoked by uid 500); 5 Apr 2016 03:40:52 -0000 Mailing-List: contact commits-help@asterixdb.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.incubator.apache.org Delivered-To: mailing list commits@asterixdb.incubator.apache.org Received: (qmail 74968 invoked by uid 99); 5 Apr 2016 03:40:52 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Apr 2016 03:40:52 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 1F0B61A0661 for ; Tue, 5 Apr 2016 03:40:52 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 6Mf59AAcjiHQ for ; Tue, 5 Apr 2016 03:40:42 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 390735FB06 for ; Tue, 5 Apr 2016 03:40:41 +0000 (UTC) Received: (qmail 74620 invoked by uid 99); 5 Apr 2016 03:40:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Apr 2016 03:40:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 57EF7E10A1; Tue, 5 Apr 2016 03:40:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: buyingyi@apache.org To: commits@asterixdb.incubator.apache.org Date: Tue, 05 Apr 2016 03:40:47 -0000 Message-Id: In-Reply-To: <27ef614162c746b0ac6fc9dcc0ea73c2@git.apache.org> References: <27ef614162c746b0ac6fc9dcc0ea73c2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/10] incubator-asterixdb git commit: Rewrite SQL++ functions. http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.2.update.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.2.update.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.2.update.sqlpp index cbf8790..eed803e 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.2.update.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.2.update.sqlpp @@ -17,7 +17,7 @@ * under the License. */ /* - * Description : Tests the scalar version of sql-sum with an empty list. + * Description : Tests the scalar version of coll_sql-sum with an empty list. * Success : Yes */ http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.3.query.sqlpp index b101b78..5030566 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_empty/scalar_sum_empty.3.query.sqlpp @@ -17,11 +17,11 @@ * under the License. */ /* - * Description : Tests the scalar version of sql-sum with an empty list. + * Description : Tests the scalar version of coll_sql-sum with an empty list. * Success : Yes */ use test; -select element test."sql-sum"([]); +select element test."coll_sql-sum"([]); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.1.ddl.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.1.ddl.sqlpp index a7d4b35..a661a36 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.1.ddl.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.1.ddl.sqlpp @@ -17,7 +17,7 @@ * under the License. */ /* - * Description : Tests the scalar version of sql-sum with nulls. + * Description : Tests the scalar version of coll_sql-sum with nulls. * Success : Yes */ http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.2.update.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.2.update.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.2.update.sqlpp index 980a38e..f05913c 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.2.update.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.2.update.sqlpp @@ -17,7 +17,7 @@ * under the License. */ /* - * Description : Tests the scalar version of sql-sum with nulls. + * Description : Tests the scalar version of coll_sql-sum with nulls. * Success : Yes */ http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.query.sqlpp index 4bd7894..90020e5 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/scalar_sum_null/scalar_sum_null.3.query.sqlpp @@ -17,19 +17,19 @@ * under the License. */ /* - * Description : Tests the scalar version of sql-sum with nulls. + * Description : Tests the scalar version of coll_sql-sum with nulls. * Success : Yes */ use test; -with i8 as test."sql-sum"([test.int8('1'),test.int8('2'),test.int8('3'),null]), - i16 as test."sql-sum"([test.int16('1'),test.int16('2'),test.int16('3'),null]), - i32 as test."sql-sum"([test.int32('1'),test.int32('2'),test.int32('3'),null]), - i64 as test."sql-sum"([test.int64('1'),test.int64('2'),test.int64('3'),null]), - f as test."sql-sum"([test.float('1'),test.float('2'),test.float('3'),null]), - d as test."sql-sum"([test.double('1'),test.double('2'),test.double('3'),null]) +with i8 as test."coll_sql-sum"([test.int8('1'),test.int8('2'),test.int8('3'),null]), + i16 as test."coll_sql-sum"([test.int16('1'),test.int16('2'),test.int16('3'),null]), + i32 as test."coll_sql-sum"([test.int32('1'),test.int32('2'),test.int32('3'),null]), + i64 as test."coll_sql-sum"([test.int64('1'),test.int64('2'),test.int64('3'),null]), + f as test."coll_sql-sum"([test.float('1'),test.float('2'),test.float('3'),null]), + d as test."coll_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/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double/sum_double.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double/sum_double.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double/sum_double.3.query.sqlpp index 6bb46d1..498337c 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double/sum_double.3.query.sqlpp +++ b/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."sql-sum"(( +select element test."coll_sql-sum"(( select element x from [1.0,2.0,3.0] as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.query.sqlpp index 30945ab..a4c12fc 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.query.sqlpp +++ b/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."sql-sum"(( +select element test."coll_sql-sum"(( select element x.doubleField from Numeric as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.1.ddl.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.1.ddl.sqlpp index 5559c89..cc6f313 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.1.ddl.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.1.ddl.sqlpp @@ -17,7 +17,7 @@ * under the License. */ /* - * Description : Tests that sql-sum aggregation correctly returns null for an empty stream, + * Description : Tests that coll_sql-sum aggregation correctly returns null for an empty stream, * without an aggregate combiner. * Success : Yes */ http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.2.update.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.2.update.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.2.update.sqlpp index 7f09a49..f0eaeca 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.2.update.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.2.update.sqlpp @@ -17,7 +17,7 @@ * under the License. */ /* - * Description : Tests that sql-sum aggregation correctly returns null for an empty stream, + * Description : Tests that coll_sql-sum aggregation correctly returns null for an empty stream, * without an aggregate combiner. * Success : Yes */ http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.query.sqlpp index b20de6a..90ab5e5 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_01/sum_empty_01.3.query.sqlpp @@ -17,7 +17,7 @@ * under the License. */ /* - * Description : Tests that sql-sum aggregation correctly returns null for an empty stream, + * Description : Tests that coll_sql-sum aggregation correctly returns null for an empty stream, * without an aggregate combiner. * Success : Yes */ @@ -25,7 +25,7 @@ use test; -select element test."sql-sum"(( +select element test."coll_sql-sum"(( select element x from [1,2,3] as x where (x > 10) http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.1.ddl.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.1.ddl.sqlpp index 6316d09..f3134a2 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.1.ddl.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.1.ddl.sqlpp @@ -17,7 +17,7 @@ * under the License. */ /* - * Description : Tests that sql-sum aggregation correctly returns null for an empty stream, + * Description : Tests that coll_sql-sum aggregation correctly returns null for an empty stream, * with an aggregate combiner. * Success : Yes */ http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.2.update.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.2.update.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.2.update.sqlpp index f19da12..2ae8290 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.2.update.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.2.update.sqlpp @@ -17,7 +17,7 @@ * under the License. */ /* - * Description : Tests that sql-sum aggregation correctly returns null for an empty stream, + * Description : Tests that coll_sql-sum aggregation correctly returns null for an empty stream, * with an aggregate combiner. * Success : Yes */ http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.query.sqlpp index 737f23f..0e02b18 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.query.sqlpp @@ -17,7 +17,7 @@ * under the License. */ /* - * Description : Tests that sql-sum aggregation correctly returns null for an empty stream, + * Description : Tests that coll_sql-sum aggregation correctly returns null for an empty stream, * with an aggregate combiner. * Success : Yes */ @@ -25,7 +25,7 @@ use test; -select element test."sql-sum"(( +select element test."coll_sql-sum"(( select element x.val from Test as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float/sum_float.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float/sum_float.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float/sum_float.3.query.sqlpp index f84c73b..bd66bc0 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float/sum_float.3.query.sqlpp +++ b/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."sql-sum"(( +select element test."coll_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/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.query.sqlpp index 367f251..50e1170 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.query.sqlpp +++ b/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."sql-sum"(( +select element test."coll_sql-sum"(( select element x.floatField from Numeric as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16/sum_int16.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16/sum_int16.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16/sum_int16.3.query.sqlpp index 317daf0..5e334c0 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16/sum_int16.3.query.sqlpp +++ b/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."sql-sum"(( +select element test."coll_sql-sum"(( select element x from [test.int16('1'),test.int16('2'),test.int16('3')] as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.query.sqlpp index 6f269f3..57b9a1a 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.query.sqlpp +++ b/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."sql-sum"(( +select element test."coll_sql-sum"(( select element x.int16Field from Numeric as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32/sum_int32.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32/sum_int32.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32/sum_int32.3.query.sqlpp index 7f85f31..54b403d 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32/sum_int32.3.query.sqlpp +++ b/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."sql-sum"(( +select element test."coll_sql-sum"(( select element x from [test.int32('1'),test.int32('2'),test.int32('3')] as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.3.query.sqlpp index 8339998..ffcd051 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.3.query.sqlpp @@ -20,7 +20,7 @@ use test; -select element test."sql-sum"(( +select element test."coll_sql-sum"(( select element x.int32Field from Numeric as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64/sum_int64.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64/sum_int64.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64/sum_int64.3.query.sqlpp index 57afbfc..c797118 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64/sum_int64.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64/sum_int64.3.query.sqlpp @@ -20,7 +20,7 @@ use test; -select element test."sql-sum"(( +select element test."coll_sql-sum"(( select element x from [test.int64('1'),test.int64('2'),test.int64('3')] as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.3.query.sqlpp index c555e24..2a6e4b0 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.3.query.sqlpp @@ -20,7 +20,7 @@ use test; -select element test."sql-sum"(( +select element test."coll_sql-sum"(( select element x.int64Field from Numeric as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8/sum_int8.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8/sum_int8.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8/sum_int8.3.query.sqlpp index 046bdd0..2bcfc28 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8/sum_int8.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8/sum_int8.3.query.sqlpp @@ -20,7 +20,7 @@ use test; -select element test."sql-sum"(( +select element test."coll_sql-sum"(( select element x from [test.int8('1'),test.int8('2'),test.int8('3')] as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.3.query.sqlpp index d2414d9..327ecfa 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.3.query.sqlpp @@ -20,7 +20,7 @@ use test; -select element test."sql-sum"(( +select element test."coll_sql-sum"(( select element x.int8Field from Numeric as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_mixed/sum_mixed.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_mixed/sum_mixed.1.ddl.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_mixed/sum_mixed.1.ddl.sqlpp index 24bdd1c..bf05e6b 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_mixed/sum_mixed.1.ddl.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_mixed/sum_mixed.1.ddl.sqlpp @@ -17,7 +17,7 @@ * under the License. */ /* -* Description : Run sql-sum over an ordered list with mixed types +* Description : Run coll_sql-sum over an ordered list with mixed types * Expected Res : Failure * Date : Feb 7th 2014 */ http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.query.sqlpp index d05df5c..76c5b86 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_mixed/sum_mixed.3.query.sqlpp @@ -17,12 +17,12 @@ * under the License. */ /* -* Description : Run sql-sum over an ordered list with mixed types +* Description : Run coll_sql-sum over an ordered list with mixed types * Expected Res : Failure * Date : Feb 7th 2014 */ -select element "sql-sum"(( +select element "coll_sql-sum"(( select element x from [float('2.0'),'hello world',93847382783847382,date('2013-01-01')] as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp index 3442fd4..810ce8e 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp @@ -17,8 +17,8 @@ * under the License. */ /* - * Description : sql-sum() aggregate function must return the numeric sql-sum, when non null values are given as input to sql-sum(). - * : Get the sql-sum for those tuples which are non null for salary fields. + * Description : sql-coll_sum() aggregate function must return the numeric coll_sql-sum, when non null values are given as input to sql-coll_sum(). + * : Get the coll_sql-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/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp index 5d723c8..a62c168 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.2.update.sqlpp @@ -17,8 +17,8 @@ * under the License. */ /* - * Description : sql-sum() aggregate function must return the numeric sql-sum, when non null values are given as input to sql-sum(). - * : Get the sql-sum for those tuples which are non null for salary fields. + * Description : sql-coll_sum() aggregate function must return the numeric coll_sql-sum, when non null values are given as input to sql-coll_sum(). + * : Get the coll_sql-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/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp index 6f538cc..e119cfa 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.query.sqlpp @@ -17,8 +17,8 @@ * under the License. */ /* - * Description : sql-sum() aggregate function must return the numeric sql-sum, when non null values are given as input to sql-sum(). - * : Get the sql-sum for those tuples which are non null for salary fields. + * Description : sql-coll_sum() aggregate function must return the numeric coll_sql-sum, when non null values are given as input to sql-coll_sum(). + * : Get the coll_sql-sum for those tuples which are non null for salary fields. * Expected result : Success * Date : July 20th 2012 */ @@ -28,7 +28,7 @@ use test; set "import-private-functions" "true"; -select element test."sql-sum"(( +select element test."coll_sql-sum"(( select element l.sal from tdst as l where test.not(test."is-null"(l.sal)) http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp index 942e2a0..e01b778 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp +++ b/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-sum() aggregate function must return null. + * Description : Add numeric values with a null value, sql-coll_sum() aggregate function must return null. * Expected result : Success * Date : July 20th 2012 */ http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.2.update.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.2.update.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.2.update.sqlpp index 44cc106..00f93a4 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.2.update.sqlpp +++ b/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-sum() aggregate function must return null. + * Description : Add numeric values with a null value, sql-coll_sum() aggregate function must return null. * Expected result : Success * Date : July 20th 2012 */ http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.3.query.sqlpp index ed82deb..e603924 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.3.query.sqlpp +++ b/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-sum() aggregate function must return null. + * Description : Add numeric values with a null value, sql-coll_sum() aggregate function must return null. * Expected result : Success * Date : July 20th 2012 */ @@ -25,7 +25,7 @@ use test; -select element test."sql-sum"(( +select element test."coll_sql-sum"(( select element l.sal from tdst as l )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null/agg_null.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null/agg_null.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null/agg_null.3.query.sqlpp index dc3ef07..38c0972 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null/agg_null.3.query.sqlpp +++ b/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':count([null]),'average1':avg([null]),'sum1':sum([null]),'min1':min([null]),'max1':max([null]),'count2':count({{null,null}}),'average2':avg({{null,null}}),'sum2':sum({{null,null}}),'min2':min({{null,null}}),'max2':max({{null,null}})}; +{'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}})}; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.query.sqlpp index ddd882e..9ada73b 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.query.sqlpp +++ b/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.count(( +{'count':test.coll_count(( select element t.valplus from Test as t -)),'average':test.avg(( +)),'average':test.coll_avg(( select element t.valplus from Test as t -)),'sum':test.sum(( +)),'sum':test.coll_sum(( select element t.valplus from Test as t -)),'min':test.min(( +)),'min':test.coll_min(( select element t.valplus from Test as t -)),'max':test.max(( +)),'max':test.coll_max(( select element t.valplus from Test as t ))}; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp index 6cf606d..3643901 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.query.sqlpp +++ b/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.count(( +{'count':test.coll_count(( select element t from Test as t -)),'average':test.avg(( +)),'average':test.coll_avg(( select element i.val from ( select element t from Test as t ) as i -)),'sum':test.sum(( +)),'sum':test.coll_sum(( select element i.val from ( select element t from Test as t ) as i -)),'min':test.min(( +)),'min':test.coll_min(( select element i.valplus from ( select element t from Test as t ) as i -)),'max':test.max(( +)),'max':test.coll_max(( select element i.valplus from ( select element t http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number/agg_number.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number/agg_number.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number/agg_number.3.query.sqlpp index 87f159f..c90641b 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number/agg_number.3.query.sqlpp +++ b/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':count([float('2.0'),double('3.0'),93847382783847382,1]),'average1':avg([float('2.0'),double('3.0'),93847382783847382,1]),'sum1':sum([float('2.0'),double('3.0'),93847382783847382,1]),'min1':min([float('2.0'),double('3.0'),93847382783847382,1]),'max1':max([float('2.0'),double('3.0'),93847382783847382,1]),'count2':count({{float('2.0'),double('3.0'),93847382783847382,1}}),'average2':avg({{float('2.0'),double('3.0'),93847382783847382,1}}),'sum2':sum({{float('2.0'),double('3.0'),93847382783847382,1}}),'min2':min({{float('2.0'),double('3.0'),93847382783847382,1}}),'max2':max({{float('2.0'),double('3.0'),93847382783847382,1}})}; +{'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}})}; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.query.sqlpp index 63ba0ad..42306d8 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.query.sqlpp +++ b/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.count(( +{'count':test.coll_count(( select element t.valplus from Test as t -)),'average':test.avg(( +)),'average':test.coll_avg(( select element t.valplus from Test as t -)),'sum':test.sum(( +)),'sum':test.coll_sum(( select element t.valplus from Test as t -)),'min':test.min(( +)),'min':test.coll_min(( select element t.valplus from Test as t -)),'max':test.max(( +)),'max':test.coll_max(( select element t.valplus from Test as t ))}; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double/avg_double.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double/avg_double.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double/avg_double.3.query.sqlpp index 12a1cfb..ae1b1eb 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double/avg_double.3.query.sqlpp +++ b/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 avg(( +select element coll_avg(( select element x from [1.0,2.0,double('3.0')] as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double_null/avg_double_null.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double_null/avg_double_null.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double_null/avg_double_null.3.query.sqlpp index 2926232..4c10066 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double_null/avg_double_null.3.query.sqlpp +++ b/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.avg(( +{'average':test.coll_avg(( select element x.doubleField from Numeric as x ))}; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.query.sqlpp index 10aa600..d7a5263 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_01/avg_empty_01.3.query.sqlpp +++ b/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.avg(( +select element test.coll_avg(( select element x from [1,2,3] as x where (x > 10) http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.query.sqlpp index 7b6a34a..8d2359f 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.query.sqlpp +++ b/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.avg(( +select element test.coll_avg(( select element x.val from Test as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float/avg_float.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float/avg_float.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float/avg_float.3.query.sqlpp index 264ec2c..14c4bc5 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float/avg_float.3.query.sqlpp +++ b/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.avg(( +select element test.coll_avg(( select element x from [test.float('1'),test.float('2'),test.float('3')] as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float_null/avg_float_nu.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float_null/avg_float_nu.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float_null/avg_float_nu.3.query.sqlpp index bbc0d48..c8c3774 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float_null/avg_float_nu.3.query.sqlpp +++ b/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.avg(( +{'average':test.coll_avg(( select element x.floatField from Numeric as x ))}; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16/avg_int16.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16/avg_int16.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16/avg_int16.3.query.sqlpp index d370467..a755219 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16/avg_int16.3.query.sqlpp +++ b/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.avg(( +select element test.coll_avg(( select element x from [test.int16('1'),test.int16('2'),test.int16('3')] as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.query.sqlpp index 2587a9d..d50b0d1 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.query.sqlpp +++ b/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.avg(( +{'average':test.coll_avg(( select element x.int16Field from Numeric as x ))}; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32/avg_int32.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32/avg_int32.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32/avg_int32.3.query.sqlpp index 769f3d0..a235c84 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32/avg_int32.3.query.sqlpp +++ b/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.avg(( +select element test.coll_avg(( select element x from [1,2,3] as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.query.sqlpp index acb814e..9618d2d 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.query.sqlpp +++ b/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.avg(( +{'average':test.coll_avg(( select element x.int32Field from Numeric as x ))}; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64/avg_int64.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64/avg_int64.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64/avg_int64.3.query.sqlpp index 1734f7f..f090f5b 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64/avg_int64.3.query.sqlpp +++ b/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.avg(( +select element test.coll_avg(( select element x from [test.int64('1'),test.int64('2'),test.int64('3')] as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.query.sqlpp index b320332..8c063d3 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.query.sqlpp +++ b/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.avg(( +{'average':test.coll_avg(( select element x.int64Field from Numeric as x ))}; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8/avg_int8.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8/avg_int8.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8/avg_int8.3.query.sqlpp index f2b9ac6..91ee6be 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8/avg_int8.3.query.sqlpp +++ b/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.avg(( +select element test.coll_avg(( select element x from [test.int8('1'),test.int8('2'),test.int8('3')] as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.query.sqlpp index 1753b77..74fb4c4 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.query.sqlpp +++ b/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.avg(( +{'average':test.coll_avg(( select element x.int8Field from Numeric as x ))}; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_mixed/avg_mixed.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_mixed/avg_mixed.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_mixed/avg_mixed.3.query.sqlpp index 988020f..4043084 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_mixed/avg_mixed.3.query.sqlpp +++ b/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 avg(( +select element coll_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/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_01/count_01.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_01/count_01.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_01/count_01.3.query.sqlpp index 5c81a50..fa90f85 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_01/count_01.3.query.sqlpp +++ b/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.count(( +select element test.coll_count(( select element x from [1,2,3] as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_01/count_empty_01.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_01/count_empty_01.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_01/count_empty_01.3.query.sqlpp index 4be4da7..383671d 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_01/count_empty_01.3.query.sqlpp +++ b/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 count(( +select element coll_count(( select element x from [1,2,3] as x where (x > 10) http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_02/count_empty_02.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_02/count_empty_02.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_02/count_empty_02.3.query.sqlpp index c36e99a..67e6e77 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_02/count_empty_02.3.query.sqlpp +++ b/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.count(( +select element test.coll_count(( select element x.val from Test as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_null/count_null.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_null/count_null.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_null/count_null.3.query.sqlpp index 5d60f10..ec84f7c 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_null/count_null.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_null/count_null.3.query.sqlpp @@ -20,7 +20,7 @@ use test; -{'count':test.count(( +{'count':test.coll_count(( select element x.doubleField from Numeric as x ))}; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue395/issue395.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue395/issue395.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue395/issue395.3.query.sqlpp index 81aa828..feea992 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue395/issue395.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue395/issue395.3.query.sqlpp @@ -20,7 +20,7 @@ use test; -select element test.count(( +select element test.coll_count(( select element l.name from Employee as l )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_0/issue412_0.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_0/issue412_0.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_0/issue412_0.3.query.sqlpp index 5dcf622..deaa68a 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_0/issue412_0.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_0/issue412_0.3.query.sqlpp @@ -17,4 +17,4 @@ * under the License. */ -count(['ASTERIX','Hyracks',null]); +coll_count(['ASTERIX','Hyracks',null]); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_1/issue412_1.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_1/issue412_1.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_1/issue412_1.3.query.sqlpp index 78c9164..9da7811 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_1/issue412_1.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue412_1/issue412_1.3.query.sqlpp @@ -17,4 +17,4 @@ * under the License. */ -{'count':count([1,60,null]),'average':avg([1,60,null]),'sum':sum([1,60,null]),'min':min([1,60,null]),'max':max([1,60,null])}; +{'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])}; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_min_hetero_list/issue425_min_hetero_list.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_min_hetero_list/issue425_min_hetero_list.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_min_hetero_list/issue425_min_hetero_list.3.query.sqlpp index 40631ed..b2c6c66 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_min_hetero_list/issue425_min_hetero_list.3.query.sqlpp +++ b/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. */ -min([23,748374857483]); +coll_min([23,748374857483]); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/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/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.query.sqlpp index 8d438e3..e12e644 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_min_hetero_list_1/issue425_min_hetero_list_1.3.query.sqlpp +++ b/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. */ -min([748374857483,23,0.5]); +coll_min([748374857483,23,0.5]); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.3.query.sqlpp index 17fd1aa..770b7dc 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list/issue425_sum_hetero_list.3.query.sqlpp +++ b/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. */ -sum([23,748374857483]); +coll_sum([23,748374857483]); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/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/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.query.sqlpp index 41429b1..3932e23 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue425_sum_hetero_list_1/issue425_sum_hetero_list_1.3.query.sqlpp +++ b/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. */ -sum([748374857483,23,0.5]); +coll_sum([748374857483,23,0.5]); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.query.sqlpp index b5b9917..2a3312e 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.query.sqlpp +++ b/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.min(( +select element {'min':test.coll_min(( select element l.name from t1 as l - )),'max':test.max(( + )),'max':test.coll_max(( select element l.name from t1 as l ))}; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/max_empty_01/max_empty_01.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/max_empty_01/max_empty_01.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/max_empty_01/max_empty_01.3.query.sqlpp index 8d565eb..fa419e6 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/max_empty_01/max_empty_01.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/max_empty_01/max_empty_01.3.query.sqlpp @@ -25,7 +25,7 @@ use test; -select element test.max(( +select element test.coll_max(( select element x from [1,2,3] as x where (x > 10) http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/max_empty_02/max_empty_02.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/max_empty_02/max_empty_02.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/max_empty_02/max_empty_02.3.query.sqlpp index 442f496..1ad7c2b 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/max_empty_02/max_empty_02.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/max_empty_02/max_empty_02.3.query.sqlpp @@ -25,7 +25,7 @@ use test; -select element test.max(( +select element test.coll_max(( select element x.val from Test as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_empty_01/min_empty_01.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_empty_01/min_empty_01.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_empty_01/min_empty_01.3.query.sqlpp index d476fcf..aa84453 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_empty_01/min_empty_01.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_empty_01/min_empty_01.3.query.sqlpp @@ -25,7 +25,7 @@ use test; -select element test.min(( +select element test.coll_min(( select element x from [1,2,3] as x where (x > 10) http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_empty_02/min_empty_02.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_empty_02/min_empty_02.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_empty_02/min_empty_02.3.query.sqlpp index ad14ddd..bd686b6 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_empty_02/min_empty_02.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_empty_02/min_empty_02.3.query.sqlpp @@ -25,7 +25,7 @@ use test; -select element test.min(( +select element test.coll_min(( select element x.val from Test as x )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_mixed/min_mixed.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_mixed/min_mixed.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_mixed/min_mixed.3.query.sqlpp index 0b5dced..1802fee 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_mixed/min_mixed.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_mixed/min_mixed.3.query.sqlpp @@ -22,7 +22,7 @@ * Date : Jun 2nd 2013 */ -select element min(( +select element coll_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/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/query-issue400/query-issue400.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/query-issue400/query-issue400.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/query-issue400/query-issue400.3.query.sqlpp index d73c8ce..f910f12 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/query-issue400/query-issue400.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/query-issue400/query-issue400.3.query.sqlpp @@ -23,6 +23,6 @@ * Date : 8th May 2013 */ -count((select element i +coll_count((select element i from [[1,2,3,4,5],[6,7,8,9]] as i )); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_avg/scalar_avg.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_avg/scalar_avg.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_avg/scalar_avg.3.query.sqlpp index 8312274..e61b9df 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_avg/scalar_avg.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_avg/scalar_avg.3.query.sqlpp @@ -24,12 +24,12 @@ use test; -with i8 as test.avg([test.int8('1'),test.int8('2'),test.int8('3')]), - i16 as test.avg([test.int16('1'),test.int16('2'),test.int16('3')]), - i32 as test.avg([test.int32('1'),test.int32('2'),test.int32('3')]), - i64 as test.avg([test.int64('1'),test.int64('2'),test.int64('3')]), - f as test.avg([test.float('1'),test.float('2'),test.float('3')]), - d as test.avg([test.double('1'),test.double('2'),test.double('3')]) +with i8 as test.coll_avg([test.int8('1'),test.int8('2'),test.int8('3')]), + i16 as test.coll_avg([test.int16('1'),test.int16('2'),test.int16('3')]), + i32 as test.coll_avg([test.int32('1'),test.int32('2'),test.int32('3')]), + i64 as test.coll_avg([test.int64('1'),test.int64('2'),test.int64('3')]), + f as test.coll_avg([test.float('1'),test.float('2'),test.float('3')]), + d as test.coll_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/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_avg_empty/scalar_avg_empty.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_avg_empty/scalar_avg_empty.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_avg_empty/scalar_avg_empty.3.query.sqlpp index 39344f6..d2655e4 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_avg_empty/scalar_avg_empty.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_avg_empty/scalar_avg_empty.3.query.sqlpp @@ -21,4 +21,4 @@ * Success : Yes */ -select element avg([]); +select element coll_avg([]); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_avg_null/scalar_avg_null.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_avg_null/scalar_avg_null.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_avg_null/scalar_avg_null.3.query.sqlpp index 2e0293f..20f6a18 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_avg_null/scalar_avg_null.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_avg_null/scalar_avg_null.3.query.sqlpp @@ -24,12 +24,12 @@ use test; -with i8 as test.avg([test.int8('1'),test.int8('2'),test.int8('3'),null]), - i16 as test.avg([test.int16('1'),test.int16('2'),test.int16('3'),null]), - i32 as test.avg([test.int32('1'),test.int32('2'),test.int32('3'),null]), - i64 as test.avg([test.int64('1'),test.int64('2'),test.int64('3'),null]), - f as test.avg([test.float('1'),test.float('2'),test.float('3'),null]), - d as test.avg([test.double('1'),test.double('2'),test.double('3'),null]) +with i8 as test.coll_avg([test.int8('1'),test.int8('2'),test.int8('3'),null]), + i16 as test.coll_avg([test.int16('1'),test.int16('2'),test.int16('3'),null]), + i32 as test.coll_avg([test.int32('1'),test.int32('2'),test.int32('3'),null]), + i64 as test.coll_avg([test.int64('1'),test.int64('2'),test.int64('3'),null]), + f as test.coll_avg([test.float('1'),test.float('2'),test.float('3'),null]), + d as test.coll_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/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_count/scalar_count.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_count/scalar_count.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_count/scalar_count.3.query.sqlpp index bcaad9e..8576a74 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_count/scalar_count.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_count/scalar_count.3.query.sqlpp @@ -24,13 +24,13 @@ use test; -with i8 as test.count([test.int8('1'),test.int8('2'),test.int8('3')]), - i16 as test.count([test.int16('1'),test.int16('2'),test.int16('3')]), - i32 as test.count([test.int32('1'),test.int32('2'),test.int32('3')]), - i64 as test.count([test.int64('1'),test.int64('2'),test.int64('3')]), - f as test.count([test.float('1'),test.float('2'),test.float('3')]), - d as test.count([test.double('1'),test.double('2'),test.double('3')]), - s as test.count(['a','b','c']) +with i8 as test.coll_count([test.int8('1'),test.int8('2'),test.int8('3')]), + i16 as test.coll_count([test.int16('1'),test.int16('2'),test.int16('3')]), + i32 as test.coll_count([test.int32('1'),test.int32('2'),test.int32('3')]), + i64 as test.coll_count([test.int64('1'),test.int64('2'),test.int64('3')]), + f as test.coll_count([test.float('1'),test.float('2'),test.float('3')]), + d as test.coll_count([test.double('1'),test.double('2'),test.double('3')]), + s as test.coll_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/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_count_empty/scalar_count_empty.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_count_empty/scalar_count_empty.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_count_empty/scalar_count_empty.3.query.sqlpp index ce9798d..d2fff80 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_count_empty/scalar_count_empty.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_count_empty/scalar_count_empty.3.query.sqlpp @@ -24,4 +24,4 @@ use test; -select element test.count([]); +select element test.coll_count([]); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_count_null/scalar_count_null.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_count_null/scalar_count_null.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_count_null/scalar_count_null.3.query.sqlpp index 8cb1e66..14eeb83 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_count_null/scalar_count_null.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_count_null/scalar_count_null.3.query.sqlpp @@ -24,13 +24,13 @@ use test; -with i8 as test.count([test.int8('1'),test.int8('2'),test.int8('3'),null]), - i16 as test.count([test.int16('1'),test.int16('2'),test.int16('3'),null]), - i32 as test.count([test.int32('1'),test.int32('2'),test.int32('3'),null]), - i64 as test.count([test.int64('1'),test.int64('2'),test.int64('3'),null]), - f as test.count([test.float('1'),test.float('2'),test.float('3'),null]), - d as test.count([test.double('1'),test.double('2'),test.double('3'),null]), - s as test.count(['a','b','c',null]) +with i8 as test.coll_count([test.int8('1'),test.int8('2'),test.int8('3'),null]), + i16 as test.coll_count([test.int16('1'),test.int16('2'),test.int16('3'),null]), + i32 as test.coll_count([test.int32('1'),test.int32('2'),test.int32('3'),null]), + i64 as test.coll_count([test.int64('1'),test.int64('2'),test.int64('3'),null]), + f as test.coll_count([test.float('1'),test.float('2'),test.float('3'),null]), + d as test.coll_count([test.double('1'),test.double('2'),test.double('3'),null]), + s as test.coll_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/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_max/scalar_max.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_max/scalar_max.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_max/scalar_max.3.query.sqlpp index 0070b55..da37e7c 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_max/scalar_max.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_max/scalar_max.3.query.sqlpp @@ -24,14 +24,14 @@ use test; -with i8 as test.max([test.int8('1'),test.int8('2'),test.int8('3')]), - i16 as test.max([test.int16('1'),test.int16('2'),test.int16('3')]), - i32 as test.max([test.int32('1'),test.int32('2'),test.int32('3')]), - i64 as test.max([test.int64('1'),test.int64('2'),test.int64('3')]), - f as test.max([test.float('1'),test.float('2'),test.float('3')]), - d as test.max([test.double('1'),test.double('2'),test.double('3')]), - s as test.max(['foo','bar','world']), - dt as test.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.coll_max([test.int8('1'),test.int8('2'),test.int8('3')]), + i16 as test.coll_max([test.int16('1'),test.int16('2'),test.int16('3')]), + i32 as test.coll_max([test.int32('1'),test.int32('2'),test.int32('3')]), + i64 as test.coll_max([test.int64('1'),test.int64('2'),test.int64('3')]), + f as test.coll_max([test.float('1'),test.float('2'),test.float('3')]), + d as test.coll_max([test.double('1'),test.double('2'),test.double('3')]), + s as test.coll_max(['foo','bar','world']), + dt as test.coll_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/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_max_empty/scalar_max_empty.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_max_empty/scalar_max_empty.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_max_empty/scalar_max_empty.3.query.sqlpp index 3bbf7e5..7978919 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_max_empty/scalar_max_empty.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_max_empty/scalar_max_empty.3.query.sqlpp @@ -24,4 +24,4 @@ use test; -select element test.max([]); +select element test.coll_max([]); http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_max_null/scalar_max_null.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_max_null/scalar_max_null.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_max_null/scalar_max_null.3.query.sqlpp index bccf473..036a5bb 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_max_null/scalar_max_null.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_max_null/scalar_max_null.3.query.sqlpp @@ -24,14 +24,14 @@ use test; -with i8 as test.max([test.int8('1'),test.int8('2'),test.int8('3'),null]), - i16 as test.max([test.int16('1'),test.int16('2'),test.int16('3'),null]), - i32 as test.max([test.int32('1'),test.int32('2'),test.int32('3'),null]), - i64 as test.max([test.int64('1'),test.int64('2'),test.int64('3'),null]), - f as test.max([test.float('1'),test.float('2'),test.float('3'),null]), - d as test.max([test.double('1'),test.double('2'),test.double('3'),null]), - s as test.max(['foo','bar','world',null]), - dt as test.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.coll_max([test.int8('1'),test.int8('2'),test.int8('3'),null]), + i16 as test.coll_max([test.int16('1'),test.int16('2'),test.int16('3'),null]), + i32 as test.coll_max([test.int32('1'),test.int32('2'),test.int32('3'),null]), + i64 as test.coll_max([test.int64('1'),test.int64('2'),test.int64('3'),null]), + f as test.coll_max([test.float('1'),test.float('2'),test.float('3'),null]), + d as test.coll_max([test.double('1'),test.double('2'),test.double('3'),null]), + s as test.coll_max(['foo','bar','world',null]), + dt as test.coll_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/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_min/scalar_min.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_min/scalar_min.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_min/scalar_min.3.query.sqlpp index 89e07a1..783c168 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_min/scalar_min.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_min/scalar_min.3.query.sqlpp @@ -24,14 +24,14 @@ use test; -with i8 as test.min([test.int8('1'),test.int8('2'),test.int8('3')]), - i16 as test.min([test.int16('1'),test.int16('2'),test.int16('3')]), - i32 as test.min([test.int32('1'),test.int32('2'),test.int32('3')]), - i64 as test.min([test.int64('1'),test.int64('2'),test.int64('3')]), - f as test.min([test.float('1'),test.float('2'),test.float('3')]), - d as test.min([test.double('1'),test.double('2'),test.double('3')]), - s as test.min(['foo','bar','world']), - dt as test.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.coll_min([test.int8('1'),test.int8('2'),test.int8('3')]), + i16 as test.coll_min([test.int16('1'),test.int16('2'),test.int16('3')]), + i32 as test.coll_min([test.int32('1'),test.int32('2'),test.int32('3')]), + i64 as test.coll_min([test.int64('1'),test.int64('2'),test.int64('3')]), + f as test.coll_min([test.float('1'),test.float('2'),test.float('3')]), + d as test.coll_min([test.double('1'),test.double('2'),test.double('3')]), + s as test.coll_min(['foo','bar','world']), + dt as test.coll_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/incubator-asterixdb/blob/3dd80ec4/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_min_empty/scalar_min_empty.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_min_empty/scalar_min_empty.3.query.sqlpp b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_min_empty/scalar_min_empty.3.query.sqlpp index 2d1db86..8a9f7ec 100644 --- a/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_min_empty/scalar_min_empty.3.query.sqlpp +++ b/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/scalar_min_empty/scalar_min_empty.3.query.sqlpp @@ -24,4 +24,4 @@ use test; -select element test.min([]); +select element test.coll_min([]);