asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buyin...@apache.org
Subject [40/44] asterixdb git commit: Renaming: "table"->"dataset", "database"->"dataverse".
Date Tue, 02 Aug 2016 01:14:42 GMT
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_03.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_03.sqlpp
index a34c63f..54004f4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_03.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-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
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_04.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_04.sqlpp
index 4f93c5a..1cb679f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_04.sqlpp
@@ -23,8 +23,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -50,7 +50,7 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_01.sqlpp
index 34c6d14..5e8581f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_01.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,9 +49,9 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
-create  table Customers2(CustomerType) primary key cid;
+create  dataset Customers2(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_02.sqlpp
index 6b07db2..df03e6f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_02.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,9 +49,9 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
-create  table Customers2(CustomerType) primary key cid;
+create  dataset Customers2(CustomerType) primary key cid;
 
 create  index interests_index  on Customers2 (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_03.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_03.sqlpp
index ce369aa..ad2e465 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_03.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-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
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_01.sqlpp
index 85d4e38..717bde2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_01.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,9 +49,9 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
-create  table Customers2(CustomerType) primary key cid;
+create  dataset Customers2(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_02.sqlpp
index 23ebd43..db8126a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_02.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,9 +49,9 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
-create  table Customers2(CustomerType) primary key cid;
+create  dataset Customers2(CustomerType) primary key cid;
 
 create  index interests_index  on Customers2 (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_03.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_03.sqlpp
index e99979a..6ad68ef 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_03.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-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
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_01.sqlpp
index 839e5b0..8cd5115 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_01.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,9 +49,9 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
-create  table Customers2(CustomerType) primary key cid;
+create  dataset Customers2(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_02.sqlpp
index 28f4360..5903b04 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_02.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,9 +49,9 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
-create  table Customers2(CustomerType) primary key cid;
+create  dataset Customers2(CustomerType) primary key cid;
 
 create  index interests_index  on Customers2 (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_03.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_03.sqlpp
index c23fbbf..74ad105 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_03.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-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
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_04.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_04.sqlpp
index b5c86e1..ca8315c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_04.sqlpp
@@ -23,8 +23,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -50,7 +50,7 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_01.sqlpp
index f749ab2..bbc50a7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_01.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,9 +49,9 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
-create  table Customers2(CustomerType) primary key cid;
+create  dataset Customers2(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_02.sqlpp
index 14e1bbc..cbfdc9b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_02.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,9 +49,9 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
-create  table Customers2(CustomerType) primary key cid;
+create  dataset Customers2(CustomerType) primary key cid;
 
 create  index interests_index  on Customers2 (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_03.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_03.sqlpp
index 052fec3..f4b194e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_03.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-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
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_04.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_04.sqlpp
index 8e72f44..c958968 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_04.sqlpp
@@ -23,8 +23,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -50,7 +50,7 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_01.sqlpp
index 556ad50..bba2518 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_01.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,9 +49,9 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
-create  table Customers2(CustomerType) primary key cid;
+create  dataset Customers2(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_02.sqlpp
index 4b93376..29b6c16 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_02.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,9 +49,9 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
-create  table Customers2(CustomerType) primary key cid;
+create  dataset Customers2(CustomerType) primary key cid;
 
 create  index interests_index  on Customers2 (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_03.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_03.sqlpp
index 725c71c..ce3a5ea 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_03.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-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
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_01.sqlpp
index 3f3d153..a7b8e57 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_01.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,9 +49,9 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
-create  table Customers2(CustomerType) primary key cid;
+create  dataset Customers2(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_02.sqlpp
index 5221df5..5baf0b3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_02.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,9 +49,9 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
-create  table Customers2(CustomerType) primary key cid;
+create  dataset Customers2(CustomerType) primary key cid;
 
 create  index interests_index  on Customers2 (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_03.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_03.sqlpp
index 66055f5..19ec44f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_03.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-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
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_04.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_04.sqlpp
index 77a5729..db01181 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_04.sqlpp
@@ -23,8 +23,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -50,7 +50,7 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_01.sqlpp
index a842c5c..8147fbf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_01.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,9 +49,9 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
-create  table Customers2(CustomerType) primary key cid;
+create  dataset Customers2(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_02.sqlpp
index 2b83288..0185420 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_02.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -49,9 +49,9 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
-create  table Customers2(CustomerType) primary key cid;
+create  dataset Customers2(CustomerType) primary key cid;
 
 create  index interests_index  on Customers2 (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_03.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_03.sqlpp
index e61f09f..3b45aa5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_03.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-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
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_04.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_04.sqlpp
index 8f64e9c..8534a54 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_04.sqlpp
@@ -23,8 +23,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -50,7 +50,7 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
index 27136db..43678b4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -46,9 +46,9 @@ create type test.CSXType as
   misc : string
 }
 
-create  table DBLP(DBLPType) primary key id;
+create  dataset DBLP(DBLPType) primary key id;
 
-create  table CSX(CSXType) primary key id;
+create  dataset CSX(CSXType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
index a8a6c7e..da59b4f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -46,9 +46,9 @@ create type test.CSXType as
   misc : string
 }
 
-create  table DBLP(DBLPType) primary key id;
+create  dataset DBLP(DBLPType) primary key id;
 
-create  table CSX(CSXType) primary key id;
+create  dataset CSX(CSXType) primary key id;
 
 create  index keyword_index  on CSX (title) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
index 93bcf2e..2dbaea8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -37,7 +37,7 @@ create type test.DBLPType as
   misc : string
 }
 
-create  table DBLP(DBLPType) primary key id;
+create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
index 09576a2..d72cd7a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
@@ -24,8 +24,8 @@
  * Success        : Yes
  */
 
-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
   countB : int32
 }
 
-create  table TweetMessages(TweetMessageType) primary key tweetid;
+create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
 create  index twmSndLocIx  on TweetMessages (`sender-location`) type rtree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_01.sqlpp
index 20a1ec8..a18ff19 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_01.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -46,9 +46,9 @@ create type test.CSXType as
   misc : string
 }
 
-create  table DBLP(DBLPType) primary key id;
+create  dataset DBLP(DBLPType) primary key id;
 
-create  table CSX(CSXType) primary key id;
+create  dataset CSX(CSXType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_02.sqlpp
index 43a8d5c..f56919d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_02.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -46,9 +46,9 @@ create type test.CSXType as
   misc : string
 }
 
-create  table DBLP(DBLPType) primary key id;
+create  dataset DBLP(DBLPType) primary key id;
 
-create  table CSX(CSXType) primary key id;
+create  dataset CSX(CSXType) primary key id;
 
 create  index keyword_index  on CSX (title) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_03.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_03.sqlpp
index 7bab710..b3dfe99 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_03.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -37,7 +37,7 @@ create type test.DBLPType as
   misc : string
 }
 
-create  table DBLP(DBLPType) primary key id;
+create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_04.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_04.sqlpp
index 22aa5a5..74c9be0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_04.sqlpp
@@ -23,8 +23,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -38,7 +38,7 @@ create type test.DBLPType as
   misc : string
 }
 
-create  table DBLP(DBLPType) primary key id;
+create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_01.sqlpp
index 3caeef3..2d7913e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_01.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -46,9 +46,9 @@ create type test.CSXType as
   misc : string
 }
 
-create  table DBLP(DBLPType) primary key id;
+create  dataset DBLP(DBLPType) primary key id;
 
-create  table CSX(CSXType) primary key id;
+create  dataset CSX(CSXType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_02.sqlpp
index 7a9da34..b763ed4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_02.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -46,9 +46,9 @@ create type test.CSXType as
   misc : string
 }
 
-create  table DBLP(DBLPType) primary key id;
+create  dataset DBLP(DBLPType) primary key id;
 
-create  table CSX(CSXType) primary key id;
+create  dataset CSX(CSXType) primary key id;
 
 create  index keyword_index  on CSX (title) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_03.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_03.sqlpp
index 5699d75..c4e3e4c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_03.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -37,7 +37,7 @@ create type test.DBLPType as
   misc : string
 }
 
-create  table DBLP(DBLPType) primary key id;
+create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_04.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_04.sqlpp
index 870584d..e428289 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_04.sqlpp
@@ -23,8 +23,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -38,7 +38,7 @@ create type test.DBLPType as
   misc : string
 }
 
-create  table DBLP(DBLPType) primary key id;
+create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_01.sqlpp
index 6513798..920cb9b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_01.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database `join-super-key_1` if exists;
-create  database `join-super-key_1`;
+drop  dataverse `join-super-key_1` if exists;
+create  dataverse `join-super-key_1`;
 
 use `join-super-key_1`;
 
@@ -89,9 +89,9 @@ create  nodegroup group1 if not exists  on
     asterix_nc2
 ;
 write output to asterix_nc1:"/tmp/join-super-key_01.adm"
-create  table LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
+create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
 
-create  table PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
+create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
 
 select element {'l_partkey':li.l_partkey}
 from  LineItems as li,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_02.sqlpp
index f5ac8c3..f54d3ce 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_02.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database `join-super-key_01` if exists;
-create  database `join-super-key_01`;
+drop  dataverse `join-super-key_01` if exists;
+create  dataverse `join-super-key_01`;
 
 use `join-super-key_01`;
 
@@ -89,9 +89,9 @@ create  nodegroup group1 if not exists  on
     asterix_nc2
 ;
 write output to asterix_nc1:"/tmp/join-super-key_01.adm"
-create  table LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
+create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
 
-create  table PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
+create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
 
 select element {'l_partkey':li.l_partkey}
 from  PartSupp as ps,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/limit-issue353.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/limit-issue353.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/limit-issue353.sqlpp
index ad1f1be..d3eedd3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/limit-issue353.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/limit-issue353.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 28th April 2013
  */
 
-drop  database tpch if exists;
-create  database tpch;
+drop  dataverse tpch if exists;
+create  dataverse tpch;
 
 use tpch;
 
@@ -49,7 +49,7 @@ create type tpch.LineItemType as
   l_comment : string
 }
 
-create  table LineItem(LineItemType) primary key l_orderkey,l_linenumber;
+create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
 write output to asterix_nc1:"/tmp/push_limit.adm"
 select element {'l_returnflag':l.l_returnflag,'l_linestatus':l.l_linestatus,'l_shipmode':l.l_shipmode}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_01.sqlpp
index 12d3749..007dd56 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_01.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database `loj-super-key_01` if exists;
-create  database `loj-super-key_01`;
+drop  dataverse `loj-super-key_01` if exists;
+create  dataverse `loj-super-key_01`;
 
 use `loj-super-key_01`;
 
@@ -89,9 +89,9 @@ create  nodegroup group1 if not exists  on
     asterix_nc2
 ;
 write output to asterix_nc1:"/tmp/loj-super-key_01.adm"
-create  table LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
+create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
 
-create  table PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
+create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
 
 select element {'li':li,'partsupp':partsupp}
 from  LineItems as li

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_02.sqlpp
index cc29539..13918a1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_02.sqlpp
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-drop  database `loj-super-key_02` if exists;
-create  database `loj-super-key_02`;
+drop  dataverse `loj-super-key_02` if exists;
+create  dataverse `loj-super-key_02`;
 
 use `loj-super-key_02`;
 
@@ -89,9 +89,9 @@ create  nodegroup group1 if not exists  on
     asterix_nc2
 ;
 write output to asterix_nc1:"/tmp/loj-super-key_01.adm"
-create  table LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
+create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
 
-create  table PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
+create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
 
 select element {'partsupp':ps,'li':items}
 from  PartSupp as ps

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nest_aggregate.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nest_aggregate.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nest_aggregate.sqlpp
index 80fb9bc..a61d8c2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nest_aggregate.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nest_aggregate.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 2nd Jun 2014
  */
 
-drop  database tpch if exists;
-create  database tpch;
+drop  dataverse tpch if exists;
+create  dataverse tpch;
 
 use tpch;
 
@@ -102,21 +102,21 @@ create type tpch.PartSuppType as
   ps_comment : string
 }
 
-create  table Orders(OrderType) primary key o_orderkey;
+create  dataset Orders(OrderType) primary key o_orderkey;
 
-create  table Supplier(SupplierType) primary key s_suppkey;
+create  dataset Supplier(SupplierType) primary key s_suppkey;
 
-create  table Region(RegionType) primary key r_regionkey;
+create  dataset Region(RegionType) primary key r_regionkey;
 
-create  table Nation(NationType) primary key n_nationkey;
+create  dataset Nation(NationType) primary key n_nationkey;
 
-create  table Part(PartType) primary key p_partkey;
+create  dataset Part(PartType) primary key p_partkey;
 
-create  table Partsupp(PartSuppType) primary key ps_partkey,ps_suppkey;
+create  dataset Partsupp(PartSuppType) primary key ps_partkey,ps_suppkey;
 
-create  table Customer(CustomerType) primary key c_custkey;
+create  dataset Customer(CustomerType) primary key c_custkey;
 
-create  table SelectedNation(NationType) primary key n_nationkey;
+create  dataset SelectedNation(NationType) primary key n_nationkey;
 
 select element {'nation_key':nation.n_nationkey,'name':nation.n_name,'aggregates':(
         select element {'order_date':orderdate,'sum_price':sum}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/disjunction-to-join.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/disjunction-to-join.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/disjunction-to-join.sqlpp
index 8dd464b..edfef0c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/disjunction-to-join.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/disjunction-to-join.sqlpp
@@ -22,8 +22,8 @@
  * Success        : Yes
  */
 
-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.TestType as
   nested : NestedTestType
 }
 
-create  table TestSet(TestType) primary key id;
+create  dataset TestSet(TestType) primary key id;
 
 create  index TestSetIndex  on TestSet (nested.idx) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.sqlpp
index 4e1d353..7c7b057 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.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,7 +56,7 @@ create type test.TweetMessageType as
   nested : TweetMessageNestedType
 }
 
-create  table TweetMessages(TweetMessageType) primary key nested.tweetid;
+create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
 create  index msgCountBIx  on TweetMessages (nested.countB) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.sqlpp
index c3b2c54..75c6cfc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.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,7 +56,7 @@ create type test.TweetMessageType as
   nested : TweetMessageNestedType
 }
 
-create  table TweetMessages(TweetMessageType) primary key nested.tweetid;
+create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
 create  index msgCountBIx  on TweetMessages (nested.countB) type btree;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_01.sqlpp
index 2221f85..f98bbe4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_01.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 11th November 2014
  */
 
-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.Name as
   nested : Nametmp
 }
 
-create  table Names(Name) primary key nested.fname,nested.lname;
+create  dataset Names(Name) primary key nested.fname,nested.lname;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_01.adm"
 select element {'emp1':emp1,'emp2':emp2}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_02.sqlpp
index 030ce47..e258bed 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_02.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 11th November 2014
  */
 
-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.Name as
   nested : Nametmp
 }
 
-create  table Names(Name) primary key nested.fname,nested.lname;
+create  dataset Names(Name) primary key nested.fname,nested.lname;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_02.adm"
 select element {'emp1':emp1,'emp2':emp2}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_03.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_03.sqlpp
index e7141d3..88a49e4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_03.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 11th November 2014
  */
 
-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.Name as
   nested : Nametmp
 }
 
-create  table Names(Name) primary key nested.fname,nested.lname;
+create  dataset Names(Name) primary key nested.fname,nested.lname;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_03.adm"
 select element {'emp1':emp1,'emp2':emp2}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_01.sqlpp
index 72105d7..1256c80 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_01.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 11th November 2014
  */
 
-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.Name as
   nested : Nametmp
 }
 
-create  table Names(Name) primary key nested.fname,nested.lname;
+create  dataset Names(Name) primary key nested.fname,nested.lname;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_01.adm"
 select element {'emp1':emp1,'emp2':emp2}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_02.sqlpp
index 79996e3..a974c25 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_02.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 11th November 2014
  */
 
-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.Name as
   nested : Nametmp
 }
 
-create  table Names(Name) primary key nested.fname,nested.lname;
+create  dataset Names(Name) primary key nested.fname,nested.lname;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_02.adm"
 select element {'emp1':emp1,'emp2':emp2}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_03.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_03.sqlpp
index 6f77505..4725180 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_03.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 11th November 2014
  */
 
-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.Name as
   nested : Nametmp
 }
 
-create  table Names(Name) primary key nested.fname,nested.lname;
+create  dataset Names(Name) primary key nested.fname,nested.lname;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_03.adm"
 select element {'emp1':emp1,'emp2':emp2}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_04.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_04.sqlpp
index bc7bfcb..f2d0a26 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_04.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 11th November 2014
  */
 
-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.Name as
   nested : Nametmp
 }
 
-create  table Names(Name) primary key nested.fname,nested.lname;
+create  dataset Names(Name) primary key nested.fname,nested.lname;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_04.adm"
 select element {'emp1':emp1,'emp2':emp2}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_05.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_05.sqlpp
index f9496c1..c46863d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_05.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 11th November 2014
  */
 
-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.Name as
   nested : Nametmp
 }
 
-create  table Names(Name) primary key nested.fname,nested.lname;
+create  dataset Names(Name) primary key nested.fname,nested.lname;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_05.adm"
 select element {'emp1':emp1,'emp2':emp2}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_06.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_06.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_06.sqlpp
index e9bb73c..f98307f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_06.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_06.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 11th November 2014
  */
 
-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.Name as
   nested : Nametmp
 }
 
-create  table Names(Name) primary key nested.fname,nested.lname;
+create  dataset Names(Name) primary key nested.fname,nested.lname;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_06.adm"
 select element {'emp1':emp1,'emp2':emp2}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join-multipred.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join-multipred.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join-multipred.sqlpp
index cf15b62..b4228d9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join-multipred.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join-multipred.sqlpp
@@ -25,8 +25,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -71,9 +71,9 @@ create type test.OrderType as
   nested : OrderTypetmp
 }
 
-create  table Customers(CustomerType) primary key nested.cid;
+create  dataset Customers(CustomerType) primary key nested.cid;
 
-create  table Orders(OrderType) primary key nested.oid;
+create  dataset Orders(OrderType) primary key nested.oid;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-multipred.adm"
 select element {'customer':c.nested,'order':o.nested}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join-neg_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join-neg_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join-neg_01.sqlpp
index 084d18c..dc4e7a9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join-neg_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join-neg_01.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 29th November 2012
  */
 
-drop  database test1 if exists;
-create  database test1;
+drop  dataverse test1 if exists;
+create  dataverse test1;
 
 create type test1.TestTypetmp as
 {
@@ -39,9 +39,9 @@ create type test1.TestType as
   nested : TestTypetmp
 }
 
-create  table test1.DsOne(TestType) primary key nested.key1;
+create  dataset test1.DsOne(TestType) primary key nested.key1;
 
-create  table test1.DsTwo(TestType) primary key nested.key1;
+create  dataset test1.DsTwo(TestType) primary key nested.key1;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-neg_01.adm"
 select element x

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_01.sqlpp
index 90b9245..544a96c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_01.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 29th November 2012
  */
 
-drop  database test1 if exists;
-create  database test1;
+drop  dataverse test1 if exists;
+create  dataverse test1;
 
 create type test1.TestTypetmp as
 {
@@ -39,9 +39,9 @@ create type test1.TestType as
   nested : TestTypetmp
 }
 
-create  table test1.DsOne(TestType) primary key nested.key1;
+create  dataset test1.DsOne(TestType) primary key nested.key1;
 
-create  table test1.DsTwo(TestType) primary key nested.key1;
+create  dataset test1.DsTwo(TestType) primary key nested.key1;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_01.adm"
 select element x

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_02.sqlpp
index d6f3b44..2934f26 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_02.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 29th November 2012
  */
 
-drop  database test1 if exists;
-create  database test1;
+drop  dataverse test1 if exists;
+create  dataverse test1;
 
 create type test1.TestTypetmp as
 {
@@ -39,9 +39,9 @@ create type test1.TestType as
   nested : TestTypetmp
 }
 
-create  table test1.DsOne(TestType) primary key nested.key1;
+create  dataset test1.DsOne(TestType) primary key nested.key1;
 
-create  table test1.DsTwo(TestType) primary key nested.key1;
+create  dataset test1.DsTwo(TestType) primary key nested.key1;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_02.adm"
 select element x

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_03.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_03.sqlpp
index 2df46f4..b8dc14e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_03.sqlpp
@@ -23,8 +23,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -69,9 +69,9 @@ create type test.OrderType as
   nested : OrderTypetmp
 }
 
-create  table Customers(CustomerType) primary key nested.cid;
+create  dataset Customers(CustomerType) primary key nested.cid;
 
-create  table Orders(OrderType) primary key nested.oid;
+create  dataset Orders(OrderType) primary key nested.oid;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_04.adm"
 select element {'customer':c.nested,'order':o.nested}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_04.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_04.sqlpp
index 73a1651..3b74c43 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_04.sqlpp
@@ -23,8 +23,8 @@
  * Success        : Yes
  */
 
-drop  database test if exists;
-create  database test;
+drop  dataverse test if exists;
+create  dataverse test;
 
 use test;
 
@@ -69,9 +69,9 @@ create type test.OrderType as
   nested : OrderTypetmp
 }
 
-create  table Customers(CustomerType) primary key nested.cid;
+create  dataset Customers(CustomerType) primary key nested.cid;
 
-create  table Orders(OrderType) primary key nested.oid;
+create  dataset Orders(OrderType) primary key nested.oid;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_05.adm"
 select element {'customer':c.nested,'order':o.nested}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_05.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_05.sqlpp
index e749432..29d0b4c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_05.sqlpp
@@ -23,8 +23,8 @@
  * Success        : Yes
  */
 
-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.CustomerType as
   nested : CustomerTypetmp
 }
 
-create  table Customers(CustomerType) primary key nested.cid;
+create  dataset Customers(CustomerType) primary key nested.cid;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_06.adm"
 select element {'customer1':c1.nested,'customer2':c2.nested}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-ge-join_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-ge-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-ge-join_01.sqlpp
index 74a409e..953fcd9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-ge-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-ge-join_01.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 29th November 2012
  */
 
-drop  database test1 if exists;
-create  database test1;
+drop  dataverse test1 if exists;
+create  dataverse test1;
 
 create type test1.TestTypetmp as
 {
@@ -39,9 +39,9 @@ create type test1.TestType as
   nested : TestTypetmp
 }
 
-create  table test1.DsOne(TestType) primary key nested.key1;
+create  dataset test1.DsOne(TestType) primary key nested.key1;
 
-create  table test1.DsTwo(TestType) primary key nested.key1;
+create  dataset test1.DsTwo(TestType) primary key nested.key1;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-ge-join_01.adm"
 select element x

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-gt-join_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-gt-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-gt-join_01.sqlpp
index 942b388..9854698 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-gt-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-gt-join_01.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 29th November 2012
  */
 
-drop  database test1 if exists;
-create  database test1;
+drop  dataverse test1 if exists;
+create  dataverse test1;
 
 create type test1.TestTypetmp as
 {
@@ -39,9 +39,9 @@ create type test1.TestType as
   nested : TestTypetmp
 }
 
-create  table test1.DsOne(TestType) primary key nested.key1;
+create  dataset test1.DsOne(TestType) primary key nested.key1;
 
-create  table test1.DsTwo(TestType) primary key nested.key1;
+create  dataset test1.DsTwo(TestType) primary key nested.key1;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-gt-join_01.adm"
 select element x

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-le-join_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-le-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-le-join_01.sqlpp
index d819d67..38ac7d3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-le-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-le-join_01.sqlpp
@@ -23,8 +23,8 @@
  * Date         : 29th November 2012
  */
 
-drop  database test1 if exists;
-create  database test1;
+drop  dataverse test1 if exists;
+create  dataverse test1;
 
 create type test1.TestTypetmp as
 {
@@ -39,9 +39,9 @@ create type test1.TestType as
   nested : TestTypetmp
 }
 
-create  table test1.DsOne(TestType) primary key nested.key1;
+create  dataset test1.DsOne(TestType) primary key nested.key1;
 
-create  table test1.DsTwo(TestType) primary key nested.key1;
+create  dataset test1.DsTwo(TestType) primary key nested.key1;
 
 write output to asterix_nc1:"rttest/btree-index-join_primary-le-join_01.adm"
 select element x


Mime
View raw message