asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buyin...@apache.org
Subject [18/44] asterixdb git commit: Renaming: "table"->"dataset", "database"->"dataverse".
Date Tue, 02 Aug 2016 01:14:20 GMT
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.2.update.sqlpp
index 5bfb114..eb6e72a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.2.update.sqlpp
@@ -26,7 +26,7 @@
 use test;
 
 
-load  table TweetMessagesTmp using localfs ((`path`=`asterix_nc1://data/twitter/tw_for_indexleftouterjoin.adm`),(`format`=`adm`));
+load  dataset TweetMessagesTmp using localfs ((`path`=`asterix_nc1://data/twitter/tw_for_indexleftouterjoin.adm`),(`format`=`adm`));
 
 insert into TweetMessages
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
index a8db412..46265fd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 8th May 2014
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -56,9 +56,9 @@ create type test.TweetMessageType as
   nested : TweetMessageNestedType
 }
 
-create  table TweetMessages(TweetMessageType) primary key nested.tweetid;
+create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
-create  table TweetMessagesTmp(TweetMessageNestedType) primary key tweetid;
+create  dataset TweetMessagesTmp(TweetMessageNestedType) primary key tweetid;
 
 create  index twmSndLocIx  on TweetMessages (nested.`sender-location`) type rtree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.2.update.sqlpp
index 5bfb114..eb6e72a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.2.update.sqlpp
@@ -26,7 +26,7 @@
 use test;
 
 
-load  table TweetMessagesTmp using localfs ((`path`=`asterix_nc1://data/twitter/tw_for_indexleftouterjoin.adm`),(`format`=`adm`));
+load  dataset TweetMessagesTmp using localfs ((`path`=`asterix_nc1://data/twitter/tw_for_indexleftouterjoin.adm`),(`format`=`adm`));
 
 insert into TweetMessages
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp
index 90f4191..c109943 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp
@@ -26,8 +26,8 @@
  * Date            : 5th Feb, 2013
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -55,7 +55,7 @@ create type test.Emp as
   nested : Nested
 }
 
-create  table employeeTmp(EmpTmp) primary key id;
+create  dataset employeeTmp(EmpTmp) primary key id;
 
-create  table employee(Emp) primary key nested.id;
+create  dataset employee(Emp) primary key nested.id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.2.update.sqlpp
index 9c8c89a..41d8ba2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.2.update.sqlpp
@@ -29,7 +29,7 @@
 use test;
 
 
-load  table employeeTmp using localfs ((`path`=`asterix_nc1://data/names.adm`),(`format`=`delimited-text`),(`delimiter`=`|`));
+load  dataset employeeTmp using localfs ((`path`=`asterix_nc1://data/names.adm`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
 insert into employee
 select element {'nested':{'id':c.id,'fname':c.fname,'lname':c.lname,'age':c.age,'dept':c.dept}}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
index 628b2f3..b049310 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
@@ -25,8 +25,8 @@
  * Date            : 7th August 2012
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -54,7 +54,7 @@ create type test.Emp as
   nested : Nested
 }
 
-create  table employeeTmp(EmpTmp) primary key id;
+create  dataset employeeTmp(EmpTmp) primary key id;
 
-create  table employee(Emp) primary key nested.id;
+create  dataset employee(Emp) primary key nested.id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.2.update.sqlpp
index 763c13b..6f17563 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.2.update.sqlpp
@@ -28,7 +28,7 @@
 use test;
 
 
-load  table employeeTmp using localfs ((`path`=`asterix_nc1://data/names.adm`),(`format`=`delimited-text`),(`delimiter`=`|`));
+load  dataset employeeTmp using localfs ((`path`=`asterix_nc1://data/names.adm`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
 insert into employee
 select element {'nested':{'id':c.id,'fname':c.fname,'lname':c.lname,'age':c.age,'dept':c.dept}}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
index bcfc2ff..ed5b65d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
@@ -24,8 +24,8 @@
  * Issue           : Issue 204
  */
 
-drop  database tpch if exists;
-create  database tpch;
+drop  dataverse tpch if exists;
+create  dataverse tpch;
 
 use tpch;
 
@@ -61,7 +61,7 @@ create type tpch.OrderType as
   nested : Nested
 }
 
-create  table Orders(OrderType) primary key nested.o_orderkey;
+create  dataset Orders(OrderType) primary key nested.o_orderkey;
 
-create  table Orderstmp(OrderTypetmp) primary key o_orderkey;
+create  dataset Orderstmp(OrderTypetmp) primary key o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.2.update.sqlpp
index c758470..0f07a9a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.2.update.sqlpp
@@ -27,7 +27,7 @@
 use tpch;
 
 
-load  table Orderstmp using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset Orderstmp using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
 insert into Orders
 select element {'nested':{'o_orderkey':c.o_orderkey,'o_custkey':c.o_custkey,'o_orderstatus':c.o_orderstatus,'o_totalprice':c.o_totalprice,'o_orderdate':c.o_orderdate,'o_orderpriority':c.o_orderpriority,'o_clerk':c.o_clerk,'o_shippriority':c.o_shippriority,'o_comment':c.o_comment}}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.1.ddl.sqlpp
index 383f24c..95a2e06 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.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;
 
@@ -49,7 +49,7 @@ create type test.CustomerType as
   nested : CustomerTypetmp
 }
 
-create  table Customerstmp(CustomerTypetmp) primary key cid;
+create  dataset Customerstmp(CustomerTypetmp) primary key cid;
 
-create  table Customers(CustomerType) primary key nested.cid;
+create  dataset Customers(CustomerType) primary key nested.cid;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.2.update.sqlpp
index b6cb6e3..9336ac2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.2.update.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-load  table Customerstmp using localfs ((`path`=`asterix_nc1://data/semistructured/tiny01/customer.adm`),(`format`=`adm`));
+load  dataset Customerstmp using localfs ((`path`=`asterix_nc1://data/semistructured/tiny01/customer.adm`),(`format`=`adm`));
 
 insert into Customers
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
index 1233968..7ebec44 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.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;
 
@@ -41,7 +41,7 @@ create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;
-create  table DBLPtmp(DBLPTypetmp) primary key id on group1;
+create  dataset DBLPtmp(DBLPTypetmp) primary key id on group1;
 
-create  table DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id on group1;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.2.update.sqlpp
index 00bce9d..4d96a90 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.2.update.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-load  table DBLPtmp using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
+load  dataset DBLPtmp using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
 
 insert into DBLP
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
index 38aface..169aea5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.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;
 
@@ -41,7 +41,7 @@ create type test.DBLPType as
   nested : DBLPNestedType
 }
 
-create  table DBLPtmp(DBLPNestedType) primary key id on group1;
+create  dataset DBLPtmp(DBLPNestedType) primary key id on group1;
 
-create  table DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id on group1;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.2.update.sqlpp
index 24c6cc2..38de0df 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.2.update.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-load  table DBLPtmp using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
+load  dataset DBLPtmp using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
 
 insert into test.DBLP
 select element {'nested':x}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
index 1233968..7ebec44 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.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;
 
@@ -41,7 +41,7 @@ create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;
-create  table DBLPtmp(DBLPTypetmp) primary key id on group1;
+create  dataset DBLPtmp(DBLPTypetmp) primary key id on group1;
 
-create  table DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id on group1;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.2.update.sqlpp
index 00bce9d..4d96a90 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.2.update.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-load  table DBLPtmp using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
+load  dataset DBLPtmp using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
 
 insert into DBLP
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
index 0552989..882c59d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.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;
 
@@ -41,7 +41,7 @@ create type test.DBLPType as
   nested : DBLPNestedType
 }
 
-create  table DBLPtmp(DBLPNestedType) primary key id on group1;
+create  dataset DBLPtmp(DBLPNestedType) primary key id on group1;
 
-create  table DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id on group1;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.2.update.sqlpp
index 24c6cc2..38de0df 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.2.update.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-load  table DBLPtmp using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
+load  dataset DBLPtmp using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
 
 insert into test.DBLP
 select element {'nested':x}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
index 1233968..7ebec44 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.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;
 
@@ -41,7 +41,7 @@ create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;
-create  table DBLPtmp(DBLPTypetmp) primary key id on group1;
+create  dataset DBLPtmp(DBLPTypetmp) primary key id on group1;
 
-create  table DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id on group1;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.2.update.sqlpp
index 00bce9d..4d96a90 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.2.update.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-load  table DBLPtmp using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
+load  dataset DBLPtmp using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
 
 insert into DBLP
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
index 1233968..7ebec44 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.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;
 
@@ -41,7 +41,7 @@ create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;
-create  table DBLPtmp(DBLPTypetmp) primary key id on group1;
+create  dataset DBLPtmp(DBLPTypetmp) primary key id on group1;
 
-create  table DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id on group1;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.2.update.sqlpp
index 00bce9d..4d96a90 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.2.update.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-load  table DBLPtmp using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
+load  dataset DBLPtmp using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
 
 insert into DBLP
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.sqlpp
index 3878c15..32b5466 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.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;
 
@@ -52,7 +52,7 @@ create type test.CustomerType as
 create  nodegroup group1 if not exists  on
     asterix_nc1
 ;
-create  table Customerstmp(CustomerTypetmp) primary key cid on group1;
+create  dataset Customerstmp(CustomerTypetmp) primary key cid on group1;
 
-create  table Customers(CustomerType) primary key nested.cid on group1;
+create  dataset Customers(CustomerType) primary key nested.cid on group1;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.2.update.sqlpp
index a2d2932..e1401bc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.2.update.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-load  table Customerstmp using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
+load  dataset Customerstmp using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
 
 insert into Customers
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.sqlpp
index 3878c15..32b5466 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.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;
 
@@ -52,7 +52,7 @@ create type test.CustomerType as
 create  nodegroup group1 if not exists  on
     asterix_nc1
 ;
-create  table Customerstmp(CustomerTypetmp) primary key cid on group1;
+create  dataset Customerstmp(CustomerTypetmp) primary key cid on group1;
 
-create  table Customers(CustomerType) primary key nested.cid on group1;
+create  dataset Customers(CustomerType) primary key nested.cid on group1;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.2.update.sqlpp
index a2d2932..e1401bc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.2.update.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-load  table Customerstmp using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
+load  dataset Customerstmp using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
 
 insert into Customers
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.sqlpp
index 3878c15..32b5466 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.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;
 
@@ -52,7 +52,7 @@ create type test.CustomerType as
 create  nodegroup group1 if not exists  on
     asterix_nc1
 ;
-create  table Customerstmp(CustomerTypetmp) primary key cid on group1;
+create  dataset Customerstmp(CustomerTypetmp) primary key cid on group1;
 
-create  table Customers(CustomerType) primary key nested.cid on group1;
+create  dataset Customers(CustomerType) primary key nested.cid on group1;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.2.update.sqlpp
index a2d2932..e1401bc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.2.update.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-load  table Customerstmp using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
+load  dataset Customerstmp using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
 
 insert into Customers
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.sqlpp
index d591c3b..67765e5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.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;
 
@@ -52,7 +52,7 @@ create type test.CustomerType as
 create  nodegroup group1 if not exists  on
     asterix_nc1
 ;
-create  table Customerstmp(CustomerTypetmp) primary key cid on group1;
+create  dataset Customerstmp(CustomerTypetmp) primary key cid on group1;
 
-create  table Customers(CustomerType) primary key nested.cid on group1;
+create  dataset Customers(CustomerType) primary key nested.cid on group1;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.2.update.sqlpp
index ea0ca3f..257b506 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.2.update.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-load  table Customerstmp using localfs ((`path`=`asterix_nc1://data/semistructured/co1k/customer.adm`),(`format`=`adm`));
+load  dataset Customerstmp using localfs ((`path`=`asterix_nc1://data/semistructured/co1k/customer.adm`),(`format`=`adm`));
 
 insert into Customers
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
index 1233968..7ebec44 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.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;
 
@@ -41,7 +41,7 @@ create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;
-create  table DBLPtmp(DBLPTypetmp) primary key id on group1;
+create  dataset DBLPtmp(DBLPTypetmp) primary key id on group1;
 
-create  table DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id on group1;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.2.update.sqlpp
index 00bce9d..4d96a90 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.2.update.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-load  table DBLPtmp using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
+load  dataset DBLPtmp using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
 
 insert into DBLP
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
index 1233968..7ebec44 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.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;
 
@@ -41,7 +41,7 @@ create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;
-create  table DBLPtmp(DBLPTypetmp) primary key id on group1;
+create  dataset DBLPtmp(DBLPTypetmp) primary key id on group1;
 
-create  table DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id on group1;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.2.update.sqlpp
index 00bce9d..4d96a90 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.2.update.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-load  table DBLPtmp using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
+load  dataset DBLPtmp using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
 
 insert into DBLP
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.ddl.sqlpp
index 55e8c1b..6c42ffe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database tpch if exists;
-create  database tpch;
+drop  dataverse tpch if exists;
+create  dataverse tpch;
 
 use tpch;
 
@@ -41,7 +41,7 @@ create type tpch.OrderType as
   nested : OrderTypetmp
 }
 
-create  table Orderstmp(OrderTypetmp) primary key o_orderkey;
+create  dataset Orderstmp(OrderTypetmp) primary key o_orderkey;
 
-create  table Orders(OrderType) primary key nested.o_orderkey;
+create  dataset Orders(OrderType) primary key nested.o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.2.update.sqlpp
index ec14fa4..e745382 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.2.update.sqlpp
@@ -20,7 +20,7 @@
 use tpch;
 
 
-load  table Orderstmp using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset Orderstmp using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
 insert into Orders
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
index 7aa5e02..54992c5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database tpch if exists;
-create  database tpch;
+drop  dataverse tpch if exists;
+create  dataverse tpch;
 
 use tpch;
 
@@ -41,7 +41,7 @@ create type tpch.OrderType as
   nested : OrderTypetmp
 }
 
-create  table Orderstmp(OrderTypetmp) primary key o_orderkey;
+create  dataset Orderstmp(OrderTypetmp) primary key o_orderkey;
 
-create  table Orders(OrderType) primary key nested.o_orderkey;
+create  dataset Orders(OrderType) primary key nested.o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.2.update.sqlpp
index ec14fa4..e745382 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.2.update.sqlpp
@@ -20,7 +20,7 @@
 use tpch;
 
 
-load  table Orderstmp using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset Orderstmp using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
 insert into Orders
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp
index 7aa5e02..54992c5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database tpch if exists;
-create  database tpch;
+drop  dataverse tpch if exists;
+create  dataverse tpch;
 
 use tpch;
 
@@ -41,7 +41,7 @@ create type tpch.OrderType as
   nested : OrderTypetmp
 }
 
-create  table Orderstmp(OrderTypetmp) primary key o_orderkey;
+create  dataset Orderstmp(OrderTypetmp) primary key o_orderkey;
 
-create  table Orders(OrderType) primary key nested.o_orderkey;
+create  dataset Orders(OrderType) primary key nested.o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.2.update.sqlpp
index ec14fa4..e745382 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.2.update.sqlpp
@@ -20,7 +20,7 @@
 use tpch;
 
 
-load  table Orderstmp using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset Orderstmp using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
 insert into Orders
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
index 7aa5e02..54992c5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database tpch if exists;
-create  database tpch;
+drop  dataverse tpch if exists;
+create  dataverse tpch;
 
 use tpch;
 
@@ -41,7 +41,7 @@ create type tpch.OrderType as
   nested : OrderTypetmp
 }
 
-create  table Orderstmp(OrderTypetmp) primary key o_orderkey;
+create  dataset Orderstmp(OrderTypetmp) primary key o_orderkey;
 
-create  table Orders(OrderType) primary key nested.o_orderkey;
+create  dataset Orders(OrderType) primary key nested.o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.2.update.sqlpp
index ec14fa4..e745382 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.2.update.sqlpp
@@ -20,7 +20,7 @@
 use tpch;
 
 
-load  table Orderstmp using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset Orderstmp using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
 insert into Orders
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search-open/range-search-open.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search-open/range-search-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search-open/range-search-open.1.ddl.sqlpp
index 696d61e..821fcd9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search-open/range-search-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search-open/range-search-open.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;
 
@@ -48,7 +48,7 @@ create type test.LineItemType as
   nested : LineItemTypetmp
 }
 
-create  table LineItemtmp(LineItemTypetmp) primary key l_orderkey,l_linenumber;
+create  dataset LineItemtmp(LineItemTypetmp) primary key l_orderkey,l_linenumber;
 
-create  table LineItem(LineItemType) primary key nested.l_orderkey,nested.l_linenumber;
+create  dataset LineItem(LineItemType) primary key nested.l_orderkey,nested.l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search-open/range-search-open.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search-open/range-search-open.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search-open/range-search-open.2.update.sqlpp
index 13a8b4c..4c9ed00 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search-open/range-search-open.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search-open/range-search-open.2.update.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-load  table LineItemtmp using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset LineItemtmp using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
 insert into LineItem
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search/range-search.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search/range-search.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search/range-search.1.ddl.sqlpp
index 696d61e..821fcd9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search/range-search.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search/range-search.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;
 
@@ -48,7 +48,7 @@ create type test.LineItemType as
   nested : LineItemTypetmp
 }
 
-create  table LineItemtmp(LineItemTypetmp) primary key l_orderkey,l_linenumber;
+create  dataset LineItemtmp(LineItemTypetmp) primary key l_orderkey,l_linenumber;
 
-create  table LineItem(LineItemType) primary key nested.l_orderkey,nested.l_linenumber;
+create  dataset LineItem(LineItemType) primary key nested.l_orderkey,nested.l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search/range-search.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search/range-search.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search/range-search.2.update.sqlpp
index 13a8b4c..4c9ed00 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search/range-search.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search/range-search.2.update.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-load  table LineItemtmp using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset LineItemtmp using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
 insert into LineItem
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.sqlpp
index 07b2d9b..5b98248 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.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;
 
@@ -40,7 +40,7 @@ create type test.MyRecord as
   nested : MyRecordtmp
 }
 
-create  table MyDatatmp(MyRecordtmp) primary key id;
+create  dataset MyDatatmp(MyRecordtmp) primary key id;
 
-create  table MyData(MyRecord) primary key nested.id;
+create  dataset MyData(MyRecord) primary key nested.id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.2.update.sqlpp
index 9b2f583a..47d8d7e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.2.update.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-load  table MyDatatmp using localfs ((`path`=`asterix_nc1://data/spatial/spatialDataNulls.json`),(`format`=`adm`));
+load  dataset MyDatatmp using localfs ((`path`=`asterix_nc1://data/spatial/spatialDataNulls.json`),(`format`=`adm`));
 
 insert into MyData
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.sqlpp
index 8de9668..1fd419e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.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;
 
@@ -40,7 +40,7 @@ create type test.MyRecord as
   nested : MyRecordtmp
 }
 
-create  table MyDatatmp(MyRecordtmp) primary key id;
+create  dataset MyDatatmp(MyRecordtmp) primary key id;
 
-create  table MyData(MyRecord) primary key nested.id;
+create  dataset MyData(MyRecord) primary key nested.id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.2.update.sqlpp
index de54170..8199dbd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.2.update.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-load  table MyDatatmp using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
+load  dataset MyDatatmp using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
 insert into MyData
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
index dd8363d..e480660 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.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;
 
@@ -41,7 +41,7 @@ create type test.MyRecord as
   nested : MyRecordtmp
 }
 
-create  table MyDatatmp(MyRecordtmp) primary key id;
+create  dataset MyDatatmp(MyRecordtmp) primary key id;
 
-create  table MyData(MyRecord) primary key nested.id;
+create  dataset MyData(MyRecord) primary key nested.id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.2.update.sqlpp
index de54170..8199dbd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.2.update.sqlpp
@@ -20,7 +20,7 @@
 use test;
 
 
-load  table MyDatatmp using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
+load  dataset MyDatatmp using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
 insert into MyData
 select element {'nested':c}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/adm-format/adm-format.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/adm-format/adm-format.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/adm-format/adm-format.1.ddl.sqlpp
index 1ae4577..32325c9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/adm-format/adm-format.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/adm-format/adm-format.1.ddl.sqlpp
@@ -23,8 +23,8 @@
 * Expected Res : Success
 * Date         : 3rd Jan 2014
 */
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -46,7 +46,7 @@ create type test.MyRecord as
   nested : MyRecordNested
 }
 
-create external  table MyData(MyRecord) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/spatialDataNested.json`),(`input-format`=`text-input-format`),(`format`=`adm`));
+create external  dataset MyData(MyRecord) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/spatialDataNested.json`),(`input-format`=`text-input-format`),(`format`=`adm`));
 
 create  index idx  on MyData (nested.id:int32) type btree enforced;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
index b33457a..a7d11e1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 8th May 2014
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -52,7 +52,7 @@ create type test.TweetMessageType as
   nested : TweetMessageNestedType
 }
 
-create external  table TweetMessages(TweetMessageType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/tw_for_indexleftouterjoin_nested.adm`),(`input-format`=`text-input-format`),(`format`=`adm`));
+create external  dataset TweetMessages(TweetMessageType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/tw_for_indexleftouterjoin_nested.adm`),(`input-format`=`text-input-format`),(`format`=`adm`));
 
 create  index IdIx  on TweetMessages (nested.tweetid:int64) type btree enforced;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
index c1ed78c..4b6c084 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 8th May 2014
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -53,7 +53,7 @@ create type test.TweetMessageType as
   nested : TweetMessageNestedType
 }
 
-create external  table TweetMessages(TweetMessageType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/tw_for_indexleftouterjoin_nested.adm`),(`input-format`=`text-input-format`),(`format`=`adm`));
+create external  dataset TweetMessages(TweetMessageType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/tw_for_indexleftouterjoin_nested.adm`),(`input-format`=`text-input-format`),(`format`=`adm`));
 
 create  index IdIx  on TweetMessages (nested.tweetid:int64) type btree enforced;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
index 366e1ac..05f7b18 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/rtree-index/rtree-index.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;
 
@@ -40,7 +40,7 @@ create type test.MyRecord as
   nested : MyRecordNested
 }
 
-create external  table MyData(MyRecord) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/spatialDataNested.json`),(`input-format`=`text-input-format`),(`format`=`adm`));
+create external  dataset MyData(MyRecord) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/spatialDataNested.json`),(`input-format`=`text-input-format`),(`format`=`adm`));
 
 create  index rtree_index_point  on MyData (nested.point:point) type rtree enforced;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-closed/bottom-closed-top-closed.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-closed/bottom-closed-top-closed.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-closed/bottom-closed-top-closed.1.ddl.sqlpp
index 69e8b03..ff18880 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-closed/bottom-closed-top-closed.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-closed/bottom-closed-top-closed.1.ddl.sqlpp
@@ -25,8 +25,8 @@
 * Date         : 20 Oct 2014
 */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -89,23 +89,23 @@ create type test.Animal as
   class : Classification
 }
 
-create  table Animals(Animal) primary key id;
+create  dataset Animals(Animal) primary key id;
 
-create  table Classifications(Classification) primary key id;
+create  dataset Classifications(Classification) primary key id;
 
-create  table KPCOFGSs(KPCOFGS) primary key id;
+create  dataset KPCOFGSs(KPCOFGS) primary key id;
 
-create  table Ss(S) primary key id;
+create  dataset Ss(S) primary key id;
 
-create  table GSs(GS) primary key id;
+create  dataset GSs(GS) primary key id;
 
-create  table FGSs(FGS) primary key id;
+create  dataset FGSs(FGS) primary key id;
 
-create  table OFGSs(OFGS) primary key id;
+create  dataset OFGSs(OFGS) primary key id;
 
-create  table COFGSs(COFGS) primary key id;
+create  dataset COFGSs(COFGS) primary key id;
 
-create  table PCOFGSs(PCOFGS) primary key id;
+create  dataset PCOFGSs(PCOFGS) primary key id;
 
 create  index species  on Ss (Species) type btree;
 


Mime
View raw message