http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/push-socket-with-auuid/push-socket-with-auuid.1.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/push-socket-with-auuid/push-socket-with-auuid.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/push-socket-with-auuid/push-socket-with-auuid.1.ddl.aql index d234ecf..9b11ff7 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/push-socket-with-auuid/push-socket-with-auuid.1.ddl.aql +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/push-socket-with-auuid/push-socket-with-auuid.1.ddl.aql @@ -62,10 +62,10 @@ create dataset DBLP0(DBLPType0) primary key id autogenerated; create dataset DBLP1(DBLPType1) primary key id autogenerated; create dataset DBLP2(DBLPType2) primary key dblpid; -create feed DBLPFeed using socket_adapter -( - ("sockets"="127.0.0.1:10001"), - ("address-type"="IP"), - ("type-name"="DBLPFeedType"), - ("format"="adm") -); \ No newline at end of file +create feed DBLPFeed with { + "adapter-name" : "socket_adapter", + "sockets" : "127.0.0.1:10001", + "address-type" : "IP", + "type-name" : "DBLPFeedType", + "format" : "adm" +};
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/record-reader-with-malformed-input-stream/record-reader-with-malformed-input-stream.1.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/record-reader-with-malformed-input-stream/record-reader-with-malformed-input-stream.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/record-reader-with-malformed-input-stream/record-reader-with-malformed-input-stream.1.ddl.aql index 747c858..1b37ef0 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/record-reader-with-malformed-input-stream/record-reader-with-malformed-input-stream.1.ddl.aql +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/record-reader-with-malformed-input-stream/record-reader-with-malformed-input-stream.1.ddl.aql @@ -26,7 +26,9 @@ create type RestaurantsType as open { create dataset Restaurants(RestaurantsType) primary key restr_id; -create feed RFeed using localfs -(("type-name"="RestaurantsType"), -("path"="asterix_nc1://data/restaurants/"), /* This test case reply on restaurants.adm implicitly*/ -("format"="adm")); \ No newline at end of file +create feed RFeed with { + "adapter-name" : "localfs", + "type-name" : "RestaurantsType", + "path" : "asterix_nc1://data/restaurants/", /* This test case reply on restaurants.adm implicitly*/ + "format" : "adm" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/revised-tweet-parser/revised-tweet-parser.1.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/revised-tweet-parser/revised-tweet-parser.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/revised-tweet-parser/revised-tweet-parser.1.ddl.aql index ddffc43..970fe06 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/revised-tweet-parser/revised-tweet-parser.1.ddl.aql +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/revised-tweet-parser/revised-tweet-parser.1.ddl.aql @@ -47,9 +47,11 @@ create type Tweet as open create dataset Tweets (Tweet) primary key id; -create feed TwitterFeed using push_twitter( -("type-name"="Tweet"), -("format"="twitter-status"),// -("consumer.key"="************"), -("access.token"="************"), -("access.token.secret"="************")); \ No newline at end of file +create feed TwitterFeed with { + "adapter-name" : "push_twitter", + "type-name" : "Tweet", + "format" : "twitter-status",// + "consumer.key" : "************", + "access.token" : "************", + "access.token.secret" : "************" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/start-feed/start-feed.1.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/start-feed/start-feed.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/start-feed/start-feed.1.ddl.aql index f14d609..66d9a99 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/start-feed/start-feed.1.ddl.aql +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/start-feed/start-feed.1.ddl.aql @@ -50,10 +50,10 @@ create type TweetMessageType as closed { create dataset Tweets1(TweetMessageType) primary key tweetid; create dataset Tweets2(TweetMessageType) primary key tweetid; -create feed TweetFeed using socket_adapter -( - ("sockets"="127.0.0.1:10001"), - ("address-type"="IP"), - ("type-name"="TweetMessageType"), - ("format"="adm") -); \ No newline at end of file +create feed TweetFeed with { + "adapter-name" : "socket_adapter", + "sockets" : "127.0.0.1:10001", + "address-type" : "IP", + "type-name" : "TweetMessageType", + "format" : "adm" +}; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/start-started-feed/start-started-feed.0.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/start-started-feed/start-started-feed.0.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/start-started-feed/start-started-feed.0.ddl.aql index f7e30c1..483630a 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/start-started-feed/start-started-feed.0.ddl.aql +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/start-started-feed/start-started-feed.0.ddl.aql @@ -28,13 +28,13 @@ create dataset Tweets1(TweetMessageType) primary key tweetid; create dataset Tweets2(TweetMessageType) primary key tweetid; -create feed TweetFeed using socket_adapter -( - ("sockets"="127.0.0.1:10001"), - ("address-type"="IP"), - ("type-name"="TweetMessageType"), - ("format"="adm") -); +create feed TweetFeed with { + "adapter-name" : "socket_adapter", + "sockets" : "127.0.0.1:10001", + "address-type" : "IP", + "type-name" : "TweetMessageType", + "format" : "adm" +}; connect feed TweetFeed to dataset Tweets1; connect feed TweetFeed to dataset Tweets2; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/stop-stopped-feed/stop-stopped-feed.0.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/stop-stopped-feed/stop-stopped-feed.0.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/stop-stopped-feed/stop-stopped-feed.0.ddl.aql index 00fb12d..932fd1f 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/stop-stopped-feed/stop-stopped-feed.0.ddl.aql +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/stop-stopped-feed/stop-stopped-feed.0.ddl.aql @@ -29,13 +29,13 @@ create type TweetMessageType as closed { create dataset Tweets1(TweetMessageType) primary key tweetid; create dataset Tweets2(TweetMessageType) primary key tweetid; -create feed TweetFeed using socket_adapter -( - ("sockets"="127.0.0.1:10001"), - ("address-type"="IP"), - ("type-name"="TweetMessageType"), - ("format"="adm") -); +create feed TweetFeed with { + "adapter-name" : "socket_adapter", + "sockets" : "127.0.0.1:10001", + "address-type" : "IP", + "type-name" : "TweetMessageType", + "format" : "adm" +}; connect feed TweetFeed to dataset Tweets1; connect feed TweetFeed to dataset Tweets2; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/twitter-feed/twitter-feed.1.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/twitter-feed/twitter-feed.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/twitter-feed/twitter-feed.1.ddl.aql index d7827c5..66cc3bb 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/twitter-feed/twitter-feed.1.ddl.aql +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/twitter-feed/twitter-feed.1.ddl.aql @@ -4,7 +4,7 @@ * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance + * "License"; you may not use this file except in compliance * with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 @@ -46,9 +46,11 @@ message_text:string create dataset Tweets (Tweet) primary key id; -create feed TwitterFeed using push_twitter( -("type-name"="Tweet"), -("format"="twitter-status"), -("consumer.key"="************"), -("access.token"="**********"), -("access.token.secret"="*************")); \ No newline at end of file +create feed TwitterFeed with { + "adapter-name" : "push_twitter", + "type-name" : "Tweet", + "format" : "twitter-status", + "consumer.key" : "************", + "access.token" : "**********", + "access.token.secret" : "*************" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries/filters/delete/delete.1.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/filters/delete/delete.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/filters/delete/delete.1.ddl.aql index da5aeab..d8254fb 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/filters/delete/delete.1.ddl.aql +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/filters/delete/delete.1.ddl.aql @@ -92,10 +92,10 @@ with { create index text_idx if not exists on Tweet("text") type fulltext; create index state_idx if not exists on Tweet(geo_tag.stateID) type btree; -create feed TweetFeed using socket_adapter -( - ("sockets"="127.0.0.1:10001"), - ("address-type"="IP"), - ("type-name"="typeTweet"), - ("format"="adm") -); +create feed TweetFeed with { + "adapter-name" : "socket_adapter", + "sockets" : "127.0.0.1:10001", + "address-type" : "IP", + "type-name" : "typeTweet", + "format" : "adm" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries/filters/upsert/upsert.1.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/filters/upsert/upsert.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/filters/upsert/upsert.1.ddl.aql index cb270f9..ae8dbd0 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/filters/upsert/upsert.1.ddl.aql +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/filters/upsert/upsert.1.ddl.aql @@ -92,10 +92,10 @@ with { create index text_idx if not exists on Tweet("text") type btree; create index state_idx if not exists on Tweet(geo_tag.stateID) type btree; -create feed TweetFeed using socket_adapter -( - ("sockets"="127.0.0.1:10001"), - ("address-type"="IP"), - ("type-name"="typeTweet"), - ("format"="adm") -); +create feed TweetFeed with { + "adapter-name" : "socket_adapter", + "sockets" : "127.0.0.1:10001", + "address-type" : "IP", + "type-name" : "typeTweet", + "format" : "adm" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.1.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.1.ddl.aql index 460c9b4..a6a0add 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.1.ddl.aql +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.1.ddl.aql @@ -39,9 +39,10 @@ create dataset Tweets(TweetType) primary key id hints(cardinality=200); -create feed TweetFeed -using localfs -(("path"="asterix_nc1://data/twitter/obamatweets.adm"), -("format"="adm"), -("type-name"="TweetType"), -("tuple-interval"="10")); +create feed TweetFeed with { + "adapter-name" : "localfs", + "path" : "asterix_nc1://data/twitter/obamatweets.adm", + "format" : "adm", + "type-name" : "TweetType", + "tuple-interval" : "10" +}; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-correlated-secondary-index-nullable/scan-delete-btree-correlated-secondary-index-nullable.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-correlated-secondary-index-nullable/scan-delete-btree-correlated-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-correlated-secondary-index-nullable/scan-delete-btree-correlated-secondary-index-nullable.1.ddl.sqlpp index 70ae710..e25121b 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-correlated-secondary-index-nullable/scan-delete-btree-correlated-secondary-index-nullable.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-correlated-secondary-index-nullable/scan-delete-btree-correlated-secondary-index-nullable.1.ddl.sqlpp @@ -59,11 +59,10 @@ with { } }; - -create feed CustomerFeed -using localfs -(("path"="asterix_nc1://data/semistructured/co1k/customer.adm"), -("format"="adm"), -("type-name"="CustomerType"), -("tuple-interval"="10")); - +create feed CustomerFeed with { + "adapter-name" : "localfs", + "path" : "asterix_nc1://data/semistructured/co1k/customer.adm", + "format" : "adm", + "type-name" : "CustomerType", + "tuple-interval" : "10" +}; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index-nullable/scan-delete-inverted-index-ngram-correlated-secondary-index-nullable.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index-nullable/scan-delete-inverted-index-ngram-correlated-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index-nullable/scan-delete-inverted-index-ngram-correlated-secondary-index-nullable.1.ddl.sqlpp index f867ad4..764a473 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index-nullable/scan-delete-inverted-index-ngram-correlated-secondary-index-nullable.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index-nullable/scan-delete-inverted-index-ngram-correlated-secondary-index-nullable.1.ddl.sqlpp @@ -47,10 +47,11 @@ with { } }; -create feed DBLPFeed -using localfs -((`path`=`asterix_nc1://data/dblp-small/dblp-small-nulls.adm`), -(`format`=`adm`), -(`delimiter`=`:`), -(`type-name`=`DBLPType`), -(`tuple-interval`=`10`)); +create feed DBLPFeed with { + "adapter-name" : "localfs", + "path":"asterix_nc1://data/dblp-small/dblp-small-nulls.adm", + "format":"adm", + "delimiter":":", + "type-name":"DBLPType", + "tuple-interval":"10" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index/scan-delete-inverted-index-ngram-correlated-secondary-index.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index/scan-delete-inverted-index-ngram-correlated-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index/scan-delete-inverted-index-ngram-correlated-secondary-index.1.ddl.sqlpp index 79b4547..2a0eaee 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index/scan-delete-inverted-index-ngram-correlated-secondary-index.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index/scan-delete-inverted-index-ngram-correlated-secondary-index.1.ddl.sqlpp @@ -46,10 +46,11 @@ with { } }; -create feed DBLPFeed -using localfs -((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`), -(`format`=`delimited-text`), -(`delimiter`=`:`), -(`type-name`=`DBLPType`), -(`tuple-interval`=`10`)); +create feed DBLPFeed with { + "adapter-name" : "localfs", + "path":"asterix_nc1://data/dblp-small/dblp-small-id.txt", + "format":"delimited-text", + "delimiter":":", + "type-name":"DBLPType", + "tuple-interval":"10" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index-nullable/scan-delete-inverted-index-word-correlated-secondary-index-nullable.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index-nullable/scan-delete-inverted-index-word-correlated-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index-nullable/scan-delete-inverted-index-word-correlated-secondary-index-nullable.1.ddl.sqlpp index e22bdc1..4dc54b6 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index-nullable/scan-delete-inverted-index-word-correlated-secondary-index-nullable.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index-nullable/scan-delete-inverted-index-word-correlated-secondary-index-nullable.1.ddl.sqlpp @@ -47,9 +47,11 @@ with { } }; -create feed DBLPFeed -using localfs -((`path`=`asterix_nc1://data/dblp-small/dblp-small-nulls.adm`), -(`format`=`adm`), -(`type-name`=`DBLPType`), -(`tuple-interval`=`10`)); +create feed DBLPFeed with { + "adapter-name" : "localfs", + "path":"asterix_nc1://data/dblp-small/dblp-small-nulls.adm", + "format":"adm", + "delimiter":":", + "type-name":"DBLPType", + "tuple-interval":"10" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index/scan-delete-inverted-index-word-correlated-secondary-index.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index/scan-delete-inverted-index-word-correlated-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index/scan-delete-inverted-index-word-correlated-secondary-index.1.ddl.sqlpp index 7ea63ee..b7b64c3 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index/scan-delete-inverted-index-word-correlated-secondary-index.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index/scan-delete-inverted-index-word-correlated-secondary-index.1.ddl.sqlpp @@ -47,11 +47,11 @@ with { }; -create feed DBLPFeed -using localfs -((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`), -(`format`=`delimited-text`), -(`delimiter`=`:`), -(`type-name`=`DBLPType`), -(`tuple-interval`=`10`)); - +create feed DBLPFeed with { + "adapter-name" : "localfs", + "path":"asterix_nc1://data/dblp-small/dblp-small-id.txt", + "format":"delimited-text", + "delimiter":":", + "type-name":"DBLPType", + "tuple-interval":"10" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index-nullable/scan-delete-rtree-correlated-secondary-index-nullable.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index-nullable/scan-delete-rtree-correlated-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index-nullable/scan-delete-rtree-correlated-secondary-index-nullable.1.ddl.sqlpp index 8481c6f..e6226ca 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index-nullable/scan-delete-rtree-correlated-secondary-index-nullable.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index-nullable/scan-delete-rtree-correlated-secondary-index-nullable.1.ddl.sqlpp @@ -50,10 +50,11 @@ with { } }; -create feed MyFeed -using localfs -((`path`=`asterix_nc1://data/spatial/spatialDataNulls.json`), -(`format`=`adm`), -(`type-name`=`MyRecord`), -(`tuple-interval`=`10`)); +create feed MyFeed with { + "adapter-name" : "localfs", + "path" : "asterix_nc1://data/spatial/spatialDataNulls.json", + "format" : "adm", + "type-name" : "MyRecord", + "tuple-interval" : "10" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index/scan-delete-rtree-correlated-secondary-index.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index/scan-delete-rtree-correlated-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index/scan-delete-rtree-correlated-secondary-index.1.ddl.sqlpp index 82494ee..d4a392e 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index/scan-delete-rtree-correlated-secondary-index.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index/scan-delete-rtree-correlated-secondary-index.1.ddl.sqlpp @@ -51,9 +51,10 @@ with { } }; -create feed MyFeed -using localfs -((`path`=`asterix_nc1://data/spatial/spatialData.json`), -(`format`=`adm`), -(`type-name`=`MyRecord`), -(`tuple-interval`=`10`)); +create feed MyFeed with { + "adapter-name" : "localfs", + "path" : "asterix_nc1://data/spatial/spatialData.json", + "format" : "adm", + "type-name" : "MyRecord", + "tuple-interval" : "10" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index-nullable/scan-insert-rtree-correlated-secondary-index-nullable.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index-nullable/scan-insert-rtree-correlated-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index-nullable/scan-insert-rtree-correlated-secondary-index-nullable.1.ddl.sqlpp index 7847d7e..f9e08de 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index-nullable/scan-insert-rtree-correlated-secondary-index-nullable.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index-nullable/scan-insert-rtree-correlated-secondary-index-nullable.1.ddl.sqlpp @@ -65,10 +65,10 @@ with { } }; -create feed MyFeed -using localfs -((`path`=`asterix_nc1://data/spatial/spatialDataNulls.json`), -(`format`=`adm`), -(`type-name`=`MyRecord`), -(`tuple-interval`=`10`)); - +create feed MyFeed with { + "adapter-name" : "localfs", + "path" : "asterix_nc1://data/spatial/spatialDataNulls.json", + "format" : "adm", + "type-name" : "MyRecord", + "tuple-interval" : "10" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index-open/scan-insert-rtree-correlated-secondary-index-open.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index-open/scan-insert-rtree-correlated-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index-open/scan-insert-rtree-correlated-secondary-index-open.1.ddl.sqlpp index f6a3ce6..c785252 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index-open/scan-insert-rtree-correlated-secondary-index-open.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index-open/scan-insert-rtree-correlated-secondary-index-open.1.ddl.sqlpp @@ -64,10 +64,11 @@ with { } }; -create feed MyFeed -using localfs -((`path`=`asterix_nc1://data/spatial/spatialData.json`), -(`format`=`adm`), -(`type-name`=`MyRecord`), -(`tuple-interval`=`10`)); +create feed MyFeed with { + "adapter-name" : "localfs", + "path" : "asterix_nc1://data/spatial/spatialData.json", + "format" : "adm", + "type-name" : "MyRecord", + "tuple-interval" : "10" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index/scan-insert-rtree-correlated-secondary-index.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index/scan-insert-rtree-correlated-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index/scan-insert-rtree-correlated-secondary-index.1.ddl.sqlpp index 336d475..94e700a 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index/scan-insert-rtree-correlated-secondary-index.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index/scan-insert-rtree-correlated-secondary-index.1.ddl.sqlpp @@ -57,19 +57,22 @@ with { } }; -create feed MyFeed -using localfs -((`path`=`asterix_nc1://data/spatial/spatialData.json`), -(`format`=`adm`), -(`type-name`=`MyRecord`), -(`tuple-interval`=`10`)); +create feed MyFeed with { + "adapter-name" : "localfs", + "path" : "asterix_nc1://data/spatial/spatialData.json", + "format" : "adm", + "type-name" : "MyRecord", + "tuple-interval" : "10" +}; + -create feed MyMiniFeed -using localfs -((`path`=`asterix_nc1://data/spatial/spatialData0.json`), -(`format`=`adm`), -(`type-name`=`MyMiniRecord`), -(`tuple-interval`=`10`)); +create feed MyMiniFeed with { + "adapter-name" : "localfs", + "path" : "asterix_nc1://data/spatial/spatialData0.json", + "format" : "adm", + "type-name" : "MyMiniRecord", + "tuple-interval" : "10" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-correlated-prefix-merge-policy-with-feed/using-correlated-prefix-merge-policy-with-feed.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-correlated-prefix-merge-policy-with-feed/using-correlated-prefix-merge-policy-with-feed.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-correlated-prefix-merge-policy-with-feed/using-correlated-prefix-merge-policy-with-feed.1.ddl.sqlpp index 1c22a9d..ad9b25a 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-correlated-prefix-merge-policy-with-feed/using-correlated-prefix-merge-policy-with-feed.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-correlated-prefix-merge-policy-with-feed/using-correlated-prefix-merge-policy-with-feed.1.ddl.sqlpp @@ -57,10 +57,11 @@ with { } }; -create feed LineItemFeed -using localfs -(("path"="asterix_nc1://data/tpch0.001/lineitem.tbl"), -("format"="delimited-text"), -("delimiter"="|"), -("type-name"="LineItemType"), -("tuple-interval"="10")); +create feed LineItemFeed with { + "adapter-name" : "localfs", + "path" : "asterix_nc1://data/tpch0.001/lineitem.tbl", + "format" : "delimited-text", + "delimiter" : "|", + "type-name" : "LineItemType", + "tuple-interval" : "10" +}; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-library/return_invalid_type/return_invalid_type.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-library/return_invalid_type/return_invalid_type.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-library/return_invalid_type/return_invalid_type.1.ddl.sqlpp index e375558..059b7e4 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-library/return_invalid_type/return_invalid_type.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-library/return_invalid_type/return_invalid_type.1.ddl.sqlpp @@ -52,12 +52,14 @@ create type ProcessedTweet if not exists as open { create dataset SyntheticTweets(Tweet) primary key id; -create feed SyntheticTweetFeed using stream -(("duration"="1"), -("stream-source"="org.apache.asterix.external.input.stream.factory.TwitterFirehoseStreamFactory"), -("tps"="50"), -("type-name"="Tweet"), -("tput-duration"="1"), -("dataverse-dataset"="feeds:SyntheticTweets"), -("format"="adm"), -("mode"="controlled")); +create feed SyntheticTweetFeed with { + "adapter-name" : "stream", + "duration" : "1", + "stream-source" : "org.apache.asterix.external.input.stream.factory.TwitterFirehoseStreamFactory", + "tps" : "50", + "type-name" : "Tweet", + "tput-duration" : "1", + "dataverse-dataset" : "feeds:SyntheticTweets", + "format" : "adm", + "mode" : "controlled" +}; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/connect-feed-with-function/connect-feed-with-function.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/connect-feed-with-function/connect-feed-with-function.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/connect-feed-with-function/connect-feed-with-function.1.ddl.sqlpp index 4de5415..111486f 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/connect-feed-with-function/connect-feed-with-function.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/connect-feed-with-function/connect-feed-with-function.1.ddl.sqlpp @@ -45,11 +45,11 @@ create function test_func1(anyname) { object_merge((case (anyname.popularity = "Good!") when true then {"true_popularity":"Indeed Good!"} else {"true_popularity":"Indeed Bad!"} end), anyname) }; -create feed UserFeed using socket_adapter -( - ("sockets"="127.0.0.1:10001"), - ("address-type"="IP"), - ("type-name"="TwitterUser"), - ("format"="adm"), - ("upsert-feed"="true") -); \ No newline at end of file +create feed UserFeed with { + "adapter-name" : "socket_adapter", + "sockets" : "127.0.0.1:10001", + "address-type" : "IP", + "type-name" : "TwitterUser", + "format" : "adm", + "upsert-feed" : "true" +}; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feed-with-external-function/feed-with-external-function.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feed-with-external-function/feed-with-external-function.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feed-with-external-function/feed-with-external-function.1.ddl.sqlpp index 9b0f2a0..4fdc669 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feed-with-external-function/feed-with-external-function.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feed-with-external-function/feed-with-external-function.1.ddl.sqlpp @@ -43,11 +43,13 @@ create type TweetOutputType as open { topics : {{string}} }; -create feed TweetFeed -using localfs -(("type-name"="TweetInputType"), -("path"="asterix_nc1://data/twitter/obamatweets.adm"), -("format"="adm")); +create feed TweetFeed with +{ + "adapter-name" : "localfs", + "type-name" : "TweetInputType", + "path" : "asterix_nc1://data/twitter/obamatweets.adm", + "format" : "adm" +}; create dataset TweetsFeedIngest(TweetOutputType) primary key id; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_01/feeds_01.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_01/feeds_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_01/feeds_01.1.ddl.sqlpp index 7f79467..f381284 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_01/feeds_01.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_01/feeds_01.1.ddl.sqlpp @@ -39,5 +39,10 @@ create type feeds.TweetType as create dataset Tweets(TweetType) primary key id; -create feed TweetFeed using localfs -((`type-name`=`TweetType`),(`path`=`asterix_nc1://data/twitter/obamatweets.adm`),(`format`=`adm`),(`tuple-interval`=`10`)); +create feed TweetFeed with { + "adapter-name" : "localfs", + "type-name" : "TweetType", + "path" : "asterix_nc1://data/twitter/obamatweets.adm", + "format" : "adm", + "tuple-interval" : "10" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.1.ddl.sqlpp index a0d01c2..de40e1a 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.1.ddl.sqlpp @@ -39,8 +39,10 @@ create type feeds.TweetType as }; create dataset Tweets(TweetType) primary key id; -create feed TweetFeed using localfs -((`path`=`asterix_nc1://data/twitter/obamatweets.adm`), -(`format`=`adm`), -(`type-name`=`TweetType`), -(`tuple-interval`=`10`)); +create feed TweetFeed with { + "adapter-name" : "localfs", + "path" : "asterix_nc1://data/twitter/obamatweets.adm", + "format": "adm", + "type-name" : "TweetType", + "tuple-interval" : "10" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_03/feeds_03.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_03/feeds_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_03/feeds_03.1.ddl.sqlpp index 7b8e70c..4cff7b1 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_03/feeds_03.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_03/feeds_03.1.ddl.sqlpp @@ -41,7 +41,10 @@ create function feed_processor(x) { x }; -create feed TweetFeed -using localfs -((`type-name`=`TweetType`),(`path`=`asterix_nc1://data/twitter/obamatweets.adm`),(`format`=`adm`) -,(`tuple-interval`=`10`)); +create feed TweetFeed with { + "adapter-name" : "localfs", + "type-name" : "TweetType", + "path" : "asterix_nc1://data/twitter/obamatweets.adm", + "format" : "adm", + "tuple-interval" : "10" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.1.ddl.sqlpp index 5553694..9e77b07 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.1.ddl.sqlpp @@ -45,12 +45,14 @@ create type feeds.TweetMessageType as create dataset SyntheticTweets(TweetMessageType) primary key id; -create feed SyntheticTweetFeed using stream( -(`duration`=`5`), -(`tps`=`50`), -(`type-name`=`TweetMessageType`), -(`format`=`adm`), -(`stream-source`=`org.apache.asterix.external.input.stream.factory.TwitterFirehoseStreamFactory`), -(`tput-duration`=`5`), -(`dataverse-dataset`=`feeds:SyntheticTweets`), -(`mode`=`controlled`)); +create feed SyntheticTweetFeed with { + "adapter-name" : "stream", + "duration" : "5", + "tps" : "50", + "type-name" : "TweetMessageType", + "format" : "adm", + "stream-source" : "org.apache.asterix.external.input.stream.factory.TwitterFirehoseStreamFactory", + "tput-duration" : "5", + "dataverse-dataset" : "feeds:SyntheticTweets", + "mode" : "controlled" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.1.ddl.sqlpp index 3b78e5a..1cf6a95 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.1.ddl.sqlpp @@ -45,12 +45,15 @@ create type feeds.TweetMessageType as create dataset SyntheticTweets(TweetMessageType) primary key id; create index ngram_index on SyntheticTweets (message_text) type ngram (3); -create feed SyntheticTweetFeed using stream ( -(`duration`=`5`), -(`tps`=`50`), -(`stream-source`=`org.apache.asterix.external.input.stream.factory.TwitterFirehoseStreamFactory`), -(`type-name`=`TweetMessageType`), -(`tput-duration`=`5`), -(`dataverse-dataset`=`feeds:SyntheticTweets`), -(`format`=`adm`), -(`mode`=`controlled`)); + +create feed SyntheticTweetFeed with { + "adapter-name" : "stream", + "duration" : "5", + "tps" : "50", + "stream-source" : "org.apache.asterix.external.input.stream.factory.TwitterFirehoseStreamFactory", + "type-name" : "TweetMessageType", + "tput-duration" : "5", + "dataverse-dataset" : "feeds:SyntheticTweets", + "format" : "adm", + "mode" : "controlled" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.1.ddl.sqlpp index f979a3a..0c627bf 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.1.ddl.sqlpp @@ -45,7 +45,14 @@ create type feeds_09.TweetMessageType as }; create dataset SyntheticTweets(TweetMessageType) primary key id; create index message_text on SyntheticTweets (message_text) type btree; -create feed SyntheticTweetFeed using stream ((`duration`=`5`), -(`tps`=`50`),(`tput-duration`=`5`),(`type-name`=`TweetMessageType`), -(`dataverse-dataset`=`feeds:SyntheticTweets`),(`format`=`adm`), -(`stream-source`=`org.apache.asterix.external.input.stream.factory.TwitterFirehoseStreamFactory`),(`mode`=`controlled`)); + +create feed SyntheticTweetFeed with { + "adapter-name" : "stream", + "duration" : "5", + "tps" : "50","tput-duration" : "5", + "type-name" : "TweetMessageType", + "dataverse-dataset" : "feeds:SyntheticTweets", + "format" : "adm", + "stream-source" : "org.apache.asterix.external.input.stream.factory.TwitterFirehoseStreamFactory", + "mode" : "controlled" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_10/feeds_10.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_10/feeds_10.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_10/feeds_10.1.ddl.sqlpp index 8898864..c198723 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_10/feeds_10.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_10/feeds_10.1.ddl.sqlpp @@ -36,8 +36,10 @@ create dataset Tweets(TweetType) primary key id; create index usernameIdx on Tweets (username) type btree; -create feed TweetFeed using localfs -((`path`=`asterix_nc1://data/twitter/obamatweets.adm`), -(`format`=`adm`), -(`type-name`=`TweetType`), -(`tuple-interval`=`10`)); +create feed TweetFeed with { + "adapter-name" : "localfs", + "path" : "asterix_nc1://data/twitter/obamatweets.adm", + "format" : "adm", + "type-name" : "TweetType", + "tuple-interval" : "10" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_11/feeds_11.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_11/feeds_11.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_11/feeds_11.1.ddl.sqlpp index 84c8047..f497dfe 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_11/feeds_11.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_11/feeds_11.1.ddl.sqlpp @@ -31,8 +31,10 @@ create type feeds.TweetType as }; create dataset Tweets(TweetType) primary key id; -create feed TweetFeed using localfs -((`path`=`asterix_nc1://data/twitter/obamatweets.adm`), -(`format`=`adm`), -(`type-name`=`TweetType`), -(`tuple-interval`=`10`)); +create feed TweetFeed with { + "adapter-name" : "localfs", + "path" : "asterix_nc1://data/twitter/obamatweets.adm", + "format" : "adm", + "type-name" : "TweetType", + "tuple-interval" : "10" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_12/feeds_12.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_12/feeds_12.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_12/feeds_12.1.ddl.sqlpp index 9f1ce3a..de4bd7c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_12/feeds_12.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_12/feeds_12.1.ddl.sqlpp @@ -34,8 +34,10 @@ create type feeds_12.TweetType as create dataset Tweets(TweetType) primary key id; -create feed TweetFeed using localfs -((`path`=`asterix_nc1://data/twitter/obamatweets_duplicate.adm`), -(`format`=`adm`), -(`type-name`=`TweetType`), -(`tuple-interval`=`10`)); +create feed TweetFeed with { + "adapter-name" : "localfs", + "path":"asterix_nc1://data/twitter/obamatweets_duplicate.adm", + "format":"adm", + "type-name":"TweetType", + "tuple-interval":"10" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/insert-feed/insert-feed.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/insert-feed/insert-feed.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/insert-feed/insert-feed.1.ddl.sqlpp index be7c383..f7890c8 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/insert-feed/insert-feed.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/insert-feed/insert-feed.1.ddl.sqlpp @@ -36,11 +36,11 @@ create type TwitterUser if not exists as open{ create dataset TwitterUsers(TwitterUser) primary key `screen-name`; -create feed UserFeed using socket_adapter -( - ("sockets"="127.0.0.1:10001"), - ("address-type"="IP"), - ("type-name"="TwitterUser"), - ("format"="adm"), - ("insert-feed"="true") -); +create feed UserFeed with { + "adapter-name" : "socket_adapter", + "sockets" : "127.0.0.1:10001", + "address-type" : "IP", + "type-name" : "TwitterUser", + "format" : "adm", + "insert-feed" : "true" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/issue_230_feeds/issue_230_feeds.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/issue_230_feeds/issue_230_feeds.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/issue_230_feeds/issue_230_feeds.1.ddl.sqlpp index 3141627..231e125 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/issue_230_feeds/issue_230_feeds.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/issue_230_feeds/issue_230_feeds.1.ddl.sqlpp @@ -34,8 +34,10 @@ create type feeds.TweetType as create dataset Tweets(TweetType) primary key id; -create feed TweetFeed using localfs -((`path`=`asterix_nc1://data/twitter/obamatweets.adm`), -(`format`=`adm`), -(`type-name`=`TweetType`), -(`tuple-interval`=`10`)); +create feed TweetFeed with { + "adapter-name" : "localfs", + "path" : "asterix_nc1://data/twitter/obamatweets.adm", + "format" : "adm", + "type-name" : "TweetType", + "tuple-interval" : "10" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/delete/delete.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/delete/delete.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/delete/delete.1.ddl.sqlpp index 0b9d178..3d0a5e4 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/delete/delete.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/delete/delete.1.ddl.sqlpp @@ -92,10 +92,10 @@ with { create index text_idx if not exists on Tweet(`text`) type fulltext; create index state_idx if not exists on Tweet(geo_tag.stateID) type btree; -create feed TweetFeed using socket_adapter -( - ("sockets"="127.0.0.1:10001"), - ("address-type"="IP"), - ("type-name"="typeTweet"), - ("format"="adm") -); +create feed TweetFeed with { + "adapter-name" : "socket_adapter", + "sockets" : "127.0.0.1:10001", + "address-type" : "IP", + "type-name" : "typeTweet", + "format" : "adm" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/upsert/upsert.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/upsert/upsert.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/upsert/upsert.1.ddl.sqlpp index 589e7f9..91b3ee1 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/upsert/upsert.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/upsert/upsert.1.ddl.sqlpp @@ -93,10 +93,10 @@ with { create index text_idx if not exists on Tweet(`text`) type btree; create index state_idx if not exists on Tweet(geo_tag.stateID) type btree; -create feed TweetFeed using socket_adapter -( - ("sockets"="127.0.0.1:10001"), - ("address-type"="IP"), - ("type-name"="typeTweet"), - ("format"="adm") -); +create feed TweetFeed with { + "adapter-name" : "socket_adapter", + "sockets" : "127.0.0.1:10001", + "address-type" : "IP", + "type-name" : "typeTweet", + "format" : "adm" +}; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.1.ddl.sqlpp index ec7ede9..233ea32 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.1.ddl.sqlpp @@ -41,8 +41,10 @@ create type feeds.TweetType as create dataset Tweets(TweetType) primary key id hints (`CARDINALITY`=`200`); -create feed TweetFeed using localfs( -(`path`=`asterix_nc1://data/twitter/obamatweets.adm`), -(`format`=`adm`), -(`type-name`=`TweetType`), -(`tuple-interval`=`10`)); +create feed TweetFeed with { + "adapter-name" : "localfs", + "path" : "asterix_nc1://data/twitter/obamatweets.adm", + "format" : "adm", + "type-name" : "TweetType", + "tuple-interval" : "10" +}; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-app/src/test/resources/runtimets/results/feeds/feeds_01/feeds_01.1.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/feeds/feeds_01/feeds_01.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/feeds/feeds_01/feeds_01.1.adm index a6fa97e..85cd967 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results/feeds/feeds_01/feeds_01.1.adm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/feeds/feeds_01/feeds_01.1.adm @@ -1 +1 @@ -{ "DataverseName": "feeds", "FeedName": "TweetFeed", "AdapterName": "localfs", "AdapterConfiguration": {{ { "Name": "type-name", "Value": "TweetType" }, { "Name": "path", "Value": "asterix_nc1://data/twitter/obamatweets.adm" }, { "Name": "format", "Value": "adm" }, { "Name": "tuple-interval", "Value": "10" }, { "Name": "is-feed", "Value": "true" }, { "Name": "dataverse", "Value": "feeds" }, { "Name": "feed", "Value": "TweetFeed" }, { "Name": "reader", "Value": "localfs" }, { "Name": "parser", "Value": "adm" } }}, "Timestamp": "Mon Oct 10 14:54:32 PDT 2016" } +{ "DataverseName": "feeds", "FeedName": "TweetFeed", "AdapterConfiguration": {{ { "Name": "path", "Value": "asterix_nc1://data/twitter/obamatweets.adm" }, { "Name": "feed", "Value": "TweetFeed" }, { "Name": "adapter-name", "Value": "localfs" }, { "Name": "is-feed", "Value": "true" }, { "Name": "parser", "Value": "adm" }, { "Name": "reader", "Value": "localfs" }, { "Name": "format", "Value": "adm" }, { "Name": "tuple-interval", "Value": "10" }, { "Name": "type-name", "Value": "TweetType" }, { "Name": "dataverse", "Value": "feeds" } }}, "Timestamp": "Thu Dec 07 19:22:41 PST 2017" } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeed.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeed.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeed.java index f5c25f7..f197233 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeed.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/feed/api/IFeed.java @@ -24,26 +24,12 @@ import org.apache.asterix.active.EntityId; public interface IFeed extends Serializable { - public enum FeedType { - /** - * A feed that derives its data from an external source. - */ - PRIMARY, - - /** - * A feed that derives its data from another primary or secondary feed. - */ - SECONDARY - } - public String getFeedName(); public String getDataverseName(); public EntityId getFeedId(); - public Map<String, String> getAdapterConfiguration(); - - public String getAdapterName(); + public Map<String, String> getConfiguration(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorDescriptor.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorDescriptor.java index e7f8564..7a0341a 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorDescriptor.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorDescriptor.java @@ -78,14 +78,14 @@ public class FeedIntakeOperatorDescriptor extends AbstractSingleActivityOperator this.outRecDescs[0] = rDesc; } - public FeedIntakeOperatorDescriptor(JobSpecification spec, IFeed primaryFeed, String adapterLibraryName, + public FeedIntakeOperatorDescriptor(JobSpecification spec, IFeed feed, String adapterLibraryName, String adapterFactoryClassName, ARecordType adapterOutputType, FeedPolicyAccessor policyAccessor, RecordDescriptor rDesc) { super(spec, 0, 1); - this.feedId = new EntityId(FEED_EXTENSION_NAME, primaryFeed.getDataverseName(), primaryFeed.getFeedName()); + this.feedId = new EntityId(FEED_EXTENSION_NAME, feed.getDataverseName(), feed.getFeedName()); this.adaptorFactoryClassName = adapterFactoryClassName; this.adaptorLibraryName = adapterLibraryName; - this.adaptorConfiguration = primaryFeed.getAdapterConfiguration(); + this.adaptorConfiguration = feed.getConfiguration(); this.adapterOutputType = adapterOutputType; this.policyAccessor = policyAccessor; this.outRecDescs[0] = rDesc; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataConstants.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataConstants.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataConstants.java index a6c46c3..494efb5 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataConstants.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataConstants.java @@ -95,6 +95,7 @@ public class ExternalDataConstants { // a string representing the format of the record (for adapters which produces records with additional information like pk or metadata) public static final String KEY_RECORD_FORMAT = "record-format"; public static final String KEY_META_TYPE_NAME = "meta-type-name"; + public static final String KEY_ADAPTER_NAME = "adapter-name"; public static final String READER_STREAM = "stream"; public static final String KEY_HTTP_PROXY_HOST = "http-proxy-host"; public static final String KEY_HTTP_PROXY_PORT = "http-proxy-port"; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj b/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj index d55db87..7ddc5d2 100644 --- a/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj +++ b/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj @@ -153,6 +153,7 @@ import org.apache.asterix.lang.common.struct.VarIdentifier; import org.apache.asterix.metadata.utils.MetadataConstants; import org.apache.hyracks.algebricks.common.utils.Pair; import org.apache.hyracks.algebricks.common.utils.Triple; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation; import org.apache.hyracks.algebricks.core.algebra.expressions.IndexedNLJoinExpressionAnnotation; import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; @@ -733,19 +734,21 @@ CreateFeedStatement FeedSpecification() throws ParseException: { Pair<Identifier,Identifier> nameComponents = null; boolean ifNotExists = false; - String adapterName = null; - Map<String,String> properties = null; CreateFeedStatement cfs = null; Pair<Identifier,Identifier> sourceNameComponents = null; - + RecordConstructor withRecord = null; } { <FEED> nameComponents = QualifiedName() ifNotExists = IfNotExists() - <USING> adapterName = AdapterName() properties = Configuration() - { - cfs = new CreateFeedStatement(nameComponents, adapterName, properties, ifNotExists); - return cfs; - } + <WITH> withRecord = RecordConstructor() + { + try { + cfs = new CreateFeedStatement(nameComponents, withRecord, ifNotExists); + return cfs; + } catch (AlgebricksException e) { + throw new ParseException(e.getMessage()); + } + } } CreateFeedPolicyStatement FeedPolicySpecification() throws ParseException: http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/CreateFeedStatement.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/CreateFeedStatement.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/CreateFeedStatement.java index 1e7a182..ba2cdc4 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/CreateFeedStatement.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/CreateFeedStatement.java @@ -19,11 +19,14 @@ package org.apache.asterix.lang.common.statement; import org.apache.asterix.common.exceptions.CompilationException; -import org.apache.asterix.common.functions.FunctionSignature; import org.apache.asterix.lang.common.base.Statement; +import org.apache.asterix.lang.common.expression.RecordConstructor; import org.apache.asterix.lang.common.struct.Identifier; +import org.apache.asterix.lang.common.util.ExpressionUtils; +import org.apache.asterix.lang.common.util.MergePolicyUtils; import org.apache.asterix.lang.common.visitor.base.ILangVisitor; -import org.apache.hadoop.io.compress.bzip2.CBZip2InputStream; +import org.apache.asterix.object.base.AdmObjectNode; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.common.utils.Pair; import java.util.Map; @@ -36,15 +39,13 @@ public class CreateFeedStatement implements Statement { private final Pair<Identifier, Identifier> qName; private final boolean ifNotExists; - private final String adaptorName; - private final Map<String, String> adaptorConfiguration; + private final AdmObjectNode withObjectNode; - public CreateFeedStatement(Pair<Identifier, Identifier> qName, String adaptorName, - Map<String, String> adaptorConfiguration, boolean ifNotExists) { + public CreateFeedStatement(Pair<Identifier, Identifier> qName, RecordConstructor withRecord, boolean ifNotExists) + throws AlgebricksException { this.qName = qName; this.ifNotExists = ifNotExists; - this.adaptorName = adaptorName; - this.adaptorConfiguration = adaptorConfiguration; + this.withObjectNode = withRecord == null ? null : ExpressionUtils.toNode(withRecord); } public Identifier getDataverseName() { @@ -59,14 +60,6 @@ public class CreateFeedStatement implements Statement { return this.ifNotExists; } - public String getAdaptorName() { - return adaptorName; - } - - public Map<String, String> getAdaptorConfiguration() { - return adaptorConfiguration; - } - @Override public byte getKind() { return Kind.CREATE_FEED; @@ -81,4 +74,12 @@ public class CreateFeedStatement implements Statement { public byte getCategory() { return Category.DDL; } + + public Map<String, String> getConfiguration() throws CompilationException { + return MergePolicyUtils.toProperties(withObjectNode); + } + + public AdmObjectNode getWithObjectNode() { + return withObjectNode; + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/FormatPrintVisitor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/FormatPrintVisitor.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/FormatPrintVisitor.java index ea81865..7ba01ce 100644 --- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/FormatPrintVisitor.java +++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/FormatPrintVisitor.java @@ -754,8 +754,10 @@ public class FormatPrintVisitor implements ILangVisitor<Void, Integer> { out.print(skip(step) + "create " + FEED); out.print(generateFullName(cfs.getDataverseName(), cfs.getFeedName())); out.print(generateIfNotExists(cfs.getIfNotExists())); - out.print(" using " + cfs.getAdaptorName() + " "); - printConfiguration(cfs.getAdaptorConfiguration()); + if (cfs.getWithObjectNode() != null) { + out.print(" with "); + out.print(cfs.getWithObjectNode().toString()); + } out.println(SEMICOLON); return null; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj index b68ffd6..56de389 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj +++ b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj @@ -170,6 +170,7 @@ import org.apache.asterix.lang.sqlpp.util.SqlppVariableUtil; import org.apache.asterix.om.functions.BuiltinFunctions; import org.apache.hyracks.algebricks.common.utils.Pair; import org.apache.hyracks.algebricks.common.utils.Triple; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation; import org.apache.hyracks.algebricks.core.algebra.expressions.IndexedNLJoinExpressionAnnotation; import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; @@ -790,13 +791,18 @@ CreateFeedStatement FeedSpecification() throws ParseException: Map<String,String> properties = null; CreateFeedStatement cfs = null; Pair<Identifier,Identifier> sourceNameComponents = null; + RecordConstructor withRecord = null; } { <FEED> nameComponents = QualifiedName() ifNotExists = IfNotExists() - <USING> adapterName = AdapterName() properties = Configuration() + <WITH> withRecord = RecordConstructor() { - cfs = new CreateFeedStatement(nameComponents, adapterName, properties, ifNotExists); - return cfs; + try { + cfs = new CreateFeedStatement(nameComponents, withRecord, ifNotExists); + return cfs; + } catch (AlgebricksException e) { + throw new ParseException(e.getMessage()); + } } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataCache.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataCache.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataCache.java index 4f827f5..a12b079 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataCache.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataCache.java @@ -475,7 +475,7 @@ public class MetadataCache { } } - public DatasourceAdapter dropAdapter(DatasourceAdapter adapter) { + public DatasourceAdapter dropAdapterIfExists(DatasourceAdapter adapter) { synchronized (adapters) { Map<String, DatasourceAdapter> adaptersInDataverse = adapters.get(adapter.getAdapterIdentifier().getNamespace()); @@ -544,7 +544,7 @@ public class MetadataCache { } } - public Feed dropFeed(Feed feed) { + public Feed dropFeedIfExists(Feed feed) { synchronized (feeds) { Map<String, Feed> feedsInDataverse = feeds.get(feed.getDataverseName()); if (feedsInDataverse != null) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java index f8adc81..8578d6b 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java @@ -654,6 +654,7 @@ public class MetadataManager implements IMetadataManager { } catch (RemoteException e) { throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e); } + ctx.dropAdapter(dataverseName, name); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataTransactionContext.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataTransactionContext.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataTransactionContext.java index 406b3d6..841065b 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataTransactionContext.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataTransactionContext.java @@ -109,7 +109,7 @@ public class MetadataTransactionContext extends MetadataCache { } public void addAdapter(DatasourceAdapter adapter) { - droppedCache.dropAdapter(adapter); + droppedCache.dropAdapterIfExists(adapter); logAndApply(new MetadataLogicalOperation(adapter, true)); } @@ -228,13 +228,11 @@ public class MetadataTransactionContext extends MetadataCache { } public void addFeed(Feed feed) { - droppedCache.dropFeed(feed); + droppedCache.dropFeedIfExists(feed); logAndApply(new MetadataLogicalOperation(feed, true)); } - public void dropFeed(String dataverseName, String feedName) { - Feed feed = null; - feed = new Feed(dataverseName, feedName, null, null); + public void dropFeed(Feed feed) { droppedCache.addFeedIfNotExists(feed); logAndApply(new MetadataLogicalOperation(feed, false)); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataRecordTypes.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataRecordTypes.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataRecordTypes.java index 2a04b58..e0f925c 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataRecordTypes.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataRecordTypes.java @@ -356,17 +356,16 @@ public final class MetadataRecordTypes { public static final String RECORD_NAME_FEED = "FeedRecordType"; public static final int FEED_ARECORD_DATAVERSE_NAME_FIELD_INDEX = 0; public static final int FEED_ARECORD_FEED_NAME_FIELD_INDEX = 1; - public static final int FEED_ARECORD_ADAPTOR_NAME_INDEX = 2; - public static final int FEED_ARECORD_ADAPTOR_CONFIG_INDEX = 3; - public static final int FEED_ARECORD_TIMESTAMP_FIELD_INDEX = 4; + public static final int FEED_ARECORD_ADAPTOR_CONFIG_INDEX = 2; + public static final int FEED_ARECORD_TIMESTAMP_FIELD_INDEX = 3; public static final ARecordType FEED_RECORDTYPE = createRecordType( // RecordTypeName RECORD_NAME_FEED, // FieldNames - new String[] { FIELD_NAME_DATAVERSE_NAME, FIELD_NAME_FEED_NAME, FIELD_NAME_ADAPTER_NAME, - FIELD_NAME_ADAPTER_CONFIGURATION, FIELD_NAME_TIMESTAMP }, + new String[] { FIELD_NAME_DATAVERSE_NAME, FIELD_NAME_FEED_NAME, FIELD_NAME_ADAPTER_CONFIGURATION, + FIELD_NAME_TIMESTAMP }, // FieldTypes - new IAType[] { BuiltinType.ASTRING, BuiltinType.ASTRING, BuiltinType.ASTRING, + new IAType[] { BuiltinType.ASTRING, BuiltinType.ASTRING, new AUnorderedListType(FEED_ADAPTER_CONFIGURATION_RECORDTYPE, null), BuiltinType.ASTRING }, //IsOpen? true); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java index 2b34182..b8790e5 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java @@ -401,10 +401,10 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> public Triple<IOperatorDescriptor, AlgebricksPartitionConstraint, IAdapterFactory> buildFeedIntakeRuntime( JobSpecification jobSpec, Feed feed, FeedPolicyAccessor policyAccessor) throws Exception { Triple<IAdapterFactory, RecordDescriptor, IDataSourceAdapter.AdapterType> factoryOutput; - factoryOutput = FeedMetadataUtil.getPrimaryFeedFactoryAndOutput(feed, policyAccessor, mdTxnCtx, + factoryOutput = FeedMetadataUtil.getFeedFactoryAndOutput(feed, policyAccessor, mdTxnCtx, getApplicationContext()); - ARecordType recordType = FeedMetadataUtil.getOutputType(feed, feed.getAdapterConfiguration(), - ExternalDataConstants.KEY_TYPE_NAME); + ARecordType recordType = FeedMetadataUtil.getOutputType(feed, + feed.getConfiguration().get(ExternalDataConstants.KEY_TYPE_NAME)); IAdapterFactory adapterFactory = factoryOutput.first; FeedIntakeOperatorDescriptor feedIngestor = null; switch (factoryOutput.third) { @@ -413,7 +413,7 @@ public class MetadataProvider implements IMetadataProvider<DataSourceId, String> policyAccessor, factoryOutput.second); break; case EXTERNAL: - String libraryName = feed.getAdapterName().trim() + String libraryName = feed.getConfiguration().get(ExternalDataConstants.KEY_ADAPTER_NAME).trim() .split(FeedConstants.NamingConstants.LIBRARY_NAME_SEPARATOR)[0]; feedIngestor = new FeedIntakeOperatorDescriptor(jobSpec, feed, libraryName, adapterFactory.getClass().getName(), recordType, policyAccessor, factoryOutput.second); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/DatasourceAdapter.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/DatasourceAdapter.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/DatasourceAdapter.java index 5a85327..b72c058 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/DatasourceAdapter.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/DatasourceAdapter.java @@ -44,7 +44,7 @@ public class DatasourceAdapter implements IMetadataEntity<DatasourceAdapter> { @Override public DatasourceAdapter dropFromCache(MetadataCache cache) { - return cache.dropAdapter(this); + return cache.dropAdapterIfExists(this); } public AdapterIdentifier getAdapterIdentifier() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Feed.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Feed.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Feed.java index ea0e4eb..40c7ede 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Feed.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Feed.java @@ -37,16 +37,13 @@ public class Feed implements IMetadataEntity<Feed>, IFeed { private EntityId feedId; /** A string representation of the instance **/ private String displayName; - /** A string representation of the adapter name **/ - private String adapterName; - /** Adapter configuration */ - private Map<String, String> adapterConfiguration; + /** Feed configurations */ + private Map<String, String> feedConfiguration; - public Feed(String dataverseName, String feedName,String adapterName, Map<String, String> configuration) { + public Feed(String dataverseName, String feedName, Map<String, String> feedConfiguration) { this.feedId = new EntityId(EXTENSION_NAME, dataverseName, feedName); this.displayName = "(" + feedId + ")"; - this.adapterName = adapterName; - this.adapterConfiguration = configuration; + this.feedConfiguration = feedConfiguration; } @Override @@ -93,16 +90,11 @@ public class Feed implements IMetadataEntity<Feed>, IFeed { @Override public Feed dropFromCache(MetadataCache cache) { - return cache.dropFeed(this); + return cache.dropFeedIfExists(this); } @Override - public String getAdapterName() { - return adapterName; - } - - @Override - public Map<String, String> getAdapterConfiguration() { - return adapterConfiguration; + public Map<String, String> getConfiguration() { + return feedConfiguration; } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5a61b2ad/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedTupleTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedTupleTranslator.java index 264da60..4e1056e 100644 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedTupleTranslator.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedTupleTranslator.java @@ -89,8 +89,6 @@ public class FeedTupleTranslator extends AbstractTupleTranslator<Feed> { AUnorderedList feedConfig = (AUnorderedList) feedRecord.getValueByPos(MetadataRecordTypes.FEED_ARECORD_ADAPTOR_CONFIG_INDEX); - String adapterName = ((AString) feedRecord.getValueByPos(MetadataRecordTypes.FEED_ARECORD_ADAPTOR_NAME_INDEX)) - .getStringValue(); IACursor cursor = feedConfig.getCursor(); @@ -104,7 +102,7 @@ public class FeedTupleTranslator extends AbstractTupleTranslator<Feed> { value = ((AString) field.getValueByPos(MetadataRecordTypes.PROPERTIES_VALUE_FIELD_INDEX)).getStringValue(); adaptorConfiguration.put(key, value); } - feed = new Feed(dataverseName, feedName, adapterName, adaptorConfiguration); + feed = new Feed(dataverseName, feedName, adaptorConfiguration); return feed; } @@ -134,12 +132,6 @@ public class FeedTupleTranslator extends AbstractTupleTranslator<Feed> { stringSerde.serialize(aString, fieldValue.getDataOutput()); recordBuilder.addField(MetadataRecordTypes.FEED_ARECORD_FEED_NAME_FIELD_INDEX, fieldValue); - // adaptor name - fieldValue.reset(); - aString.setValue(feed.getAdapterName()); - stringSerde.serialize(aString, fieldValue.getDataOutput()); - recordBuilder.addField(MetadataRecordTypes.FEED_ARECORD_ADAPTOR_NAME_INDEX, fieldValue); - // write adaptor configuration fieldValue.reset(); writeFeedAdaptorField(recordBuilder, feed, fieldValue); @@ -165,7 +157,7 @@ public class FeedTupleTranslator extends AbstractTupleTranslator<Feed> { listBuilder.reset((AUnorderedListType) MetadataRecordTypes.FEED_RECORDTYPE .getFieldTypes()[MetadataRecordTypes.FEED_ARECORD_ADAPTOR_CONFIG_INDEX]); - for (Map.Entry<String, String> property : feed.getAdapterConfiguration().entrySet()) { + for (Map.Entry<String, String> property : feed.getConfiguration().entrySet()) { String name = property.getKey(); String value = property.getValue(); listEleBuffer.reset();