http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.sqlpp index bad8e2e..4c34aef 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.sqlpp @@ -32,7 +32,7 @@ set `import-private-functions` `true`; create type test.DBLPType as { - id : int32, + id : integer, dblpid : string, authors : string, misc : string
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.sqlpp index 63f42fa..2aa1c1f 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.sqlpp @@ -32,7 +32,7 @@ set `import-private-functions` `true`; create type test.DBLPType as { - id : int32, + id : integer, dblpid : string, authors : string, misc : string @@ -40,7 +40,7 @@ create type test.DBLPType as create type test.CSXType as { - id : int32, + id : integer, csxid : string, authors : string, misc : string http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.sqlpp index 977f9f6..1da54bd 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.sqlpp @@ -33,7 +33,7 @@ set `import-private-functions` `true`; create type test.DBLPType as { - id : int32, + id : integer, dblpid : string, authors : string, misc : string http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp index 76c7f87..4f80369 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp @@ -30,7 +30,7 @@ use test; create type test.DBLPType as { - id : int32, + id : integer, dblpid : string, authors : string, misc : string @@ -38,7 +38,7 @@ create type test.DBLPType as create type test.CSXType as closed { - id : int32, + id : integer, csxid : string, title : string, authors : string, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp index 51ba227..5afa445 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp @@ -30,7 +30,7 @@ use test; create type test.DBLPType as closed { - id : int32, + id : integer, dblpid : string, title : string, authors : string, @@ -39,7 +39,7 @@ create type test.DBLPType as create type test.CSXType as { - id : int32, + id : integer, csxid : string, authors : string, misc : string http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp index 9c9597b..4c0f319 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp @@ -30,7 +30,7 @@ use test; create type test.DBLPType as { - id : int32, + id : integer, dblpid : string, authors : string, misc : string http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp index 3874ec6..9693ce0 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp @@ -30,7 +30,7 @@ use test; create type test.DBLPType as { - id : int32, + id : integer, dblpid : string, authors : string, misc : string @@ -38,7 +38,7 @@ create type test.DBLPType as create type test.CSXType as { - id : int32, + id : integer, csxid : string, authors : string, misc : string http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp index 81bce6b..e9f647b 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp @@ -34,21 +34,21 @@ create type test.TwitterUserType as closed { `screen-name` : string, lang : string, - `friends-count` : int32, - `statuses-count` : int32, + `friends-count` : integer, + `statuses-count` : integer, name : string, - `followers-count` : int32 + `followers-count` : integer } create type test.TweetMessageType as { - tweetid : int64, + tweetid : bigint, user : TwitterUserType, `sender-location` : point, `send-time` : datetime, `referred-topics` : {{string}}, - countA : int32, - countB : int32 + countA : integer, + countB : integer } create dataset TweetMessages(TweetMessageType) primary key tweetid; @@ -66,5 +66,5 @@ select element {'t1':t1.tweetid,'t2':t2.tweetid,'sim':sim[1]} from TweetMessages as t1, TweetMessages as t2 with sim as test.`similarity-jaccard-check`(test.`word-tokens`(t1.`message-text`),test.`word-tokens`(t2.`message-text`),0.600000f) -where (sim[0] and (t1.tweetid < test.int64('20')) and (t2.tweetid != t1.tweetid)) +where (sim[0] and (t1.tweetid < test.bigint('20')) and (t2.tweetid != t1.tweetid)) ; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.sqlpp index a8a2b79..95db0e9 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.sqlpp @@ -30,7 +30,7 @@ use test; create type test.DBLPType as { - id : int32, + id : integer, dblpid : string, authors : string, misc : string @@ -38,7 +38,7 @@ create type test.DBLPType as create type test.CSXType as closed { - id : int32, + id : integer, csxid : string, title : string, authors : string, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.sqlpp index bb70c14..1532cf9 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.sqlpp @@ -30,7 +30,7 @@ use test; create type test.DBLPType as closed { - id : int32, + id : integer, dblpid : string, title : string, authors : string, @@ -39,7 +39,7 @@ create type test.DBLPType as create type test.CSXType as { - id : int32, + id : integer, csxid : string, authors : string, misc : string http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.sqlpp index 818cef6..bee9fd1 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.sqlpp @@ -30,7 +30,7 @@ use test; create type test.DBLPType as { - id : int32, + id : integer, dblpid : string, authors : string, misc : string http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.sqlpp index 2dc7c71..d1ba535 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.sqlpp @@ -30,7 +30,7 @@ use test; create type test.DBLPType as { - id : int32, + id : integer, dblpid : string, authors : string, misc : string @@ -38,7 +38,7 @@ create type test.DBLPType as create type test.CSXType as { - id : int32, + id : integer, csxid : string, authors : string, misc : string http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.sqlpp index aefcbfe..d4793b0 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.sqlpp @@ -31,7 +31,7 @@ use test; create type test.DBLPType as { - id : int32, + id : integer, dblpid : string, authors : string, misc : string http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.sqlpp index 8050164..b0429d0 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.sqlpp @@ -30,7 +30,7 @@ use test; create type test.DBLPType as { - id : int32, + id : integer, dblpid : string, authors : string, misc : string @@ -38,7 +38,7 @@ create type test.DBLPType as create type test.CSXType as closed { - id : int32, + id : integer, csxid : string, title : string, authors : string, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.sqlpp index b343255..cc0eeee 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.sqlpp @@ -30,7 +30,7 @@ use test; create type test.DBLPType as closed { - id : int32, + id : integer, dblpid : string, title : string, authors : string, @@ -39,7 +39,7 @@ create type test.DBLPType as create type test.CSXType as { - id : int32, + id : integer, csxid : string, authors : string, misc : string http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.sqlpp index 3396a88..50f5f99 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.sqlpp @@ -30,7 +30,7 @@ use test; create type test.DBLPType as { - id : int32, + id : integer, dblpid : string, authors : string, misc : string http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.sqlpp index 9ec32c8..0332e72 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.sqlpp @@ -30,7 +30,7 @@ use test; create type test.DBLPType as { - id : int32, + id : integer, dblpid : string, authors : string, misc : string @@ -38,7 +38,7 @@ create type test.DBLPType as create type test.CSXType as { - id : int32, + id : integer, csxid : string, authors : string, misc : string http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.sqlpp index 36cbcea..a32e635 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.sqlpp @@ -31,7 +31,7 @@ use test; create type test.DBLPType as { - id : int32, + id : integer, dblpid : string, authors : string, misc : string http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp index 9bf6da7..9316496 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp @@ -33,21 +33,21 @@ create type test.TwitterUserType as closed { `screen-name` : string, lang : string, - `friends-count` : int32, - `statuses-count` : int32, + `friends-count` : integer, + `statuses-count` : integer, name : string, - `followers-count` : int32 + `followers-count` : integer } create type test.TweetMessageType as { - tweetid : int64, + tweetid : bigint, user : TwitterUserType, `send-time` : datetime, `referred-topics` : {{string}}, `message-text` : string, - countA : int32, - countB : int32 + countA : integer, + countB : integer } create dataset TweetMessages(TweetMessageType) primary key tweetid; @@ -69,6 +69,6 @@ select element {'tweetid1':t1.tweetid,'loc1':t1.`sender-location`,'nearby-messag )} from TweetMessages as t1 with n as test.`create-circle`(t1.`sender-location`,0.5) -where (t1.tweetid < test.int64('10')) +where (t1.tweetid < test.bigint('10')) order by t1.tweetid ; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp index 07b14fd..2e98762 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp @@ -33,21 +33,21 @@ create type test.TwitterUserType as closed { `screen-name` : string, lang : string, - `friends-count` : int32, - `statuses-count` : int32, + `friends-count` : integer, + `statuses-count` : integer, name : string, - `followers-count` : int32 + `followers-count` : integer } create type test.TweetMessageType as { - tweetid : int64, + tweetid : bigint, user : TwitterUserType, `send-time` : datetime, `referred-topics` : {{string}}, `message-text` : string, - countA : int32, - countB : int32 + countA : integer, + countB : integer } create dataset TweetMessages(TweetMessageType) primary key tweetid; @@ -69,6 +69,6 @@ select element {'tweetid1':t1.tweetid,'loc1':t1.`sender-location`,'nearby-messag )} from TweetMessages as t1 with n as test.`create-circle`(t1.`sender-location`,0.5) -where (t1.tweetid < test.int64('10')) +where (t1.tweetid < test.bigint('10')) order by t1.tweetid ; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.sqlpp index d073c92..66a2d7d 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.sqlpp @@ -31,7 +31,7 @@ use test; create type test.MyRecord as closed { - id : int32, + id : integer, point : point, kwds : string, line1 : line, @@ -43,7 +43,7 @@ create type test.MyRecord as create type test.MyRecordOpen as { - id : int32, + id : integer, kwds : string, line1 : line, line2 : line, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.sqlpp index 254b252..e9ff808 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.sqlpp @@ -31,7 +31,7 @@ use test; create type test.MyRecord as closed { - id : int32, + id : integer, point : point, kwds : string, line1 : line, @@ -43,7 +43,7 @@ create type test.MyRecord as create type test.MyRecordOpen as { - id : int32, + id : integer, kwds : string, line1 : line, line2 : line, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.sqlpp index 3741459..17f34b9 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.sqlpp @@ -31,7 +31,7 @@ use test; create type test.MyRecord as { - id : int32, + id : integer, kwds : string, line1 : line, line2 : line, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.sqlpp index ef5f0ae..ed4abbc 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.sqlpp @@ -31,7 +31,7 @@ use test; create type test.MyRecord as { - id : int32, + id : integer, kwds : string, line1 : line, line2 : line, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.sqlpp index d58b8f5..c5482f8 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.sqlpp @@ -31,7 +31,7 @@ use test; create type test.MyRecord as { - id : int32, + id : integer, kwds : string, line1 : line, line2 : line, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orderby-desc-using-gby.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orderby-desc-using-gby.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orderby-desc-using-gby.sqlpp index ab15e15..86bf00b 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orderby-desc-using-gby.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orderby-desc-using-gby.sqlpp @@ -25,19 +25,19 @@ use `gby-using-orderby-desc`; create type `gby-using-orderby-desc`.AddressType as closed { - number : int32, + number : integer, street : string, city : string } create type `gby-using-orderby-desc`.CustomerType as closed { - cid : int32, + cid : integer, name : string, - age : int32?, + age : integer?, address : AddressType?, lastorder : { - oid : int32, + oid : integer, total : float } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp index d70364a..734f80b 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp @@ -25,8 +25,8 @@ use `orders-aggreg`; create type `orders-aggreg`.OrderType as closed { - oid : int32, - cid : int32, + oid : integer, + cid : integer, orderstatus : string, orderpriority : string, clerk : string, @@ -40,10 +40,10 @@ create nodegroup group1 if not exists on create dataset Orders(OrderType) primary key oid on group1; write output to asterix_nc1:"/tmp/orders-aggreg.adm" -select element {'cid':cid,'ordpercust':`orders-aggreg`.coll_count(o),'totalcust':`orders-aggreg`.coll_sum(( +select element {'cid':cid,'ordpercust':`orders-aggreg`.array_count(o),'totalcust':`orders-aggreg`.array_sum(( select element i.total from o as i - )),'avgcust':`orders-aggreg`.coll_avg(( + )),'avgcust':`orders-aggreg`.array_avg(( select element i.total from o as i ))} http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-composite-index-search.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-composite-index-search.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-composite-index-search.sqlpp index 684d222..2870161 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-composite-index-search.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-composite-index-search.sqlpp @@ -25,14 +25,14 @@ use index_search; create type index_search.OrderType as closed { - o_orderkey : int32, - o_custkey : int32, + o_orderkey : integer, + o_custkey : integer, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int32, + o_shippriority : integer, o_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_01.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_01.sqlpp index f49bb23..05e89ac 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_01.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_01.sqlpp @@ -25,14 +25,14 @@ use tpch; create type tpch.OrderType as { - o_orderkey : int32, - o_custkey : int32, + o_orderkey : integer, + o_custkey : integer, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int32, + o_shippriority : integer, o_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_02.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_02.sqlpp index 0e3d988..4d938a6 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_02.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_02.sqlpp @@ -25,14 +25,14 @@ use tpch; create type tpch.OrderType as { - o_orderkey : int32, - o_custkey : int32, + o_orderkey : integer, + o_custkey : integer, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int32, + o_shippriority : integer, o_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_01.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_01.sqlpp index f111ed8..244b6e5 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_01.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_01.sqlpp @@ -25,14 +25,14 @@ use tpch; create type tpch.OrderType as closed { - o_orderkey : int32, - o_custkey : int32, + o_orderkey : integer, + o_custkey : integer, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int32, + o_shippriority : integer, o_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_02.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_02.sqlpp index 83a5d6c..e6a1f7c 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_02.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_02.sqlpp @@ -25,14 +25,14 @@ use tpch; create type tpch.OrderType as closed { - o_orderkey : int32, - o_custkey : int32, + o_orderkey : integer, + o_custkey : integer, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int32, + o_shippriority : integer, o_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-open.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-open.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-open.sqlpp index 2605ee9..5d713d2 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-open.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-open.sqlpp @@ -25,14 +25,14 @@ use index_search; create type index_search.OrderType as { - o_orderkey : int32, - o_custkey : int32, + o_orderkey : integer, + o_custkey : integer, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int32, + o_shippriority : integer, o_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search.sqlpp index f144db5..e4fec15 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search.sqlpp @@ -25,14 +25,14 @@ use index_search; create type index_search.OrderType as closed { - o_orderkey : int32, - o_custkey : int32, + o_orderkey : integer, + o_custkey : integer, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int32, + o_shippriority : integer, o_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search-open.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search-open.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search-open.sqlpp index 85cea3c..69f90f9 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search-open.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search-open.sqlpp @@ -25,14 +25,14 @@ use prim_index_search; create type prim_index_search.OrderType as { - o_orderkey : int32, - o_custkey : int32, + o_orderkey : integer, + o_custkey : integer, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int32, + o_shippriority : integer, o_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search.sqlpp index fb1bc83..f658423 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search.sqlpp @@ -25,14 +25,14 @@ use prim_index_search; create type prim_index_search.OrderType as closed { - o_orderkey : int32, - o_custkey : int32, + o_orderkey : integer, + o_custkey : integer, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int32, + o_shippriority : integer, o_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/pull_select_above_eq_join.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/pull_select_above_eq_join.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/pull_select_above_eq_join.sqlpp index dfe276c..0d1d4b9 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/pull_select_above_eq_join.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/pull_select_above_eq_join.sqlpp @@ -25,18 +25,18 @@ use `pull-select-above-eq-join`; create type `pull-select-above-eq-join`.UserType as { - uid : int32, + uid : integer, name : string, city : string, - lottery_numbers : {{int32}} + lottery_numbers : {{integer}} } create type `pull-select-above-eq-join`.VisitorType as { - vid : int32, + vid : integer, name : string, city : string, - lottery_numbers : {{int32}} + lottery_numbers : {{integer}} } create nodegroup group1 if not exists on http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push-project-through-group.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push-project-through-group.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push-project-through-group.sqlpp index fe11f66..02b6a90 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push-project-through-group.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push-project-through-group.sqlpp @@ -25,7 +25,7 @@ use fuzzyjoin_080; create type fuzzyjoin_080.DBLPType as { - id : int32, + id : integer, dblpid : string, title : string, authors : string, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push_limit.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push_limit.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push_limit.sqlpp index 5730c7a..7c36684 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push_limit.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push_limit.sqlpp @@ -25,14 +25,14 @@ use tpch; create type tpch.OrderType as closed { - o_orderkey : int32, - o_custkey : int32, + o_orderkey : integer, + o_custkey : integer, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int32, + o_shippriority : integer, o_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q01_pricing_summary_report_nt.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q01_pricing_summary_report_nt.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q01_pricing_summary_report_nt.sqlpp index f978e43..db5e29f 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q01_pricing_summary_report_nt.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q01_pricing_summary_report_nt.sqlpp @@ -25,10 +25,10 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int32, - l_partkey : int32, - l_suppkey : int32, - l_linenumber : int32, + l_orderkey : integer, + l_partkey : integer, + l_suppkey : integer, + l_linenumber : integer, l_quantity : double, l_extendedprice : double, l_discount : double, @@ -48,28 +48,28 @@ create dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber; load dataset LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted; write output to asterix_nc1:"rttest/tpch_q1_pricing_summary_report_nt.adm" -select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'sum_qty':tpch.coll_sum(( +select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'sum_qty':tpch.array_sum(( select element i.l_quantity from l as i - )),'sum_base_price':tpch.coll_sum(( + )),'sum_base_price':tpch.array_sum(( select element i.l_extendedprice from l as i - )),'sum_disc_price':tpch.coll_sum(( + )),'sum_disc_price':tpch.array_sum(( select element (i.l_extendedprice * (1 - i.l_discount)) from l as i - )),'sum_charge':tpch.coll_sum(( + )),'sum_charge':tpch.array_sum(( select element (i.l_extendedprice * (1 - i.l_discount) * (1 + i.l_tax)) from l as i - )),'ave_qty':tpch.coll_avg(( + )),'ave_qty':tpch.array_avg(( select element i.l_quantity from l as i - )),'ave_price':tpch.coll_avg(( + )),'ave_price':tpch.array_avg(( select element i.l_extendedprice from l as i - )),'ave_disc':tpch.coll_avg(( + )),'ave_disc':tpch.array_avg(( select element i.l_discount from l as i - )),'count_order':tpch.coll_count(l)} + )),'count_order':tpch.array_count(l)} from LineItem as l where (l.l_shipdate <= '1998-09-02') /* +hash */ http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp index f2a209b..6765482 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp @@ -25,10 +25,10 @@ use q3_shipping_priority; create type q3_shipping_priority.LineItemType as closed { - l_orderkey : int32, - l_partkey : int32, - l_suppkey : int32, - l_linenumber : int32, + l_orderkey : integer, + l_partkey : integer, + l_suppkey : integer, + l_linenumber : integer, l_quantity : double, l_extendedprice : double, l_discount : double, @@ -45,23 +45,23 @@ create type q3_shipping_priority.LineItemType as create type q3_shipping_priority.OrderType as closed { - o_orderkey : int32, - o_custkey : int32, + o_orderkey : integer, + o_custkey : integer, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int32, + o_shippriority : integer, o_comment : string } create type q3_shipping_priority.CustomerType as closed { - c_custkey : int32, + c_custkey : integer, c_name : string, c_address : string, - c_nationkey : int32, + c_nationkey : integer, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -86,7 +86,7 @@ from Customers as c, where (((c.c_mktsegment = 'BUILDING') and (c.c_custkey = o.o_custkey)) and ((l.l_orderkey = o.o_orderkey) and (o.o_orderdate < '1995-03-15') and (l.l_shipdate > '1995-03-15'))) /* +hash */ group by l.l_orderkey as l_orderkey,o.o_orderdate as o_orderdate,o.o_shippriority as o_shippriority -with revenue as q3_shipping_priority.coll_sum(( +with revenue as q3_shipping_priority.array_sum(( select element (i.l_extendedprice * (1 - i.l_discount)) from l as i )) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp index eea7ff7..ae0f070 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp @@ -25,10 +25,10 @@ use q5_local_supplier; create type q5_local_supplier.LineItemType as closed { - l_orderkey : int32, - l_partkey : int32, - l_suppkey : int32, - l_linenumber : int32, + l_orderkey : integer, + l_partkey : integer, + l_suppkey : integer, + l_linenumber : integer, l_quantity : double, l_extendedprice : double, l_discount : double, @@ -45,23 +45,23 @@ create type q5_local_supplier.LineItemType as create type q5_local_supplier.OrderType as closed { - o_orderkey : int32, - o_custkey : int32, + o_orderkey : integer, + o_custkey : integer, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int32, + o_shippriority : integer, o_comment : string } create type q5_local_supplier.CustomerType as closed { - c_custkey : int32, + c_custkey : integer, c_name : string, c_address : string, - c_nationkey : int32, + c_nationkey : integer, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type q5_local_supplier.CustomerType as create type q5_local_supplier.SupplierType as closed { - s_suppkey : int32, + s_suppkey : integer, s_name : string, s_address : string, - s_nationkey : int32, + s_nationkey : integer, s_phone : string, s_acctbal : double, s_comment : string @@ -81,15 +81,15 @@ create type q5_local_supplier.SupplierType as create type q5_local_supplier.NationType as closed { - n_nationkey : int32, + n_nationkey : integer, n_name : string, - n_regionkey : int32, + n_regionkey : integer, n_comment : string } create type q5_local_supplier.RegionType as closed { - r_regionkey : int32, + r_regionkey : integer, r_name : string, r_comment : string } @@ -137,7 +137,7 @@ from Customers as c, where ((c.c_nationkey = o1.s_nationkey) and (c.c_custkey = o1.o_custkey)) /* +hash */ group by o1.n_name as n_name -with revenue as q5_local_supplier.coll_sum(( +with revenue as q5_local_supplier.array_sum(( select element (i.l_extendedprice * (1 - i.l_discount)) from o1 as i )) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q08_group_by.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q08_group_by.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q08_group_by.sqlpp index c734437..f0310dd 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q08_group_by.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q08_group_by.sqlpp @@ -25,10 +25,10 @@ use q08_group_by; create type q08_group_by.LineItemType as closed { - l_orderkey : int32, - l_partkey : int32, - l_suppkey : int32, - l_linenumber : int32, + l_orderkey : integer, + l_partkey : integer, + l_suppkey : integer, + l_linenumber : integer, l_quantity : double, l_extendedprice : double, l_discount : double, @@ -45,23 +45,23 @@ create type q08_group_by.LineItemType as create type q08_group_by.OrderType as closed { - o_orderkey : int32, - o_custkey : int32, + o_orderkey : integer, + o_custkey : integer, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int32, + o_shippriority : integer, o_comment : string } create type q08_group_by.CustomerType as closed { - c_custkey : int32, + c_custkey : integer, c_name : string, c_address : string, - c_nationkey : int32, + c_nationkey : integer, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type q08_group_by.CustomerType as create type q08_group_by.SupplierType as closed { - s_suppkey : int32, + s_suppkey : integer, s_name : string, s_address : string, - s_nationkey : int32, + s_nationkey : integer, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type q08_group_by.SupplierType as create type q08_group_by.NationType as closed { - n_nationkey : int32, + n_nationkey : integer, n_name : string, - n_regionkey : int32, + n_regionkey : integer, n_comment : string } create type q08_group_by.RegionType as closed { - r_regionkey : int32, + r_regionkey : integer, r_name : string, r_comment : string } create type q08_group_by.PartType as closed { - p_partkey : int32, + p_partkey : integer, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int32, + p_size : integer, p_container : string, p_retailprice : double, p_comment : string http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q09_group_by.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q09_group_by.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q09_group_by.sqlpp index 6e103a5..e85d97d 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q09_group_by.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q09_group_by.sqlpp @@ -25,11 +25,11 @@ use q09_group_by; create type q09_group_by.LineItemType as closed { - l_orderkey : int32, - l_partkey : int32, - l_suppkey : int32, - l_linenumber : int32, - l_quantity : int32, + l_orderkey : integer, + l_partkey : integer, + l_suppkey : integer, + l_linenumber : integer, + l_quantity : integer, l_extendedprice : double, l_discount : double, l_tax : double, @@ -45,23 +45,23 @@ create type q09_group_by.LineItemType as create type q09_group_by.OrderType as closed { - o_orderkey : int32, - o_custkey : int32, + o_orderkey : integer, + o_custkey : integer, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int32, + o_shippriority : integer, o_comment : string } create type q09_group_by.CustomerType as closed { - c_custkey : int32, + c_custkey : integer, c_name : string, c_address : string, - c_nationkey : int32, + c_nationkey : integer, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type q09_group_by.CustomerType as create type q09_group_by.SupplierType as closed { - s_suppkey : int32, + s_suppkey : integer, s_name : string, s_address : string, - s_nationkey : int32, + s_nationkey : integer, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type q09_group_by.SupplierType as create type q09_group_by.NationType as closed { - n_nationkey : int32, + n_nationkey : integer, n_name : string, - n_regionkey : int32, + n_regionkey : integer, n_comment : string } create type q09_group_by.RegionType as closed { - r_regionkey : int32, + r_regionkey : integer, r_name : string, r_comment : string } create type q09_group_by.PartType as closed { - p_partkey : int32, + p_partkey : integer, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int32, + p_size : integer, p_container : string, p_retailprice : double, p_comment : string @@ -109,9 +109,9 @@ create type q09_group_by.PartType as create type q09_group_by.PartSuppType as closed { - ps_partkey : int32, - ps_suppkey : int32, - ps_availqty : int32, + ps_partkey : integer, + ps_suppkey : integer, + ps_availqty : integer, ps_supplycost : double, ps_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue562.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue562.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue562.sqlpp index 42faa43..d869b55 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue562.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue562.sqlpp @@ -31,11 +31,11 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int32, - l_partkey : int32, - l_suppkey : int32, - l_linenumber : int32, - l_quantity : int32, + l_orderkey : integer, + l_partkey : integer, + l_suppkey : integer, + l_linenumber : integer, + l_quantity : integer, l_extendedprice : double, l_discount : double, l_tax : double, @@ -51,23 +51,23 @@ create type tpch.LineItemType as create type tpch.OrderType as closed { - o_orderkey : int32, - o_custkey : int32, + o_orderkey : integer, + o_custkey : integer, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int32, + o_shippriority : integer, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int32, + c_custkey : integer, c_name : string, c_address : string, - c_nationkey : int32, + c_nationkey : integer, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -86,18 +86,18 @@ declare function q22_customer_tmp() { where ((phone_substr = '13') or (phone_substr = '31') or (phone_substr = '23') or (phone_substr = '29') or (phone_substr = '30') or (phone_substr = '18') or (phone_substr = '17')) ) }; -with avg as tpch.coll_avg(( +with avg as tpch.array_avg(( select element c.c_acctbal from Customer as c with phone_substr as tpch.substring(c.c_phone,1,2) where ((c.c_acctbal > 0.0) and ((phone_substr = '13') or (phone_substr = '31') or (phone_substr = '23') or (phone_substr = '29') or (phone_substr = '30') or (phone_substr = '18') or (phone_substr = '17'))) )) -select element {'cntrycode':cntrycode,'numcust':tpch.coll_count(ct),'totacctbal':tpch.coll_sum(( +select element {'cntrycode':cntrycode,'numcust':tpch.array_count(ct),'totacctbal':tpch.array_sum(( select element i.c_acctbal from ct as i ))} from tpch.q22_customer_tmp() as ct -where (tpch.coll_count(( +where (tpch.array_count(( select element o from Orders as o where (ct.c_custkey = o.o_custkey) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue601.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue601.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue601.sqlpp index 639ae51..346c1a4 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue601.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue601.sqlpp @@ -31,10 +31,10 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int32, - l_partkey : int32, - l_suppkey : int32, - l_linenumber : int32, + l_orderkey : integer, + l_partkey : integer, + l_suppkey : integer, + l_linenumber : integer, l_quantity : double, l_extendedprice : double, l_discount : double, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue697.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue697.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue697.sqlpp index d9afebe..63a2489 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue697.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue697.sqlpp @@ -31,13 +31,13 @@ use test; create type test.TestType as closed { - key1 : int32, - `value` : int32 + key1 : integer, + `value` : integer } create dataset test(TestType) primary key key1; -select element {'gid':aid,'avg':test.coll_avg(( +select element {'gid':aid,'avg':test.array_avg(( select element j.`value` from i as j where j.`value` is not null http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue785.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue785.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue785.sqlpp index eb12ea9..58ac609 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue785.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue785.sqlpp @@ -31,23 +31,23 @@ use tpch; create type tpch.OrderType as closed { - o_orderkey : int32, - o_custkey : int32, + o_orderkey : integer, + o_custkey : integer, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int32, + o_shippriority : integer, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int32, + c_custkey : integer, c_name : string, c_address : string, - c_nationkey : int32, + c_nationkey : integer, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -56,10 +56,10 @@ create type tpch.CustomerType as create type tpch.SupplierType as closed { - s_suppkey : int32, + s_suppkey : integer, s_name : string, s_address : string, - s_nationkey : int32, + s_nationkey : integer, s_phone : string, s_acctbal : double, s_comment : string @@ -67,15 +67,15 @@ create type tpch.SupplierType as create type tpch.NationType as closed { - n_nationkey : int32, + n_nationkey : integer, n_name : string, - n_regionkey : int32, + n_regionkey : integer, n_comment : string } create type tpch.RegionType as closed { - r_regionkey : int32, + r_regionkey : integer, r_name : string, r_comment : string } @@ -105,7 +105,7 @@ with t as ( Orders as orders where ((orders.o_custkey = customer.c_custkey) and (customer.c_nationkey = n.n_nationkey)) group by orders.o_orderdate as orderdate,n.n_nationkey as nation_key - with sum as tpch.coll_sum(( + with sum as tpch.array_sum(( select element o.o_totalprice from orders as o )) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810-2.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810-2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810-2.sqlpp index 1cfdc3e..6d0e91f 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810-2.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810-2.sqlpp @@ -31,10 +31,10 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int32, - l_partkey : int32, - l_suppkey : int32, - l_linenumber : int32, + l_orderkey : integer, + l_partkey : integer, + l_suppkey : integer, + l_linenumber : integer, l_quantity : double, l_extendedprice : double, l_discount : double, @@ -51,7 +51,7 @@ create type tpch.LineItemType as create dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber; -select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'count_cheaps':tpch.coll_count(cheaps),'avg_expensive_discounts':tpch.coll_avg(expensives),'sum_disc_prices':tpch.coll_sum(disc_prices),'total_charges':tpch.coll_sum(charges)} +select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'count_cheaps':tpch.array_count(cheaps),'avg_expensive_discounts':tpch.array_avg(expensives),'sum_disc_prices':tpch.array_sum(disc_prices),'total_charges':tpch.array_sum(charges)} from LineItem as l where (l.l_shipdate <= '1998-09-02') /* +hash */ http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810.sqlpp index f66be11..1210c38 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810.sqlpp @@ -31,10 +31,10 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int32, - l_partkey : int32, - l_suppkey : int32, - l_linenumber : int32, + l_orderkey : integer, + l_partkey : integer, + l_suppkey : integer, + l_linenumber : integer, l_quantity : double, l_extendedprice : double, l_discount : double, @@ -51,7 +51,7 @@ create type tpch.LineItemType as create dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber; -select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'count_cheaps':tpch.coll_count(cheap),'count_expensives':tpch.coll_count(expensive)} +select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'count_cheaps':tpch.array_count(cheap),'count_expensives':tpch.array_count(expensive)} from LineItem as l where (l.l_shipdate <= '1998-09-02') /* +hash */ http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue827-2.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue827-2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue827-2.sqlpp index 33b640b..4ab1498 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue827-2.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue827-2.sqlpp @@ -31,10 +31,10 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int32, - l_partkey : int32, - l_suppkey : int32, - l_linenumber : int32, + l_orderkey : integer, + l_partkey : integer, + l_suppkey : integer, + l_linenumber : integer, l_quantity : double, l_extendedprice : double, l_discount : double, @@ -51,30 +51,30 @@ create type tpch.LineItemType as create dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber; -{'sum_qty_partial':tpch.coll_sum(( +{'sum_qty_partial':tpch.array_sum(( select element i.l_quantity from LineItem as i where (i.l_shipdate <= '1998-09-02') -)),'sum_base_price':tpch.coll_sum(( +)),'sum_base_price':tpch.array_sum(( select element i.l_extendedprice from LineItem as i -)),'sum_disc_price':tpch.coll_sum(( +)),'sum_disc_price':tpch.array_sum(( select element (i.l_extendedprice * (1 - i.l_discount)) from LineItem as i -)),'sum_charge':tpch.coll_sum(( +)),'sum_charge':tpch.array_sum(( select element (i.l_extendedprice * (1 - i.l_discount) * (1 + i.l_tax)) from LineItem as i -)),'ave_qty':tpch.coll_avg(( +)),'ave_qty':tpch.array_avg(( select element i.l_quantity from LineItem as i where (i.l_shipdate <= '1998-09-02') -)),'ave_price':tpch.coll_avg(( +)),'ave_price':tpch.array_avg(( select element i.l_extendedprice from LineItem as i -)),'ave_disc':tpch.coll_avg(( +)),'ave_disc':tpch.array_avg(( select element i.l_discount from LineItem as i -)),'count_order':tpch.coll_count(( +)),'count_order':tpch.array_count(( select element l from LineItem as l ))}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849-2.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849-2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849-2.sqlpp index de4d82c..34c9489 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849-2.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849-2.sqlpp @@ -31,7 +31,7 @@ use test; create type test.sType as closed { - b : int32 + b : integer } create dataset s(sType) primary key b; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849.sqlpp index 385426c..d1d2b3b 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849.sqlpp @@ -31,7 +31,7 @@ use test; create type test.sType as closed { - b : int32 + b : integer } create dataset s(sType) primary key b; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.sqlpp index e1ad6a2..500f2c1 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.sqlpp @@ -33,10 +33,10 @@ create type TinySocial.TwitterUserType as { `screen-name` : string, lang : string, - friends_count : int64, - statuses_count : int64, + friends_count : bigint, + statuses_count : bigint, name : string, - followers_count : int64 + followers_count : bigint } create dataset TwitterUsers(TwitterUserType) primary key `screen-name`; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric.sqlpp index 8ecff47..48ebde9 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric.sqlpp @@ -33,10 +33,10 @@ create type TinySocial.TwitterUserType as { `screen-name` : string, lang : string, - friends_count : int64, - statuses_count : int64, + friends_count : bigint, + statuses_count : bigint, name : string, - followers_count : int64 + followers_count : bigint } create dataset TwitterUsers(TwitterUserType) primary key `screen-name`; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string-desc.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string-desc.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string-desc.sqlpp index 7023eac..89b0885 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string-desc.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string-desc.sqlpp @@ -33,10 +33,10 @@ create type TinySocial.TwitterUserType as { `screen-name` : string, lang : string, - friends_count : int64, - statuses_count : int64, + friends_count : bigint, + statuses_count : bigint, name : string, - followers_count : int64 + followers_count : bigint } create dataset TwitterUsers(TwitterUserType) primary key `screen-name`; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string.sqlpp index bb97244..da38ad9 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string.sqlpp @@ -33,10 +33,10 @@ create type TinySocial.TwitterUserType as { `screen-name` : string, lang : string, - friends_count : int64, - statuses_count : int64, + friends_count : bigint, + statuses_count : bigint, name : string, - followers_count : int64 + followers_count : bigint } create dataset TwitterUsers(TwitterUserType) primary key `screen-name`; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/issue730.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/issue730.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/issue730.sqlpp index 4e43101..f67eed0 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/issue730.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/issue730.sqlpp @@ -33,15 +33,15 @@ create type test.TwitterUserType as { screen_name : string, lang : string, - friends_count : int32, - statuses_count : int32, + friends_count : integer, + statuses_count : integer, name : string, - followers_count : int32 + followers_count : integer } create type test.TweetMessageType as { - tweetid : int64, + tweetid : bigint, user : TwitterUserType, sender_location : point?, send_time : datetime, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp index e51464f..c7403ab 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp @@ -33,22 +33,22 @@ create type test.TwitterUserType as closed { `screen-name` : string, lang : string, - `friends-count` : int32, - `statuses-count` : int32, + `friends-count` : integer, + `statuses-count` : integer, name : string, - `followers-count` : int32 + `followers-count` : integer } create type test.TweetMessageType as closed { - tweetid : int64, + tweetid : bigint, user : TwitterUserType, `sender-location` : point, `send-time` : datetime, `referred-topics` : {{string}}, `message-text` : string, - countA : int32, - countB : int32 + countA : integer, + countB : integer } create dataset TweetMessages(TweetMessageType) primary key tweetid; @@ -70,6 +70,6 @@ select element {'tweetid1':t1.tweetid,'loc1':t1.`sender-location`,'nearby-messag )} from TweetMessages as t1 with n as test.`create-circle`(t1.`sender-location`,0.5) -where (t1.tweetid < test.int64('10')) +where (t1.tweetid < test.bigint('10')) order by t1.tweetid ; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp index d86b6a8..8a37269 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp @@ -33,22 +33,22 @@ create type test.TwitterUserType as closed { `screen-name` : string, lang : string, - `friends-count` : int32, - `statuses-count` : int32, + `friends-count` : integer, + `statuses-count` : integer, name : string, - `followers-count` : int32 + `followers-count` : integer } create type test.TweetMessageType as closed { - tweetid : int64, + tweetid : bigint, user : TwitterUserType, `sender-location` : point, `send-time` : datetime, `referred-topics` : {{string}}, `message-text` : string, - countA : int32, - countB : int32 + countA : integer, + countB : integer } create dataset TweetMessages(TweetMessageType) primary key tweetid; @@ -70,6 +70,6 @@ select element {'tweetid1':t1.tweetid,'loc1':t1.`sender-location`,'nearby-messag )} from TweetMessages as t1 with n as test.`create-circle`(t1.`sender-location`,0.5) -where (t1.tweetid < test.int64('10')) +where (t1.tweetid < test.bigint('10')) order by t1.tweetid ; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/query-issue838.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/query-issue838.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/query-issue838.sqlpp index b4247fc..cfbd1e1 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/query-issue838.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/query-issue838.sqlpp @@ -31,14 +31,14 @@ use twitter; create type twitter.TweetMessageType as closed { - tweetid : int64, + tweetid : bigint, `sender-location` : point, text : string } create type twitter.TweetHistorySubscription as { - `subscription-id` : int32, + `subscription-id` : integer, location : point } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_01.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_01.sqlpp index a1ae48a..b15412a 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_01.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_01.sqlpp @@ -31,7 +31,7 @@ use test; create type test.MyRecord as closed { - id : int32, + id : integer, point : point, kwds : string, line1 : line, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_02.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_02.sqlpp index a118aef..3b3e18d 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_02.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_02.sqlpp @@ -31,7 +31,7 @@ use test; create type test.MyRecord as closed { - id : int32, + id : integer, point : point, kwds : string, line1 : line, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_03.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_03.sqlpp index 1117bab..b700008 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_03.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_03.sqlpp @@ -31,7 +31,7 @@ use test; create type test.MyRecord as closed { - id : int32, + id : integer, point : point, kwds : string, line1 : line, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index-open.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index-open.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index-open.sqlpp index 09ddffe..e610c31 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index-open.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index-open.sqlpp @@ -25,7 +25,7 @@ use test; create type test.MyRecord as { - id : int32, + id : integer, point : point, kwds : string, line1 : line, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index.sqlpp index 0ba63ac..4658fb9 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index.sqlpp @@ -25,7 +25,7 @@ use test; create type test.MyRecord as closed { - id : int32, + id : integer, point : point, kwds : string, line1 : line, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-all.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-all.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-all.sqlpp index 4bc2518..eb0b4fa 100644 --- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-all.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-all.sqlpp @@ -25,10 +25,10 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int32, - l_partkey : int32, - l_suppkey : int32, - l_linenumber : int32, + l_orderkey : integer, + l_partkey : integer, + l_suppkey : integer, + l_linenumber : integer, l_quantity : double, l_extendedprice : double, l_discount : double, @@ -45,9 +45,9 @@ create type tpch.LineItemType as create type tpch.LineIDType as closed { - l_orderkey : int32, - l_partkey : int32, - l_suppkey : int32 + l_orderkey : integer, + l_partkey : integer, + l_suppkey : integer } create nodegroup group1 if not exists on