You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by am...@apache.org on 2016/07/29 06:46:11 UTC
[2/2] asterixdb git commit: ASTERIXDB-1135 Fix Feed Policy Creation
From File
ASTERIXDB-1135 Fix Feed Policy Creation From File
Change-Id: I452ac11714e20e2ecc31ab8b96a9964ca9d9d6cd
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1018
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: abdullah alamoudi <ba...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/5dc73edd
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/5dc73edd
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/5dc73edd
Branch: refs/heads/master
Commit: 5dc73edd313eac8755a51dd603b73f4263e03c82
Parents: af8255b
Author: Abdullah Alamoudi <ba...@gmail.com>
Authored: Thu Jul 28 05:03:13 2016 +0300
Committer: abdullah alamoudi <ba...@gmail.com>
Committed: Thu Jul 28 23:43:23 2016 -0700
----------------------------------------------------------------------
.../data/feed-policy/policy.properties | 3 +
.../create-policy-from-file.1.ddl.aql | 29 ++++
.../create-policy-from-file.2.query.aql | 27 ++++
.../create-policy-from-file.3.ddl.aql | 27 ++++
.../queries/feeds/feeds_04/feeds_04.1.ddl.aql | 43 ------
.../feeds/feeds_04/feeds_04.2.update.aql | 31 ----
.../queries/feeds/feeds_04/feeds_04.3.query.aql | 30 ----
.../queries/feeds/feeds_05/feeds_05.1.ddl.aql | 56 -------
.../feeds/feeds_05/feeds_05.2.update.aql | 33 -----
.../queries/feeds/feeds_05/feeds_05.3.query.aql | 39 -----
.../queries/feeds/feeds_06/feeds_06.1.ddl.aql | 65 ---------
.../feeds/feeds_06/feeds_06.2.update.aql | 35 -----
.../queries/feeds/feeds_06/feeds_06.3.sleep.aql | 19 ---
.../feeds/feeds_06/feeds_06.4.update.aql | 35 -----
.../queries/feeds/feeds_06/feeds_06.5.query.aql | 35 -----
.../issue_711_feeds/issue_711_feeds.1.ddl.aql | 48 ------
.../issue_711_feeds.2.update.aql | 33 -----
.../issue_711_feeds/issue_711_feeds.3.query.aql | 32 ----
.../create-policy-from-file.1.ddl.sqlpp | 29 ++++
.../create-policy-from-file.2.query.sqlpp | 26 ++++
.../create-policy-from-file.3.ddl.sqlpp | 27 ++++
.../feeds/feeds_01/feeds_01.1.ddl.sqlpp | 3 +-
.../feeds/feeds_02/feeds_02.1.ddl.sqlpp | 11 +-
.../feeds/feeds_02/feeds_02.2.update.sqlpp | 9 +-
.../feeds/feeds_02/feeds_02.3.query.sqlpp | 9 +-
.../feeds/feeds_03/feeds_03.1.ddl.sqlpp | 23 +++
.../feeds/feeds_04/feeds_04.1.ddl.sqlpp | 39 -----
.../feeds/feeds_04/feeds_04.2.update.sqlpp | 27 ----
.../feeds/feeds_04/feeds_04.3.query.sqlpp | 28 ----
.../feeds/feeds_05/feeds_05.1.ddl.sqlpp | 50 -------
.../feeds/feeds_05/feeds_05.2.update.sqlpp | 27 ----
.../feeds/feeds_05/feeds_05.3.query.sqlpp | 30 ----
.../feeds/feeds_06/feeds_06.1.ddl.sqlpp | 53 -------
.../feeds/feeds_06/feeds_06.2.update.sqlpp | 27 ----
.../feeds/feeds_06/feeds_06.3.sleep.sqlpp | 20 ---
.../feeds/feeds_06/feeds_06.4.update.sqlpp | 27 ----
.../feeds/feeds_06/feeds_06.5.query.sqlpp | 28 ----
.../feeds/feeds_07/feeds_07.1.ddl.sqlpp | 32 ++--
.../feeds/feeds_07/feeds_07.2.update.sqlpp | 5 +-
.../feeds/feeds_07/feeds_07.3.query.sqlpp | 14 +-
.../feeds/feeds_08/feeds_08.1.ddl.sqlpp | 14 +-
.../feeds/feeds_08/feeds_08.2.update.sqlpp | 3 -
.../feeds/feeds_08/feeds_08.3.query.sqlpp | 14 +-
.../feeds/feeds_08/feeds_08.4.sleep.sqlpp | 19 +++
.../feeds/feeds_09/feeds_09.1.ddl.sqlpp | 10 +-
.../feeds/feeds_09/feeds_09.2.update.sqlpp | 5 -
.../feeds/feeds_09/feeds_09.3.query.sqlpp | 14 +-
.../feeds/feeds_09/feeds_09.4.ddl.sqlpp | 20 +++
.../feeds/feeds_10/feeds_10.1.ddl.sqlpp | 8 +-
.../feeds/feeds_10/feeds_10.2.update.sqlpp | 5 -
.../feeds/feeds_10/feeds_10.3.query.sqlpp | 3 -
.../feeds/feeds_10/feeds_10.4.ddl.sqlpp | 20 +++
.../feeds/feeds_11/feeds_11.1.ddl.sqlpp | 11 +-
.../feeds/feeds_11/feeds_11.2.update.sqlpp | 5 -
.../feeds/feeds_11/feeds_11.3.query.sqlpp | 7 +-
.../feeds/feeds_12/feeds_12.1.ddl.sqlpp | 8 +-
.../feeds/feeds_12/feeds_12.2.update.sqlpp | 5 -
.../feeds/feeds_12/feeds_12.3.query.sqlpp | 6 +-
.../feeds/feeds_12/feeds_12.4.ddl.sqlpp | 20 +++
.../issue_230_feeds/issue_230_feeds.1.ddl.sqlpp | 8 +-
.../issue_230_feeds.2.update.sqlpp | 5 -
.../issue_230_feeds.3.query.sqlpp | 6 +-
.../issue_230_feeds/issue_230_feeds.4.ddl.sqlpp | 20 +++
.../issue_711_feeds/issue_711_feeds.1.ddl.sqlpp | 41 ------
.../issue_711_feeds.2.update.sqlpp | 27 ----
.../issue_711_feeds.3.query.sqlpp | 28 ----
.../create-policy-from-file.1.adm | 1 +
.../results/feeds/feeds_04/feeds_04.1.adm | 11 --
.../results/feeds/feeds_05/feeds_05.1.adm | 1 -
.../results/feeds/feeds_06/feeds_06.1.adm | 100 -------------
.../feeds/issue_711_feeds/issue_711_feeds.1.adm | 11 --
.../src/test/resources/runtimets/testsuite.xml | 23 +--
.../resources/runtimets/testsuite_sqlpp.xml | 145 ++++++++-----------
.../asterix-lang-aql/src/main/javacc/AQL.jj | 7 +-
.../asterix-lang-sqlpp/src/main/javacc/SQLPP.jj | 7 +-
.../metadata/utils/MetadataLockManager.java | 4 +-
76 files changed, 457 insertions(+), 1349 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/data/feed-policy/policy.properties
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/data/feed-policy/policy.properties b/asterixdb/asterix-app/data/feed-policy/policy.properties
new file mode 100644
index 0000000..bd065f0
--- /dev/null
+++ b/asterixdb/asterix-app/data/feed-policy/policy.properties
@@ -0,0 +1,3 @@
+name = testname
+value = testvalue
+key = testkey
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/create-policy-from-file/create-policy-from-file.1.ddl.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/create-policy-from-file/create-policy-from-file.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/create-policy-from-file/create-policy-from-file.1.ddl.aql
new file mode 100644
index 0000000..aa8f8b5
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/create-policy-from-file/create-policy-from-file.1.ddl.aql
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/*
+ * Description : Create a feed policy from file on CC
+ * Expected Res : Success
+ * Date : 25th Jul 2016
+ */
+drop dataverse experiments if exists;
+create dataverse experiments;
+use dataverse experiments;
+
+create ingestion policy testPolicy from path "data/feed-policy/policy.properties"
+definition "someString";
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/create-policy-from-file/create-policy-from-file.2.query.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/create-policy-from-file/create-policy-from-file.2.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/create-policy-from-file/create-policy-from-file.2.query.aql
new file mode 100644
index 0000000..23f0e2f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/create-policy-from-file/create-policy-from-file.2.query.aql
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/*
+ * Description : Create a feed policy from file on CC
+ * Expected Res : Success
+ * Date : 25th Jul 2016
+ */
+
+for $x in dataset Metadata.FeedPolicy
+where $x.DataverseName = "experiments"
+return $x;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/create-policy-from-file/create-policy-from-file.3.ddl.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/create-policy-from-file/create-policy-from-file.3.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/create-policy-from-file/create-policy-from-file.3.ddl.aql
new file mode 100644
index 0000000..2877e5c
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/create-policy-from-file/create-policy-from-file.3.ddl.aql
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/*
+ * Description : Create a feed policy from file on CC
+ * Expected Res : Success
+ * Date : 25th Jul 2016
+ */
+
+use dataverse experiments;
+drop ingestion policy testPolicy;
+drop dataverse experiments;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04/feeds_04.1.ddl.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04/feeds_04.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04/feeds_04.1.ddl.aql
deleted file mode 100644
index 62430db..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04/feeds_04.1.ddl.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset that uses the feed simulator adapter.
- The feed simulator simulates feed from a file in the HDFS.
- Begin ingestion and verify contents of the dataset post completion.
- * Expected Res : Success
- * Date : 24th Dec 2012
- */
-drop dataverse feeds if exists;
-create dataverse feeds;
-use dataverse feeds;
-
-create type TweetType as closed {
- id: string,
- username : string,
- location : string,
- text : string,
- timestamp : string
-}
-
-create dataset Tweets(TweetType)
-primary key id;
-
-create feed TweetFeed
-using file_feed
-(("fs"="hdfs"),("hdfs"="hdfs://127.0.0.1:31888"),("path"="/asterix/obamatweets.adm"),("format"="adm"),("input-format"="text-input-format"),("type-name"="TweetType"),("tuple-interval"="10"));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04/feeds_04.2.update.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04/feeds_04.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04/feeds_04.2.update.aql
deleted file mode 100644
index 6870ea8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04/feeds_04.2.update.aql
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset that uses the feed simulator adapter.
- The feed simulator simulates feed from a file in the HDFS.
- Begin ingestion and verify contents of the dataset post completion.
- * Expected Res : Success
- * Date : 24th Dec 2012
- */
-
-use dataverse feeds;
-
-set wait-for-completion-feed "true";
-
-connect feed TweetFeed to dataset Tweets;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04/feeds_04.3.query.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04/feeds_04.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04/feeds_04.3.query.aql
deleted file mode 100644
index 39d193a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_04/feeds_04.3.query.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset that uses the feed simulator adapter.
- The feed simulator simulates feed from a file in the HDFS.
- Begin ingestion and verify contents of the dataset post completion.
- * Expected Res : Success
- * Date : 24th Dec 2012
- */
-use dataverse feeds;
-
-for $x in dataset('Tweets')
-order by $x.id
-return $x
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_05/feeds_05.1.ddl.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_05/feeds_05.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_05/feeds_05.1.ddl.aql
deleted file mode 100644
index ea64bef..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_05/feeds_05.1.ddl.aql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset that uses the synthetic feed simulator adapter.
- The synthetic feed simulator uses the Social-Data generator to generate data and simulate a feed.
- The feed lasts a configured duration with data arriving at a configured rate (tweets per second).
- Verify the existence of data after the feed finishes.
-
- * Expected Res : Success
- * Date : 20th Jun 2013
- */
-
-drop dataverse feeds if exists;
-create dataverse feeds;
-use dataverse feeds;
-
-create type TwitterUserType as closed {
- screen-name: string,
- lang: string,
- friends_count: int32,
- statuses_count: int32,
- name: string,
- followers_count: int32
-}
-
-create type TweetMessageType as closed {
- tweetid: string,
- user: TwitterUserType,
- sender-location: point,
- send-time: datetime,
- referred-topics: {{ string }},
- message-text: string
-}
-
-create dataset SyntheticTweets(TweetMessageType)
-primary key tweetid;
-
-create feed SyntheticTweetFeed
-using twitter_firehose
-(("duration"="5"),("tps"="50"),("type-name"="TweetMessageType"),("tput-duration"="5"),("dataverse-dataset"="feeds:SyntheticTweets"),("mode"="controlled"));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_05/feeds_05.2.update.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_05/feeds_05.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_05/feeds_05.2.update.aql
deleted file mode 100644
index 054c3b9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_05/feeds_05.2.update.aql
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset that uses the synthetic feed simulator adapter.
- The synthetic feed simulator uses the Social-Data generator to generate data and simulate a feed.
- The feed lasts a configured duration with data arriving at a configured rate (tweets per second).
- Verify the existence of data after the feed finishes.
-
- * Expected Res : Success
- * Date : 20th Jun 2013
- */
-
-use dataverse feeds;
-
-set wait-for-completion-feed "true";
-
-connect feed SyntheticTweetFeed to dataset SyntheticTweets;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_05/feeds_05.3.query.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_05/feeds_05.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_05/feeds_05.3.query.aql
deleted file mode 100644
index 44ec41b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_05/feeds_05.3.query.aql
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset that uses the synthetic feed simulator adapter.
- The synthetic feed simulator uses the Social-Data generator to generate data and simulate a feed.
- The feed lasts a configured duration with data arriving at a configured rate (tweets per second).
- Verify the existence of data after the feed finishes.
-
- * Expected Res : Success
- * Date : 20th Jun 2013
- */
-
-use dataverse feeds;
-
-let $totalTweets:=count(
-for $x in dataset('SyntheticTweets')
-return $x)
-return
-(if($totalTweets > 0)
- then 1
-else
- 0
-)
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.1.ddl.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.1.ddl.aql
deleted file mode 100644
index 64aeef5..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.1.ddl.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset and a feed using the generic socket feed adapter.
- To drive the socket adapter based feed, we define another feed using the
- client socket test adapter. Content from the file is read by the test adapter
- and forwarded to the socket feed adapter that is listening at a known socket.
- At the end, data is collected in the dataset that was fed by the socket feed adapter.
- Verify the existence of data in the dataset.
-
- * Expected Res : Success
- * Date : 20th Nov 2013
- */
-
-drop dataverse feeds if exists;
-create dataverse feeds;
-use dataverse feeds;
-
-create type TwitterUserType as closed {
-screen-name: string,
-lang: string,
-friends_count: int32,
-statuses_count: int32,
-name: string,
-followers_count: int32
-}
-
-create type TweetMessageType as closed {
-tweetid: int64,
-user: TwitterUserType,
-sender-location: point,
-send-time: datetime,
-referred-topics: {{ string }},
-message-text: string
-}
-
-create dataset MyTweets(TweetMessageType)
-primary key tweetid;
-
-create dataset DummyTweets(TweetMessageType)
-primary key tweetid;
-
-create feed socket_feed
-using socket_adapter
-(("sockets"="127.0.0.1:9009"),("addressType"="IP"),("type-name"="TweetMessageType"),("format"="adm"));
-
-create feed client_test_feed
-using socket_client
-(("sockets"="127.0.0.1:9009"),("type-name"="TweetMessageType"),("addressType"="IP"),("format"="adm"),("file_splits"="data/twitter/tw_messages_100.adm"));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.2.update.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.2.update.aql
deleted file mode 100644
index ef6f31e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.2.update.aql
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset and a feed using the generic socket feed adapter.
- To drive the socket adapter based feed, we define another feed using the
- client socket test adapter. Content from the file is read by the test adapter
- and forwarded to the socket feed adapter that is listening at a known socket.
- At the end, data is collected in the dataset that was fed by the socket feed adapter.
- Verify the existence of data in the dataset.
-
- * Expected Res : Success
- * Date : 20th Nov 2013
-*/
-
-use dataverse feeds;
-
-set wait-for-completion-feed "false";
-
-connect feed socket_feed to dataset MyTweets;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.3.sleep.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.3.sleep.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.3.sleep.aql
deleted file mode 100644
index 67009c5..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.3.sleep.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-3000
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.4.update.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.4.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.4.update.aql
deleted file mode 100644
index a550ced..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.4.update.aql
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset and a feed using the generic socket feed adapter.
- To drive the socket adapter based feed, we define another feed using the
- client socket test adapter. Content from the file is read by the test adapter
- and forwarded to the socket feed adapter that is listening at a known socket.
- At the end, data is collected in the dataset that was fed by the socket feed adapter.
- Verify the existence of data in the dataset.
-
- * Expected Res : Success
- * Date : 20th Nov 2013
-*/
-
-use dataverse feeds;
-
-set wait-for-completion-feed "true";
-
-connect feed client_test_feed to dataset DummyTweets;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.5.query.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.5.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.5.query.aql
deleted file mode 100644
index 83d77da..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/feeds_06/feeds_06.5.query.aql
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset and a feed using the generic socket feed adapter.
- To drive the socket adapter based feed, we define another feed using the
- client socket test adapter. Content from the file is read by the test adapter
- and forwarded to the socket feed adapter that is listening at a known socket.
- At the end, data is collected in the dataset that was fed by the socket feed adapter.
- Verify the existence of data in the dataset.
-
- * Expected Res : Success
- * Date : 20th Nov 2013
-*/
-
-use dataverse feeds;
-
-for $x in dataset MyTweets
-order by $x.tweetid
-return $x
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/issue_711_feeds/issue_711_feeds.1.ddl.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/issue_711_feeds/issue_711_feeds.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/issue_711_feeds/issue_711_feeds.1.ddl.aql
deleted file mode 100644
index b150fd0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/issue_711_feeds/issue_711_feeds.1.ddl.aql
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a dataset with a secondary btree index.
- Create a feed that uses the file_feed adapter.
- The file_feed adapter simulates a feed from a file in the HDFS.
- Connect the feed to the dataset and verify contents of the dataset post completion.
- * Issue : 711
- * Expected Res : Success
- * Date : 6th Feb 2014
- */
-
-drop dataverse feeds if exists;
-create dataverse feeds;
-use dataverse feeds;
-
-create type TweetType as closed {
- id: string,
- username : string,
- location : string,
- text : string,
- timestamp : string
-}
-
-create dataset Tweets(TweetType)
-primary key id;
-
-create index usernameIdx on Tweets(username) type btree;
-
-create feed TweetFeed
-using file_feed
-(("fs"="hdfs"),("hdfs"="hdfs://127.0.0.1:31888"),("path"="/asterix/obamatweets.adm"),("format"="adm"),("input-format"="text-input-format"),("type-name"="TweetType"),("tuple-interval"="10"));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/issue_711_feeds/issue_711_feeds.2.update.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/issue_711_feeds/issue_711_feeds.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/issue_711_feeds/issue_711_feeds.2.update.aql
deleted file mode 100644
index f4bbb24..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/issue_711_feeds/issue_711_feeds.2.update.aql
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a dataset with a secondary btree index.
- Create a feed that uses the file_feed adapter.
- The file_feed adapter simulates a feed from a file in the HDFS.
- Connect the feed to the dataset and verify contents of the dataset post completion.
- * Issue : 711
- * Expected Res : Success
- * Date : 6th Feb 2014
- */
-
-use dataverse feeds;
-
-set wait-for-completion-feed "true";
-
-connect feed TweetFeed to dataset Tweets;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/issue_711_feeds/issue_711_feeds.3.query.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/issue_711_feeds/issue_711_feeds.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/issue_711_feeds/issue_711_feeds.3.query.aql
deleted file mode 100644
index 809f365..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/feeds/issue_711_feeds/issue_711_feeds.3.query.aql
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a dataset with a secondary btree index.
- Create a feed that uses the file_feed adapter.
- The file_feed adapter simulates a feed from a file in the HDFS.
- Connect the feed to the dataset and verify contents of the dataset post completion.
- * Issue : 711
- * Expected Res : Success
- * Date : 6th Feb 2014
- */
-use dataverse feeds;
-
-for $x in dataset('Tweets')
-order by $x.id
-return $x
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/create-policy-from-file/create-policy-from-file.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/create-policy-from-file/create-policy-from-file.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/create-policy-from-file/create-policy-from-file.1.ddl.sqlpp
new file mode 100644
index 0000000..d5ccbb9
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/create-policy-from-file/create-policy-from-file.1.ddl.sqlpp
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/*
+ * Description : Create a feed policy from file on CC
+ * Expected Res : Success
+ * Date : 25th Jul 2016
+ */
+drop database experiments if exists;
+create database experiments;
+use experiments;
+
+create ingestion policy testPolicy from path 'data/feed-policy/policy.properties'
+definition 'someString';
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/create-policy-from-file/create-policy-from-file.2.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/create-policy-from-file/create-policy-from-file.2.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/create-policy-from-file/create-policy-from-file.2.query.sqlpp
new file mode 100644
index 0000000..8a50280
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/create-policy-from-file/create-policy-from-file.2.query.sqlpp
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/*
+ * Description : Create a feed policy from file on CC
+ * Expected Res : Success
+ * Date : 25th Jul 2016
+ */
+
+select element x from `Metadata.FeedPolicy` as x
+where x.DataverseName = 'experiments';
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/create-policy-from-file/create-policy-from-file.3.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/create-policy-from-file/create-policy-from-file.3.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/create-policy-from-file/create-policy-from-file.3.ddl.sqlpp
new file mode 100644
index 0000000..f85bde8
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/create-policy-from-file/create-policy-from-file.3.ddl.sqlpp
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/*
+ * Description : Create a feed policy from file on CC
+ * Expected Res : Success
+ * Date : 25th Jul 2016
+ */
+
+use experiments;
+drop ingestion policy testPolicy;
+drop database experiments;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/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 0d0c4d4..f9f1aa5 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,4 +39,5 @@ create type feeds.TweetType as
create table Tweets(TweetType) primary key id;
-create primary feed TweetFeed using file_feed ((`output-type-name`=`TweetType`),(`fs`=`localfs`),(`path`=`asterix_nc1://data/twitter/obamatweets.adm`),(`format`=`adm`),(`tuple-interval`=`10`));
+create primary feed TweetFeed using localfs
+((`type-name`=`TweetType`),(`path`=`asterix_nc1://data/twitter/obamatweets.adm`),(`format`=`adm`),(`tuple-interval`=`10`));
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/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 8ffcda2..5fec6e6 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
@@ -18,6 +18,10 @@
*/
/*
* Description : Create a feed dataset that uses the feed simulator adapter.
+ Begin ingestion and verify contents of the dataset post completion.
+ * Expected Res : Success
+ * Date : 24th Dec 2012
+ */
drop database feeds if exists;
create database feeds;
@@ -35,5 +39,8 @@ create type feeds.TweetType as
}
create table Tweets(TweetType) primary key id;
-
-create primary feed TweetFeed using file_feed ((`fs`=`localfs`),(`path`=`asterix_nc1://data/twitter/obamatweets.adm`),(`format`=`adm`),(`type-name`=`TweetType`),(`tuple-interval`=`10`));
+create primary feed TweetFeed using 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/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.2.update.sqlpp
index c596583..9c3031d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.2.update.sqlpp
@@ -18,10 +18,11 @@
*/
/*
* Description : Create a feed dataset that uses the feed simulator adapter.
+ Begin ingestion and verify contents of the dataset post completion.
+ * Expected Res : Success
+ * Date : 24th Dec 2012
+ */
use feeds;
-
-
set `wait-for-completion-feed` `true`;
-
-connect feed TweetFeed to table Tweets using policy `BasicFT`;
+connect feed TweetFeed to table Tweets;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.3.query.sqlpp
index b392ce8..cb9d8c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.3.query.sqlpp
@@ -18,11 +18,12 @@
*/
/*
* Description : Create a feed dataset that uses the feed simulator adapter.
+ Begin ingestion and verify contents of the dataset post completion.
+ * Expected Res : Success
+ * Date : 24th Dec 2012
+ */
use feeds;
-
-
select element x
from Tweets as x
-order by x.id
-;
+order by x.id;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/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 63c9909..b1b11c2 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
@@ -22,3 +22,26 @@
* Date : 24th Dec 2012
*/
+drop database feeds if exists;
+create database feeds;
+use feeds;
+
+create type TweetType as closed {
+ id: string,
+ username : string,
+ location : string,
+ text : string,
+ timestamp : string
+}
+
+create table Tweets(TweetType)
+primary key id;
+
+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`))
+apply function feed_processor;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_04/feeds_04.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_04/feeds_04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_04/feeds_04.1.ddl.sqlpp
deleted file mode 100644
index ce87221..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_04/feeds_04.1.ddl.sqlpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset that uses the feed simulator adapter.
-
-drop database feeds if exists;
-create database feeds;
-
-use feeds;
-
-
-create type feeds.TweetType as
- closed {
- id : string,
- username : string,
- location : string,
- text : string,
- timestamp : string
-}
-
-create table Tweets(TweetType) primary key id;
-
-create primary feed TweetFeed using file_feed ((`fs`=`hdfs`),(`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/obamatweets.adm`),(`format`=`adm`),(`input-format`=`text-input-format`),(`type-name`=`TweetType`),(`tuple-interval`=`10`));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_04/feeds_04.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_04/feeds_04.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_04/feeds_04.2.update.sqlpp
deleted file mode 100644
index c596583..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_04/feeds_04.2.update.sqlpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset that uses the feed simulator adapter.
-
-use feeds;
-
-
-set `wait-for-completion-feed` `true`;
-
-connect feed TweetFeed to table Tweets using policy `BasicFT`;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_04/feeds_04.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_04/feeds_04.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_04/feeds_04.3.query.sqlpp
deleted file mode 100644
index b392ce8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_04/feeds_04.3.query.sqlpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset that uses the feed simulator adapter.
-
-use feeds;
-
-
-select element x
-from Tweets as x
-order by x.id
-;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_05/feeds_05.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_05/feeds_05.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_05/feeds_05.1.ddl.sqlpp
deleted file mode 100644
index ced5ffd..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_05/feeds_05.1.ddl.sqlpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset that uses the synthetic feed simulator adapter.
-
-drop database feeds if exists;
-create database feeds;
-
-use feeds;
-
-
-create type feeds.TwitterUserType as
- closed {
- `screen-name` : string,
- lang : string,
- friends_count : int32,
- statuses_count : int32,
- name : string,
- followers_count : int32
-}
-
-create type feeds.TweetMessageType as
- closed {
- tweetid : string,
- user : TwitterUserType,
- `sender-location` : point,
- `send-time` : datetime,
- `referred-topics` : {{string}},
- `message-text` : string
-}
-
-create table SyntheticTweets(TweetMessageType) primary key tweetid;
-
-create primary feed SyntheticTweetFeed using twitter_firehose ((`duration`=`5`),(`tps`=`50`),(`type-name`=`TweetMessageType`),(`tput-duration`=`5`),(`dataverse-dataset`=`feeds:SyntheticTweets`),(`mode`=`controlled`));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_05/feeds_05.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_05/feeds_05.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_05/feeds_05.2.update.sqlpp
deleted file mode 100644
index 0397965..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_05/feeds_05.2.update.sqlpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset that uses the synthetic feed simulator adapter.
-
-use feeds;
-
-
-set `wait-for-completion-feed` `true`;
-
-connect feed SyntheticTweetFeed to table SyntheticTweets using policy `BasicFT`;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_05/feeds_05.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_05/feeds_05.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_05/feeds_05.3.query.sqlpp
deleted file mode 100644
index ba6c676..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_05/feeds_05.3.query.sqlpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset that uses the synthetic feed simulator adapter.
-
-use feeds;
-
-
-if ((feeds.coll_count((
- select element x
- from SyntheticTweets as x
- )) > 0))
-then 1
-else 0;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.1.ddl.sqlpp
deleted file mode 100644
index 5b00071..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.1.ddl.sqlpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset and a feed using the generic socket feed adapter.
-
-drop database feeds if exists;
-create database feeds;
-
-use feeds;
-
-
-create type feeds.TwitterUserType as
- closed {
- `screen-name` : string,
- lang : string,
- friends_count : int32,
- statuses_count : int32,
- name : string,
- followers_count : int32
-}
-
-create type feeds.TweetMessageType as
- closed {
- tweetid : int64,
- user : TwitterUserType,
- `sender-location` : point,
- `send-time` : datetime,
- `referred-topics` : {{string}},
- `message-text` : string
-}
-
-create table MyTweets(TweetMessageType) primary key tweetid;
-
-create table DummyTweets(TweetMessageType) primary key tweetid;
-
-create primary feed socket_feed using socket_adapter ((`sockets`=`127.0.0.1:9009`),(`addressType`=`IP`),(`type-name`=`TweetMessageType`),(`format`=`adm`));
-create primary feed client_test_feed using socket_client ((`sockets`=`127.0.0.1:9009`),(`type-name`=`TweetMessageType`),(`addressType`=`IP`),(`format`=`adm`),(`file_splits`=`data/twitter/tw_messages_100.adm`));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.2.update.sqlpp
deleted file mode 100644
index 88db055..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.2.update.sqlpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset and a feed using the generic socket feed adapter.
-
-use feeds;
-
-
-set `wait-for-completion-feed` `false`;
-
-connect feed socket_feed to table MyTweets using policy `BasicFT`;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.3.sleep.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.3.sleep.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.3.sleep.sqlpp
deleted file mode 100644
index c516444..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.3.sleep.sqlpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-select element 2000;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.4.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.4.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.4.update.sqlpp
deleted file mode 100644
index 4eb8b0d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.4.update.sqlpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset and a feed using the generic socket feed adapter.
-
-use feeds;
-
-
-set `wait-for-completion-feed` `true`;
-
-connect feed client_test_feed to table DummyTweets using policy `BasicFT`;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.5.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.5.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.5.query.sqlpp
deleted file mode 100644
index 839b7e7..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_06/feeds_06.5.query.sqlpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * 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
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a feed dataset and a feed using the generic socket feed adapter.
-
-use feeds;
-
-
-select element x
-from MyTweets as x
-order by x.tweetid
-;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/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 f78f3af..69dcc06 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
@@ -16,23 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Create a feed using the synthetic feed simulator adapter.
-drop database feeds if exists;
-create database feeds;
+drop database feeds if exists;
+create database feeds;
use feeds;
-
create type feeds.TwitterUserType as
closed {
- `screen-name` : string,
- lang : string,
- friends_count : int32,
- statuses_count : int32,
- name : string,
- followers_count : int32
+ `screen_name`: string,
+ language: string,
+ friends_count: int32,
+ status_count: int32,
+ name: string,
+ followers_count: int32
}
create type feeds.TweetMessageType as
@@ -41,7 +38,6 @@ create type feeds.TweetMessageType as
user : TwitterUserType,
latitude : double,
longitude : double,
- `send-time` : datetime,
message_text : string,
created_at : string,
country : string
@@ -49,6 +45,12 @@ create type feeds.TweetMessageType as
create table SyntheticTweets(TweetMessageType) primary key id;
-create index locationIdx on SyntheticTweets (`sender-location`) type rtree;
-
-create primary feed SyntheticTweetFeed using twitter_firehose ((`duration`=`5`),(`tps`=`50`),(`type-name`=`TweetMessageType`),(`tput-duration`=`5`),(`dataverse-dataset`=`feeds:SyntheticTweets`),(`mode`=`controlled`));
+create primary feed SyntheticTweetFeed using twitter_firehose(
+(`duration`=`5`),
+(`tps`=`50`),
+(`type-name`=`TweetMessageType`),
+(`format`=`adm`),
+(`reader-stream`=`twitter_firehose`),
+(`tput-duration`=`5`),
+(`dataverse-dataset`=`feeds:SyntheticTweets`),
+(`mode`=`controlled`));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.2.update.sqlpp
index 59d8012..a41f2ef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.2.update.sqlpp
@@ -16,12 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Create a feed using the synthetic feed simulator adapter.
use feeds;
-
set `wait-for-completion-feed` `true`;
-connect feed SyntheticTweetFeed to table SyntheticTweets using policy `BasicFT`;
+connect feed SyntheticTweetFeed to table SyntheticTweets;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.3.query.sqlpp
index 7760608..49fb04c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.3.query.sqlpp
@@ -16,15 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Create a feed using the synthetic feed simulator adapter.
use feeds;
-
-if ((feeds.coll_count((
- select element x
- from SyntheticTweets as x
- )) > 0))
-then 1
-else 0;
+case
+ when ((feeds.coll_count((select element x from SyntheticTweets as x )) > 0))
+ then 1
+ else 0
+ end;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/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 da08848..75e4dbc 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
@@ -16,15 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Create a feed using the synthetic feed simulator adapter.
drop database feeds if exists;
create database feeds;
use feeds;
-
create type feeds.TwitterUserType as
closed {
screen_name : string,
@@ -47,7 +44,12 @@ create type feeds.TweetMessageType as
}
create table SyntheticTweets(TweetMessageType) primary key id;
-
create index ngram_index on SyntheticTweets (message_text) type ngram (3);
-
-create primary feed SyntheticTweetFeed using twitter_firehose ((`duration`=`5`),(`tps`=`50`),(`type-name`=`TweetMessageType`),(`tput-duration`=`5`),(`dataverse-dataset`=`feeds:SyntheticTweets`),(`mode`=`controlled`));
+create primary feed SyntheticTweetFeed using twitter_firehose (
+(`duration`=`5`),
+(`tps`=`50`),
+(`type-name`=`TweetMessageType`),
+(`tput-duration`=`5`),
+(`dataverse-dataset`=`feeds:SyntheticTweets`),
+(`format`=`adm`),
+(`mode`=`controlled`));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.2.update.sqlpp
index 59d8012..6b0bd75 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.2.update.sqlpp
@@ -16,12 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Create a feed using the synthetic feed simulator adapter.
use feeds;
-
set `wait-for-completion-feed` `true`;
connect feed SyntheticTweetFeed to table SyntheticTweets using policy `BasicFT`;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.3.query.sqlpp
index 7760608..f7ae3c8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.3.query.sqlpp
@@ -16,15 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Create a feed using the synthetic feed simulator adapter.
use feeds;
-
-if ((feeds.coll_count((
- select element x
- from SyntheticTweets as x
- )) > 0))
-then 1
-else 0;
+case
+ when ((feeds.coll_count((select element x from SyntheticTweets as x )) > 0))
+ then 1
+ else 0
+ end;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.4.sleep.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.4.sleep.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.4.sleep.sqlpp
new file mode 100644
index 0000000..6559ae8
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.4.sleep.sqlpp
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+2000
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/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 610f3e8..7ffd538 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
@@ -16,8 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Create a feed using the synthetic feed simulator adapter.
drop database feeds_09 if exists;
create database feeds_09;
@@ -45,9 +43,9 @@ create type feeds_09.TweetMessageType as
created_at : string,
country : string
}
-
create table SyntheticTweets(TweetMessageType) primary key id;
-
create index message_text on SyntheticTweets (message_text) type btree;
-
-create primary feed SyntheticTweetFeed using twitter_firehose ((`duration`=`5`),(`tps`=`50`),(`tput-duration`=`5`),(`type-name`=`TweetMessageType`),(`dataverse-dataset`=`feeds:SyntheticTweets`),(`mode`=`controlled`));
+create primary feed SyntheticTweetFeed using twitter_firehose ((`duration`=`5`),
+(`tps`=`50`),(`tput-duration`=`5`),(`type-name`=`TweetMessageType`),
+(`dataverse-dataset`=`feeds:SyntheticTweets`),(`format`=`adm`),
+(`reader-stream`=`twitter_firehose`),(`mode`=`controlled`));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.2.update.sqlpp
index 4be1b58..b3242e0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.2.update.sqlpp
@@ -16,12 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Create a feed using the synthetic feed simulator adapter.
use feeds_09;
-
-
set `wait-for-completion-feed` `true`;
-
connect feed SyntheticTweetFeed to table SyntheticTweets using policy `BasicFT`;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.3.query.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.3.query.sqlpp
index 3b4fbad..d0f5898 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.3.query.sqlpp
@@ -16,15 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Create a feed using the synthetic feed simulator adapter.
use feeds_09;
-
-if ((feeds_09.coll_count((
- select element x
- from SyntheticTweets as x
- )) > 0))
-then 1
-else 0;
+case
+ when ((feeds_09.coll_count(( select element x from SyntheticTweets as x )) > 0))
+ then 1
+ else 0
+ end;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5dc73edd/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.4.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.4.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.4.ddl.sqlpp
new file mode 100644
index 0000000..d5cbb9e
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.4.ddl.sqlpp
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+drop database feeds_09;