asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buyin...@apache.org
Subject [11/44] asterixdb git commit: Renaming: "table"->"dataset", "database"->"dataverse".
Date Tue, 02 Aug 2016 01:14:13 GMT
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1168/query-ASTERIXDB-1168.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1168/query-ASTERIXDB-1168.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1168/query-ASTERIXDB-1168.1.ddl.sqlpp
index 6e9dcd1..c2c0dc6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1168/query-ASTERIXDB-1168.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1168/query-ASTERIXDB-1168.1.ddl.sqlpp
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-drop database test if exists;
-create database test;
+drop dataverse test if exists;
+create dataverse test;
 use test;
 
 create type TType as closed
 { id: int64, content: string }
 
-create table TData (TType) primary key id;
+create dataset TData (TType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.1.ddl.sqlpp
index 78d754a..6ae5f32 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-DROP DATABASE test IF EXISTS;
-CREATE DATABASE test;
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
 USE test;
 
 
@@ -46,6 +46,6 @@ CREATE TYPE CustomerType AS CLOSED {
 }
 
 
-CREATE TABLE Customer(CustomerType) PRIMARY KEY c_custkey;
+CREATE DATASET Customer(CustomerType) PRIMARY KEY c_custkey;
 
-CREATE TABLE Orders(OrderType) PRIMARY KEY o_orderkey;
+CREATE DATASET Orders(OrderType) PRIMARY KEY o_orderkey;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.2.update.sqlpp
index e09d9e5..4be976e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.2.update.sqlpp
@@ -18,7 +18,7 @@
  */
 USE test;
 
-load  table Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
+load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
-load  table Customer using localfs ((`path`=`asterix_nc1://data/tpch0.001/customer.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
+load  dataset Customer using localfs ((`path`=`asterix_nc1://data/tpch0.001/customer.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.1.ddl.sqlpp
index 78d754a..6ae5f32 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-DROP DATABASE test IF EXISTS;
-CREATE DATABASE test;
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
 USE test;
 
 
@@ -46,6 +46,6 @@ CREATE TYPE CustomerType AS CLOSED {
 }
 
 
-CREATE TABLE Customer(CustomerType) PRIMARY KEY c_custkey;
+CREATE DATASET Customer(CustomerType) PRIMARY KEY c_custkey;
 
-CREATE TABLE Orders(OrderType) PRIMARY KEY o_orderkey;
+CREATE DATASET Orders(OrderType) PRIMARY KEY o_orderkey;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.2.update.sqlpp
index e09d9e5..4be976e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.2.update.sqlpp
@@ -18,7 +18,7 @@
  */
 USE test;
 
-load  table Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
+load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
-load  table Customer using localfs ((`path`=`asterix_nc1://data/tpch0.001/customer.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
+load  dataset Customer using localfs ((`path`=`asterix_nc1://data/tpch0.001/customer.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.1.ddl.sqlpp
index 78d754a..6ae5f32 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-DROP DATABASE test IF EXISTS;
-CREATE DATABASE test;
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
 USE test;
 
 
@@ -46,6 +46,6 @@ CREATE TYPE CustomerType AS CLOSED {
 }
 
 
-CREATE TABLE Customer(CustomerType) PRIMARY KEY c_custkey;
+CREATE DATASET Customer(CustomerType) PRIMARY KEY c_custkey;
 
-CREATE TABLE Orders(OrderType) PRIMARY KEY o_orderkey;
+CREATE DATASET Orders(OrderType) PRIMARY KEY o_orderkey;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.2.update.sqlpp
index e09d9e5..4be976e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.2.update.sqlpp
@@ -18,7 +18,7 @@
  */
 USE test;
 
-load  table Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
+load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
-load  table Customer using localfs ((`path`=`asterix_nc1://data/tpch0.001/customer.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
+load  dataset Customer using localfs ((`path`=`asterix_nc1://data/tpch0.001/customer.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/01/01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/01/01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/01/01.1.ddl.sqlpp
index 4cac12b..ad97753 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/01/01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/01/01.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/02/02.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/02/02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/02/02.1.ddl.sqlpp
index 4cac12b..ad97753 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/02/02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/02/02.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/03/03.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/03/03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/03/03.1.ddl.sqlpp
index 4cac12b..ad97753 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/03/03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/03/03.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/04/04.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/04/04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/04/04.1.ddl.sqlpp
index 4cac12b..ad97753 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/04/04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/04/04.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/05/05.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/05/05.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/05/05.1.ddl.sqlpp
index 4cac12b..ad97753 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/05/05.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/05/05.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/06/06.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/06/06.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/06/06.1.ddl.sqlpp
index 4cac12b..ad97753 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/06/06.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/06/06.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/07/07.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/07/07.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/07/07.1.ddl.sqlpp
index 4cac12b..ad97753 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/07/07.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subset-collection/07/07.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
index a3ea6cd..e42f0c6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
@@ -23,8 +23,8 @@
  *
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,5 +49,5 @@ create type test.LineItemType as
   l_comment : string
 }
 
-create temporary table LineItem(LineItemType) primary key l_orderkey,l_linenumber;
+create temporary dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.update.sqlpp
index 192c6a1..5ebf862 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.update.sqlpp
@@ -26,5 +26,5 @@
 use test;
 
 
-load  table LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp
index df87619..d2178a7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp
@@ -23,8 +23,8 @@
  *
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,5 +49,5 @@ create type test.LineItemType as
   l_comment : string
 }
 
-create temporary table LineItem(LineItemType) primary key l_orderkey,l_linenumber;
+create temporary dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.2.update.sqlpp
index 4cd1a81..eb0f76e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.2.update.sqlpp
@@ -26,7 +26,7 @@
 use test;
 
 
-load  table LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
 delete from LineItem
  where l_orderkey >= 10;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp
index 9caa534..56fdaab 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp
@@ -23,8 +23,8 @@
  *
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,7 +49,7 @@ create type test.TestType as
   person : Person
 }
 
-create temporary table t1(TestType) primary key id;
+create temporary dataset t1(TestType) primary key id;
 
 create  index rtree_index_point  on t1 (locn) type rtree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.1.ddl.sqlpp
index e06c6af..934cdc3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.1.ddl.sqlpp
@@ -23,8 +23,8 @@
  *
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,5 +49,5 @@ create type test.Schema as
   string4 : string
 }
 
-create temporary table t1(Schema) primary key unique2;
+create temporary dataset t1(Schema) primary key unique2;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.2.update.sqlpp
index e73bfa5..23906a4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.2.update.sqlpp
@@ -26,5 +26,5 @@
 use test;
 
 
-load  table t1 using localfs ((`path`=`asterix_nc1://data/wisc/onektup.adm`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset t1 using localfs ((`path`=`asterix_nc1://data/wisc/onektup.adm`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp
index a7b7c7d..256a01c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp
@@ -22,8 +22,8 @@
  * Date            : March 27 2015
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,7 +48,7 @@ create type test.LineItemType as
   l_comment : string
 }
 
-create temporary table LineItem(LineItemType) primary key l_orderkey,l_linenumber;
+create temporary dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
 create  index part_index  on LineItem (l_partkey) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.2.update.sqlpp
index 74a358b..ef9dd8f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.2.update.sqlpp
@@ -25,7 +25,7 @@
 use test;
 
 
-load  table LineItem using localfs ((`path`=`asterix_nc1://data/empty.adm`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset LineItem using localfs ((`path`=`asterix_nc1://data/empty.adm`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
-load  table LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp
index 2c6e41c..4d276ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp
@@ -23,8 +23,8 @@
  * Date            : March 27 2015
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 create type test.Emp as
  closed {
@@ -35,7 +35,7 @@ create type test.Emp as
   dept : string
 }
 
-create temporary table test.employee(Emp) primary key id;
+create temporary dataset test.employee(Emp) primary key id;
 
 create  index idx_employee_first_name  on test.employee (fname) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.2.update.sqlpp
index 6c9c5a2..da759b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.2.update.sqlpp
@@ -26,7 +26,7 @@
 use test;
 
 
-load  table test.employee using localfs ((`path`=`asterix_nc1://data/names.adm`),(`format`=`delimited-text`),(`delimiter`=`|`));
+load  dataset test.employee using localfs ((`path`=`asterix_nc1://data/names.adm`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
 insert into test.employee
 select element {'id':(x.id + 10000),'fname':x.fname,'lname':x.lname,'age':x.age,'dept':x.dept}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
index 70a4ef8..99c0994 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
@@ -23,8 +23,8 @@
  * Date            : July 11 2013
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -34,5 +34,5 @@ create type test.myDataType as
   id : int64
 }
 
-create temporary table myData(myDataType) primary key id;
+create temporary dataset myData(myDataType) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.2.update.sqlpp
index 71ebea9..06917df 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.2.update.sqlpp
@@ -27,7 +27,7 @@
 use test;
 
 
-load  table myData using localfs ((`path`=`asterix_nc1://data/odd-numbers.adm`),(`format`=`adm`)) pre-sorted;
+load  dataset myData using localfs ((`path`=`asterix_nc1://data/odd-numbers.adm`),(`format`=`adm`)) pre-sorted;
 
 insert into myData
 select element {'id':(x.id + 1)}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
index cd43601..3db5983 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
@@ -22,8 +22,8 @@
  * Date            : March 27 2015
  */
 
-drop  database tpch if exists;
-create  database tpch;
+drop  dataverse tpch if exists;
+create  dataverse tpch;
 
 use tpch;
 
@@ -48,5 +48,5 @@ create type tpch.LineItemType as
   l_comment : string
 }
 
-create temporary table LineItem(LineItemType) primary key l_orderkey,l_linenumber;
+create temporary dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.2.update.sqlpp
index 447271a..696a84b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.2.update.sqlpp
@@ -25,5 +25,5 @@
 use tpch;
 
 
-load  table LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
index 57b58b0..807276b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
@@ -22,8 +22,8 @@
  * Date            : March 27 2015
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -41,5 +41,5 @@ create type test.MyRecord as
   circle : circle
 }
 
-create temporary table MyData(MyRecord) primary key id;
+create temporary dataset MyData(MyRecord) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.2.update.sqlpp
index aa8fa13..39eaee2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.2.update.sqlpp
@@ -25,5 +25,5 @@
 use test;
 
 
-load  table MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`)) pre-sorted;
+load  dataset MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.sqlpp
index 8651e4d..4dfb789 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.sqlpp
@@ -23,8 +23,8 @@
  * Date            : March 27 2015
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,7 +48,7 @@ create type test.MyMiniRecord as
   point : point
 }
 
-create  table MyData(MyRecord) primary key id;
+create  dataset MyData(MyRecord) primary key id;
 
-create temporary table MyMiniData(MyMiniRecord) primary key id;
+create temporary dataset MyMiniData(MyMiniRecord) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.2.update.sqlpp
index a459f56..c2214c9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.2.update.sqlpp
@@ -26,7 +26,7 @@
 use test;
 
 
-load  table MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`)) pre-sorted;
+load  dataset MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`)) pre-sorted;
 
-load  table MyMiniData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData0.json`),(`format`=`adm`)) pre-sorted;
+load  dataset MyMiniData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData0.json`),(`format`=`adm`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
index 2112a71..ba96966 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
@@ -23,8 +23,8 @@
  * Date            : March 27 2015
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,7 +48,7 @@ create type test.MyMiniRecord as
   point : point
 }
 
-create temporary table MyData(MyRecord) primary key id;
+create temporary dataset MyData(MyRecord) primary key id;
 
-create temporary table MyMiniData(MyMiniRecord) primary key id;
+create temporary dataset MyMiniData(MyMiniRecord) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.2.update.sqlpp
index a459f56..c2214c9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.2.update.sqlpp
@@ -26,7 +26,7 @@
 use test;
 
 
-load  table MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`)) pre-sorted;
+load  dataset MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`)) pre-sorted;
 
-load  table MyMiniData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData0.json`),(`format`=`adm`)) pre-sorted;
+load  dataset MyMiniData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData0.json`),(`format`=`adm`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.sqlpp
index 59c7c8c..f0abe6e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.sqlpp
@@ -23,8 +23,8 @@
  * Date            : March 27 2015
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -48,7 +48,7 @@ create type test.MyMiniRecord as
   point : point
 }
 
-create temporary table MyData(MyRecord) primary key id;
+create temporary dataset MyData(MyRecord) primary key id;
 
-create  table MyMiniData(MyMiniRecord) primary key id;
+create  dataset MyMiniData(MyMiniRecord) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.2.update.sqlpp
index a459f56..c2214c9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.2.update.sqlpp
@@ -26,7 +26,7 @@
 use test;
 
 
-load  table MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`)) pre-sorted;
+load  dataset MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`)) pre-sorted;
 
-load  table MyMiniData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData0.json`),(`format`=`adm`)) pre-sorted;
+load  dataset MyMiniData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData0.json`),(`format`=`adm`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors/accessors.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors/accessors.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors/accessors.1.ddl.sqlpp
index 15f980b..21479a2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors/accessors.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors/accessors.1.ddl.sqlpp
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors_interval/accessors_interval.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors_interval/accessors_interval.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors_interval/accessors_interval.1.ddl.sqlpp
index 15f980b..21479a2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors_interval/accessors_interval.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors_interval/accessors_interval.1.ddl.sqlpp
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors_interval_null/accessors_interval_null.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors_interval_null/accessors_interval_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors_interval_null/accessors_interval_null.1.ddl.sqlpp
index 15f980b..21479a2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors_interval_null/accessors_interval_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/accessors_interval_null/accessors_interval_null.1.ddl.sqlpp
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/adjust_timezone/adjust_timezone.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/adjust_timezone/adjust_timezone.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/adjust_timezone/adjust_timezone.1.ddl.sqlpp
index ad5ec6d..c47eddd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/adjust_timezone/adjust_timezone.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/adjust_timezone/adjust_timezone.1.ddl.sqlpp
@@ -22,6 +22,6 @@
  * Date             :   15th Oct, 2012
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.1.ddl.sqlpp
index 9ef16b0..4f1cd7d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -33,5 +33,5 @@ create type test.Schema as
   ymduration : `year-month-duration`
 }
 
-create  table tsdata(Schema) primary key id;
+create  dataset tsdata(Schema) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.1.ddl.sqlpp
index 9ef16b0..4f1cd7d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -33,5 +33,5 @@ create type test.Schema as
   ymduration : `year-month-duration`
 }
 
-create  table tsdata(Schema) primary key id;
+create  dataset tsdata(Schema) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/calendar_duration/calendar_duration.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/calendar_duration/calendar_duration.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/calendar_duration/calendar_duration.1.ddl.sqlpp
index a4105c1..cec4e57 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/calendar_duration/calendar_duration.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/calendar_duration/calendar_duration.1.ddl.sqlpp
@@ -22,6 +22,6 @@
  * Date             :   15th Oct, 2012
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/date_functions/date_functions.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/date_functions/date_functions.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/date_functions/date_functions.1.ddl.sqlpp
index cedf4bd..6f834f4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/date_functions/date_functions.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/date_functions/date_functions.1.ddl.sqlpp
@@ -22,6 +22,6 @@
  * Date             :   24th Sep, 2012
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/datetime_functions/datetime_functions.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/datetime_functions/datetime_functions.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/datetime_functions/datetime_functions.1.ddl.sqlpp
index c6310ff..24c9ba9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/datetime_functions/datetime_functions.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/datetime_functions/datetime_functions.1.ddl.sqlpp
@@ -22,6 +22,6 @@
  * Date             :   24th Sep, 2012
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/day_of_week_01/day_of_week_01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/day_of_week_01/day_of_week_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/day_of_week_01/day_of_week_01.1.ddl.sqlpp
index 1f76c38..7554b09 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/day_of_week_01/day_of_week_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/day_of_week_01/day_of_week_01.1.ddl.sqlpp
@@ -21,6 +21,6 @@
  * Expected result: success
  **/
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/duration_comps/duration_comps.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/duration_comps/duration_comps.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/duration_comps/duration_comps.1.ddl.sqlpp
index d2a1672..4deb4c6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/duration_comps/duration_comps.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/duration_comps/duration_comps.1.ddl.sqlpp
@@ -22,6 +22,6 @@
  * Date             :   19 Apr, 2013
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/duration_functions/duration_functions.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/duration_functions/duration_functions.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/duration_functions/duration_functions.1.ddl.sqlpp
index 58bdfa7..8a477f8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/duration_functions/duration_functions.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/duration_functions/duration_functions.1.ddl.sqlpp
@@ -22,6 +22,6 @@
  * Date             :   08/22/2013
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_delimited_ds/insert_from_delimited_ds.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_delimited_ds/insert_from_delimited_ds.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_delimited_ds/insert_from_delimited_ds.1.ddl.sqlpp
index bd98d88..55af74e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_delimited_ds/insert_from_delimited_ds.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_delimited_ds/insert_from_delimited_ds.1.ddl.sqlpp
@@ -22,6 +22,6 @@
  * Expected result: success
  */
 
-drop  database testdvt if exists;
-create  database testdvt;
+drop  dataverse testdvt if exists;
+create  dataverse testdvt;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_delimited_ds/insert_from_delimited_ds.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_delimited_ds/insert_from_delimited_ds.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_delimited_ds/insert_from_delimited_ds.2.update.sqlpp
index 7311d6e..f1df899 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_delimited_ds/insert_from_delimited_ds.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_delimited_ds/insert_from_delimited_ds.2.update.sqlpp
@@ -20,5 +20,5 @@
 use testdvt;
 
 
-create external  table testds(testtype) using localfs((`path`=`asterix_nc1://data/temporal/temporalData.txt`),(`format`=`delimited-text`),(`delimiter`=`|`));
+create external  dataset testds(testtype) using localfs((`path`=`asterix_nc1://data/temporal/temporalData.txt`),(`format`=`delimited-text`),(`delimiter`=`|`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.1.ddl.sqlpp
index 509a003..07e19b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.1.ddl.sqlpp
@@ -22,8 +22,8 @@
  * Expected result: success
  */
 
-drop  database testdvt if exists;
-create  database testdvt;
+drop  dataverse testdvt if exists;
+create  dataverse testdvt;
 
 use testdvt;
 
@@ -40,5 +40,5 @@ create type testdvt.testtype as
   dayTimeDurationField : `day-time-duration`?
 }
 
-create external  table testds(testtype) using localfs((`path`=`asterix_nc1://data/temporal/temporalData.json`),(`format`=`adm`));
+create external  dataset testds(testtype) using localfs((`path`=`asterix_nc1://data/temporal/temporalData.json`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.1.ddl.sqlpp
index 4b38ff3..5a0bebb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.1.ddl.sqlpp
@@ -22,8 +22,8 @@
  * Expected result: success
  */
 
-drop  database timeTest if exists;
-create  database timeTest;
+drop  dataverse timeTest if exists;
+create  dataverse timeTest;
 
 use timeTest;
 
@@ -41,5 +41,5 @@ create type timeTest.timesType as
   `datetime-interval` : interval
 }
 
-create  table timeData(timesType) primary key date;
+create  dataset timeData(timesType) primary key date;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.2.update.sqlpp
index 8e81163..6f211b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.2.update.sqlpp
@@ -20,5 +20,5 @@
 use timeTest;
 
 
-load  table timeData using localfs ((`path`=`asterix_nc1://data/temporal/simpletemp_30.json`),(`format`=`adm`));
+load  dataset timeData using localfs ((`path`=`asterix_nc1://data/temporal/simpletemp_30.json`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin/interval_bin.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin/interval_bin.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin/interval_bin.1.ddl.sqlpp
index 09e53ae..741e60b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin/interval_bin.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin/interval_bin.1.ddl.sqlpp
@@ -21,6 +21,6 @@
  * Expected result: success
  **/
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.1.ddl.sqlpp
index bc30e4e..250a836 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.1.ddl.sqlpp
@@ -21,8 +21,8 @@
  * Expected result: success
  **/
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -33,5 +33,5 @@ create type test.Schema as
   timestamp : datetime
 }
 
-create  table tsdata(Schema) primary key id;
+create  dataset tsdata(Schema) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.1.ddl.sqlpp
index bc30e4e..250a836 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.1.ddl.sqlpp
@@ -21,8 +21,8 @@
  * Expected result: success
  **/
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -33,5 +33,5 @@ create type test.Schema as
   timestamp : datetime
 }
 
-create  table tsdata(Schema) primary key id;
+create  dataset tsdata(Schema) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_functions/interval_functions.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_functions/interval_functions.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_functions/interval_functions.1.ddl.sqlpp
index 7802a4e..ac28312 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_functions/interval_functions.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_functions/interval_functions.1.ddl.sqlpp
@@ -22,6 +22,6 @@
  * Date             :   2nd Nov, 2012
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.1.ddl.sqlpp
index b405834..8fe76df 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.1.ddl.sqlpp
@@ -21,8 +21,8 @@
  * Expected result: success
  **/
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -34,5 +34,5 @@ create type test.Schema as
   duration : `day-time-duration`
 }
 
-create  table tsdata(Schema) primary key id;
+create  dataset tsdata(Schema) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.1.ddl.sqlpp
index b405834..8fe76df 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.1.ddl.sqlpp
@@ -21,8 +21,8 @@
  * Expected result: success
  **/
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -34,5 +34,5 @@ create type test.Schema as
   duration : `day-time-duration`
 }
 
-create  table tsdata(Schema) primary key id;
+create  dataset tsdata(Schema) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.1.ddl.sqlpp
index 1cc7f90..9352ae3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.1.ddl.sqlpp
@@ -21,8 +21,8 @@
  * Expected result: success
  **/
 
-drop  database multitask if exists;
-create  database multitask;
+drop  dataverse multitask if exists;
+create  dataverse multitask;
 
 use multitask;
 
@@ -35,5 +35,5 @@ create type multitask.LogType as
   app : string
 }
 
-create  table logs(LogType) primary key row_id;
+create  dataset logs(LogType) primary key row_id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/parse_01/parse_01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/parse_01/parse_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/parse_01/parse_01.1.ddl.sqlpp
index a83dba7..280877e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/parse_01/parse_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/parse_01/parse_01.1.ddl.sqlpp
@@ -21,6 +21,6 @@
  * Expected Result: Success
  **/
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/parse_02/parse_02.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/parse_02/parse_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/parse_02/parse_02.1.ddl.sqlpp
index a83dba7..280877e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/parse_02/parse_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/parse_02/parse_02.1.ddl.sqlpp
@@ -21,6 +21,6 @@
  * Expected Result: Success
  **/
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/time_functions/time_functions.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/time_functions/time_functions.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/time_functions/time_functions.1.ddl.sqlpp
index 3a31488..5ed11ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/time_functions/time_functions.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/time_functions/time_functions.1.ddl.sqlpp
@@ -22,6 +22,6 @@
  * Date             :   24th Sep, 2012
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.1.ddl.sqlpp
index ea8cd94..c210744 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database TinySocial if exists;
-create  database TinySocial;
+drop  dataverse TinySocial if exists;
+create  dataverse TinySocial;
 
 use TinySocial;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.2.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.2.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.2.ddl.sqlpp
index 8c5387f..e95fbfa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.2.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.2.ddl.sqlpp
@@ -20,13 +20,13 @@
 use TinySocial;
 
 
-create  table FacebookUsers(FacebookUserType) primary key id;
+create  dataset FacebookUsers(FacebookUserType) primary key id;
 
-create  table FacebookMessages(FacebookMessageType) primary key `message-id`;
+create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
 
-create  table TwitterUsers(TwitterUserType) primary key `screen-name`;
+create  dataset TwitterUsers(TwitterUserType) primary key `screen-name`;
 
-create  table TweetMessages(TweetMessageType) primary key tweetid hints (`CARDINALITY`=`100`);
+create  dataset TweetMessages(TweetMessageType) primary key tweetid hints (`CARDINALITY`=`100`);
 
 create  index fbUserSinceIdx  on FacebookUsers (`user-since`:datetime) type btree enforced;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.3.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.3.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.3.update.sqlpp
index c28f892..5211fb6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.3.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.3.update.sqlpp
@@ -20,11 +20,11 @@
 use TinySocial;
 
 
-load  table FacebookUsers using localfs ((`path`=`asterix_nc1://data/tinysocial/fbu.adm`),(`format`=`adm`));
+load  dataset FacebookUsers using localfs ((`path`=`asterix_nc1://data/tinysocial/fbu.adm`),(`format`=`adm`));
 
-load  table FacebookMessages using localfs ((`path`=`asterix_nc1://data/tinysocial/fbm.adm`),(`format`=`adm`));
+load  dataset FacebookMessages using localfs ((`path`=`asterix_nc1://data/tinysocial/fbm.adm`),(`format`=`adm`));
 
-load  table TwitterUsers using localfs ((`path`=`asterix_nc1://data/tinysocial/twu.adm`),(`format`=`adm`));
+load  dataset TwitterUsers using localfs ((`path`=`asterix_nc1://data/tinysocial/twu.adm`),(`format`=`adm`));
 
-load  table TweetMessages using localfs ((`path`=`asterix_nc1://data/tinysocial/twm.adm`),(`format`=`adm`));
+load  dataset TweetMessages using localfs ((`path`=`asterix_nc1://data/tinysocial/twm.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.1.ddl.sqlpp
index 523aed5..d6fa514 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database TinySocial if exists;
-create  database TinySocial;
+drop  dataverse TinySocial if exists;
+create  dataverse TinySocial;
 
 use TinySocial;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.2.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.2.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.2.ddl.sqlpp
index 76819ff..d82c32b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.2.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.2.ddl.sqlpp
@@ -20,13 +20,13 @@
 use TinySocial;
 
 
-create  table FacebookUsers(FacebookUserType) primary key id;
+create  dataset FacebookUsers(FacebookUserType) primary key id;
 
-create  table FacebookMessages(FacebookMessageType) primary key `message-id`;
+create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
 
-create  table TwitterUsers(TwitterUserType) primary key `screen-name`;
+create  dataset TwitterUsers(TwitterUserType) primary key `screen-name`;
 
-create  table TweetMessages(TweetMessageType) primary key tweetid hints (`CARDINALITY`=`100`);
+create  dataset TweetMessages(TweetMessageType) primary key tweetid hints (`CARDINALITY`=`100`);
 
 create  index fbUserSinceIdx  on FacebookUsers (`user-since`) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.3.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.3.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.3.update.sqlpp
index c28f892..5211fb6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.3.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.3.update.sqlpp
@@ -20,11 +20,11 @@
 use TinySocial;
 
 
-load  table FacebookUsers using localfs ((`path`=`asterix_nc1://data/tinysocial/fbu.adm`),(`format`=`adm`));
+load  dataset FacebookUsers using localfs ((`path`=`asterix_nc1://data/tinysocial/fbu.adm`),(`format`=`adm`));
 
-load  table FacebookMessages using localfs ((`path`=`asterix_nc1://data/tinysocial/fbm.adm`),(`format`=`adm`));
+load  dataset FacebookMessages using localfs ((`path`=`asterix_nc1://data/tinysocial/fbm.adm`),(`format`=`adm`));
 
-load  table TwitterUsers using localfs ((`path`=`asterix_nc1://data/tinysocial/twu.adm`),(`format`=`adm`));
+load  dataset TwitterUsers using localfs ((`path`=`asterix_nc1://data/tinysocial/twu.adm`),(`format`=`adm`));
 
-load  table TweetMessages using localfs ((`path`=`asterix_nc1://data/tinysocial/twm.adm`),(`format`=`adm`));
+load  dataset TweetMessages using localfs ((`path`=`asterix_nc1://data/tinysocial/twm.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/counthashed-gram-tokens_01/counthashed-gram-tokens_01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/counthashed-gram-tokens_01/counthashed-gram-tokens_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/counthashed-gram-tokens_01/counthashed-gram-tokens_01.1.ddl.sqlpp
index 4cac12b..ad97753 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/counthashed-gram-tokens_01/counthashed-gram-tokens_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/counthashed-gram-tokens_01/counthashed-gram-tokens_01.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/counthashed-gram-tokens_02/counthashed-gram-tokens_02.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/counthashed-gram-tokens_02/counthashed-gram-tokens_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/counthashed-gram-tokens_02/counthashed-gram-tokens_02.1.ddl.sqlpp
index 4cac12b..ad97753 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/counthashed-gram-tokens_02/counthashed-gram-tokens_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/counthashed-gram-tokens_02/counthashed-gram-tokens_02.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/counthashed-word-tokens_01/counthashed-word-tokens_01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/counthashed-word-tokens_01/counthashed-word-tokens_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/counthashed-word-tokens_01/counthashed-word-tokens_01.1.ddl.sqlpp
index 4cac12b..ad97753 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/counthashed-word-tokens_01/counthashed-word-tokens_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/counthashed-word-tokens_01/counthashed-word-tokens_01.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/gram-tokens_01/gram-tokens_01.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/gram-tokens_01/gram-tokens_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/gram-tokens_01/gram-tokens_01.1.ddl.sqlpp
index 4cac12b..ad97753 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/gram-tokens_01/gram-tokens_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/gram-tokens_01/gram-tokens_01.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/gram-tokens_02/gram-tokens_02.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/gram-tokens_02/gram-tokens_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/gram-tokens_02/gram-tokens_02.1.ddl.sqlpp
index 4cac12b..ad97753 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/gram-tokens_02/gram-tokens_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tokenizers/gram-tokens_02/gram-tokens_02.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 


Mime
View raw message