asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buyin...@apache.org
Subject [22/44] asterixdb git commit: Renaming: "table"->"dataset", "database"->"dataverse".
Date Tue, 02 Aug 2016 01:14:24 GMT
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/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/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.2.update.sqlpp
index dc98d53..be39b43 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.2.update.sqlpp
@@ -29,5 +29,5 @@
 use test;
 
 
-load  table employee using localfs ((`path`=`asterix_nc1://data/names.adm`),(`format`=`delimited-text`),(`delimiter`=`|`));
+load  dataset employee using localfs ((`path`=`asterix_nc1://data/names.adm`),(`format`=`delimited-text`),(`delimiter`=`|`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
index 61f2a02..1035033 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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;
 
@@ -40,5 +40,5 @@ create type test.Emp as
   dept : string
 }
 
-create  table employee(Emp) primary key id;
+create  dataset employee(Emp) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/btree-index-composite-key/btree-index-composite-key.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-index-composite-key/btree-index-composite-key.2.update.sqlpp
index 8563823..3634ef0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-index-composite-key/btree-index-composite-key.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-index-composite-key/btree-index-composite-key.2.update.sqlpp
@@ -28,5 +28,5 @@
 use test;
 
 
-load  table employee using localfs ((`path`=`asterix_nc1://data/names.adm`),(`format`=`delimited-text`),(`delimiter`=`|`));
+load  dataset employee using localfs ((`path`=`asterix_nc1://data/names.adm`),(`format`=`delimited-text`),(`delimiter`=`|`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
index 0beaa09..065cf10 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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;
 
@@ -43,5 +43,5 @@ create type tpch.OrderType as
   o_comment : string
 }
 
-create  table Orders(OrderType) primary key o_orderkey;
+create  dataset Orders(OrderType) primary key o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.2.update.sqlpp
index f124dc0..023d131 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.2.update.sqlpp
@@ -27,5 +27,5 @@
 use tpch;
 
 
-load  table Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/cust-index-age-nullable/cust-index-age-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/cust-index-age-nullable/cust-index-age-nullable.1.ddl.sqlpp
index 31cffec..6b576e5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/cust-index-age-nullable/cust-index-age-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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;
 
@@ -44,5 +44,5 @@ create type test.CustomerType as
 ]
 }
 
-create  table Customers(CustomerType) primary key cid;
+create  dataset Customers(CustomerType) primary key cid;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/cust-index-age-nullable/cust-index-age-nullable.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/cust-index-age-nullable/cust-index-age-nullable.2.update.sqlpp
index 0fb279d..17c9d78 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/cust-index-age-nullable/cust-index-age-nullable.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/cust-index-age-nullable/cust-index-age-nullable.2.update.sqlpp
@@ -20,5 +20,5 @@
 use test;
 
 
-load  table Customers using localfs ((`path`=`asterix_nc1://data/semistructured/tiny01/customer.adm`),(`format`=`adm`));
+load  dataset Customers using localfs ((`path`=`asterix_nc1://data/semistructured/tiny01/customer.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/disjunctive-predicate-1/disjunctive-predicate-1.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/disjunctive-predicate-1/disjunctive-predicate-1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/disjunctive-predicate-1/disjunctive-predicate-1.1.ddl.sqlpp
index cbd1f2e..7e75a7e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/disjunctive-predicate-1/disjunctive-predicate-1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/disjunctive-predicate-1/disjunctive-predicate-1.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;
 
@@ -30,7 +30,7 @@ create type test.TestType as
   `no-idx` : string
 }
 
-create  table TestSet(TestType) primary key id;
+create  dataset TestSet(TestType) primary key id;
 
 create  index TestSetIndex  on TestSet (idx) type btree;
 

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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.2.update.sqlpp
index 75146b8..731510f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.2.update.sqlpp
@@ -20,5 +20,5 @@
 use test;
 
 
-load  table DBLP using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
+load  dataset DBLP using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
 

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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/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/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.2.update.sqlpp
index 75146b8..731510f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.2.update.sqlpp
@@ -20,5 +20,5 @@
 use test;
 
 
-load  table DBLP using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
+load  dataset DBLP using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
 

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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/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/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.2.update.sqlpp
index 75146b8..731510f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.2.update.sqlpp
@@ -20,5 +20,5 @@
 use test;
 
 
-load  table DBLP using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
+load  dataset DBLP using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/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/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
index 9ff0f9c..30e6b22 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/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;
 
@@ -36,5 +36,5 @@ create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;
-create  table DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id on group1;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/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/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.2.update.sqlpp
index 75146b8..731510f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.2.update.sqlpp
@@ -20,5 +20,5 @@
 use test;
 
 
-load  table DBLP using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
+load  dataset DBLP using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
 

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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/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/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.2.update.sqlpp
index 75146b8..731510f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.2.update.sqlpp
@@ -20,5 +20,5 @@
 use test;
 
 
-load  table DBLP using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
+load  dataset DBLP using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
 

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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.2.update.sqlpp
index 75146b8..731510f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.2.update.sqlpp
@@ -20,5 +20,5 @@
 use test;
 
 
-load  table DBLP using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
+load  dataset DBLP using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
 

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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/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/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.2.update.sqlpp
index de9ac14..5d9de35 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.2.update.sqlpp
@@ -20,5 +20,5 @@
 use test;
 
 
-load  table Customers using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
+load  dataset Customers using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
 

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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/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/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.2.update.sqlpp
index de9ac14..5d9de35 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.2.update.sqlpp
@@ -20,5 +20,5 @@
 use test;
 
 
-load  table Customers using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
+load  dataset Customers using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
 

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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.2.update.sqlpp
index de9ac14..5d9de35 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.2.update.sqlpp
@@ -20,5 +20,5 @@
 use test;
 
 
-load  table Customers using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
+load  dataset Customers using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
 

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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.2.update.sqlpp
index 169aa51..4f631f2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.2.update.sqlpp
@@ -20,5 +20,5 @@
 use test;
 
 
-load  table Customers using localfs ((`path`=`asterix_nc1://data/semistructured/co1k/customer.adm`),(`format`=`adm`));
+load  dataset Customers using localfs ((`path`=`asterix_nc1://data/semistructured/co1k/customer.adm`),(`format`=`adm`));
 

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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/inverted-index-word-contains/inverted-index-word-contains.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.2.update.sqlpp
index 75146b8..731510f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.2.update.sqlpp
@@ -20,5 +20,5 @@
 use test;
 
 
-load  table DBLP using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
+load  dataset DBLP using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
 

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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.2.update.sqlpp
index 75146b8..731510f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.2.update.sqlpp
@@ -20,5 +20,5 @@
 use test;
 
 
-load  table DBLP using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
+load  dataset DBLP using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/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/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.ddl.sqlpp
index f32d58f..b73d2df 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/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;
 
@@ -36,5 +36,5 @@ create type tpch.OrderType as
   o_comment : string
 }
 
-create  table Orders(OrderType) primary key o_orderkey;
+create  dataset Orders(OrderType) primary key o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/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/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.2.update.sqlpp
index 8b51f22..b667ea3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.2.update.sqlpp
@@ -20,5 +20,5 @@
 use tpch;
 
 
-load  table Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
index 3094851..e7a62cd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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;
 
@@ -36,5 +36,5 @@ create type tpch.OrderType as
   o_comment : string
 }
 
-create  table Orders(OrderType) primary key o_orderkey;
+create  dataset Orders(OrderType) primary key o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.2.update.sqlpp
index 8b51f22..b667ea3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.2.update.sqlpp
@@ -20,5 +20,5 @@
 use tpch;
 
 
-load  table Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp
index 8e7cecd..9e0cd10 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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;
 
@@ -40,5 +40,5 @@ create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;
-create  table Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey on group1;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/orders-index-custkey-open/orders-index-custkey-open.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-open/orders-index-custkey-open.2.update.sqlpp
index 8b51f22..b667ea3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-open/orders-index-custkey-open.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-open/orders-index-custkey-open.2.update.sqlpp
@@ -20,5 +20,5 @@
 use tpch;
 
 
-load  table Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
index 3094851..e7a62cd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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;
 
@@ -36,5 +36,5 @@ create type tpch.OrderType as
   o_comment : string
 }
 
-create  table Orders(OrderType) primary key o_orderkey;
+create  dataset Orders(OrderType) primary key o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey/orders-index-custkey.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey/orders-index-custkey.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey/orders-index-custkey.2.update.sqlpp
index 8b51f22..b667ea3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey/orders-index-custkey.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey/orders-index-custkey.2.update.sqlpp
@@ -20,5 +20,5 @@
 use tpch;
 
 
-load  table Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search-open/range-search-open.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search-open/range-search-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search-open/range-search-open.1.ddl.sqlpp
index 61d7ca9..ce63b62 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search-open/range-search-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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;
 
@@ -43,5 +43,5 @@ create type test.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;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search-open/range-search-open.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search-open/range-search-open.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search-open/range-search-open.2.update.sqlpp
index 3e2a3d5..546a831 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search-open/range-search-open.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search-open/range-search-open.2.update.sqlpp
@@ -20,5 +20,5 @@
 use test;
 
 
-load  table LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
+load  dataset LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search/range-search.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search/range-search.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search/range-search.1.ddl.sqlpp
index 4cf856b..d2c232b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/range-search/range-search.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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;
 
@@ -43,5 +43,5 @@ create type test.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;
 

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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.1.ddl.sqlpp
index 52704f2..8acd45e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.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;
 
@@ -36,5 +36,5 @@ create type test.MyRecord as
   circle : circle
 }
 
-create  table MyData(MyRecord) primary key id;
+create  dataset MyData(MyRecord) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.2.update.sqlpp
index 6db7d98..b9556ff 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.2.update.sqlpp
@@ -20,5 +20,5 @@
 use test;
 
 
-load  table MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
+load  dataset MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.sqlpp
index 977439c..49fda09 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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;
 
@@ -35,5 +35,5 @@ create type test.MyRecord as
   rec : rectangle
 }
 
-create  table MyData(MyRecord) primary key id;
+create  dataset MyData(MyRecord) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.2.update.sqlpp
index 78308cb..797aae6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.2.update.sqlpp
@@ -20,5 +20,5 @@
 use test;
 
 
-load  table MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialDataNulls.json`),(`format`=`adm`));
+load  dataset MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialDataNulls.json`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.sqlpp
index 33b2d45..a7f3838 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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;
 
@@ -35,5 +35,5 @@ create type test.MyRecord as
   rec : rectangle
 }
 
-create  table MyData(MyRecord) primary key id;
+create  dataset MyData(MyRecord) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.2.update.sqlpp
index 6db7d98..b9556ff 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.2.update.sqlpp
@@ -20,5 +20,5 @@
 use test;
 
 
-load  table MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
+load  dataset MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 

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

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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
index 58c3592..2241b83 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.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;
 
@@ -51,7 +51,7 @@ 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;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.2.update.sqlpp
index 484231e..1a4b844 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.2.update.sqlpp
@@ -27,7 +27,7 @@
 use test;
 
 
-load  table Customers using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
+load  dataset Customers using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
 
-load  table Customers2 using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
+load  dataset Customers2 using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
index 58ae67c..ee4e407 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.1.ddl.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  table Customers2(CustomerType) primary key cid;
+create  dataset Customers2(CustomerType) primary key cid;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.2.update.sqlpp
index 5ee9036..3f4805f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.2.update.sqlpp
@@ -26,7 +26,7 @@
 use test;
 
 
-load  table Customers using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
+load  dataset Customers using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
 
-load  table Customers2 using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
+load  dataset Customers2 using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
index 7bdf5ca..58471c8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.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;
 
@@ -48,7 +48,7 @@ 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;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.2.update.sqlpp
index d4b9690..0958261 100644
Binary files a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.2.update.sqlpp and b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.2.update.sqlpp differ

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
index 03ec203..1e472bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.1.ddl.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;
 
@@ -47,7 +47,7 @@ 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;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.2.update.sqlpp
index 478a36b..214c940 100644
Binary files a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.2.update.sqlpp and b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.2.update.sqlpp differ

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.sqlpp
index 48bbebe..d188743 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.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;
 
@@ -51,7 +51,7 @@ 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;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.2.update.sqlpp
index a517e66..b5a7fec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.2.update.sqlpp
@@ -27,7 +27,7 @@
 use test;
 
 
-load  table Customers using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
+load  dataset Customers using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
 
-load  table Customers2 using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
+load  dataset Customers2 using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.1.ddl.sqlpp
index 85e8564..a7109ed 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.1.ddl.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  table Customers2(CustomerType) primary key cid;
+create  dataset Customers2(CustomerType) primary key cid;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.2.update.sqlpp
index 8e4eec8..127b0a2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.2.update.sqlpp
@@ -26,7 +26,7 @@
 use test;
 
 
-load  table Customers using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
+load  dataset Customers using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
 
-load  table Customers2 using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
+load  dataset Customers2 using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.1.ddl.sqlpp
index db0e7cc..c50750c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.1.ddl.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;
 
@@ -51,7 +51,7 @@ 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;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.2.update.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.2.update.sqlpp
index dcefb72..b82369f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.2.update.sqlpp
@@ -27,7 +27,7 @@
 use test;
 
 
-load  table Customers using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
+load  dataset Customers using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
 
-load  table Customers2 using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
+load  dataset Customers2 using localfs ((`path`=`asterix_nc1://data/semistructured/co1k_olist/customer.adm`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d56ff03f/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.1.ddl.sqlpp
index 24b6212..fb165dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.1.ddl.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  table Customers2(CustomerType) primary key cid;
+create  dataset Customers2(CustomerType) primary key cid;
 


Mime
View raw message