You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mh...@apache.org on 2017/08/22 10:15:06 UTC

[11/32] asterixdb git commit: [ASTERIXDB-2050][SQL] Enforce a Semicolon After Each SQL++ Statement

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.1.ddl.sqlpp
index 00c0546..3ed19de 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.1.ddl.sqlpp
@@ -36,12 +36,12 @@ create type test.DBLPTypetmp as
   title : string?,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLPtmp(DBLPTypetmp) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.1.ddl.sqlpp
index 0491022..78bef0b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.1.ddl.sqlpp
@@ -36,12 +36,12 @@ create type test.DBLPTypetmp as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLPtmp(DBLPTypetmp) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.1.ddl.sqlpp
index 2d6d9d1..3412815 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.1.ddl.sqlpp
@@ -36,12 +36,12 @@ create type test.DBLPTypetmp as
   title : string?,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLPtmp(DBLPTypetmp) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.1.ddl.sqlpp
index 5592819..3bcde1e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.1.ddl.sqlpp
@@ -36,12 +36,12 @@ create type test.DBLPTypetmp as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLPtmp(DBLPTypetmp) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.1.ddl.sqlpp
index 52f0cb8..46b4399 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.1.ddl.sqlpp
@@ -39,18 +39,18 @@ create type test.MyRecordtmp as
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyMiniRecordtmp as
  closed {
   id : bigint,
   point : point?
-}
+};
 
 create type test.MyMiniRecord as
  closed {
   nested : MyMiniRecordtmp
-}
+};
 
 create  dataset MyDatatmp(MyRecordtmp) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
index 8b1f030..1dcefdf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
@@ -34,23 +34,23 @@ create type test.MyRecordtmp as
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyMiniRecordtmp as
  closed {
   id : bigint,
   point : point
-}
+};
 
 create type test.MyRecord as
  closed {
   nested : MyRecordtmp
-}
+};
 
 create type test.MyMiniRecord as
  closed {
   nested : MyMiniRecordtmp
-}
+};
 
 create  dataset MyDatatmp(MyRecordtmp) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/adm-format/adm-format.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/adm-format/adm-format.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/adm-format/adm-format.1.ddl.sqlpp
index 75839a2..82dd1f1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/adm-format/adm-format.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/adm-format/adm-format.1.ddl.sqlpp
@@ -41,12 +41,12 @@ create type test.MyRecordNested as
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyRecord as
  closed {
   nested : MyRecordNested
-}
+};
 
 create external  dataset MyData(MyRecord) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/spatialDataNested.json`),(`input-format`=`text-input-format`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
index dc4bba5..097f13a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
@@ -37,7 +37,7 @@ create type test.TwitterUserType as
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,12 +49,12 @@ create type test.TweetMessageNestedType as
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create external  dataset TweetMessages(TweetMessageType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/tw_for_indexleftouterjoin_nested.adm`),(`input-format`=`text-input-format`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
index b02f33f..d8f2c6e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
@@ -37,7 +37,7 @@ create type test.TwitterUserType as
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,12 +49,12 @@ create type test.TweetMessageNestedType as
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create external  dataset TweetMessages(TweetMessageType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/tw_for_indexleftouterjoin_nested.adm`),(`input-format`=`text-input-format`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
index 10856f1..2fd0a1f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
@@ -34,12 +34,12 @@ create type test.MyRecordNested as
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyRecord as
  closed {
   nested : MyRecordNested
-}
+};
 
 create external  dataset MyData(MyRecord) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/spatialDataNested.json`),(`input-format`=`text-input-format`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/btree-primary-equi-join/btree-primary-equi-join.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/btree-primary-equi-join/btree-primary-equi-join.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/btree-primary-equi-join/btree-primary-equi-join.1.ddl.sqlpp
index 6ff9ed4..124b69d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/btree-primary-equi-join/btree-primary-equi-join.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/btree-primary-equi-join/btree-primary-equi-join.1.ddl.sqlpp
@@ -34,7 +34,7 @@ create type test.AddressType as
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -48,7 +48,7 @@ create type test.CustomerTypetmp as
       total : float
   }
 
-}
+};
 
 create type test.OrderTypetmp as
 {
@@ -59,17 +59,17 @@ create type test.OrderTypetmp as
   clerk : string,
   total : float,
   items : [bigint]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create type test.OrderType as
 {
   nested : OrderTypetmp
-}
+};
 
 create  dataset Customerstmp(CustomerTypetmp) primary key cid;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp
index 53e5c9e..a4fa22e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp
@@ -36,7 +36,7 @@ create type test.DBLPTypetmp as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -45,17 +45,17 @@ create type test.CSXTypetmp as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLPtmp(DBLPTypetmp) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
index fc0fcdc..ad48360 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
@@ -34,7 +34,7 @@ create type test.AddressType as
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerNestedType as
  closed {
@@ -48,12 +48,12 @@ create type test.CustomerNestedType as
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerNestedType
-}
+};
 
 create  dataset Customerstmp(CustomerNestedType) primary key cid;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
index 4ac0afc..b6d9ced 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
@@ -33,7 +33,7 @@ create type test.AddressType as
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerNestedType as
  closed {
@@ -47,12 +47,12 @@ create type test.CustomerNestedType as
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerNestedType
-}
+};
 
 create  dataset Customerstmp(CustomerNestedType) primary key cid;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
index bfa3e75..ccc3468 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
@@ -36,12 +36,12 @@ create type test.DBLPNestedType as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPNestedType
-}
+};
 
 create type test.CSXNestedType as
  closed {
@@ -50,12 +50,12 @@ create type test.CSXNestedType as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXNestedType
-}
+};
 
 create  dataset DBLPtmp(DBLPNestedType) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
index 435156f..1eec7eb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
@@ -35,12 +35,12 @@ create type test.DBLPNestedType as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPNestedType
-}
+};
 
 create type test.CSXNestedType as
  closed {
@@ -49,12 +49,12 @@ create type test.CSXNestedType as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXNestedType
-}
+};
 
 create  dataset DBLPtmp(DBLPNestedType) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp
index f319b0a..dc84dca 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp
@@ -40,12 +40,12 @@ create type test.MyRecordtmp as
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyRecord as
  closed {
   nested : MyRecordtmp
-}
+};
 
 create  dataset MyData1tmp(MyRecordtmp) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
index c80c65f..98ac644 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
@@ -36,12 +36,12 @@ create type test.DBLPNestedType as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPNestedType
-}
+};
 
 create type test.CSXNestedType as
  closed {
@@ -50,12 +50,12 @@ create type test.CSXNestedType as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXNestedType
-}
+};
 
 create  dataset DBLPtmp(DBLPNestedType) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/word-jaccard/word-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
index 55703af..89789af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
@@ -35,12 +35,12 @@ create type test.DBLPNestedType as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPNestedType
-}
+};
 
 create type test.CSXNestedType as
  closed {
@@ -49,12 +49,12 @@ create type test.CSXNestedType as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXNestedType
-}
+};
 
 create  dataset DBLPtmp(DBLPNestedType) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp
index 4bdd19a..e9628b0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp
@@ -37,7 +37,7 @@ create type test.TwitterUserType as
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,12 +49,12 @@ create type test.TweetMessageNestedType as
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp
index 4bdd19a..e9628b0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp
@@ -37,7 +37,7 @@ create type test.TwitterUserType as
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,12 +49,12 @@ create type test.TweetMessageNestedType as
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.1.ddl.sqlpp
index bc0376f..5ea7fda 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.1.ddl.sqlpp
@@ -37,7 +37,7 @@ create type test.TwitterUserType as
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,12 +49,12 @@ create type test.TweetMessageNestedType as
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp
index bc0376f..5ea7fda 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp
@@ -37,7 +37,7 @@ create type test.TwitterUserType as
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,12 +49,12 @@ create type test.TweetMessageNestedType as
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp
index 5db31a6..7acb462 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp
@@ -37,7 +37,7 @@ create type test.TwitterUserType as
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,12 +49,12 @@ create type test.TweetMessageNestedType as
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
index 5db31a6..7acb462 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
@@ -37,7 +37,7 @@ create type test.TwitterUserType as
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,12 +49,12 @@ create type test.TweetMessageNestedType as
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp
index 79bce19..eb020aa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp
@@ -39,7 +39,7 @@ create type test.EmpTmp as
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create type test.Nested as
  closed {
@@ -48,12 +48,12 @@ create type test.Nested as
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create type test.Emp as
  closed {
   nested : Nested
-}
+};
 
 create  dataset employeeTmp(EmpTmp) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
index 4c8a450..84f58f3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
@@ -38,7 +38,7 @@ create type test.EmpTmp as
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create type test.Nested as
  closed {
@@ -47,12 +47,12 @@ create type test.Nested as
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create type test.Emp as
  closed {
   nested : Nested
-}
+};
 
 create  dataset employeeTmp(EmpTmp) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
index a87d465..1ef440a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
@@ -41,7 +41,7 @@ create type tpch.OrderTypetmp as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.Nested as
 {
@@ -54,12 +54,12 @@ create type tpch.Nested as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.OrderType as
 {
   nested : Nested
-}
+};
 
 create  dataset Orders(OrderType) primary key nested.o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.1.ddl.sqlpp
index 50612e9..fded88f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.1.ddl.sqlpp
@@ -28,7 +28,7 @@ create type test.AddressType as
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
 {
@@ -42,12 +42,12 @@ create type test.CustomerTypetmp as
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
 {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customerstmp(CustomerTypetmp) primary key cid;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
index 799f6fc..710cb66 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
@@ -30,12 +30,12 @@ create type test.DBLPTypetmp as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
index 5f5baba..31cbd0f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
@@ -30,7 +30,7 @@ create type test.DBLPNestedType as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -39,7 +39,7 @@ create  nodegroup group1 if not exists  on
 create type test.DBLPType as
  closed {
   nested : DBLPNestedType
-}
+};
 
 create  dataset DBLPtmp(DBLPNestedType) primary key id on group1;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
index 799f6fc..710cb66 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
@@ -30,12 +30,12 @@ create type test.DBLPTypetmp as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
index 75f3f25..d1ba662 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
@@ -30,7 +30,7 @@ create type test.DBLPNestedType as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -39,7 +39,7 @@ create  nodegroup group1 if not exists  on
 create type test.DBLPType as
  closed {
   nested : DBLPNestedType
-}
+};
 
 create  dataset DBLPtmp(DBLPNestedType) primary key id on group1;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
index 799f6fc..710cb66 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
@@ -30,12 +30,12 @@ create type test.DBLPTypetmp as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
index 799f6fc..710cb66 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
@@ -30,12 +30,12 @@ create type test.DBLPTypetmp as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.sqlpp
index 8d3d731..76506fd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.sqlpp
@@ -28,7 +28,7 @@ create type test.AddressType as
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -42,12 +42,12 @@ create type test.CustomerTypetmp as
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.sqlpp
index 8d3d731..76506fd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.sqlpp
@@ -28,7 +28,7 @@ create type test.AddressType as
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -42,12 +42,12 @@ create type test.CustomerTypetmp as
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.sqlpp
index 8d3d731..76506fd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.sqlpp
@@ -28,7 +28,7 @@ create type test.AddressType as
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -42,12 +42,12 @@ create type test.CustomerTypetmp as
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.sqlpp
index 5ef7b86..38695e6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.sqlpp
@@ -28,7 +28,7 @@ create type test.AddressType as
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -42,12 +42,12 @@ create type test.CustomerTypetmp as
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
index 799f6fc..710cb66 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
@@ -30,12 +30,12 @@ create type test.DBLPTypetmp as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
index 799f6fc..710cb66 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
@@ -30,12 +30,12 @@ create type test.DBLPTypetmp as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.ddl.sqlpp
index 82540ed..5aa513f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.1.ddl.sqlpp
@@ -34,12 +34,12 @@ create type tpch.OrderTypetmp as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
   nested : OrderTypetmp
-}
+};
 
 create  dataset Orderstmp(OrderTypetmp) primary key o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
index 9c6e363..07dd91f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
@@ -34,12 +34,12 @@ create type tpch.OrderTypetmp as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
   nested : OrderTypetmp
-}
+};
 
 create  dataset Orderstmp(OrderTypetmp) primary key o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp
index 9c6e363..07dd91f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp
@@ -34,12 +34,12 @@ create type tpch.OrderTypetmp as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
   nested : OrderTypetmp
-}
+};
 
 create  dataset Orderstmp(OrderTypetmp) primary key o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
index 9c6e363..07dd91f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
@@ -34,12 +34,12 @@ create type tpch.OrderTypetmp as
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
   nested : OrderTypetmp
-}
+};
 
 create  dataset Orderstmp(OrderTypetmp) primary key o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search-open/range-search-open.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search-open/range-search-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search-open/range-search-open.1.ddl.sqlpp
index 3326e43..8b3cf79 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search-open/range-search-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search-open/range-search-open.1.ddl.sqlpp
@@ -41,12 +41,12 @@ create type test.LineItemTypetmp as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type test.LineItemType as
  closed {
   nested : LineItemTypetmp
-}
+};
 
 create  dataset LineItemtmp(LineItemTypetmp) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search/range-search.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search/range-search.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search/range-search.1.ddl.sqlpp
index 3326e43..8b3cf79 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search/range-search.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/range-search/range-search.1.ddl.sqlpp
@@ -41,12 +41,12 @@ create type test.LineItemTypetmp as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type test.LineItemType as
  closed {
   nested : LineItemTypetmp
-}
+};
 
 create  dataset LineItemtmp(LineItemTypetmp) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.sqlpp
index 4bd7165..4ef8d16 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.1.ddl.sqlpp
@@ -33,12 +33,12 @@ create type test.MyRecordtmp as
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyRecord as
  closed {
   nested : MyRecordtmp
-}
+};
 
 create  dataset MyDatatmp(MyRecordtmp) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.sqlpp
index d83d584..30a64a2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.1.ddl.sqlpp
@@ -33,12 +33,12 @@ create type test.MyRecordtmp as
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyRecord as
 {
   nested : MyRecordtmp
-}
+};
 
 create  dataset MyDatatmp(MyRecordtmp) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
index 39c7321..cdaa412 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
@@ -34,12 +34,12 @@ create type test.MyRecordtmp as
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyRecord as
  closed {
   nested : MyRecordtmp
-}
+};
 
 create  dataset MyDatatmp(MyRecordtmp) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/adm-format/adm-format.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/adm-format/adm-format.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/adm-format/adm-format.1.ddl.sqlpp
index aade8ee..f91f8f7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/adm-format/adm-format.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/adm-format/adm-format.1.ddl.sqlpp
@@ -39,12 +39,12 @@ create type test.MyRecordNested as
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyRecord as
  closed {
   nested : MyRecordNested
-}
+};
 
 create external  dataset MyData(MyRecord) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/spatialDataNested.json`),(`input-format`=`text-input-format`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
index ee59dd5..c61e936 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
@@ -37,7 +37,7 @@ create type test.TwitterUserType as
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
 {
@@ -45,12 +45,12 @@ create type test.TweetMessageNestedType as
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create external  dataset TweetMessages(TweetMessageType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/tw_for_indexleftouterjoin_nested.adm`),(`input-format`=`text-input-format`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
index 7c77c2f..5e749bd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
@@ -37,7 +37,7 @@ create type test.TwitterUserType as
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
 {
@@ -46,12 +46,12 @@ create type test.TweetMessageNestedType as
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create external  dataset TweetMessages(TweetMessageType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/tw_for_indexleftouterjoin_nested.adm`),(`input-format`=`text-input-format`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
index 3f1591f..8cb3332 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
@@ -33,12 +33,12 @@ create type test.MyRecordNested as
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyRecord as
  closed {
   nested : MyRecordNested
-}
+};
 
 create external  dataset MyData(MyRecord) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/spatialDataNested.json`),(`input-format`=`text-input-format`),(`format`=`adm`));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-closed/bottom-closed-top-closed.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-closed/bottom-closed-top-closed.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-closed/bottom-closed-top-closed.1.ddl.sqlpp
index 8511374..5838c48 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-closed/bottom-closed-top-closed.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-closed/bottom-closed-top-closed.1.ddl.sqlpp
@@ -35,59 +35,59 @@ create type test.S as
  closed {
   id : bigint,
   Species : string
-}
+};
 
 create type test.GS as
  closed {
   id : bigint,
   Genus : string,
   lower : S
-}
+};
 
 create type test.FGS as
 {
   id : bigint,
   Family : string
-}
+};
 
 create type test.OFGS as
  closed {
   id : bigint,
   `Order` : string,
   lower : FGS
-}
+};
 
 create type test.COFGS as
  closed {
   id : bigint,
   Class : string,
   lower : OFGS
-}
+};
 
 create type test.PCOFGS as
  closed {
   id : bigint,
   Phylum : string,
   lower : COFGS
-}
+};
 
 create type test.KPCOFGS as
 {
   id : bigint,
   Kingdom : string
-}
+};
 
 create type test.Classification as
  closed {
   id : bigint,
   fullClassification : KPCOFGS
-}
+};
 
 create type test.Animal as
  closed {
   id : bigint,
   class : Classification
-}
+};
 
 create  dataset Animals(Animal) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-open/bottom-closed-top-open.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-open/bottom-closed-top-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-open/bottom-closed-top-open.1.ddl.sqlpp
index bb5ab2f..80de7d3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-open/bottom-closed-top-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-open/bottom-closed-top-open.1.ddl.sqlpp
@@ -35,58 +35,58 @@ create type test.S as
  closed {
   id : bigint,
   Species : string
-}
+};
 
 create type test.GS as
  closed {
   id : bigint,
   Genus : string,
   lower : S
-}
+};
 
 create type test.FGS as
 {
   id : bigint,
   Family : string
-}
+};
 
 create type test.OFGS as
  closed {
   id : bigint,
   `Order` : string,
   lower : FGS
-}
+};
 
 create type test.COFGS as
  closed {
   id : bigint,
   Class : string,
   lower : OFGS
-}
+};
 
 create type test.PCOFGS as
  closed {
   id : bigint,
   Phylum : string,
   lower : COFGS
-}
+};
 
 create type test.KPCOFGS as
 {
   id : bigint,
   Kingdom : string
-}
+};
 
 create type test.Classification as
  closed {
   id : bigint,
   fullClassification : KPCOFGS
-}
+};
 
 create type test.Animal as
 {
   id : bigint
-}
+};
 
 create  dataset Animals(Animal) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-open-top-closed/bottom-open-top-closed.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-open-top-closed/bottom-open-top-closed.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-open-top-closed/bottom-open-top-closed.1.ddl.sqlpp
index d7cfc1e..3757c8c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-open-top-closed/bottom-open-top-closed.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-open-top-closed/bottom-open-top-closed.1.ddl.sqlpp
@@ -34,59 +34,59 @@ use test;
 create type test.S as
 {
   id : bigint
-}
+};
 
 create type test.GS as
  closed {
   id : bigint,
   Genus : string,
   lower : S
-}
+};
 
 create type test.FGS as
 {
   id : bigint,
   Family : string
-}
+};
 
 create type test.OFGS as
  closed {
   id : bigint,
   `Order` : string,
   lower : FGS
-}
+};
 
 create type test.COFGS as
  closed {
   id : bigint,
   Class : string,
   lower : OFGS
-}
+};
 
 create type test.PCOFGS as
  closed {
   id : bigint,
   Phylum : string,
   lower : COFGS
-}
+};
 
 create type test.KPCOFGS as
 {
   id : bigint,
   Kingdom : string
-}
+};
 
 create type test.Classification as
  closed {
   id : bigint,
   fullClassification : KPCOFGS
-}
+};
 
 create type test.Animal as
  closed {
   id : bigint,
   class : Classification
-}
+};
 
 create  dataset Animals(Animal) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-open-top-open/bottom-open-top-open.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-open-top-open/bottom-open-top-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-open-top-open/bottom-open-top-open.1.ddl.sqlpp
index 8ffaf16..02af8a6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-open-top-open/bottom-open-top-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/highly-open-highly-nested/bottom-open-top-open/bottom-open-top-open.1.ddl.sqlpp
@@ -34,58 +34,58 @@ use test;
 create type test.S as
 {
   id : bigint
-}
+};
 
 create type test.GS as
  closed {
   id : bigint,
   Genus : string,
   lower : S
-}
+};
 
 create type test.FGS as
 {
   id : bigint,
   Family : string
-}
+};
 
 create type test.OFGS as
  closed {
   id : bigint,
   `Order` : string,
   lower : FGS
-}
+};
 
 create type test.COFGS as
  closed {
   id : bigint,
   Class : string,
   lower : OFGS
-}
+};
 
 create type test.PCOFGS as
  closed {
   id : bigint,
   Phylum : string,
   lower : COFGS
-}
+};
 
 create type test.KPCOFGS as
 {
   id : bigint,
   Kingdom : string
-}
+};
 
 create type test.Classification as
  closed {
   id : bigint,
   fullClassification : KPCOFGS
-}
+};
 
 create type test.Animal as
 {
   id : bigint
-}
+};
 
 create  dataset Animals(Animal) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp
index d20e5d9..29cb657 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp
@@ -36,7 +36,7 @@ create type test.DBLPTypetmp as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -44,7 +44,7 @@ create type test.DBLPOpenType as
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -53,17 +53,17 @@ create type test.CSXTypetmp as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPOpenType
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLPtmp(DBLPTypetmp) primary key id;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
index 3ce2a76..9aec6ad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
@@ -34,7 +34,7 @@ create type test.AddressType as
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerOpenNestedType as
 {
@@ -47,7 +47,7 @@ create type test.CustomerOpenNestedType as
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerNestedType as
  closed {
@@ -61,17 +61,17 @@ create type test.CustomerNestedType as
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerNestedType
-}
+};
 
 create type test.CustomerOpenType as
  closed {
   nested : CustomerOpenNestedType
-}
+};
 
 create  dataset Customerstmp(CustomerOpenNestedType) primary key cid;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
index c2c2274..0b8ed26 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
@@ -33,7 +33,7 @@ create type test.AddressType as
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerOpenNestedType as
 {
@@ -46,7 +46,7 @@ create type test.CustomerOpenNestedType as
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerNestedType as
  closed {
@@ -60,17 +60,17 @@ create type test.CustomerNestedType as
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerNestedType
-}
+};
 
 create type test.CustomerOpenType as
  closed {
   nested : CustomerOpenNestedType
-}
+};
 
 create  dataset Customerstmp(CustomerOpenNestedType) primary key cid;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
index 2eb146a..624e86c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
@@ -36,7 +36,7 @@ create type test.DBLPTypetmp as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -44,7 +44,7 @@ create type test.DBLPOpenType as
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -53,17 +53,17 @@ create type test.CSXTypetmp as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPOpenType
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLPtmp(DBLPTypetmp) primary key id;