diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/constant-agg.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/constant-agg.sqlpp
index 2081d2e..efde2b4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/constant-agg.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/constant-agg.sqlpp
@@ -26,21 +26,21 @@
 create type TinySocial.TwitterUserType as
 {
   `screen-name` : string
-}
+};
 
 create type TinySocial.TweetMessageType as {
   tweetid : string
-}
+};
 
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
  open {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/constant-gby-agg.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/constant-gby-agg.sqlpp
index b901447..cfedb7d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/constant-gby-agg.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/constant-gby-agg.sqlpp
@@ -26,21 +26,21 @@
 create type TinySocial.TwitterUserType as
 {
   `screen-name` : string
-}
+};
 
 create type TinySocial.TweetMessageType as {
   tweetid : string
-}
+};
 
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
  open {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/count-dataset.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/count-dataset.sqlpp
index c54962f..88f8cd8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/count-dataset.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/count-dataset.sqlpp
@@ -26,7 +26,7 @@
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/list-dataset.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/list-dataset.sqlpp
index a77a741..4e72848 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/list-dataset.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/list-dataset.sqlpp
@@ -26,7 +26,7 @@
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 
 create dataset FacebookUsers(FacebookUserType) primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-2.sqlpp
index 4247ef9..01a85d8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-2.sqlpp
@@ -27,7 +27,7 @@
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-3.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-3.sqlpp
index 6a81d64..50b799e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-3.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-3.sqlpp
@@ -27,7 +27,7 @@
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626.sqlpp
index 7a19526..8f7a024 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626.sqlpp
@@ -27,7 +27,7 @@
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-between-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-between-join_01.sqlpp
index 55afe6a..4622cd9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-between-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-between-join_01.sqlpp
@@ -26,7 +26,7 @@
     key2: integer,
     fname : string,
     lname : string
-}
+};
 
 create dataset DsOne(TestType) primary key key1;
 create dataset DsTwo(TestType) primary key key1;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch-2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch-2.sqlpp
index 753b2d1..d6dbb98 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch-2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch-2.sqlpp
@@ -25,11 +25,11 @@
 
 create type FooType as {
   fid: integer
-}
+};
 
 create type BarType as {
   bid: integer
-}
+};
 
 create dataset Foo(FooType) primary key fid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch-3.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch-3.sqlpp
index 687f9d0..f6d3acf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch-3.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch-3.sqlpp
@@ -25,11 +25,11 @@
 
 create type FooType as {
   fid: integer
-}
+};
 
 create type BarType as {
   bid: integer
-}
+};
 
 create dataset Foo(FooType) primary key fid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch.sqlpp
index cce9f91..1eb508c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch.sqlpp
@@ -25,11 +25,11 @@
 
 create type FooType as {
   fid: integer
-}
+};
 
 create type BarType as {
   bid: integer
-}
+};
 
 create dataset Foo(FooType) primary key fid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-core.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-core.sqlpp
index 2a5ed3a..d9834c3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-core.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-core.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-sugar.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-sugar.sqlpp
index 1a952d6..98fa9a5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-sugar.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-sugar.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-05.sqlpp
index 175fa08..c8ad09c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-05.sqlpp
@@ -26,11 +26,11 @@
 create dataverse test;
 use test;
 
-write output to asterix_nc1:"rttest/btree-equi-join-non-enforced_btree-equi-join-non-enforced-05.adm"
+write output to asterix_nc1:"rttest/btree-equi-join-non-enforced_btree-equi-join-non-enforced-05.adm";
 
 create type TestOpenType as open {
   c_id: int64
-}
+};
 
 create dataset TestOpen1(TestOpenType)
 primary key c_id;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-06.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-06.sqlpp
index edff5ce..0fdf599 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-06.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-06.sqlpp
@@ -25,11 +25,11 @@
 create dataverse test;
 use test;
 
-write output to asterix_nc1:"rttest/btree-equi-join-non-enforced_btree-equi-join-non-enforced-06.adm"
+write output to asterix_nc1:"rttest/btree-equi-join-non-enforced_btree-equi-join-non-enforced-06.adm";
 
 create type TestOpenType as open {
   c_id: int64
-}
+};
 
 create dataset TestOpen1(TestOpenType)
 primary key c_id;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-07.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-07.sqlpp
index 32f4c5a..2ceb8d8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-07.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-07.sqlpp
@@ -25,11 +25,11 @@
 create dataverse test;
 use test;
 
-write output to asterix_nc1:"rttest/btree-equi-join-non-enforced_btree-equi-join-non-enforced-07.adm"
+write output to asterix_nc1:"rttest/btree-equi-join-non-enforced_btree-equi-join-non-enforced-07.adm";
 
 create type TestOpenType as open {
   c_id: int64
-}
+};
 
 create dataset TestOpen1(TestOpenType)
 primary key c_id;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-08.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-08.sqlpp
index aef434a..40c1bc3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-08.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-08.sqlpp
@@ -26,11 +26,11 @@
 create dataverse test;
 use test;
 
-write output to asterix_nc1:"rttest/btree-equi-join-non-enforced_btree-equi-join-non-enforced-08.adm"
+write output to asterix_nc1:"rttest/btree-equi-join-non-enforced_btree-equi-join-non-enforced-08.adm";
 
 create type TestOpenType as open {
   c_id: int64
-}
+};
 
 create dataset TestOpen1(TestOpenType)
 primary key c_id;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-09.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-09.sqlpp
index a8b24b1..510f2df 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-09.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-equi-join-non-enforced/btree-equi-join-non-enforced-09.sqlpp
@@ -26,11 +26,11 @@
 create dataverse test;
 use test;
 
-write output to asterix_nc1:"rttest/btree-equi-join-non-enforced_btree-equi-join-non-enforced-08.adm"
+write output to asterix_nc1:"rttest/btree-equi-join-non-enforced_btree-equi-join-non-enforced-08.adm";
 
 create type TestOpenType as open {
   c_id: int64
-}
+};
 
 create dataset TestOpen1(TestOpenType)
 primary key c_id;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-04.sqlpp
index 5d804b9..86a04a2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-04.sqlpp
@@ -27,11 +27,11 @@
 create dataverse test;
 use test;
 
-write output to asterix_nc1:"rttest/btree-index-non-enforced_btree-index-non-enforced-04.adm"
+write output to asterix_nc1:"rttest/btree-index-non-enforced_btree-index-non-enforced-04.adm";
 
 create type TestOpenType as open {
   c_id: int64
-}
+};
 
 create dataset TestOpen(TestOpenType)
 primary key c_id;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-05.sqlpp
index 2818002..83ae02a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-05.sqlpp
@@ -27,11 +27,11 @@
 create dataverse test;
 use test;
 
-write output to asterix_nc1:"rttest/btree-index-non-enforced_btree-index-non-enforced-05.adm"
+write output to asterix_nc1:"rttest/btree-index-non-enforced_btree-index-non-enforced-05.adm";
 
 create type TestOpenType as open {
   c_id: int64
-}
+};
 
 create dataset TestOpen(TestOpenType)
 primary key c_id;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-06.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-06.sqlpp
index 7bff919..b8cdcd0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-06.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-06.sqlpp
@@ -27,11 +27,11 @@
 create dataverse test;
 use test;
 
-write output to asterix_nc1:"rttest/btree-index-non-enforced_btree-index-non-enforced-06.adm"
+write output to asterix_nc1:"rttest/btree-index-non-enforced_btree-index-non-enforced-06.adm";
 
 create type TestOpenType as open {
   c_id: int64
-}
+};
 
 create dataset TestOpen(TestOpenType)
 primary key c_id;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-07.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-07.sqlpp
index fe78300..b84796b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-07.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-07.sqlpp
@@ -27,11 +27,11 @@
 create dataverse test;
 use test;
 
-write output to asterix_nc1:"rttest/btree-index-non-enforced_btree-index-non-enforced-07.adm"
+write output to asterix_nc1:"rttest/btree-index-non-enforced_btree-index-non-enforced-07.adm";
 
 create type TestOpenType as open {
   c_id: int64
-}
+};
 
 create dataset TestOpen(TestOpenType)
 primary key c_id;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-08.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-08.sqlpp
index 0116c95..9659d6c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-08.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-08.sqlpp
@@ -27,11 +27,11 @@
 create dataverse test;
 use test;
 
-write output to asterix_nc1:"rttest/btree-index-non-enforced_btree-index-non-enforced-08.adm"
+write output to asterix_nc1:"rttest/btree-index-non-enforced_btree-index-non-enforced-08.adm";
 
 create type TestOpenType as open {
   c_id: int64
-}
+};
 
 create dataset TestOpen(TestOpenType)
 primary key c_id;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-09.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-09.sqlpp
index 2c39be5..39414d0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-09.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-09.sqlpp
@@ -27,11 +27,11 @@
 create dataverse test;
 use test;
 
-write output to asterix_nc1:"rttest/btree-index-non-enforced_btree-index-non-enforced-09.adm"
+write output to asterix_nc1:"rttest/btree-index-non-enforced_btree-index-non-enforced-09.adm";
 
 create type TestOpenType as open {
   c_id: int64
-}
+};
 
 create dataset TestOpen(TestOpenType)
 primary key c_id;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-10.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-10.sqlpp
index f3519ab..18b75ef 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-10.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-10.sqlpp
@@ -27,11 +27,11 @@
 create dataverse test;
 use test;
 
-write output to asterix_nc1:"rttest/btree-index-non-enforced_btree-index-non-enforced-10.adm"
+write output to asterix_nc1:"rttest/btree-index-non-enforced_btree-index-non-enforced-10.adm";
 
 create type TestOpenType as open {
   c_id: int64
-}
+};
 
 create dataset TestOpen(TestOpenType)
 primary key c_id;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-105.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-105.sqlpp
index 0ef985e..e34f931 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-105.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-105.sqlpp
@@ -28,11 +28,11 @@
 create dataverse test;
 use test;
 
-write output to asterix_nc1:"rttest/btree-index-non-enforced_btree-index-non-enforced-104.adm"
+write output to asterix_nc1:"rttest/btree-index-non-enforced_btree-index-non-enforced-104.adm";
 
 create type TestOpenType as open {
   c_id: int64
-}
+};
 
 create dataset TestOpen(TestOpenType)
 primary key c_id;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-11.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-11.sqlpp
index 0032524..f4d2a2d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-11.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/open-index-non-enforced/btree-index-non-enforced/btree-index-non-enforced-11.sqlpp
@@ -27,11 +27,11 @@
 create dataverse test;
 use test;
 
-write output to asterix_nc1:"rttest/btree-index-non-enforced_btree-index-non-enforced-11.adm"
+write output to asterix_nc1:"rttest/btree-index-non-enforced_btree-index-non-enforced-11.adm";
 
 create type TestOpenType as open {
   c_id: int64
-}
+};
 
 create dataset TestOpen(TestOpenType)
 primary key c_id;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-159-3.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-159-3.sqlpp
index a41fb6d..8da16a0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-159-3.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-159-3.sqlpp
@@ -25,7 +25,7 @@
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1671.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1671.sqlpp
index 33b40b2..088e819 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1671.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1671.sqlpp
@@ -26,7 +26,7 @@
 CREATE TYPE LineItemType AS {
   l_orderkey : bigint,
   l_linenumber : bigint
-}
+};
 
 CREATE DATASET LineItem(LineItemType) PRIMARY KEY l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1806.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1806.sqlpp
index b7ab318..063ebff 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1806.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1806.sqlpp
@@ -46,7 +46,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810-2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810-2.sqlpp
index b6f6159..a05087b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810-2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810-2.sqlpp
@@ -46,7 +46,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 CREATE DATASET LineItem(LineItemType) PRIMARY KEY l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810.sqlpp
index 451f163..0a46e9a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-810.sqlpp
@@ -46,7 +46,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 CREATE DATASET LineItem(LineItemType) PRIMARY KEY l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/exists.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/exists.sqlpp
index a38359d..74573b9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/exists.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/exists.sqlpp
@@ -32,7 +32,7 @@
   o_clerk: string,
   o_shippriority: integer,
   o_comment: string
-}
+};
 
 CREATE TYPE CustomerType AS CLOSED {
   c_custkey: integer,
@@ -43,7 +43,7 @@
   c_acctbal: double,
   c_mktsegment: string,
   c_comment: string
-}
+};
 
 CREATE EXTERNAL DATASET Customer(CustomerType) USING `localfs`
 ((`path`=`asterix_nc1://data/tpch0.001/customer.tbl`),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/in.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/in.sqlpp
index 270c81a..0a11b07 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/in.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/in.sqlpp
@@ -24,11 +24,11 @@
 
 CREATE TYPE OrderType AS {
   o_orderkey: integer
-}
+};
 
 CREATE TYPE CustomerType AS {
   c_custkey: integer
-}
+};
 
 
 CREATE COLLECTION Customers(CustomerType) PRIMARY KEY c_custkey;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/in_correlated.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/in_correlated.sqlpp
index dfbef68..55a63f8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/in_correlated.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/in_correlated.sqlpp
@@ -25,11 +25,11 @@
 
 CREATE TYPE OrderType AS {
   o_orderkey: integer
-}
+};
 
 CREATE TYPE CustomerType AS {
   c_custkey: integer
-}
+};
 
 
 CREATE COLLECTION Customers(CustomerType) PRIMARY KEY c_custkey;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/not_exists.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/not_exists.sqlpp
index f31b7c1..0dfdea0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/not_exists.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/not_exists.sqlpp
@@ -32,7 +32,7 @@
   o_clerk: string,
   o_shippriority: integer,
   o_comment: string
-}
+};
 
 CREATE TYPE CustomerType AS CLOSED {
   c_custkey: integer,
@@ -43,7 +43,7 @@
   c_acctbal: double,
   c_mktsegment: string,
   c_comment: string
-}
+};
 
 CREATE EXTERNAL DATASET Customer(CustomerType) USING `localfs`
 ((`path`=`asterix_nc1://data/tpch0.001/customer.tbl`),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1580.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1580.sqlpp
index fc72375..ce6ce07 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1580.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1580.sqlpp
@@ -36,7 +36,7 @@
     ca_country:                 string?,
     ca_gmt_offset:              double?,
     ca_location_type:           string?
-}
+};
 
 create type tpcds.customer_type as closed {
     c_customer_sk:             bigint,
@@ -57,7 +57,7 @@
     c_login:                   string?,
     c_email_address:           string?,
     c_last_review_date:        string?
-}
+};
 
 create type tpcds.store_sales_type as closed {
     ss_sold_date_sk:           bigint?,
@@ -83,7 +83,7 @@
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 create type tpcds.date_dim_type as closed {
     d_date_sk:                 bigint,
@@ -114,7 +114,7 @@
     d_current_month:           string?,
     d_current_quarter:         string?,
     d_current_year:            string?
-}
+};
 
 create type tpcds.item_type as closed {
     i_item_sk:                 bigint,
@@ -139,7 +139,7 @@
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset customer (customer_type)
 primary key c_customer_sk;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1581-correlated.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1581-correlated.sqlpp
index 39b3eac..a41f864 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1581-correlated.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1581-correlated.sqlpp
@@ -46,7 +46,7 @@
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 
 create type tpcds.item_type as closed {
@@ -72,7 +72,7 @@
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset store_sales (store_sales_type)
 primary key ss_item_sk, ss_ticket_number;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1581.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1581.sqlpp
index d736540..5c94fcf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1581.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1581.sqlpp
@@ -46,7 +46,7 @@
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 
 create type tpcds.item_type as closed {
@@ -72,7 +72,7 @@
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset store_sales (store_sales_type)
 primary key ss_item_sk, ss_ticket_number;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1591.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1591.sqlpp
index 3886520..7608cdf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1591.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1591.sqlpp
@@ -38,7 +38,7 @@
     ca_country:                 string?,
     ca_gmt_offset:              double?,
     ca_location_type:           string?
-}
+};
 
 create type customer_type as closed {
     c_customer_sk:             bigint,
@@ -59,7 +59,7 @@
     c_login:                   string?,
     c_email_address:           string?,
     c_last_review_date:        string?
-}
+};
 
 create type store_sales_type as closed {
     ss_sold_date_sk:           bigint?,
@@ -85,7 +85,7 @@
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 create type catalog_sales_type as closed {
     cs_sold_date_sk:           bigint?,
@@ -122,7 +122,7 @@
     cs_net_paid_inc_ship:      double?,
     cs_net_paid_inc_ship_tax:  double?,
     cs_net_profit:             double?
-}
+};
 
 create type catalog_returns_type as closed {
     cr_returned_date_sk:       bigint?,
@@ -152,7 +152,7 @@
     cr_reversed_charge:        double?,
     cr_store_credit:           double?,
     cr_net_loss:               double?
-}
+};
 
 create type tpcds.date_dim_type as closed {
     d_date_sk:                 bigint,
@@ -183,7 +183,7 @@
     d_current_month:           string?,
     d_current_quarter:         string?,
     d_current_year:            string?
-}
+};
 
 create type item_type as closed {
     i_item_sk:                 bigint,
@@ -208,7 +208,7 @@
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create type web_sales_type as closed {
     ws_sold_date_sk:           bigint?,
@@ -245,7 +245,7 @@
     ws_net_paid_inc_ship:      double?,
     ws_net_paid_inc_ship_tax:  double?,
     ws_net_profit:             double?
-}
+};
 
 create dataset customer (customer_type)
 primary key c_customer_sk;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1596.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1596.sqlpp
index a953e59..2308340 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1596.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1596.sqlpp
@@ -57,7 +57,7 @@
     cs_net_paid_inc_ship:      double?,
     cs_net_paid_inc_ship_tax:  double?,
     cs_net_profit:             double?
-}
+};
 
 create type tpcds.catalog_returns_type as closed {
     cr_returned_date_sk:       bigint?,
@@ -87,7 +87,7 @@
     cr_reversed_charge:        double?,
     cr_store_credit:           double?,
     cr_net_loss:               double?
-}
+};
 
 create type tpcds.item_type as closed {
     i_item_sk:                 bigint,
@@ -112,7 +112,7 @@
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset catalog_sales (catalog_sales_type)
 primary key cs_item_sk, cs_order_number;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpch/q12_shipping.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpch/q12_shipping.sqlpp
index e1d10e1..70581d8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpch/q12_shipping.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpch/q12_shipping.sqlpp
@@ -26,11 +26,11 @@
 
 CREATE TYPE LineItemType AS {
   l_linenumber : integer
-}
+};
 
 CREATE TYPE OrderType AS {
   o_orderkey : integer
-}
+};
 
 CREATE DATASET LineItem(LineItemType) PRIMARY KEY l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpch/q12_shipping_broadcast.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpch/q12_shipping_broadcast.sqlpp
index 94b5d2b..9add5d3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpch/q12_shipping_broadcast.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpch/q12_shipping_broadcast.sqlpp
@@ -26,11 +26,11 @@
 
 CREATE TYPE LineItemType AS {
   l_linenumber : integer
-}
+};
 
 CREATE TYPE OrderType AS {
   o_orderkey : integer
-}
+};
 
 CREATE DATASET LineItem(LineItemType) PRIMARY KEY l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.sqlpp
index bf58b28..fc99d0b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
  closed {
@@ -49,7 +49,7 @@
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
@@ -61,7 +61,7 @@
 
 create  index msgTextIx  on TweetMessages (`message-text`) type keyword;
 
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm";
 select element {'tweetid1':t1.tweetid,'count1':t1.countA,'t2info':(
         select element {'tweetid2':t2.tweetid,'count2':t2.countB}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.sqlpp
index 0d0933d..96e43a9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
  closed {
@@ -49,7 +49,7 @@
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
@@ -61,7 +61,7 @@
 
 create  index msgTextIx  on TweetMessages (`message-text`) type keyword;
 
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm";
 select element {'tweetid1':t1.tweetid,'count1':t1.countA,'t2info':(
         select element {'tweetid2':t2.tweetid,'count2':t2.countB}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-join_01.sqlpp
index 7d521a1..f00eeeb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-join_01.sqlpp
@@ -33,11 +33,11 @@
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset Names(Name) primary key fname,lname;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_01.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-join_02.sqlpp
index 00fa3f1..c12df2e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-join_02.sqlpp
@@ -33,11 +33,11 @@
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset Names(Name) primary key fname,lname;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_02.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-join_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-join_03.sqlpp
index 0ed7290..fa95763 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-join_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-join_03.sqlpp
@@ -33,11 +33,11 @@
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset Names(Name) primary key fname,lname;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_03.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_03.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_01.sqlpp
index b068383..fdc5d9b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_01.sqlpp
@@ -33,11 +33,11 @@
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset Names(Name) primary key fname,lname;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_01.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_02.sqlpp
index 0ff28d4..285affd2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_02.sqlpp
@@ -33,11 +33,11 @@
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset Names(Name) primary key fname,lname;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_02.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_03.sqlpp
index ee75dbe..61268a4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_03.sqlpp
@@ -33,11 +33,11 @@
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset Names(Name) primary key fname,lname;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_03.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_03.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_04.sqlpp
index e611b42..83feb01 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_04.sqlpp
@@ -33,11 +33,11 @@
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset Names(Name) primary key fname,lname;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_04.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_04.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_05.sqlpp
index 5762a92..dab1456 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_05.sqlpp
@@ -33,11 +33,11 @@
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset Names(Name) primary key fname,lname;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_05.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_05.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_06.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_06.sqlpp
index cdac8fc..54a57dd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_06.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-composite-key-prefix-join_06.sqlpp
@@ -33,11 +33,11 @@
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset Names(Name) primary key fname,lname;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_06.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_06.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-multipred.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-multipred.sqlpp
index 81d06b1..7cf8561 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-multipred.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-multipred.sqlpp
@@ -36,7 +36,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -49,7 +49,7 @@
       total : float
   }
 
-}
+};
 
 create type test.OrderType as
  closed {
@@ -59,13 +59,13 @@
   orderpriority : string,
   clerk : string,
   total : float
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  dataset Orders(OrderType) primary key oid;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-multipred.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-multipred.adm";
 select element {'customer':c,'order':o}
 from  Customers as c,
       Orders as o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-neg_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-neg_01.sqlpp
index 07044bb..ab8d14a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-neg_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-neg_01.sqlpp
@@ -32,13 +32,13 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key key1;
 
 create  dataset test1.DsTwo(TestType) primary key key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-neg_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-neg_01.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-neg_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-neg_02.sqlpp
index 33fa8a8..bd7d7b2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-neg_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-neg_02.sqlpp
@@ -32,13 +32,13 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key key1;
 
 create  dataset test1.DsTwo(TestType) primary key key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-neg_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-neg_02.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_01.sqlpp
index 8be3a29..5313576 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_01.sqlpp
@@ -32,13 +32,13 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key key1;
 
 create  dataset test1.DsTwo(TestType) primary key key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_01.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_02.sqlpp
index 8771300..a3740b6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_02.sqlpp
@@ -32,13 +32,13 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key key1;
 
 create  dataset test1.DsTwo(TestType) primary key key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_02.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_03.sqlpp
index 9d70e51..9d1aaf3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_03.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
       total : float
   }
 
-}
+};
 
 create type test.OrderType as
  closed {
@@ -57,13 +57,13 @@
   orderpriority : string,
   clerk : string,
   total : float
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  dataset Orders(OrderType) primary key oid;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_04.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_04.adm";
 select element {'customer':c,'order':o}
 from  Customers as c,
       Orders as o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_04.sqlpp
index cd0f18f..e465dc4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_04.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
       total : float
   }
 
-}
+};
 
 create type test.OrderType as
  closed {
@@ -57,13 +57,13 @@
   orderpriority : string,
   clerk : string,
   total : float
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  dataset Orders(OrderType) primary key oid;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_05.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_05.adm";
 select element {'customer':c,'order':o}
 from  Orders as o,
       Customers as c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_05.sqlpp
index 50d3c22..75f6bdd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_05.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,11 +47,11 @@
       total : float
   }
 
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_06.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_06.adm";
 select element {'customer1':c1,'customer2':c2}
 from  Customers as c1,
       Customers as c2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-ge-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-ge-join_01.sqlpp
index 531ae70..6c1a30a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-ge-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-ge-join_01.sqlpp
@@ -32,13 +32,13 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key key1;
 
 create  dataset test1.DsTwo(TestType) primary key key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-ge-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-ge-join_01.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-ge-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-ge-join_02.sqlpp
index 9da023e..954b3a6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-ge-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-ge-join_02.sqlpp
@@ -32,13 +32,13 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key key1;
 
 create  dataset test1.DsTwo(TestType) primary key key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-ge-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-ge-join_02.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-gt-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-gt-join_01.sqlpp
index c4a1aa4..8763a0d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-gt-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-gt-join_01.sqlpp
@@ -32,13 +32,13 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key key1;
 
 create  dataset test1.DsTwo(TestType) primary key key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-gt-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-gt-join_01.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-gt-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-gt-join_02.sqlpp
index 6c10a54..748bfb0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-gt-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-gt-join_02.sqlpp
@@ -32,13 +32,13 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key key1;
 
 create  dataset test1.DsTwo(TestType) primary key key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-gt-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-gt-join_02.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-le-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-le-join_01.sqlpp
index 77227a6..0e99c88 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-le-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-le-join_01.sqlpp
@@ -32,13 +32,13 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key key1;
 
 create  dataset test1.DsTwo(TestType) primary key key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-le-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-le-join_01.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-le-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-le-join_02.sqlpp
index 541c0eb..2eb1dde 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-le-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-le-join_02.sqlpp
@@ -32,13 +32,13 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key key1;
 
 create  dataset test1.DsTwo(TestType) primary key key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-le-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-le-join_02.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-lt-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-lt-join_01.sqlpp
index 3711d3c..f717a64 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-lt-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-lt-join_01.sqlpp
@@ -32,13 +32,13 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key key1;
 
 create  dataset test1.DsTwo(TestType) primary key key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-lt-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-lt-join_01.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-lt-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-lt-join_02.sqlpp
index 55bbbef..e574877 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-lt-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-lt-join_02.sqlpp
@@ -32,13 +32,13 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key key1;
 
 create  dataset test1.DsTwo(TestType) primary key key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-lt-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-lt-join_02.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join-multiindex.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join-multiindex.sqlpp
index 3704121..4580dab 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join-multiindex.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join-multiindex.sqlpp
@@ -36,7 +36,7 @@
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type test.FacebookUserType as
  closed {
@@ -48,7 +48,7 @@
   `user-since-copy` : datetime,
   `friend-ids` : {{integer}},
   employment : [EmploymentType]
-}
+};
 
 create type test.FacebookMessageType as
  closed {
@@ -59,7 +59,7 @@
   `in-response-to` : integer?,
   `sender-location` : point?,
   message : string
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
@@ -67,7 +67,7 @@
 
 create  index fbmIdxAutId  if not exists  on FacebookMessages (`author-id-copy`) type btree;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multiindex.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multiindex.adm";
 select element {'fbu-ID':user.id,'fbm-auth-ID':message.`author-id`,'uname':user.name,'message':message.message}
 from  FacebookUsers as user,
       FacebookMessages as message
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join-multipred.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join-multipred.sqlpp
index be83104..0fb1462 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join-multipred.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join-multipred.sqlpp
@@ -38,7 +38,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -47,7 +47,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -55,7 +55,7 @@
 
 create  index title_index  on DBLP (title) type btree;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multipred.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multipred.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_01.sqlpp
index 9500353..30352db 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_01.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -45,7 +45,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -53,7 +53,7 @@
 
 create  index title_index  on DBLP (title) type btree;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_02.sqlpp
index ffcea23..1c315f8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_02.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -45,7 +45,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -53,7 +53,7 @@
 
 create  index title_index  on CSX (title) type btree;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_03.sqlpp
index 8d9e478..7ab67fa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_03.sqlpp
@@ -36,13 +36,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index title_index  on DBLP (title) type btree;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_03.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_03.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-01.sqlpp
index d81beeb..38f05de 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-01.sqlpp
@@ -36,7 +36,7 @@
   timestamp : datetime,
   title : string,
   message : string
-}
+};
 
 create  dataset CHPReports(CHPReport) primary key timestamp;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-02.sqlpp
index 67d7dda..ce4ccdc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-02.sqlpp
@@ -36,7 +36,7 @@
   timestamp : datetime,
   title : string,
   message : string
-}
+};
 
 create  dataset CHPReports(CHPReport) primary key timestamp;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-03.sqlpp
index 9fefe73..aeb0e16 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-03.sqlpp
@@ -36,7 +36,7 @@
   timestamp : datetime,
   title : string,
   message : string
-}
+};
 
 create  dataset CHPReports(CHPReport) primary key timestamp;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-04.sqlpp
index dc9457f..daaba92 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-04.sqlpp
@@ -35,7 +35,7 @@
   timestamp : datetime,
   title : string,
   message : string
-}
+};
 
 create  dataset CHPReports(CHPReport) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-01.sqlpp
index ff74d80..9e4f892 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-01.sqlpp
@@ -29,12 +29,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-01.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-01.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-02.sqlpp
index e01e004..f2e401e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-02.sqlpp
@@ -29,12 +29,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-02.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-02.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-03.sqlpp
index 65669d6..ad6db11 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-03.sqlpp
@@ -29,12 +29,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-03.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-03.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-04.sqlpp
index 99cd613..b5ea3a0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-04.sqlpp
@@ -29,12 +29,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-04.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-04.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-05.sqlpp
index ca375fa..b237a63 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-05.sqlpp
@@ -29,12 +29,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-05.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-05.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-06.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-06.sqlpp
index 197fbbc..e653b33 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-06.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-06.sqlpp
@@ -29,12 +29,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-06.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-06.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-07.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-07.sqlpp
index 8527a3e..bef5f61 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-07.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-07.sqlpp
@@ -29,12 +29,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-07.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-07.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-08.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-08.sqlpp
index 62609e5..d8f267e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-08.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-08.sqlpp
@@ -28,12 +28,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-08.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-08.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-09.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-09.sqlpp
index 5832ec4..b2c4c89 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-09.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-09.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-09.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-09.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-10.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-10.sqlpp
index 0341553..3d19624 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-10.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-10.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-10.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-10.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-11.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-11.sqlpp
index 8b1f1f3..4838fea 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-11.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-11.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-11.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-11.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-12.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-12.sqlpp
index c48329e..5c5f01b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-12.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-12.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-12.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-12.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-13.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-13.sqlpp
index 45d56e9..90719de 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-13.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-13.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-13.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-13.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-14.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-14.sqlpp
index eba848e..14d9178 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-14.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-14.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-14.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-14.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-15.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-15.sqlpp
index 71f291d..f182790 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-15.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-15.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-15.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-15.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-16.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-16.sqlpp
index 3403716..0298ab5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-16.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-16.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-16.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-16.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-17.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-17.sqlpp
index 4442669..bb5de9e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-17.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-17.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-17.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-17.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-18.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-18.sqlpp
index 149b68c..0f02205 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-18.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-18.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-18.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-18.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-19.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-19.sqlpp
index a30e6c5..e095a0b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-19.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-19.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-19.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-19.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-20.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-20.sqlpp
index 3e1eb98..1735713 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-20.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-20.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-20.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-20.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-21.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-21.sqlpp
index a37b0dc..95a9407 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-21.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-21.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-21.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-21.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-22.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-22.sqlpp
index e9228b8..3fd48d5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-22.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-22.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-22.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-22.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-23.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-23.sqlpp
index 0373513..72a2a480 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-23.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-23.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-23.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-23.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-24.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-24.sqlpp
index 43f65c4..0b8a9aa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-24.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-24.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-24.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-24.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-25.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-25.sqlpp
index c2e881e..fb855e1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-25.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-25.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-25.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-25.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-26.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-26.sqlpp
index 0e9aaf0..e187f4a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-26.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-26.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-26.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-26.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-27.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-27.sqlpp
index 8a7e358..8b83fff 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-27.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-27.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-27.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-27.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-28.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-28.sqlpp
index 0e036ba..388f4a9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-28.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-28.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-28.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-28.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-29.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-29.sqlpp
index 18d4416..5b6d1fc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-29.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-29.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-29.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-29.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-30.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-30.sqlpp
index 821ebd7..9dfe2b6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-30.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-30.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-30.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-30.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-31.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-31.sqlpp
index d6383c7..2c36adb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-31.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-31.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-31.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-31.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-32.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-32.sqlpp
index c015337..f61fee1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-32.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-primary-32.sqlpp
@@ -30,12 +30,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-32.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-32.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-33.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-33.sqlpp
index 772efee..845da2a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-33.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-33.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-33.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-33.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-34.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-34.sqlpp
index ee08603..db55b28 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-34.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-34.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-34.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-34.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-35.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-35.sqlpp
index be8efc2..ecac451 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-35.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-35.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-35.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-35.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-36.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-36.sqlpp
index 7ad0c61..6354f25 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-36.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-36.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-36.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-36.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-37.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-37.sqlpp
index 5b45d44..5a044bc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-37.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-37.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-37.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-37.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-38.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-38.sqlpp
index 68c0a6e..154c912 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-38.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-38.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-38.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-38.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-39.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-39.sqlpp
index 4fdfc62..9e274b0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-39.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-39.sqlpp
@@ -29,13 +29,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-39.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-39.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-40.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-40.sqlpp
index 46c5a8b..d8a95cd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-40.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-40.sqlpp
@@ -29,13 +29,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-40.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-40.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-41.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-41.sqlpp
index 4dee829..0c9ab8d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-41.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-41.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-41.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-41.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-42.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-42.sqlpp
index 24b3de8..75ccb90 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-42.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-42.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-42.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-42.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-43.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-43.sqlpp
index 599179d..2cf7dbb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-43.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-43.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-43.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-43.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-44.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-44.sqlpp
index 09812bd..98f037e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-44.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-44.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-44.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-44.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-45.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-45.sqlpp
index 9783d00..a88838f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-45.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-45.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-45.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-45.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-46.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-46.sqlpp
index 9d4b103..524b0a7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-46.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-46.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-46.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-46.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-47.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-47.sqlpp
index da1c33a..f6a5120 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-47.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-47.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-47.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-47.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-48.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-48.sqlpp
index 16f8d92..cd4fae6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-48.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-48.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-48.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-48.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-49.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-49.sqlpp
index 0f97a42..9efcfc6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-49.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-49.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-49.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-49.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-50.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-50.sqlpp
index c8bc850..4ad3c01 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-50.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-50.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-50.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-50.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-51.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-51.sqlpp
index e64ea1a..3b3b5e1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-51.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-51.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-51.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-51.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-52.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-52.sqlpp
index d060389..d6d977c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-52.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-52.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-52.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-52.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-53.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-53.sqlpp
index a70de3f..985cde7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-53.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-53.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-53.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-53.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-54.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-54.sqlpp
index 58c094c..40ae7d1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-54.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-54.sqlpp
@@ -29,13 +29,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-54.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-54.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-55.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-55.sqlpp
index 7090b1a..8b9a588b3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-55.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-55.sqlpp
@@ -29,13 +29,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-55.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-55.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-56.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-56.sqlpp
index 3340c72..14d1ce9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-56.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-56.sqlpp
@@ -29,13 +29,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-56.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-56.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-57.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-57.sqlpp
index be955ff..4070114 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-57.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-57.sqlpp
@@ -29,13 +29,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-57.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-57.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-58.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-58.sqlpp
index 10f92f8..e3f42ca 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-58.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-58.sqlpp
@@ -29,13 +29,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-58.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-58.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-59.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-59.sqlpp
index 710a2c4..8656ab8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-59.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-59.sqlpp
@@ -29,13 +29,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-59.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-59.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-60.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-60.sqlpp
index 6b3e02a..38fad40 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-60.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-60.sqlpp
@@ -29,13 +29,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-60.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-60.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-61.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-61.sqlpp
index 883c8f9..e8d5627 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-61.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-61.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-61.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-61.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-62.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-62.sqlpp
index 30c21d5..ce68496 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-62.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-62.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-62.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-62.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-63.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-63.sqlpp
index 047a0e9..0ef6c12 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-63.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-63.sqlpp
@@ -30,13 +30,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-63.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-63.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/collocated.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/collocated.sqlpp
index 2bedb3e..ee49511 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/collocated.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/collocated.sqlpp
@@ -28,20 +28,20 @@
   uid : integer,
   name : string,
   lottery_numbers : {{integer}}
-}
+};
 
 create type colocated.VisitorType as
 {
   vid : integer,
   name : string,
   lottery_numbers : {{integer}}
-}
+};
 
 create  dataset Users(UserType) primary key uid;
 
 create  dataset Visitors(VisitorType) primary key vid;
 
-write output to asterix_nc1:"/tmp/fuzzy1.adm"
+write output to asterix_nc1:"/tmp/fuzzy1.adm";
 select element {'user_name':user.name,'visitor_name':visitor.name}
 from  Users as user,
       Visitors as visitor
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/consolidate-selects-complex.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/consolidate-selects-complex.sqlpp
index b5b5c6f..03d105f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/consolidate-selects-complex.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/consolidate-selects-complex.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -40,7 +40,7 @@
 
 load  dataset DBLP using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
 
-write output to asterix_nc1:"rttest/consolidate-complex-selects.aql"
+write output to asterix_nc1:"rttest/consolidate-complex-selects.aql";
 select element {'Paper':paper_tokens,'Query':query_tokens}
 from  DBLP as paper
 with  paper_tokens as test.`word-tokens`(paper.title),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/consolidate-selects-simple.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/consolidate-selects-simple.sqlpp
index 870ee0f..1ce7642 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/consolidate-selects-simple.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/consolidate-selects-simple.sqlpp
@@ -33,7 +33,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -41,7 +41,7 @@
 ;
 create  dataset Customers(CustomerType) primary key c_custkey on group1;
 
-write output to asterix_nc1:"rttest/consolidate-selects-simple.aql"
+write output to asterix_nc1:"rttest/consolidate-selects-simple.aql";
 select element c
 from  Customers as c
 where ((c.c_name = 'testname') and (c.c_address = 'testaddr') and (c.c_nationkey = 1) and (c.c_phone = '123456789'))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/const-folding.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/const-folding.sqlpp
index 1edf383..583c0b8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/const-folding.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/const-folding.sqlpp
@@ -23,5 +23,5 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/divide.adm"
+write output to asterix_nc1:"rttest/divide.adm";
 {'a':(1 + 2),'b':['foo','bar'][0]}.b;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/count-tweets.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/count-tweets.sqlpp
index 8d9c2fd..9ec110a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/count-tweets.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/count-tweets.sqlpp
@@ -30,11 +30,11 @@
   loc : point,
   time : datetime,
   text : string
-}
+};
 
 create external  dataset TwitterData(Tweet) using localfs((`path`=`asterix_nc1://data/twitter/smalltweets.txt`),("format"="adm"));
 
-write output to asterix_nc1:"/tmp/count-tweets.adm"
+write output to asterix_nc1:"/tmp/count-tweets.adm";
 select element {'word':tok,'count':count(token)}
 from  TwitterData as t,
       tokens as token
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/cust_group_no_agg.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/cust_group_no_agg.sqlpp
index 2a8a52c..3c82655 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/cust_group_no_agg.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/cust_group_no_agg.sqlpp
@@ -33,7 +33,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -41,7 +41,7 @@
 ;
 create  dataset Customers(CustomerType) primary key c_custkey on group1;
 
-write output to asterix_nc1:"/tmp/.adm"
+write output to asterix_nc1:"/tmp/.adm";
 select element name
 from  Customers as c
 group by c.c_name as name
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/denorm-cust-order.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/denorm-cust-order.sqlpp
index a3d79eb..52ce35c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/denorm-cust-order.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/denorm-cust-order.sqlpp
@@ -28,7 +28,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type custorder.CustomerType as
  closed {
@@ -41,7 +41,7 @@
       total : float
   }
 
-}
+};
 
 create type custorder.OrderType as
  closed {
@@ -51,7 +51,7 @@
   orderpriority : string,
   clerk : string,
   total : float
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -61,7 +61,7 @@
 
 create  dataset Orders(OrderType) primary key oid on group1;
 
-write output to asterix_nc1:"/tmp/custorder.adm"
+write output to asterix_nc1:"/tmp/custorder.adm";
 select element {'cid':cid,'cust':cust,'cnt-orders':count(o),'orders':o}
 from  Customers as c,
       Orders as o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/disjunction-to-join-delete-1.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/disjunction-to-join-delete-1.sqlpp
index 789741d..ff93007 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/disjunction-to-join-delete-1.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/disjunction-to-join-delete-1.sqlpp
@@ -28,7 +28,7 @@
   id : string,
   idx : string,
   `no-idx` : string
-}
+};
 
 create  dataset TestSet(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/disjunction-to-join-delete-2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/disjunction-to-join-delete-2.sqlpp
index 31915f0..7f1535a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/disjunction-to-join-delete-2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/disjunction-to-join-delete-2.sqlpp
@@ -28,7 +28,7 @@
   id : string,
   idx : string,
   `no-idx` : string
-}
+};
 
 create  dataset TestSet(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/disjunction-to-join-delete-3.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/disjunction-to-join-delete-3.sqlpp
index 99533ae..40064ef 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/disjunction-to-join-delete-3.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/disjunction-to-join-delete-3.sqlpp
@@ -28,7 +28,7 @@
   id : string,
   idx : string,
   `no-idx` : string
-}
+};
 
 create  dataset TestSet(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/distinct_aggregate.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/distinct_aggregate.sqlpp
index 94241a6..e840882 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/distinct_aggregate.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/distinct_aggregate.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -49,7 +49,7 @@
 ;
 create  dataset LineItems_q1(LineItemType) primary key l_orderkey,l_linenumber on group1;
 
-write output to asterix_nc1:"rttest/tpch_q1_pricing_summary_report_nt.adm"
+write output to asterix_nc1:"rttest/tpch_q1_pricing_summary_report_nt.adm";
 select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'count_suppkey':count(g)}
 from  (
     select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'l_suppkey':l_suppkey}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/filter-nested.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/filter-nested.sqlpp
index 85956a5..53d6cc7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/filter-nested.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/filter-nested.sqlpp
@@ -23,17 +23,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/filter-nested.adm"
+write output to asterix_nc1:"rttest/filter-nested.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname with filter on nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-dblp-csx.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-dblp-csx.sqlpp
index bb909d4..66d3523 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-dblp-csx.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-dblp-csx.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type `fj-dblp-csx`.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -49,7 +49,7 @@
 
 create  dataset CSX(CSXType) primary key id on group1;
 
-write output to asterix_nc1:"rttest/fj-dblp-csx.adm"
+write output to asterix_nc1:"rttest/fj-dblp-csx.adm";
 select element {'idDBLP':idDBLP,'idCSX':idCSX}
 from  DBLP as paperDBLP,
       tokensDBLP as prefixTokenDBLP,
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-phase1.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-phase1.sqlpp
index c446047..0b89b41 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-phase1.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-phase1.sqlpp
@@ -28,14 +28,14 @@
   uid : integer,
   name : string,
   lottery_numbers : {{integer}}
-}
+};
 
 create type rares03.VisitorType as
 {
   vid : integer,
   name : string,
   lottery_numbers : {{integer}}
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -45,7 +45,7 @@
 
 create  dataset Visitors(VisitorType) primary key vid on group1;
 
-write output to asterix_nc1:"/tmp/rares03.adm"
+write output to asterix_nc1:"/tmp/rares03.adm";
 select element {'uid':user.uid,'tokens':tokens}
 from  Users as user
 with  tokens as (
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-phase2-with-hints.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-phase2-with-hints.sqlpp
index 4ecffb6..f8c55e0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-phase2-with-hints.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-phase2-with-hints.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -38,7 +38,7 @@
 ;
 create  dataset DBLP_fuzzyjoin_078(DBLPType) primary key id on group1;
 
-write output to asterix_nc1:"rttest/fuzzyjoin_078.adm"
+write output to asterix_nc1:"rttest/fuzzyjoin_078.adm";
 select element {'id':paperDBLP.id,'tokens':tokensDBLP}
 from  DBLP_fuzzyjoin_078 as paperDBLP
 with  unrankedTokensDBLP as fuzzyjoin_078.`counthashed-word-tokens`(paperDBLP.title),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/hashjoin-with-unnest.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/hashjoin-with-unnest.sqlpp
index 609a478..4f5263c1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/hashjoin-with-unnest.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/hashjoin-with-unnest.sqlpp
@@ -32,13 +32,13 @@
 {
   id : integer,
   name : string
-}
+};
 
 create  dataset t1(TestType) primary key id;
 
 create  dataset t2(TestType) primary key id;
 
-write output to asterix_nc1:"rttest/hahsjoin-with-unnest.adm"
+write output to asterix_nc1:"rttest/hahsjoin-with-unnest.adm";
 select element {'t1':m,'t2':n}
 from  t1 as m,
       t2 as n,
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inline-funs.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inline-funs.sqlpp
index 9302058..720108a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inline-funs.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inline-funs.sqlpp
@@ -23,7 +23,7 @@
 use test;
 
 
-write output to asterix_nc1:"/tmp/inline_funs.adm"
+write output to asterix_nc1:"/tmp/inline_funs.adm";
 declare function f1() {
 (1 + test.f2())
 };
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inlined_q18_large_volume_customer.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inlined_q18_large_volume_customer.sqlpp
index 16b9c89..7819959 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inlined_q18_large_volume_customer.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inlined_q18_large_volume_customer.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type inlined_q18_large_volume_customer.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type inlined_q18_large_volume_customer.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -78,7 +78,7 @@
 
 create  dataset Customers(CustomerType) primary key c_custkey on group1;
 
-write output to asterix_nc1:"/tmp/inlined_q18_large_volume_customer.adm"
+write output to asterix_nc1:"/tmp/inlined_q18_large_volume_customer.adm";
 select element {'c_name':c_name,'c_custkey':c_custkey,'o_orderkey':o_orderkey,'o_orderdate':o_orderdate,'o_totalprice':o_totalprice,'sum_quantity':inlined_q18_large_volume_customer.coll_sum((
         select element j.l_quantity
         from  l as j
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/insert-and-scan-dataset-with-index.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/insert-and-scan-dataset-with-index.sqlpp
index ec2c0ce..615710f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/insert-and-scan-dataset-with-index.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/insert-and-scan-dataset-with-index.sqlpp
@@ -34,7 +34,7 @@
   lname : string,
   age : integer,
   dept : string
-}
+};
 
 create  dataset test.employee(Emp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/insert-and-scan-dataset.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/insert-and-scan-dataset.sqlpp
index fdbaec9..5566eaf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/insert-and-scan-dataset.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/insert-and-scan-dataset.sqlpp
@@ -33,7 +33,7 @@
 create type test.myDataType as
 {
   id : integer
-}
+};
 
 create  dataset myData(myDataType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/insert-and-scan-joined-datasets.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/insert-and-scan-joined-datasets.sqlpp
index 01498f4..4618aa2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/insert-and-scan-joined-datasets.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/insert-and-scan-joined-datasets.sqlpp
@@ -29,14 +29,14 @@
 create type test.myDataType as
 {
   id : integer
-}
+};
 
 create  dataset myData(myDataType) primary key id;
 
 create  dataset myData2(myDataType) primary key id;
 
 insert into myData
-select element {'id':(x.id + 1)}
+select element {'id':(x.id + 1)};
 from  myData2 as x,
       myData as y
 where (x.id = y.id)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/introhashpartitionmerge.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/introhashpartitionmerge.sqlpp
index b177c77..103aae8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/introhashpartitionmerge.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/introhashpartitionmerge.sqlpp
@@ -27,7 +27,7 @@
  closed {
   token : integer,
   rank : integer
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -35,7 +35,7 @@
 ;
 create  dataset TOKENSRANKEDADM(TOKENSRANKEDADMType) primary key rank on group1;
 
-write output to asterix_nc1:"rttest/introhashpartitionmerge.adm"
+write output to asterix_nc1:"rttest/introhashpartitionmerge.adm";
 select element token2.rank
 from  TOKENSRANKEDADM as token1,
       (
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-contains-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-contains-panic.sqlpp
index e4dff38..e13305d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-contains-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-contains-panic.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains-panic.adm";
 select element o
 from  DBLP as o
 where test.contains(o.title,'Mu')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-contains.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-contains.sqlpp
index ec01cd2..e5b4885 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-contains.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-contains.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains.adm";
 select element o
 from  DBLP as o
 where test.contains(o.title,'Multimedia')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-edit-distance-check-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-edit-distance-check-panic.sqlpp
index a61bd39..1f04301 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-edit-distance-check-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-edit-distance-check-panic.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check-panic.adm";
 select element o
 from  DBLP as o
 with  ed as test.`edit-distance-check`(o.authors,'Amihay Motro',5)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-edit-distance-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-edit-distance-check.sqlpp
index ee6bc26..da55c99 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-edit-distance-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-edit-distance-check.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check.adm";
 select element o
 from  DBLP as o
 where test.`edit-distance-check`(o.authors,'Amihay Motro',1)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-edit-distance-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-edit-distance-panic.sqlpp
index cace337..84eae49 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-edit-distance-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-edit-distance-panic.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-panic.adm";
 select element o
 from  DBLP as o
 where (test.`edit-distance`(o.authors,'Amihay Motro') <= 5)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-edit-distance.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-edit-distance.sqlpp
index 3e01e68..91a809b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-edit-distance.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-edit-distance.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance.adm";
 select element o
 from  DBLP as o
 where (test.`edit-distance`(o.authors,'Amihay Motro') <= 1)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-fuzzyeq-edit-distance.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-fuzzyeq-edit-distance.sqlpp
index e35ebfc..d684f0c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-fuzzyeq-edit-distance.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-fuzzyeq-edit-distance.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-edit-distance.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-edit-distance.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `1`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-fuzzyeq-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-fuzzyeq-jaccard.sqlpp
index 3f92588..5adcda0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-fuzzyeq-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-fuzzyeq-jaccard.sqlpp
@@ -37,13 +37,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-jaccard.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.8f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-jaccard-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-jaccard-check.sqlpp
index 3b83894..5b564db 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-jaccard-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-jaccard-check.sqlpp
@@ -37,13 +37,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard-check.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard-check.adm";
 select element o
 from  DBLP as o
 where test.`similarity-jaccard-check`(test.`gram-tokens`(o.title,3,false),test.`gram-tokens`('Transactions for Cooperative Environments',3,false),0.500000f)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-jaccard.sqlpp
index 1d5ee5e..3e024a0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ngram-jaccard.sqlpp
@@ -37,13 +37,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard.adm";
 select element o
 from  DBLP as o
 where (test.`similarity-jaccard`(test.`gram-tokens`(o.title,3,false),test.`gram-tokens`('Transactions for Cooperative Environments',3,false)) >= 0.500000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-edit-distance-check-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-edit-distance-check-panic.sqlpp
index 19a340f..41ceade 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-edit-distance-check-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-edit-distance-check-panic.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance-check-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance-check-panic.adm";
 select element c
 from  Customers as c
 where test.`edit-distance-check`(c.interests,['computers','wine','walking'],3)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-edit-distance-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-edit-distance-check.sqlpp
index 7af452f..0ca8b00 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-edit-distance-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-edit-distance-check.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance-check.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance-check.adm";
 select element c
 from  Customers as c
 where test.`edit-distance-check`(c.interests,['computers','wine','walking'],1)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-edit-distance-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-edit-distance-panic.sqlpp
index 17f4e64..0f2fcf4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-edit-distance-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-edit-distance-panic.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance-panic.adm";
 select element c
 from  Customers as c
 where (test.`edit-distance`(c.interests,['computers','wine','walking']) <= 3)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-edit-distance.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-edit-distance.sqlpp
index 9149bea..a4114d0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-edit-distance.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-edit-distance.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance.adm";
 select element c
 from  Customers as c
 where (test.`edit-distance`(c.interests,['computers','wine','walking']) <= 1)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-fuzzyeq-edit-distance.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-fuzzyeq-edit-distance.sqlpp
index 6ccb3de..1bfd5f9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-fuzzyeq-edit-distance.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-fuzzyeq-edit-distance.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-fuzzyeq-edit-distance.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-fuzzyeq-edit-distance.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `1`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-fuzzyeq-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-fuzzyeq-jaccard.sqlpp
index c7c3aea..a1372d9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-fuzzyeq-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-fuzzyeq-jaccard.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-fuzzyeq-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-fuzzyeq-jaccard.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.8f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-jaccard-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-jaccard-check.sqlpp
index bc4eda9..89a3eb8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-jaccard-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-jaccard-check.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-jaccard-check.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-jaccard-check.adm";
 select element c
 from  Customers as c
 where test.`similarity-jaccard-check`(c.interests,['databases','computers','wine'],0.700000f)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-jaccard.sqlpp
index 0722bda..d13c98b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/olist-jaccard.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-jaccard.adm";
 select element c
 from  Customers as c
 where (test.`similarity-jaccard`(c.interests,['databases','computers','wine']) >= 0.700000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ulist-fuzzyeq-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ulist-fuzzyeq-jaccard.sqlpp
index 2d40687..d32a8f4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ulist-fuzzyeq-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ulist-fuzzyeq-jaccard.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ulist-fuzzyeq-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ulist-fuzzyeq-jaccard.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.8f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ulist-jaccard-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ulist-jaccard-check.sqlpp
index 93d4790..25568e0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ulist-jaccard-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ulist-jaccard-check.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ulist-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ulist-jaccard.adm";
 select element c
 from  Customers as c
 where test.`similarity-jaccard-check`(c.interests,{{'computers','wine','databases'}},0.700000f)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ulist-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ulist-jaccard.sqlpp
index 504c812..2a26ee9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ulist-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/ulist-jaccard.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ulist-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ulist-jaccard.adm";
 select element c
 from  Customers as c
 where (test.`similarity-jaccard`(c.interests,{{'computers','databases','wine'}}) >= 0.700000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/word-contains.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/word-contains.sqlpp
index e553db1..2a1db6d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/word-contains.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/word-contains.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_word-contains.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_word-contains.adm";
 select element o
 from  DBLP as o
 where test.contains(o.title,'Multimedia')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/word-fuzzyeq-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/word-fuzzyeq-jaccard.sqlpp
index 60e77b4..6157fde 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/word-fuzzyeq-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/word-fuzzyeq-jaccard.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_word-fuzzyeq-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_word-fuzzyeq-jaccard.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/word-jaccard-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/word-jaccard-check.sqlpp
index a309084..b0dc05a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/word-jaccard-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/word-jaccard-check.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard-check.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard-check.adm";
 select element o
 from  DBLP as o
 where test.`similarity-jaccard-check`(test.`word-tokens`(o.title),test.`word-tokens`('Transactions for Cooperative Environments'),0.500000f)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/word-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/word-jaccard.sqlpp
index d2b2be5..eb96ddd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/word-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-basic/word-jaccard.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard.adm";
 select element o
 from  DBLP as o
 where (test.`similarity-jaccard`(test.`word-tokens`(o.title),test.`word-tokens`('Transactions for Cooperative Environments')) >= 0.500000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.sqlpp
index 86a0bb4..c60c8fd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.sqlpp
@@ -37,13 +37,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm";
 select element o
 from  DBLP as o
 with  eda as test.`edit-distance-check`(o.authors,'Amihay Motro',3),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.sqlpp
index f563500..8a5d1d6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.sqlpp
@@ -37,13 +37,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm";
 select element o
 from  DBLP as o
 with  edb as test.`edit-distance-check`(o.authors,'Amihay Motro',5),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic.sqlpp
index ec39482..2cce890 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic.sqlpp
@@ -36,13 +36,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic.adm";
 select element o
 from  DBLP as o
 with  ed as test.`edit-distance-check`(o.authors,'Amihay Motro',5)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-let.sqlpp
index 97c0a7c..1f725d6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-let.sqlpp
@@ -36,13 +36,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let.adm";
 select element o
 from  DBLP as o
 with  ed as test.`edit-distance-check`(o.authors,'Amihay Motro',1)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-substring.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-substring.sqlpp
index b18608e..d2e3888 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-substring.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-substring.sqlpp
@@ -36,13 +36,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-substring.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-substring.adm";
 select element {'id':paper.id,'title':paper.title}
 from  DBLP as paper
 where test.`edit-distance-check`(test.substring(paper.title,0,8),'datbase',1)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-word-tokens.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-word-tokens.sqlpp
index 1919c83..ea53884 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-word-tokens.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-edit-distance-check-word-tokens.sqlpp
@@ -36,13 +36,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-word-tokens.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-word-tokens.adm";
 select element {'id':paper.id,'title':paper.title}
 from  DBLP as paper,
       test.`word-tokens`(paper.title) as word
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-jaccard-check-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-jaccard-check-let.sqlpp
index a0f7048..248c243 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-jaccard-check-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-jaccard-check-let.sqlpp
@@ -38,13 +38,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-let.adm";
 select element o
 from  DBLP as o
 with  jacc as test.`similarity-jaccard-check`(test.`gram-tokens`(o.title,3,false),test.`gram-tokens`('Transactions for Cooperative Environments',3,false),0.500000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-jaccard-check-multi-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-jaccard-check-multi-let.sqlpp
index 412566c..8be4caa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-jaccard-check-multi-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ngram-jaccard-check-multi-let.sqlpp
@@ -38,13 +38,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-multi-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-multi-let.adm";
 select element {'Paper':paper_tokens,'Query':query_tokens}
 from  DBLP as paper
 with  paper_tokens as test.`gram-tokens`(paper.title,3,false),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/olist-edit-distance-check-let-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/olist-edit-distance-check-let-panic.sqlpp
index a4e05cc..68106a5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/olist-edit-distance-check-let-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/olist-edit-distance-check-let-panic.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,13 +48,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_olist-edit-distance-check-let-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_olist-edit-distance-check-let-panic.adm";
 select element c
 from  Customers as c
 with  ed as test.`edit-distance-check`(c.interests,['computers','wine','walking'],3)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/olist-edit-distance-check-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/olist-edit-distance-check-let.sqlpp
index 5f12771..7083657 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/olist-edit-distance-check-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/olist-edit-distance-check-let.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,13 +48,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_olist-edit-distance-check-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_olist-edit-distance-check-let.adm";
 select element c
 from  Customers as c
 with  ed as test.`edit-distance-check`(c.interests,['computers','wine','walking'],1)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/olist-jaccard-check-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/olist-jaccard-check-let.sqlpp
index 19fcbdb..a04a8ef 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/olist-jaccard-check-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/olist-jaccard-check-let.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,13 +48,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_olist-jaccard-check-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_olist-jaccard-check-let.adm";
 select element c
 from  Customers as c
 with  jacc as test.`similarity-jaccard-check`(c.interests,['databases','computers','wine'],0.700000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ulist-jaccard-check-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ulist-jaccard-check-let.sqlpp
index 137e22e..ceac8c6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ulist-jaccard-check-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/ulist-jaccard-check-let.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,13 +48,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ulist-jaccard-check-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ulist-jaccard-check-let.adm";
 select element c
 from  Customers as c
 with  jacc as test.`similarity-jaccard-check`(c.interests,['databases','computers','wine'],0.700000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/word-jaccard-check-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/word-jaccard-check-let.sqlpp
index bc56cf9..e4f3b8d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/word-jaccard-check-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/word-jaccard-check-let.sqlpp
@@ -36,13 +36,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-let.adm";
 select element o
 from  DBLP as o
 with  jacc as test.`similarity-jaccard-check`(test.`word-tokens`(o.title),test.`word-tokens`('Transactions for Cooperative Environments'),0.500000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/word-jaccard-check-multi-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/word-jaccard-check-multi-let.sqlpp
index 9b9dea9..56ede6d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/word-jaccard-check-multi-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-complex/word-jaccard-check-multi-let.sqlpp
@@ -36,13 +36,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-multi-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-multi-let.adm";
 select element {'Paper':paper_tokens,'Query':query_tokens}
 from  DBLP as paper
 with  paper_tokens as test.`word-tokens`(paper.title),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline.sqlpp
index 5e9e9ff..c29de43 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline.sqlpp
@@ -37,13 +37,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-edit-distance-inline.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-edit-distance-inline.adm";
 select element {'aauthors':a.authors,'bauthors':b.authors,'ed':ed}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance.sqlpp
index bc82244..767f6f5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -45,7 +45,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -53,7 +53,7 @@
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-edit-distance.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-edit-distance.adm";
 select element {'aauthors':a.authors,'bauthors':b.authors}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-edit-distance.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-edit-distance.sqlpp
index 803a965..1234824 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-edit-distance.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-edit-distance.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -45,7 +45,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -53,7 +53,7 @@
 
 create  index ngram_index  on CSX (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-fuzzyeq-edit-distance.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-fuzzyeq-edit-distance.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-jaccard.sqlpp
index 4f9465c..c050bc9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-jaccard.sqlpp
@@ -38,7 +38,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -47,7 +47,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -55,7 +55,7 @@
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-fuzzyeq-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-fuzzyeq-jaccard.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline.sqlpp
index 80491ee..4fdc637 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline.sqlpp
@@ -39,13 +39,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-jaccard-inline.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-jaccard-inline.adm";
 select element {'atitle':a.title,'btitle':b.title,'jacc':jacc}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard.sqlpp
index 11984de..ca001a0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard.sqlpp
@@ -38,7 +38,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -47,7 +47,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -55,7 +55,7 @@
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-jaccard.adm";
 select element {'atitle':a.title,'btitle':b.title}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline.sqlpp
index 1957b02..40c8c5f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline.sqlpp
@@ -35,7 +35,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -49,13 +49,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-edit-distance-inline.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-edit-distance-inline.adm";
 select element {'ainterests':a.interests,'binterests':b.interests,'ed':ed}
 from  Customers as a,
       Customers as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance.sqlpp
index 5f8c125..38c3cb9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,7 +48,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -56,7 +56,7 @@
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-edit-distance.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-edit-distance.adm";
 select element {'ainterests':a.interests,'binterests':b.interests}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-fuzzyeq-edit-distance.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-fuzzyeq-edit-distance.sqlpp
index 32a875b..4d8cfaa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-fuzzyeq-edit-distance.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-fuzzyeq-edit-distance.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,7 +48,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -56,7 +56,7 @@
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-fuzzyeq-edit-distance.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-fuzzyeq-edit-distance.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-fuzzyeq-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-fuzzyeq-jaccard.sqlpp
index 3bd074d..6ce100b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-fuzzyeq-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-fuzzyeq-jaccard.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,7 +48,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -56,7 +56,7 @@
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-fuzzyeq-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-fuzzyeq-jaccard.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.7f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline.sqlpp
index c3020ff..a003dee 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline.sqlpp
@@ -35,7 +35,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -49,13 +49,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-jaccard-inline.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-jaccard-inline.adm";
 select element {'ainterests':a.interests,'binterests':b.interests,'jacc':jacc}
 from  Customers as a,
       Customers as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard.sqlpp
index 06ba548..e0a1a64 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/olist-jaccard.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,7 +48,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -56,7 +56,7 @@
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-jaccard.adm";
 select element {'ainterests':a.interests,'binterests':b.interests}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ulist-fuzzyeq-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ulist-fuzzyeq-jaccard.sqlpp
index e6a6290..4a1bf06 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ulist-fuzzyeq-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ulist-fuzzyeq-jaccard.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,7 +48,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -56,7 +56,7 @@
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ulist-fuzzyeq-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ulist-fuzzyeq-jaccard.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.7f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline.sqlpp
index fd530b0..1372490 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline.sqlpp
@@ -35,7 +35,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -49,13 +49,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ulist-jaccard-inline.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ulist-jaccard-inline.adm";
 select element {'ainterests':a.interests,'binterests':b.interests,'jacc':jacc}
 from  Customers as a,
       Customers as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard.sqlpp
index 0a1c11d..788c90f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,7 +48,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -56,7 +56,7 @@
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ulist-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ulist-jaccard.adm";
 select element {'ainterests':a.interests,'binterests':b.interests}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/word-fuzzyeq-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/word-fuzzyeq-jaccard.sqlpp
index f2f32c7..d5f0a42 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/word-fuzzyeq-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/word-fuzzyeq-jaccard.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -45,7 +45,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -53,7 +53,7 @@
 
 create  index keyword_index  on DBLP (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_word-fuzzyeq-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_word-fuzzyeq-jaccard.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline.sqlpp
index 98636bc..9530163 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline.sqlpp
@@ -37,13 +37,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_word-jaccard-inline.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_word-jaccard-inline.adm";
 select element {'atitle':a.title,'btitle':b.title,'jacc':jacc}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard.sqlpp
index 7119e1c..89305c3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -45,7 +45,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -53,7 +53,7 @@
 
 create  index keyword_index  on DBLP (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_word-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_word-jaccard.adm";
 select element {'atitle':a.title,'btitle':b.title}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/issue741.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/issue741.sqlpp
index 66c5fb9..5a312b3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/issue741.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/issue741.sqlpp
@@ -37,7 +37,7 @@
   statuses_count : integer,
   name : string,
   followers_count : integer
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -47,13 +47,13 @@
   send_time : datetime,
   referred_topics : {{string}},
   message_text : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
 create  index topicIIx  on TweetMessages (referred_topics) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_issue741.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_issue741.adm";
 select element {'tweet':t.tweetid,'similar-tweets':(
         select element t2.tweetid
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp
index e66adef..8c2869f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
  closed {
@@ -49,7 +49,7 @@
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
@@ -65,7 +65,7 @@
 
 create  index topicKeywordIx  on TweetMessages (`referred-topics`) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-edit-distance-check_idx_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-edit-distance-check_idx_01.adm";
 select element {'tweet':{'id':t1.tweetid,'topics':t1.`message-text`},'similar-tweets':(
         select element {'id':t2.tweetid,'topics':t2.`message-text`}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.sqlpp
index f3981f9..9db0bd7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
  closed {
@@ -49,7 +49,7 @@
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
@@ -65,7 +65,7 @@
 
 create  index topicKeywordIx  on TweetMessages (`referred-topics`) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-jaccard-check_idx_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-jaccard-check_idx_01.adm";
 select element {'tweet':{'id':t1.tweetid,'topics':t1.`referred-topics`},'similar-tweets':(
         select element {'id':t2.tweetid,'topics':t2.`referred-topics`}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-contains.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-contains.sqlpp
index a17a215..ebec6c0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-contains.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-contains.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains.adm";
 select element {'title1':o1.title,'title2':o2.title}
 from  DBLP as o1,
       DBLP as o2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-check_01.sqlpp
index 836e150..04cc151 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-check_01.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -44,7 +44,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-check_02.sqlpp
index 162ad16..a6ade32 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-check_02.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -44,7 +44,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index ngram_index  on CSX (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-check_03.sqlpp
index c371ca3..ed8d6b6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-check_03.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_03.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-check_04.sqlpp
index ae96014..7a24772 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-check_04.sqlpp
@@ -36,13 +36,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_04.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_04.adm";
 select element {'arec':a,'brec':b,'ed':ed[1]}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-contains.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-contains.sqlpp
index 3ebcdb1..ec44939 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-contains.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance-contains.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -44,7 +44,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-contains.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-contains.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance_01.sqlpp
index 277d76b..e2b15f4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance_01.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -44,7 +44,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance_02.sqlpp
index e76e0b9..950a058 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance_02.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -44,7 +44,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index ngram_index  on CSX (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance_03.sqlpp
index 7cf62b8..dc8ca3c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance_03.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_03.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance_04.sqlpp
index f0f6f65..0284ff4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-edit-distance_04.sqlpp
@@ -36,13 +36,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_03.adm";
 select element {'arec':a,'brec':b,'ed':ed}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp
index a73585e..2021605 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -44,7 +44,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index ngram_index  on CSX (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_02.sqlpp
index f6912de..89f1354 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_02.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -44,7 +44,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp
index 6255c8c..d900a72 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_03.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp
index 2116e22..7c08462 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -46,7 +46,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -54,7 +54,7 @@
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_02.sqlpp
index 9d3623b..aac9ca7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_02.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -46,7 +46,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -54,7 +54,7 @@
 
 create  index ngram_index  on CSX (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_02.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_03.sqlpp
index fc02f8b..d3bcd49 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_03.sqlpp
@@ -37,13 +37,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_03.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard-check_01.sqlpp
index c4a99f8..60a1d7e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard-check_01.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -46,7 +46,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -54,7 +54,7 @@
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard-check_02.sqlpp
index 3590c5b..460f1cc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard-check_02.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -46,7 +46,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -54,7 +54,7 @@
 
 create  index ngram_index  on CSX (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard-check_03.sqlpp
index 6e4e9c6..5e180f2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard-check_03.sqlpp
@@ -37,13 +37,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_03.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard-check_04.sqlpp
index b97087b..2b9aa31 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard-check_04.sqlpp
@@ -38,13 +38,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_04.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_04.adm";
 select element {'arec':a,'brec':b,'jacc':jacc[1]}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard_01.sqlpp
index 72ed597..0057551 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard_01.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -46,7 +46,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -54,7 +54,7 @@
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard_02.sqlpp
index 826466c..a2dc8f2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard_02.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -46,7 +46,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -54,7 +54,7 @@
 
 create  index ngram_index  on CSX (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard_03.sqlpp
index 7ebf65c..fbc230c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard_03.sqlpp
@@ -37,13 +37,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_03.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard_04.sqlpp
index 3d24090..5265874 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ngram-jaccard_04.sqlpp
@@ -38,13 +38,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_04.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_04.adm";
 select element {'arec':a,'brec':b,'jacc':jacc}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance-check_01.sqlpp
index f3936c2..c14501c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance-check_01.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance-check_01.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance-check_02.sqlpp
index 2afae71..f7e6047 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance-check_02.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
 
 create  index interests_index  on Customers2 (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance-check_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance-check_02.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance-check_03.sqlpp
index c91bfe8..6435990 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance-check_03.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance-check_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance-check_03.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance-check_04.sqlpp
index 4b53454..9f14368 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance-check_04.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,13 +48,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance-check_04.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance-check_04.adm";
 select element {'arec':a,'brec':b,'ed':ed[1]}
 from  Customers as a,
       Customers as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_01.sqlpp
index 723baa7..719314e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_01.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance_01.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_02.sqlpp
index 80a0c53..5ebb518 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_02.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
 
 create  index interests_index  on Customers2 (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance_02.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_03.sqlpp
index fad377a..ac7e6ba 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_03.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance_03.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_04.sqlpp
index d64739d..0655746 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-edit-distance_04.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,13 +48,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance_04.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance_04.adm";
 select element {'arec':a,'brec':b,'ed':ed}
 from  Customers as a,
       Customers as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_01.sqlpp
index 1fbf49b..cecfbc9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_01.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_01.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_02.sqlpp
index d26182d..cd3d74f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_02.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
 
 create  index interests_index  on Customers2 (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_02.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_03.sqlpp
index a77750c..a184602 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_03.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_03.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_01.sqlpp
index 098fa68..39dde72 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_01.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.7f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_02.sqlpp
index e01c162..c1f3af7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_02.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
 
 create  index interests_index  on Customers2 (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_02.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.7f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_03.sqlpp
index 5287ad7..573f5e2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_03.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_03.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.7f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_01.sqlpp
index f27f727..b67a1af 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_01.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_02.sqlpp
index eb5a9fa..c9cbd1c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_02.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
 
 create  index interests_index  on Customers2 (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard-check_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard-check_02.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_03.sqlpp
index c13123e..6364474 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_03.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard-check_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard-check_03.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_04.sqlpp
index 4a54031..bd84396 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard-check_04.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,13 +48,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard-check_04.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard-check_04.adm";
 select element {'arec':a,'brec':b,'jacc':jacc[1]}
 from  Customers as a,
       Customers as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_01.sqlpp
index 214185f..deaecd7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_01.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_02.sqlpp
index dcbb3fb..b6bea6a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_02.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
 
 create  index interests_index  on Customers2 (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard_02.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_03.sqlpp
index 87a6ae1..3359746 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_03.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard_03.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_04.sqlpp
index 3c65c4d..941d506 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/olist-jaccard_04.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,13 +48,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard_04.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard_04.adm";
 select element {'arec':a,'brec':b,'jacc':jacc}
 from  Customers as a,
       Customers as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_01.sqlpp
index ffc00f3..2b42131 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_01.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ulist-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.7f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_02.sqlpp
index 1aa1e88..5c46ddc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_02.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
 
 create  index interests_index  on Customers2 (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-fuzzyeq-jaccard_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ulist-fuzzyeq-jaccard_02.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.7f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_03.sqlpp
index 639277b..b874be2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_03.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-fuzzyeq-jaccard_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ulist-fuzzyeq-jaccard_03.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.7f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_01.sqlpp
index 063b175..66ac460 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_01.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_02.sqlpp
index 0ff2274..2a771e3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_02.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
 
 create  index interests_index  on Customers2 (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard-check_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard-check_02.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_03.sqlpp
index 33af845..8d71bb6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_03.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard-check_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard-check_03.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_04.sqlpp
index 86abbd1..476db19 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard-check_04.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,13 +48,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard-check_04.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard-check_04.adm";
 select element {'arec':a,'brec':b,'jacc':jacc[1]}
 from  Customers as a,
       Customers as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_01.sqlpp
index f9868c4..a2fd26d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_01.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_02.sqlpp
index ff32984..287ef06 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_02.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
 
 create  index interests_index  on Customers2 (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard_02.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_03.sqlpp
index 44c325e..bc7b1cd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_03.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,13 +47,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard_03.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_04.sqlpp
index b95c2d1..77c26cf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/ulist-jaccard_04.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,13 +48,13 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
 create  index interests_index  on Customers (interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard_04.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard_04.adm";
 select element {'arec':a,'brec':b,'jacc':jacc}
 from  Customers as a,
       Customers as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
index c37c670..33e781d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -44,7 +44,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index keyword_index  on DBLP (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
index ead8c37..e2158e1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -44,7 +44,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index keyword_index  on CSX (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_02.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
index 1e3fa3d..c6c38b7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_03.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
index b6569e4..50d2442 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
@@ -38,7 +38,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
  closed {
@@ -50,7 +50,7 @@
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
@@ -62,7 +62,7 @@
 
 create  index msgTextIx  on TweetMessages (`message-text`) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check-after-btree-access.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check-after-btree-access.adm";
 select element {'t1':t1.tweetid,'t2':t2.tweetid,'sim':sim[1]}
 from  TweetMessages as t1,
       TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_01.sqlpp
index df82121..79d4834 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_01.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -44,7 +44,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index keyword_index  on DBLP (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_02.sqlpp
index 0e6da99..0c2890a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_02.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -44,7 +44,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index keyword_index  on CSX (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_03.sqlpp
index 391d7ad..fdf6235 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_03.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_03.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_04.sqlpp
index 5332721..8eb16d7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard-check_04.sqlpp
@@ -36,13 +36,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_04.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_04.adm";
 select element {'arec':a,'brec':b,'jacc':jacc[1]}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_01.sqlpp
index 2670fd7..50e657a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_01.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -44,7 +44,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index keyword_index  on DBLP (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_02.sqlpp
index b5e307c..b943eec 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_02.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -44,7 +44,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index keyword_index  on CSX (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_03.sqlpp
index 1bb7c3c..37a119b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_03.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_03.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_04.sqlpp
index 0d4848a..584522a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inverted-index-join/word-jaccard_04.sqlpp
@@ -36,13 +36,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_04.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_04.adm";
 select element {'arec':a,'brec':b,'jacc':jacc}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_01.sqlpp
index edcfdda..0e7fc0b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_01.sqlpp
@@ -32,7 +32,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type `join-super-key_1`.NationType as
  closed {
@@ -40,7 +40,7 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type `join-super-key_1`.LineItemType as
  closed {
@@ -60,7 +60,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type `join-super-key_1`.PartType as
  closed {
@@ -73,7 +73,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type `join-super-key_1`.PartSuppType as
  closed {
@@ -82,13 +82,13 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;
-write output to asterix_nc1:"/tmp/join-super-key_01.adm"
+write output to asterix_nc1:"/tmp/join-super-key_01.adm";
 create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
 
 create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_02.sqlpp
index 99330f9..7247cdc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_02.sqlpp
@@ -32,7 +32,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type `join-super-key_01`.NationType as
  closed {
@@ -40,7 +40,7 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type `join-super-key_01`.LineItemType as
  closed {
@@ -60,7 +60,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type `join-super-key_01`.PartType as
  closed {
@@ -73,7 +73,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type `join-super-key_01`.PartSuppType as
  closed {
@@ -82,13 +82,13 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;
-write output to asterix_nc1:"/tmp/join-super-key_01.adm"
+write output to asterix_nc1:"/tmp/join-super-key_01.adm";
 create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
 
 create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/limit-issue353.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/limit-issue353.sqlpp
index 12d0d0c..86ce33b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/limit-issue353.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/limit-issue353.sqlpp
@@ -47,11 +47,11 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
-write output to asterix_nc1:"/tmp/push_limit.adm"
+write output to asterix_nc1:"/tmp/push_limit.adm";
 select element {'l_returnflag':l.l_returnflag,'l_linestatus':l.l_linestatus,'l_shipmode':l.l_shipmode}
 from  LineItem as l
 limit 2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_01.sqlpp
index 05e1ef4..38bd3e3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_01.sqlpp
@@ -32,7 +32,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type `loj-super-key_01`.NationType as
  closed {
@@ -40,7 +40,7 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type `loj-super-key_01`.LineItemType as
  closed {
@@ -60,7 +60,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type `loj-super-key_01`.PartType as
  closed {
@@ -73,7 +73,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type `loj-super-key_01`.PartSuppType as
  closed {
@@ -82,13 +82,13 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;
-write output to asterix_nc1:"/tmp/loj-super-key_01.adm"
+write output to asterix_nc1:"/tmp/loj-super-key_01.adm";
 create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
 
 create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_02.sqlpp
index 3c90742..9705785 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_02.sqlpp
@@ -32,7 +32,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type `loj-super-key_02`.NationType as
  closed {
@@ -40,7 +40,7 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type `loj-super-key_02`.LineItemType as
  closed {
@@ -60,7 +60,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type `loj-super-key_02`.PartType as
  closed {
@@ -73,7 +73,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type `loj-super-key_02`.PartSuppType as
  closed {
@@ -82,13 +82,13 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;
-write output to asterix_nc1:"/tmp/loj-super-key_01.adm"
+write output to asterix_nc1:"/tmp/loj-super-key_01.adm";
 create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
 
 create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nest_aggregate.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nest_aggregate.sqlpp
index 1c2e4c9..174856f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nest_aggregate.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nest_aggregate.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -91,7 +91,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -100,7 +100,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/disjunction-to-join.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/disjunction-to-join.sqlpp
index edfef0c..a20c847 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/disjunction-to-join.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/disjunction-to-join.sqlpp
@@ -31,14 +31,14 @@
 create type test.NestedTestType as
 {
   idx : string
-}
+};
 
 create type test.TestType as
 {
   id : string,
   `no-idx` : string,
   nested : NestedTestType
-}
+};
 
 create  dataset TestSet(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.sqlpp
index e43686a..b6d1a58 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,18 +49,18 @@
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
 create  index msgCountBIx  on TweetMessages (nested.countB) type btree;
 
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm";
 select element {'tweetid1':t1.nested.tweetid,'count1':t1.nested.countA,'t2info':(
         select element {'tweetid2':t2.nested.tweetid,'count2':t2.nested.countB}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.sqlpp
index c1a5d31..c92304a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,18 +49,18 @@
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
 create  index msgCountBIx  on TweetMessages (nested.countB) type btree;
 
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm";
 select element {'tweetid1':t1.nested.tweetid,'count1':t1.nested.countA,'t2info':(
         select element {'tweetid2':t2.nested.tweetid,'count2':t2.nested.countB}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_01.sqlpp
index f98bbe4..4e864f4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_01.sqlpp
@@ -33,16 +33,16 @@
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.Name as
 {
   nested : Nametmp
-}
+};
 
 create  dataset Names(Name) primary key nested.fname,nested.lname;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_01.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_02.sqlpp
index e258bed..bf04345 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_02.sqlpp
@@ -33,16 +33,16 @@
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.Name as
 {
   nested : Nametmp
-}
+};
 
 create  dataset Names(Name) primary key nested.fname,nested.lname;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_02.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_03.sqlpp
index 88a49e4..c3c074a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-join_03.sqlpp
@@ -33,16 +33,16 @@
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.Name as
 {
   nested : Nametmp
-}
+};
 
 create  dataset Names(Name) primary key nested.fname,nested.lname;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_03.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_03.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_01.sqlpp
index 1256c80..79a5709 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_01.sqlpp
@@ -33,16 +33,16 @@
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.Name as
 {
   nested : Nametmp
-}
+};
 
 create  dataset Names(Name) primary key nested.fname,nested.lname;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_01.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_02.sqlpp
index a974c25..824f076 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_02.sqlpp
@@ -33,16 +33,16 @@
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.Name as
 {
   nested : Nametmp
-}
+};
 
 create  dataset Names(Name) primary key nested.fname,nested.lname;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_02.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_03.sqlpp
index 4725180..eff456b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_03.sqlpp
@@ -33,16 +33,16 @@
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.Name as
 {
   nested : Nametmp
-}
+};
 
 create  dataset Names(Name) primary key nested.fname,nested.lname;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_03.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_03.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_04.sqlpp
index f2d0a26..726b78e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_04.sqlpp
@@ -33,16 +33,16 @@
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.Name as
 {
   nested : Nametmp
-}
+};
 
 create  dataset Names(Name) primary key nested.fname,nested.lname;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_04.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_04.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_05.sqlpp
index c46863d..2841b8d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_05.sqlpp
@@ -33,16 +33,16 @@
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.Name as
 {
   nested : Nametmp
-}
+};
 
 create  dataset Names(Name) primary key nested.fname,nested.lname;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_05.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_05.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_06.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_06.sqlpp
index f98307f..dc9beef 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_06.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_06.sqlpp
@@ -33,16 +33,16 @@
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.Name as
 {
   nested : Nametmp
-}
+};
 
 create  dataset Names(Name) primary key nested.fname,nested.lname;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_06.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_06.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join-multipred.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join-multipred.sqlpp
index 681a955..5d3c7ab 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join-multipred.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join-multipred.sqlpp
@@ -36,7 +36,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -49,7 +49,7 @@
       total : float
   }
 
-}
+};
 
 create type test.OrderTypetmp as
  closed {
@@ -59,23 +59,23 @@
   orderpriority : string,
   clerk : string,
   total : float
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create type test.OrderType as
  closed {
   nested : OrderTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
 create  dataset Orders(OrderType) primary key nested.oid;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-multipred.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-multipred.adm";
 select element {'customer':c.nested,'order':o.nested}
 from  Customers as c,
       Orders as o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join-neg_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join-neg_01.sqlpp
index 2f2d30b..3debb01 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join-neg_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join-neg_01.sqlpp
@@ -32,18 +32,18 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test1.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key nested.key1;
 
 create  dataset test1.DsTwo(TestType) primary key nested.key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-neg_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-neg_01.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_01.sqlpp
index 793ca8e..7ed0a41 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_01.sqlpp
@@ -32,18 +32,18 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test1.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key nested.key1;
 
 create  dataset test1.DsTwo(TestType) primary key nested.key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_01.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_02.sqlpp
index 4606a4b..421b65d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_02.sqlpp
@@ -32,18 +32,18 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test1.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key nested.key1;
 
 create  dataset test1.DsTwo(TestType) primary key nested.key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_02.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_03.sqlpp
index e786edb..3c73233 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_03.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,7 +47,7 @@
       total : float
   }
 
-}
+};
 
 create type test.OrderTypetmp as
  closed {
@@ -57,23 +57,23 @@
   orderpriority : string,
   clerk : string,
   total : float
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create type test.OrderType as
  closed {
   nested : OrderTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
 create  dataset Orders(OrderType) primary key nested.oid;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_04.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_04.adm";
 select element {'customer':c.nested,'order':o.nested}
 from  Customers as c,
       Orders as o
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_04.sqlpp
index fc552b1..67e874c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_04.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,7 +47,7 @@
       total : float
   }
 
-}
+};
 
 create type test.OrderTypetmp as
  closed {
@@ -57,23 +57,23 @@
   orderpriority : string,
   clerk : string,
   total : float
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create type test.OrderType as
  closed {
   nested : OrderTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
 create  dataset Orders(OrderType) primary key nested.oid;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_05.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_05.adm";
 select element {'customer':c.nested,'order':o.nested}
 from  Orders as o,
       Customers as c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_05.sqlpp
index 35a3754..32be61e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-equi-join_05.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,16 +47,16 @@
       total : float
   }
 
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_06.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_06.adm";
 select element {'customer1':c1.nested,'customer2':c2.nested}
 from  Customers as c1,
       Customers as c2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-ge-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-ge-join_01.sqlpp
index 9777a43..434c47d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-ge-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-ge-join_01.sqlpp
@@ -32,18 +32,18 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test1.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key nested.key1;
 
 create  dataset test1.DsTwo(TestType) primary key nested.key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-ge-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-ge-join_01.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-gt-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-gt-join_01.sqlpp
index ede66d5..45827bf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-gt-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-gt-join_01.sqlpp
@@ -32,18 +32,18 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test1.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key nested.key1;
 
 create  dataset test1.DsTwo(TestType) primary key nested.key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-gt-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-gt-join_01.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-le-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-le-join_01.sqlpp
index 82775e7..a2029f3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-le-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-le-join_01.sqlpp
@@ -32,18 +32,18 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test1.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key nested.key1;
 
 create  dataset test1.DsTwo(TestType) primary key nested.key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-le-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-le-join_01.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-lt-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-lt-join_01.sqlpp
index 039fa07..20e535f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-lt-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/primary-lt-join_01.sqlpp
@@ -32,18 +32,18 @@
   key2 : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test1.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset test1.DsOne(TestType) primary key nested.key1;
 
 create  dataset test1.DsTwo(TestType) primary key nested.key1;
 
-write output to asterix_nc1:"rttest/btree-index-join_primary-lt-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_primary-lt-join_01.adm";
 select element x
 from  `test1.DsOne` as x,
       `test1.DsTwo` as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/secondary-equi-join-multiindex.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/secondary-equi-join-multiindex.sqlpp
index aac2e50..3bbf0e0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/secondary-equi-join-multiindex.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/secondary-equi-join-multiindex.sqlpp
@@ -36,7 +36,7 @@
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type test.FacebookUserTypetmp as
  closed {
@@ -48,7 +48,7 @@
   `user-since-copy` : datetime,
   `friend-ids` : {{integer}},
   employment : [EmploymentType]
-}
+};
 
 create type test.FacebookMessageTypetmp as
  closed {
@@ -59,17 +59,17 @@
   `in-response-to` : integer?,
   `sender-location` : point?,
   message : string
-}
+};
 
 create type test.FacebookUserType as
  closed {
   nested : FacebookUserTypetmp
-}
+};
 
 create type test.FacebookMessageType as
  closed {
   nested : FacebookMessageTypetmp
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key nested.id;
 
@@ -77,7 +77,7 @@
 
 create  index fbmIdxAutId  if not exists  on FacebookMessages (nested.`author-id-copy`) type btree;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multiindex.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multiindex.adm";
 select element {'fbu-ID':user.nested.id,'fbm-auth-ID':message.nested.`author-id`,'uname':user.nested.name,'message':message.nested.message}
 from  FacebookUsers as user,
       FacebookMessages as message
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/secondary-equi-join-multipred.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/secondary-equi-join-multipred.sqlpp
index 2963a26..2c0a77f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/secondary-equi-join-multipred.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/secondary-equi-join-multipred.sqlpp
@@ -38,7 +38,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -47,17 +47,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -65,7 +65,7 @@
 
 create  index title_index  on DBLP (nested.title) type btree;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multipred.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multipred.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/secondary-equi-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/secondary-equi-join_01.sqlpp
index eeddff9..67c5afb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/secondary-equi-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index-join/secondary-equi-join_01.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -45,17 +45,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -63,7 +63,7 @@
 
 create  index title_index  on DBLP (nested.title) type btree;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-01.sqlpp
index 60d8cca..af9ce63 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-01.sqlpp
@@ -29,17 +29,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-01.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-01.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-02.sqlpp
index d760d38..c653731 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-02.sqlpp
@@ -29,17 +29,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-02.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-02.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-03.sqlpp
index 690d5d0..689b3d7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-03.sqlpp
@@ -29,17 +29,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-03.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-03.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-04.sqlpp
index ecbeda5..56b6f37 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-04.sqlpp
@@ -29,17 +29,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-04.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-04.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-05.sqlpp
index cc25e32..1223043 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-05.sqlpp
@@ -29,17 +29,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-05.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-05.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-06.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-06.sqlpp
index 62f0504..d530d0e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-06.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-06.sqlpp
@@ -29,17 +29,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-06.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-06.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-07.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-07.sqlpp
index dc2d7f1..deee36b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-07.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-07.sqlpp
@@ -29,17 +29,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-07.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-07.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-08.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-08.sqlpp
index 68df4c2..0c21eaa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-08.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-08.sqlpp
@@ -28,17 +28,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-08.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-08.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-09.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-09.sqlpp
index abc28e6..f343db9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-09.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-09.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-09.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-09.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-10.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-10.sqlpp
index 23ead3b..dedde55 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-10.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-10.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-10.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-10.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-11.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-11.sqlpp
index ba77a69..2efc179 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-11.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-11.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-11.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-11.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-12.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-12.sqlpp
index a9d6e6e..8f61a7f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-12.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-12.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-12.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-12.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-13.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-13.sqlpp
index 24719f2..85c6606 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-13.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-13.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-13.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-13.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-14.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-14.sqlpp
index aa557e9..8662c7b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-14.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-14.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-14.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-14.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-15.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-15.sqlpp
index ec6394c..4222b7f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-15.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-15.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-15.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-15.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-16.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-16.sqlpp
index d556e6b..63a6221 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-16.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-16.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-16.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-16.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-17.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-17.sqlpp
index bcfcf58..e41e972 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-17.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-17.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-17.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-17.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-18.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-18.sqlpp
index 075f684..33bd030 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-18.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-18.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-18.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-18.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-19.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-19.sqlpp
index 4741ac6..886da30 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-19.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-19.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-19.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-19.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-20.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-20.sqlpp
index e9c7e32..88f8290 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-20.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-20.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-20.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-20.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-21.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-21.sqlpp
index 2b39082..818f373 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-21.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-21.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-21.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-21.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-22.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-22.sqlpp
index 0baed6c..cbbf38c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-22.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-22.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-22.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-22.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-23.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-23.sqlpp
index b221078..3312363 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-23.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-23.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-23.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-23.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-24.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-24.sqlpp
index d867b3d..4617096 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-24.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-24.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-24.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-24.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-25.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-25.sqlpp
index 35acebf..e1ce9bc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-25.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-25.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-25.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-25.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-26.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-26.sqlpp
index ac37e84..34f7225 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-26.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-26.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-26.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-26.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-27.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-27.sqlpp
index 3c971e8..a5daa7f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-27.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-27.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-27.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-27.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-28.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-28.sqlpp
index ef574c8..426fb73 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-28.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-28.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-28.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-28.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-29.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-29.sqlpp
index c43685a..7792ede 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-29.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-29.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-29.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-29.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-30.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-30.sqlpp
index 6da097d..0328442 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-30.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-30.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-30.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-30.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-31.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-31.sqlpp
index 1d7ae08..116e519 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-31.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-31.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-31.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-31.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-32.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-32.sqlpp
index 12842d1..9bb3e6e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-32.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-primary-32.sqlpp
@@ -30,17 +30,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-32.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-32.adm";
 create type test.TestTypetmp as
 {
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.fname,nested.lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-33.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-33.sqlpp
index 00ade29..062adc8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-33.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-33.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-31.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-31.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-34.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-34.sqlpp
index 7dc4131..28f3f58 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-34.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-34.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-32.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-32.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-35.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-35.sqlpp
index 013e792..b66df57 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-35.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-35.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-33.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-33.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-36.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-36.sqlpp
index 1d1254b..7c1a0be 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-36.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-36.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-34.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-34.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-37.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-37.sqlpp
index 6cd94ad..7d8eb2c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-37.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-37.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-35.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-35.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-38.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-38.sqlpp
index e847978..fe8b51c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-38.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-38.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-36.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-36.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-39.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-39.sqlpp
index d61f456..6967efb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-39.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-39.sqlpp
@@ -29,18 +29,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-37.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-37.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-40.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-40.sqlpp
index bde5ca4..d27d758 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-40.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-40.sqlpp
@@ -29,18 +29,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-38.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-38.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-41.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-41.sqlpp
index e917d5f..60b47c4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-41.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-41.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-39.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-39.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-42.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-42.sqlpp
index ff30890..6746e1e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-42.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-42.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-40.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-40.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-43.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-43.sqlpp
index 9ade4cd..cd5fbd0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-43.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-43.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-41.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-41.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-44.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-44.sqlpp
index 9bc8e3d..795a72a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-44.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-44.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-42.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-42.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-45.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-45.sqlpp
index 2363f88..3df1d41 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-45.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-45.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-43.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-43.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-46.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-46.sqlpp
index 9dec507..1c1e684 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-46.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-46.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-44.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-44.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-47.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-47.sqlpp
index d8b32a3..31d2013 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-47.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-47.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-45.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-45.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-48.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-48.sqlpp
index 0f06408..474a719 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-48.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-48.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-46.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-46.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-49.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-49.sqlpp
index 713daa0..bfc1ea5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-49.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-49.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-47.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-47.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-50.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-50.sqlpp
index 1c47540..6c4b63e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-50.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-50.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-48.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-48.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-51.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-51.sqlpp
index 5da33da..bc9fdaf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-51.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-51.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-49.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-49.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-52.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-52.sqlpp
index 26c9b94..9f3682c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-52.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-52.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-50.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-50.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-53.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-53.sqlpp
index 39934e5..3b35ddf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-53.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-53.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-51.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-51.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-54.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-54.sqlpp
index 99ad5da..9ada29c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-54.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-54.sqlpp
@@ -29,18 +29,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-52.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-52.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-55.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-55.sqlpp
index 3f96b16..a29b0a7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-55.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-55.sqlpp
@@ -29,18 +29,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-53.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-53.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-56.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-56.sqlpp
index 5ea3933..7592325 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-56.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-56.sqlpp
@@ -29,18 +29,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-54.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-54.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-57.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-57.sqlpp
index b65f432..61ad846 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-57.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-57.sqlpp
@@ -29,18 +29,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-55.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-55.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-58.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-58.sqlpp
index 4e483bb..f527712 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-58.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-58.sqlpp
@@ -29,18 +29,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-56.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-56.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-59.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-59.sqlpp
index cc92137..01bd660 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-59.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-59.sqlpp
@@ -29,18 +29,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-57.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-57.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-60.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-60.sqlpp
index cd22ece..85e778e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-60.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-60.sqlpp
@@ -29,18 +29,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-58.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-58.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-61.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-61.sqlpp
index 3c4a3f7..dfe6a06 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-61.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-61.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-61.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-61.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-62.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-62.sqlpp
index 55748c8..baf2887 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-62.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-62.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-62.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-62.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-63.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-63.sqlpp
index dbe35e4..405a8ae 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-63.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/btree-index/btree-secondary-63.sqlpp
@@ -30,18 +30,18 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-63.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-63.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-contains-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-contains-panic.sqlpp
index c498c36..0062d60 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-contains-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-contains-panic.sqlpp
@@ -35,18 +35,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains-panic.adm";
 select element o
 from  DBLP as o
 where test.contains(o.nested.title,'Mu')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-contains.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-contains.sqlpp
index 308fb0d..ba8cc73 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-contains.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-contains.sqlpp
@@ -35,18 +35,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains.adm";
 select element o
 from  DBLP as o
 where test.contains(o.nested.title,'Multimedia')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check-panic.sqlpp
index c570e5a..4b2abe6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check-panic.sqlpp
@@ -35,18 +35,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check-panic.adm";
 select element o
 from  DBLP as o
 with  ed as test.`edit-distance-check`(o.nested.authors,'Amihay Motro',5)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check.sqlpp
index f088f1d..1bf50d0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check.sqlpp
@@ -35,18 +35,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check.adm";
 select element o
 from  DBLP as o
 where test.`edit-distance-check`(o.nested.authors,'Amihay Motro',1)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-panic.sqlpp
index cd4ca4b..df59b6f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-panic.sqlpp
@@ -35,18 +35,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-panic.adm";
 select element o
 from  DBLP as o
 where (test.`edit-distance`(o.nested.authors,'Amihay Motro') <= 5)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance.sqlpp
index 62866fa..8649d19 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance.sqlpp
@@ -35,18 +35,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance.adm";
 select element o
 from  DBLP as o
 where (test.`edit-distance`(o.nested.authors,'Amihay Motro') <= 1)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.sqlpp
index 88c037d..5898c33 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.sqlpp
@@ -35,18 +35,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-edit-distance.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-edit-distance.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `1`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-jaccard.sqlpp
index de7bfef..b72c853 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-jaccard.sqlpp
@@ -37,18 +37,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-jaccard.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.8f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-jaccard-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-jaccard-check.sqlpp
index 1958146..08b09e6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-jaccard-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-jaccard-check.sqlpp
@@ -37,18 +37,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard-check.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard-check.adm";
 select element o
 from  DBLP as o
 where test.`similarity-jaccard-check`(test.`gram-tokens`(o.nested.title,3,false),test.`gram-tokens`('Transactions for Cooperative Environments',3,false),0.500000f)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-jaccard.sqlpp
index cf5da2c..fa1a246 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ngram-jaccard.sqlpp
@@ -37,18 +37,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard.adm";
 select element o
 from  DBLP as o
 where (test.`similarity-jaccard`(test.`gram-tokens`(o.nested.title,3,false),test.`gram-tokens`('Transactions for Cooperative Environments',3,false)) >= 0.500000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check-panic.sqlpp
index b66d87b..81e7ae9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check-panic.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,12 +47,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -60,7 +60,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance-check-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance-check-panic.adm";
 select element c
 from  Customers as c
 where test.`edit-distance-check`(c.nested.interests,['computers','wine','walking'],3)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check.sqlpp
index a8a6326..8c113d1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,12 +47,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -60,7 +60,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance-check.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance-check.adm";
 select element c
 from  Customers as c
 where test.`edit-distance-check`(c.nested.interests,['computers','wine','walking'],1)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-panic.sqlpp
index ea86c45..74d2796 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-panic.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,12 +47,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -60,7 +60,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance-panic.adm";
 select element c
 from  Customers as c
 where (test.`edit-distance`(c.nested.interests,['computers','wine','walking']) <= 3)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-edit-distance.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-edit-distance.sqlpp
index 61a7539..2103dc6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-edit-distance.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-edit-distance.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,12 +47,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -60,7 +60,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance.adm";
 select element c
 from  Customers as c
 where (test.`edit-distance`(c.nested.interests,['computers','wine','walking']) <= 1)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-edit-distance.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-edit-distance.sqlpp
index eb98cda..53fe1ab 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-edit-distance.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-edit-distance.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,18 +47,18 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-fuzzyeq-edit-distance.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-fuzzyeq-edit-distance.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `1`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-jaccard.sqlpp
index c3e6f33..fb4b646 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-jaccard.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,18 +47,18 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-fuzzyeq-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-fuzzyeq-jaccard.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.8f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-jaccard-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-jaccard-check.sqlpp
index af74f96..6d7e181 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-jaccard-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-jaccard-check.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,18 +47,18 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-jaccard-check.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-jaccard-check.adm";
 select element c
 from  Customers as c
 where test.`similarity-jaccard-check`(c.nested.interests,['databases','computers','wine'],0.700000f)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-jaccard.sqlpp
index 7d2b86a..e148b25 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/olist-jaccard.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,12 +47,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -60,7 +60,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_olist-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-jaccard.adm";
 select element c
 from  Customers as c
 where (test.`similarity-jaccard`(c.nested.interests,['databases','computers','wine']) >= 0.700000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ulist-fuzzyeq-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ulist-fuzzyeq-jaccard.sqlpp
index bc1f903..507ae3d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ulist-fuzzyeq-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ulist-fuzzyeq-jaccard.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,12 +47,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -60,7 +60,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ulist-fuzzyeq-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ulist-fuzzyeq-jaccard.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.8f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ulist-jaccard-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ulist-jaccard-check.sqlpp
index d1a2464..f4eb512 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ulist-jaccard-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ulist-jaccard-check.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,12 +47,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -60,7 +60,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ulist-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ulist-jaccard.adm";
 select element c
 from  Customers as c
 where test.`similarity-jaccard-check`(c.nested.interests,{{'computers','wine','databases'}},0.700000f)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ulist-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ulist-jaccard.sqlpp
index 8b6e2f2..fa54a39 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ulist-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/ulist-jaccard.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,12 +47,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -60,7 +60,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ulist-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ulist-jaccard.adm";
 select element c
 from  Customers as c
 where (test.`similarity-jaccard`(c.nested.interests,{{'computers','databases','wine'}}) >= 0.700000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/word-contains.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/word-contains.sqlpp
index 23f7df6..09b06b2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/word-contains.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/word-contains.sqlpp
@@ -35,18 +35,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index keyword_index  on DBLP (nested.title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_word-contains.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_word-contains.adm";
 select element o
 from  DBLP as o
 where test.contains(o.nested.title,'Multimedia')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.sqlpp
index 8ee8648..9d5fa37 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.sqlpp
@@ -35,18 +35,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index keyword_index  on DBLP (nested.title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_word-fuzzyeq-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_word-fuzzyeq-jaccard.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/word-jaccard-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/word-jaccard-check.sqlpp
index 161f08a..8296b81 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/word-jaccard-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/word-jaccard-check.sqlpp
@@ -35,18 +35,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index keyword_index  on DBLP (nested.title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard-check.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard-check.adm";
 select element o
 from  DBLP as o
 where test.`similarity-jaccard-check`(test.`word-tokens`(o.nested.title),test.`word-tokens`('Transactions for Cooperative Environments'),0.500000f)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/word-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/word-jaccard.sqlpp
index e1d8685..24db418 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/word-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-basic/word-jaccard.sqlpp
@@ -35,18 +35,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index keyword_index  on DBLP (nested.title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard.adm";
 select element o
 from  DBLP as o
 where (test.`similarity-jaccard`(test.`word-tokens`(o.nested.title),test.`word-tokens`('Transactions for Cooperative Environments')) >= 0.500000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.sqlpp
index b4e46ee..25b6fca 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.sqlpp
@@ -37,18 +37,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm";
 select element o
 from  DBLP as o
 with  eda as test.`edit-distance-check`(o.nested.authors,'Amihay Motro',3),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.sqlpp
index 5ceb1b7..39c1276 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.sqlpp
@@ -37,18 +37,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm";
 select element o
 from  DBLP as o
 with  edb as test.`edit-distance-check`(o.nested.authors,'Amihay Motro',5),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.sqlpp
index e5c2b87..b610925 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.sqlpp
@@ -36,18 +36,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic.adm";
 select element o
 from  DBLP as o
 with  ed as test.`edit-distance-check`(o.nested.authors,'Amihay Motro',5)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let.sqlpp
index 1c782ed..3a30c4f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let.sqlpp
@@ -36,18 +36,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let.adm";
 select element o
 from  DBLP as o
 with  ed as test.`edit-distance-check`(o.nested.authors,'Amihay Motro',1)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.sqlpp
index 4ccb10b..2adcbb3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.sqlpp
@@ -36,18 +36,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPNestedType
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-substring.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-substring.adm";
 select element {'id':paper.nested.id,'title':paper.nested.title}
 from  DBLP as paper
 where test.`edit-distance-check`(test.substring(paper.nested.title,0,8),'datbase',1)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.sqlpp
index 28e64bf..16b4f91 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.sqlpp
@@ -36,18 +36,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPNestedType
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-word-tokens.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-word-tokens.adm";
 select element {'id':paper.nested.id,'title':paper.nested.title}
 from  DBLP as paper,
       test.`word-tokens`(paper.nested.title) as word
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-let.sqlpp
index 7b95e5a..e1f79cb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-let.sqlpp
@@ -38,18 +38,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-let.adm";
 select element o
 from  DBLP as o
 with  jacc as test.`similarity-jaccard-check`(test.`gram-tokens`(o.nested.title,3,false),test.`gram-tokens`('Transactions for Cooperative Environments',3,false),0.500000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.sqlpp
index 4e4f40e..db62898 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.sqlpp
@@ -38,18 +38,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-multi-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-multi-let.adm";
 select element {'Paper':paper_tokens,'Query':query_tokens}
 from  DBLP as paper
 with  paper_tokens as test.`gram-tokens`(paper.nested.title,3,false),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.sqlpp
index ec06268..fe78dbf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -48,12 +48,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -61,7 +61,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_olist-edit-distance-check-let-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_olist-edit-distance-check-let-panic.adm";
 select element c
 from  Customers as c
 with  ed as test.`edit-distance-check`(c.nested.interests,['computers','wine','walking'],3)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let.sqlpp
index 5dd6b7a..965d567 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -48,12 +48,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -61,7 +61,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_olist-edit-distance-check-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_olist-edit-distance-check-let.adm";
 select element c
 from  Customers as c
 with  ed as test.`edit-distance-check`(c.nested.interests,['computers','wine','walking'],1)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/olist-jaccard-check-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/olist-jaccard-check-let.sqlpp
index 1529fcc..fe3f716 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/olist-jaccard-check-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/olist-jaccard-check-let.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -48,18 +48,18 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_olist-jaccard-check-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_olist-jaccard-check-let.adm";
 select element c
 from  Customers as c
 with  jacc as test.`similarity-jaccard-check`(c.nested.interests,['databases','computers','wine'],0.700000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ulist-jaccard-check-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ulist-jaccard-check-let.sqlpp
index bd4a720..af0beed 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ulist-jaccard-check-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/ulist-jaccard-check-let.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -48,12 +48,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -61,7 +61,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ulist-jaccard-check-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ulist-jaccard-check-let.adm";
 select element c
 from  Customers as c
 with  jacc as test.`similarity-jaccard-check`(c.nested.interests,['databases','computers','wine'],0.700000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-let.sqlpp
index 04a897a..6666dca 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-let.sqlpp
@@ -36,18 +36,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index keyword_index  on DBLP (nested.title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-let.adm";
 select element o
 from  DBLP as o
 with  jacc as test.`similarity-jaccard-check`(test.`word-tokens`(o.nested.title),test.`word-tokens`('Transactions for Cooperative Environments'),0.500000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-multi-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-multi-let.sqlpp
index 777d5f1..4bfed40 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-multi-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-multi-let.sqlpp
@@ -36,18 +36,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index keyword_index  on DBLP (nested.title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-multi-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-multi-let.adm";
 select element {'Paper':paper_tokens,'Query':query_tokens}
 from  DBLP as paper
 with  paper_tokens as test.`word-tokens`(paper.nested.title),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp
index c704ffc..bd41d46 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,18 +49,18 @@
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
 create  index msgNgramIx  on TweetMessages (nested.`message-text`) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-edit-distance-check_idx_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-edit-distance-check_idx_01.adm";
 select element {'tweet':{'id':t1.nested.tweetid,'topics':t1.nested.`message-text`},'similar-tweets':(
         select element {'id':t2.nested.tweetid,'topics':t2.nested.`message-text`}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.sqlpp
index eed2b06..be025d8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,18 +49,18 @@
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
 create  index topicKeywordIx  on TweetMessages (nested.`referred-topics`) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-jaccard-check_idx_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-jaccard-check_idx_01.adm";
 select element {'tweet':{'id':t1.nested.tweetid,'topics':t1.nested.`referred-topics`},'similar-tweets':(
         select element {'id':t2.nested.tweetid,'topics':t2.nested.`referred-topics`}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-check_01.sqlpp
index 2948b73..5a540ce 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-check_01.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -44,17 +44,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -62,7 +62,7 @@
 
 create  index ngram_index  on DBLP (nested.authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-contains.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-contains.sqlpp
index 6613d81..0621d0c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-contains.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-contains.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -44,17 +44,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -62,7 +62,7 @@
 
 create  index ngram_index  on DBLP (nested.authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-contains.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-contains.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-inline.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-inline.sqlpp
index a202476..4cf643a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-inline.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-inline.sqlpp
@@ -37,18 +37,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-edit-distance-inline.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-edit-distance-inline.adm";
 select element {'aauthors':a.nested.authors,'bauthors':b.nested.authors,'ed':ed}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-edit-distance_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-edit-distance_01.sqlpp
index 5f6c6a1..fd7d774 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-edit-distance_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-edit-distance_01.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -44,17 +44,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -62,7 +62,7 @@
 
 create  index ngram_index  on DBLP (nested.authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp
index ac0f9bb..4b9264c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -44,17 +44,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -62,7 +62,7 @@
 
 create  index ngram_index  on CSX (nested.authors) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp
index 6ea93b8..b81b98c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -46,17 +46,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -64,7 +64,7 @@
 
 create  index ngram_index  on CSX (nested.title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-jaccard-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-jaccard-check_01.sqlpp
index b819bad..17c1b84 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-jaccard-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-jaccard-check_01.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -46,17 +46,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -64,7 +64,7 @@
 
 create  index ngram_index  on CSX (nested.title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-jaccard-inline.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-jaccard-inline.sqlpp
index 90561a9..2b5099a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-jaccard-inline.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-jaccard-inline.sqlpp
@@ -39,18 +39,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-jaccard-inline.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-jaccard-inline.adm";
 select element {'atitle':a.nested.title,'btitle':b.nested.title,'jacc':jacc}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-jaccard_01.sqlpp
index 0cde139..a400a36 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ngram-jaccard_01.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -46,17 +46,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -64,7 +64,7 @@
 
 create  index ngram_index  on CSX (nested.title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-edit-distance-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-edit-distance-check_01.sqlpp
index 372ac1a..bf280e1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-edit-distance-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-edit-distance-check_01.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,12 +47,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -60,7 +60,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance-check_01.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-edit-distance-inline.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-edit-distance-inline.sqlpp
index 7a9f59f..89626aa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-edit-distance-inline.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-edit-distance-inline.sqlpp
@@ -35,7 +35,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -49,12 +49,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -62,7 +62,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-edit-distance-inline.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-edit-distance-inline.adm";
 select element {'ainterests':a.nested.interests,'binterests':b.nested.interests,'ed':ed}
 from  Customers as a,
       Customers as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-edit-distance_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-edit-distance_01.sqlpp
index 522918d..d38f25f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-edit-distance_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-edit-distance_01.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,12 +47,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -60,7 +60,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-edit-distance_01.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-edit-distance_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-edit-distance_01.sqlpp
index b7f34a8..7942f82 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-edit-distance_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-edit-distance_01.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,12 +47,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -60,7 +60,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_01.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-jaccard_01.sqlpp
index 8dd5b45..a56ef5c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-jaccard_01.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,12 +47,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -60,7 +60,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.7f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-jaccard-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-jaccard-check_01.sqlpp
index b2ef8bf..be86585 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-jaccard-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-jaccard-check_01.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,12 +47,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -60,7 +60,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-jaccard-inline.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-jaccard-inline.sqlpp
index 399522c..4131908 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-jaccard-inline.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-jaccard-inline.sqlpp
@@ -35,7 +35,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -49,12 +49,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -62,7 +62,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-jaccard-inline.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_olist-jaccard-inline.adm";
 select element {'ainterests':a.nested.interests,'binterests':b.nested.interests,'jacc':jacc}
 from  Customers as a,
       Customers as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-jaccard_01.sqlpp
index 3e46cbc..c860a4a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/olist-jaccard_01.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,12 +47,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -60,7 +60,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_olist-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ulist-fuzzyeq-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ulist-fuzzyeq-jaccard_01.sqlpp
index 53dc5ed..2dffabf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ulist-fuzzyeq-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ulist-fuzzyeq-jaccard_01.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,12 +47,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -60,7 +60,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ulist-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.7f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ulist-jaccard-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ulist-jaccard-check_01.sqlpp
index 8bced57..2d4c31f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ulist-jaccard-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ulist-jaccard-check_01.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,12 +47,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -60,7 +60,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ulist-jaccard-inline.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ulist-jaccard-inline.sqlpp
index c3e5793..6676599 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ulist-jaccard-inline.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ulist-jaccard-inline.sqlpp
@@ -35,7 +35,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -49,12 +49,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -62,7 +62,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ulist-jaccard-inline.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ulist-jaccard-inline.adm";
 select element {'ainterests':a.nested.interests,'binterests':b.nested.interests,'jacc':jacc}
 from  Customers as a,
       Customers as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ulist-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ulist-jaccard_01.sqlpp
index b1962ee..45bcd7a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ulist-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/ulist-jaccard_01.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -47,12 +47,12 @@
           age : integer?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customers(CustomerType) primary key nested.cid;
 
@@ -60,7 +60,7 @@
 
 create  index interests_index  on Customers (nested.interests) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ulist-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  Customers as a,
       Customers2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
index 7a868cf..07402e2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -44,17 +44,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -62,7 +62,7 @@
 
 create  index keyword_index  on DBLP (nested.title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
index 5d45bb8..ff005fd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
@@ -38,7 +38,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -50,12 +50,12 @@
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
@@ -67,7 +67,7 @@
 
 create  index msgTextIx  on TweetMessages (nested.`message-text`) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check-after-btree-access.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check-after-btree-access.adm";
 select element {'t1':t1.nested.tweetid,'t2':t2.nested.tweetid,'sim':sim[1]}
 from  TweetMessages as t1,
       TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-jaccard-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-jaccard-check_01.sqlpp
index 5363df8..95e9bbb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-jaccard-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-jaccard-check_01.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -44,17 +44,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -62,7 +62,7 @@
 
 create  index keyword_index  on DBLP (nested.title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-jaccard-inline.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-jaccard-inline.sqlpp
index 5195eae..4fe09b9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-jaccard-inline.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-jaccard-inline.sqlpp
@@ -37,18 +37,18 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index keyword_index  on DBLP (nested.title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_word-jaccard-inline.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_word-jaccard-inline.adm";
 select element {'atitle':a.nested.title,'btitle':b.nested.title,'jacc':jacc}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-jaccard_01.sqlpp
index bb028b4..3b2d0e2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/inverted-index-join/word-jaccard_01.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -44,17 +44,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -62,7 +62,7 @@
 
 create  index keyword_index  on DBLP (nested.title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
index e3e2326..1b3582e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageNestedType as
 {
@@ -49,12 +49,12 @@
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create type test.TweetMessageType as
 {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
@@ -66,7 +66,7 @@
 
 create  index msgTextIx  on TweetMessages (nested.`message-text`) type keyword;
 
-write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_01.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_01.adm";
 select element {'tweetid1':t1.nested.tweetid,'loc1':t1.nested.`sender-location`,'nearby-message':(
         select element {'tweetid2':t2.nested.tweetid,'loc2':t2.nested.`sender-location`}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
index 2803bf6..6adb262 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,12 +49,12 @@
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create type test.TweetMessageType as
 {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
@@ -66,7 +66,7 @@
 
 create  index msgTextIx  on TweetMessages (nested.`message-text`) type keyword;
 
-write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_02.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_02.adm";
 select element {'tweetid1':t1.nested.tweetid,'loc1':t1.nested.`sender-location`,'nearby-message':(
         select element {'tweetid2':t2.nested.tweetid,'loc2':t2.nested.`sender-location`}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_01.sqlpp
index b38a6e3..75f9de3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_01.sqlpp
@@ -39,12 +39,12 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyRecordNested as
  closed {
   nested : MyRecord
-}
+};
 
 create  dataset MyData1(MyRecordNested) primary key nested.id;
 
@@ -52,7 +52,7 @@
 
 create  index rtree_index  on MyData1 (nested.point) type rtree;
 
-write output to asterix_nc1:"rttest/index-join_rtree-spatial-intersect-point.adm"
+write output to asterix_nc1:"rttest/index-join_rtree-spatial-intersect-point.adm";
 select element {'a':a,'b':b}
 from  MyData1 as a,
       MyData2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_02.sqlpp
index 67cfc52..9d09f48 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_02.sqlpp
@@ -39,12 +39,12 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyRecordNested as
  closed {
   nested : MyRecord
-}
+};
 
 create  dataset MyData1(MyRecordNested) primary key nested.id;
 
@@ -52,7 +52,7 @@
 
 create  index rtree_index  on MyData2 (point) type rtree;
 
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm";
 select element {'a':a,'b':b}
 from  MyData1 as a,
       MyData2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_03.sqlpp
index 2fc5cc5..fa3ff7b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_03.sqlpp
@@ -39,18 +39,18 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyRecordNested as
  closed {
   nested : MyRecord
-}
+};
 
 create  dataset MyData(MyRecordNested) primary key nested.id;
 
 create  index rtree_index  on MyData (nested.point) type rtree;
 
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_03.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_03.adm";
 select element {'a':a,'b':b}
 from  MyData as a,
       MyData as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/disjunction-to-join.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/disjunction-to-join.sqlpp
index 819bdc7..957acfc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/disjunction-to-join.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/disjunction-to-join.sqlpp
@@ -31,14 +31,14 @@
 create type test.NestedTestType as
 {
 
-}
+};
 
 create type test.TestType as
 {
   id : string,
   `no-idx` : string,
   nested : NestedTestType
-}
+};
 
 create  dataset TestSet(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.sqlpp
index c64ab0d..4e597c4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageNestedType as
 {
@@ -48,18 +48,18 @@
   `referred-topics` : {{string}},
   `message-text` : string,
   countA : integer
-}
+};
 
 create type test.TweetMessageType as
 {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
 create  index msgCountBIx  on TweetMessages (nested.countB:integer?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm";
 select element {'tweetid1':t1.nested.tweetid,'count1':t1.nested.countA,'t2info':(
         select element {'tweetid2':t2.nested.tweetid,'count2':t2.nested.countB}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.sqlpp
index 95c3d84..a153cd0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageNestedType as
 {
@@ -47,12 +47,12 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create type test.TweetMessageType as
 {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
@@ -60,7 +60,7 @@
 
 create  index msgCountBIx  on TweetMessages (nested.countB:integer?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm";
 select element {'tweetid1':t1.nested.tweetid,'count1':t1.nested.countA,'t2info':(
         select element {'tweetid2':t2.nested.tweetid,'count2':t2.nested.countB}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.sqlpp
index 51fa7b6..c2ca7ce 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageNestedType as
 {
@@ -48,18 +48,18 @@
   `referred-topics` : {{string}},
   `message-text` : string,
   countA : integer
-}
+};
 
 create type test.TweetMessageType as
 {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
 create  index msgCountBIx  on TweetMessages (nested.countB:integer?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm";
 select element {'tweetid1':t1.nested.tweetid,'count1':t1.nested.countA,'t2info':(
         select element {'tweetid2':t2.nested.tweetid,'count2':t2.nested.countB}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.sqlpp
index e5387a2..d7a3be3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageNestedType as
 {
@@ -47,12 +47,12 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create type test.TweetMessageType as
 {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
@@ -60,7 +60,7 @@
 
 create  index msgCountBIx  on TweetMessages (nested.countB:integer?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm";
 select element {'tweetid1':t1.nested.tweetid,'count1':t1.nested.countA,'t2info':(
         select element {'tweetid2':t2.nested.tweetid,'count2':t2.nested.countB}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_01.sqlpp
index a0f82e5..a7a3c3f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_01.sqlpp
@@ -32,18 +32,18 @@
 create type test.Nametmp as
 {
   id : integer
-}
+};
 
 create type test.NameType as
 {
   nested : Nametmp
-}
+};
 
 create  dataset Names(NameType) primary key nested.id;
 
 create  index Name_idx  on Names (nested.fname:string?,lnested.name:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-join_01.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_02.sqlpp
index f44a10c..c94fc26 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_02.sqlpp
@@ -32,18 +32,18 @@
 create type test.Nametmp as
 {
   id : integer
-}
+};
 
 create type test.NameType as
 {
   nested : Nametmp
-}
+};
 
 create  dataset Names(NameType) primary key nested.id;
 
 create  index Name_idx  on Names (nested.fname:string?,lnested.name:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-join_02.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_03.sqlpp
index 7a919c3..3881d81 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_03.sqlpp
@@ -32,18 +32,18 @@
 create type test.Nametmp as
 {
   id : integer
-}
+};
 
 create type test.NameType as
 {
   nested : Nametmp
-}
+};
 
 create  dataset Names(NameType) primary key nested.id;
 
 create  index Name_idx  on Names (nested.fname:string?,lnested.name:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-join_03.adm"
+write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-join_03.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_01.sqlpp
index cebfa07..61a7672 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_01.sqlpp
@@ -32,18 +32,18 @@
 create type test.Nametmp as
 {
   id : integer
-}
+};
 
 create type test.NameType as
 {
   nested : Nametmp
-}
+};
 
 create  dataset Names(NameType) primary key nested.id;
 
 create  index Name_idx  on Names (nested.fname:string?,lnested.name:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_01.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_02.sqlpp
index a3434fe..0d617a2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_02.sqlpp
@@ -32,18 +32,18 @@
 create type test.Nametmp as
 {
   id : integer
-}
+};
 
 create type test.NameType as
 {
   nested : Nametmp
-}
+};
 
 create  dataset Names(NameType) primary key nested.id;
 
 create  index Name_idx  on Names (nested.fname:string?,lnested.name:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_02.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_03.sqlpp
index 21fa2e8..6c1a2a4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_03.sqlpp
@@ -32,18 +32,18 @@
 create type test.Nametmp as
 {
   id : integer
-}
+};
 
 create type test.NameType as
 {
   nested : Nametmp
-}
+};
 
 create  dataset Names(NameType) primary key nested.id;
 
 create  index Name_idx  on Names (nested.fname:string?,lnested.name:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_03.adm"
+write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_03.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_04.sqlpp
index 13af0ac..8c09b0b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_04.sqlpp
@@ -32,18 +32,18 @@
 create type test.Nametmp as
 {
   id : integer
-}
+};
 
 create type test.NameType as
 {
   nested : Nametmp
-}
+};
 
 create  dataset Names(NameType) primary key nested.id;
 
 create  index Name_idx  on Names (nested.fname:string?,lnested.name:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_04.adm"
+write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_04.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_05.sqlpp
index 61c7424..84069b4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_05.sqlpp
@@ -32,18 +32,18 @@
 create type test.Nametmp as
 {
   id : integer
-}
+};
 
 create type test.NameType as
 {
   nested : Nametmp
-}
+};
 
 create  dataset Names(NameType) primary key nested.id;
 
 create  index Name_idx  on Names (nested.fname:string?,lnested.name:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_05.adm"
+write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_05.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_06.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_06.sqlpp
index ef66911..4822293 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_06.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_06.sqlpp
@@ -32,18 +32,18 @@
 create type test.Nametmp as
 {
   id : integer
-}
+};
 
 create type test.NameType as
 {
   nested : Nametmp
-}
+};
 
 create  dataset Names(NameType) primary key nested.id;
 
 create  index Name_idx  on Names (nested.fname:string?,lnested.name:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_06.adm"
+write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_06.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join-multiindex.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join-multiindex.sqlpp
index 802b31c..cfb465a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join-multiindex.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join-multiindex.sqlpp
@@ -36,7 +36,7 @@
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type test.FacebookUserTypetmp as
  closed {
@@ -48,7 +48,7 @@
   `user-since-copy` : datetime,
   `friend-ids` : {{integer}},
   employment : [EmploymentType]
-}
+};
 
 create type test.FacebookMessageTypetmp as
 {
@@ -58,17 +58,17 @@
   `in-response-to` : integer?,
   `sender-location` : point?,
   message : string
-}
+};
 
 create type test.FacebookUserType as
  closed {
   nested : FacebookUserTypetmp
-}
+};
 
 create type test.FacebookMessageType as
  closed {
   nested : FacebookMessageTypetmp
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key nested.id;
 
@@ -76,7 +76,7 @@
 
 create  index fbmIdxAutId  if not exists  on FacebookMessages (nested.`author-id-copy`:integer?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multiindex.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multiindex.adm";
 select element {'fbu-ID':user.nested.id,'fbm-auth-ID':message.nested.`author-id`,'uname':user.nested.name,'message':message.nested.message}
 from  FacebookUsers as user,
       FacebookMessages as message
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join-multipred.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join-multipred.sqlpp
index 6859e93..92599bb2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join-multipred.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join-multipred.sqlpp
@@ -37,7 +37,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -46,17 +46,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -64,7 +64,7 @@
 
 create  index title_index  on DBLP (nested.title:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multipred.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multipred.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_01.sqlpp
index 90d2951..6b207c5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_01.sqlpp
@@ -35,7 +35,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -44,17 +44,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -62,7 +62,7 @@
 
 create  index title_index  on DBLP (nested.title:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_02.sqlpp
index d78a86b..fc67495 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_02.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -44,17 +44,17 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -62,7 +62,7 @@
 
 create  index title_index  on CSX (nested.title:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_03.sqlpp
index 8d5ed86..c8b0dfd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_03.sqlpp
@@ -35,7 +35,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -43,17 +43,17 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -63,7 +63,7 @@
 
 create  index title_index_CSX  on CSX (nested.title:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_03.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_03.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_04.sqlpp
index 364cfc2..c68c001 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_04.sqlpp
@@ -35,18 +35,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
 {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index title_index  on DBLP (nested.title:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_04.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_04.adm";
 select element {'arec':a,'arec2':a2}
 from  DBLP as a,
       DBLP as a2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_05.sqlpp
index 6db5040..38ff226 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_05.sqlpp
@@ -35,7 +35,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -43,17 +43,17 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -61,7 +61,7 @@
 
 create  index title_index  on DBLP (nested.title:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_05.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_05.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-33.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-33.sqlpp
index e825441..5eedf99 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-33.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-33.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-39.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-39.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-34.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-34.sqlpp
index d80cd72..dafd317 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-34.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-34.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-32.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-32.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-35.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-35.sqlpp
index c0148eb..236d8a4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-35.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-35.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-33.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-33.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-36.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-36.sqlpp
index 9050120..44a582b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-36.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-36.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-34.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-34.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-37.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-37.sqlpp
index f45c4b8..361af5f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-37.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-37.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-35.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-35.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-38.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-38.sqlpp
index 160a2ef..a7cf700 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-38.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-38.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-36.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-36.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-39.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-39.sqlpp
index ca3a1987..ed1bbcc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-39.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-39.sqlpp
@@ -29,16 +29,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-37.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-37.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-40.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-40.sqlpp
index 90a3b65..8f4bab2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-40.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-40.sqlpp
@@ -29,16 +29,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-38.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-38.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-41.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-41.sqlpp
index 0888c7e..0d54ffc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-41.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-41.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-39.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-39.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-42.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-42.sqlpp
index 3f936bd..f412a96 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-42.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-42.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-40.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-40.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-43.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-43.sqlpp
index 57e90ea..5872426 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-43.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-43.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-41.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-41.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-44.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-44.sqlpp
index bc295e8..f7a4e51 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-44.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-44.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-42.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-42.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-45.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-45.sqlpp
index f18ec0f..e5eeb29 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-45.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-45.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-43.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-43.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-46.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-46.sqlpp
index a594359..bf04ce0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-46.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-46.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-44.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-44.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-47.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-47.sqlpp
index 942f7ec..b2b23a1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-47.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-47.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-45.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-45.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-48.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-48.sqlpp
index 0c884a2..a3689e3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-48.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-48.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-46.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-46.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-49.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-49.sqlpp
index 3bf8493..f5d7566 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-49.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-49.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-47.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-47.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-50.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-50.sqlpp
index c55a454..171229e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-50.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-50.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-48.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-48.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-51.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-51.sqlpp
index b2fa4c9..6c8d7ba 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-51.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-51.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-49.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-49.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-52.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-52.sqlpp
index 7df1221..68c46aa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-52.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-52.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-50.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-50.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-53.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-53.sqlpp
index 14ae213..91b932e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-53.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-53.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-51.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-51.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-54.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-54.sqlpp
index 81530ac..7b4ed5c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-54.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-54.sqlpp
@@ -29,17 +29,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-52.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-52.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-55.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-55.sqlpp
index b0d2f17..a7a9ffa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-55.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-55.sqlpp
@@ -29,17 +29,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-53.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-53.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-56.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-56.sqlpp
index ffcb484..bbb3b01 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-56.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-56.sqlpp
@@ -29,17 +29,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-54.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-54.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-57.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-57.sqlpp
index a13a6ae..4188230 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-57.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-57.sqlpp
@@ -29,17 +29,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-55.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-55.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-58.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-58.sqlpp
index f33f06d..d0d619f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-58.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-58.sqlpp
@@ -29,17 +29,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-56.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-56.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-59.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-59.sqlpp
index eadb114..b454d71 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-59.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-59.sqlpp
@@ -29,17 +29,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-57.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-57.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-60.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-60.sqlpp
index 7898cb9..62ed07e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-60.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-60.sqlpp
@@ -29,17 +29,17 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-58.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-58.adm";
 create type test.TestTypetmp as
 {
   id : integer,
   lname : string
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-61.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-61.sqlpp
index 45dd983..c4bb152 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-61.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-61.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-59.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-59.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-62.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-62.sqlpp
index 5045510..198d361 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-62.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-62.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-62.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-62.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-63.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-63.sqlpp
index b901683..85ff1d4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-63.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/btree-index/btree-secondary-63.sqlpp
@@ -30,16 +30,16 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-63.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-63.adm";
 create type test.TestTypetmp as
 {
   id : integer
-}
+};
 
 create type test.TestType as
 {
   nested : TestTypetmp
-}
+};
 
 create  dataset testdst(TestType) primary key nested.id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-contains-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-contains-panic.sqlpp
index 98a0fc7..1d4e565 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-contains-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-contains-panic.sqlpp
@@ -34,18 +34,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains-panic.adm";
 select element o
 from  DBLP as o
 where test.contains(o.nested.title,'Mu')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-contains.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-contains.sqlpp
index 88f1908..ed08291 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-contains.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-contains.sqlpp
@@ -34,18 +34,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains.adm";
 select element o
 from  DBLP as o
 where test.contains(o.nested.title,'Multimedia')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check-panic.sqlpp
index 5745d16..9377ea0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check-panic.sqlpp
@@ -34,18 +34,18 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check-panic.adm";
 select element o
 from  DBLP as o
 with  ed as test.`edit-distance-check`(o.nested.authors,'Amihay Motro',5)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check.sqlpp
index 9ad58cb..e30ff08 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check.sqlpp
@@ -34,18 +34,18 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check.adm";
 select element o
 from  DBLP as o
 where test.`edit-distance-check`(o.nested.authors,'Amihay Motro',1)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-panic.sqlpp
index 94b1ecc..55959f2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-panic.sqlpp
@@ -34,18 +34,18 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-panic.adm";
 select element o
 from  DBLP as o
 where (test.`edit-distance`(o.nested.authors,'Amihay Motro') <= 5)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance.sqlpp
index cf15310..8c23d24 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance.sqlpp
@@ -34,18 +34,18 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance.adm";
 select element o
 from  DBLP as o
 where (test.`edit-distance`(o.nested.authors,'Amihay Motro') <= 1)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.sqlpp
index 00261d3..192ef74 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.sqlpp
@@ -34,18 +34,18 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-edit-distance.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-edit-distance.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `1`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-jaccard.sqlpp
index f435f55..d6cfd59 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-jaccard.sqlpp
@@ -36,18 +36,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-jaccard.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.8f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard-check.sqlpp
index ba44d09..cbda7b4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard-check.sqlpp
@@ -36,18 +36,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard-check.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard-check.adm";
 select element o
 from  DBLP as o
 where test.`similarity-jaccard-check`(test.`gram-tokens`(o.nested.title,3,false),test.`gram-tokens`('Transactions for Cooperative Environments',3,false),0.500000f)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard.sqlpp
index 4125bfc..be07ae2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard.sqlpp
@@ -36,18 +36,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard.adm";
 select element o
 from  DBLP as o
 where (test.`similarity-jaccard`(test.`gram-tokens`(o.nested.title,3,false),test.`gram-tokens`('Transactions for Cooperative Environments',3,false)) >= 0.500000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/word-contains.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/word-contains.sqlpp
index 3584196..4a71613 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/word-contains.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/word-contains.sqlpp
@@ -34,18 +34,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index keyword_index  on DBLP (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_word-contains.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_word-contains.adm";
 select element o
 from  DBLP as o
 where test.contains(o.nested.title,'Multimedia')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/word-fuzzyeq-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/word-fuzzyeq-jaccard.sqlpp
index cc3a797..1170592 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/word-fuzzyeq-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/word-fuzzyeq-jaccard.sqlpp
@@ -34,18 +34,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index keyword_index  on DBLP (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_word-fuzzyeq-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_word-fuzzyeq-jaccard.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/word-jaccard-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/word-jaccard-check.sqlpp
index 8ff00a2..5bfb33d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/word-jaccard-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/word-jaccard-check.sqlpp
@@ -34,18 +34,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index keyword_index  on DBLP (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard-check.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard-check.adm";
 select element o
 from  DBLP as o
 where test.`similarity-jaccard-check`(test.`word-tokens`(o.nested.title),test.`word-tokens`('Transactions for Cooperative Environments'),0.500000f)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/word-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/word-jaccard.sqlpp
index 92fc1b8..e95a48d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/word-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-basic/word-jaccard.sqlpp
@@ -34,18 +34,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index keyword_index  on DBLP (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard.adm";
 select element o
 from  DBLP as o
 where (test.`similarity-jaccard`(test.`word-tokens`(o.nested.title),test.`word-tokens`('Transactions for Cooperative Environments')) >= 0.500000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.sqlpp
index 6c34cb4..8771118 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.sqlpp
@@ -36,18 +36,18 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm";
 select element o
 from  DBLP as o
 with  eda as test.`edit-distance-check`(o.nested.authors,'Amihay Motro',3),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.sqlpp
index e076bc7..8bc92fe 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.sqlpp
@@ -36,18 +36,18 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm";
 select element o
 from  DBLP as o
 with  edb as test.`edit-distance-check`(o.nested.authors,'Amihay Motro',5),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic.sqlpp
index c960385..7ce9153 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic.sqlpp
@@ -35,18 +35,18 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic.adm";
 select element o
 from  DBLP as o
 with  ed as test.`edit-distance-check`(o.nested.authors,'Amihay Motro',5)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let.sqlpp
index b774d65..05eca1e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let.sqlpp
@@ -35,18 +35,18 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let.adm";
 select element o
 from  DBLP as o
 with  ed as test.`edit-distance-check`(o.nested.authors,'Amihay Motro',1)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-substring.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-substring.sqlpp
index 4b3d37f..d202b43 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-substring.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-substring.sqlpp
@@ -35,18 +35,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPNestedType
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-substring.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-substring.adm";
 select element {'id':paper.nested.id,'title':paper.nested.title}
 from  DBLP as paper
 where test.`edit-distance-check`(test.substring(paper.nested.title,0,8),'datbase',1)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.sqlpp
index 455e063..c37ebfd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.sqlpp
@@ -35,18 +35,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPNestedType
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-word-tokens.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-word-tokens.adm";
 select element {'id':paper.nested.id,'title':paper.nested.title}
 from  DBLP as paper,
       test.`word-tokens`(paper.nested.title) as word
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-let.sqlpp
index 682e0a3..5ff344c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-let.sqlpp
@@ -37,18 +37,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-let.adm";
 select element o
 from  DBLP as o
 with  jacc as test.`similarity-jaccard-check`(test.`gram-tokens`(o.nested.title,3,false),test.`gram-tokens`('Transactions for Cooperative Environments',3,false),0.500000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-multi-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-multi-let.sqlpp
index e278a98..964dfc0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-multi-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-multi-let.sqlpp
@@ -37,18 +37,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-multi-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-multi-let.adm";
 select element {'Paper':paper_tokens,'Query':query_tokens}
 from  DBLP as paper
 with  paper_tokens as test.`gram-tokens`(paper.nested.title,3,false),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-let.sqlpp
index dc37aec..19dd76d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-let.sqlpp
@@ -35,18 +35,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index keyword_index  on DBLP (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-let.adm";
 select element o
 from  DBLP as o
 with  jacc as test.`similarity-jaccard-check`(test.`word-tokens`(o.nested.title),test.`word-tokens`('Transactions for Cooperative Environments'),0.500000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-multi-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-multi-let.sqlpp
index f329a09..0a0abb2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-multi-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-multi-let.sqlpp
@@ -35,18 +35,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index keyword_index  on DBLP (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-multi-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-multi-let.adm";
 select element {'Paper':paper_tokens,'Query':query_tokens}
 from  DBLP as paper
 with  paper_tokens as test.`word-tokens`(paper.nested.title),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp
index d95919f..70e727e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageNestedType as
 {
@@ -48,18 +48,18 @@
   `referred-topics` : {{string}},
   countA : integer,
   countB : integer
-}
+};
 
 create type test.TweetMessageType as
 {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
 create  index msgNgramIx  on TweetMessages (nested.`message-text`:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-edit-distance-check_idx_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-edit-distance-check_idx_01.adm";
 select element {'tweet':{'id':t1.nested.tweetid,'topics':t1.nested.`message-text`},'similar-tweets':(
         select element {'id':t2.nested.tweetid,'topics':t2.nested.`message-text`}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-contains_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-contains_01.sqlpp
index 8116300..cae1003 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-contains_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-contains_01.sqlpp
@@ -33,7 +33,7 @@
   id : integer,
   dblpid : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -42,7 +42,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -50,7 +50,7 @@
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-01.adm";
 select element {'title1':o1.title,'title2':o2.title}
 from  DBLP as o1,
       CSX as o2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-contains_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-contains_02.sqlpp
index aa7515a..9d87160 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-contains_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-contains_02.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -42,7 +42,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -50,7 +50,7 @@
 
 create  index ngram_index  on CSX (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-02.adm";
 select element {'title1':o1.title,'title2':o2.title}
 from  CSX as o1,
       DBLP as o2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-contains_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-contains_03.sqlpp
index 056eed9..a489041 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-contains_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-contains_03.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-03.adm";
 select element {'title1':o1.title,'title2':o2.title}
 from  DBLP as o1,
       DBLP as o2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-contains_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-contains_04.sqlpp
index bb9ceac..2bc986c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-contains_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-contains_04.sqlpp
@@ -33,7 +33,7 @@
   id : integer,
   dblpid : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -41,7 +41,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@
 
 create  index ngram_index_CSX  on CSX (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-04.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-04.adm";
 select element {'title1':o1.title,'title2':o2.title}
 from  DBLP as o1,
       CSX as o2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_01.sqlpp
index 419f425..f4074f2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_01.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -43,17 +43,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -61,7 +61,7 @@
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_02.sqlpp
index ea0b7fc..9f3f5c5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_02.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -43,17 +43,17 @@
   csxid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -61,7 +61,7 @@
 
 create  index ngram_index  on CSX (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
 select element {'arec':a,'brec':b}
 from  CSX as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_03.sqlpp
index ebf9c02..0fbc905 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_03.sqlpp
@@ -34,18 +34,18 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_04.sqlpp
index 1011a44..87ece5a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_04.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -42,17 +42,17 @@
   csxid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -62,7 +62,7 @@
 
 create  index ngram_index_CSX  on CSX (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_05.sqlpp
index 9775659..c8add3e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_05.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -42,17 +42,17 @@
   csxid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -60,7 +60,7 @@
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-contains.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-contains.sqlpp
index 2373007..6bf1c72 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-contains.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-contains.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -43,17 +43,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -61,7 +61,7 @@
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-contains.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-contains.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-inline.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-inline.sqlpp
index 4d6eed2..0b7f72f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-inline.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-inline.sqlpp
@@ -36,18 +36,18 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-edit-distance-inline.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-edit-distance-inline.adm";
 select element {'aauthors':a.nested.authors,'bauthors':b.nested.authors,'ed':ed}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_01.sqlpp
index 0c2a41e..661e010 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_01.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -43,17 +43,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -61,7 +61,7 @@
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_02.sqlpp
index 9e46270..3c4e9fe 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_02.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -43,17 +43,17 @@
   csxid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -61,7 +61,7 @@
 
 create  index ngram_index  on CSX (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
 select element {'arec':a,'brec':b}
 from  CSX as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_03.sqlpp
index 0a1bcf7..e4d138e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_03.sqlpp
@@ -34,18 +34,18 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_04.sqlpp
index 8c2b515..08d9808 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_04.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -42,17 +42,17 @@
   csxid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -62,7 +62,7 @@
 
 create  index ngram_index_CSX  on CSX (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_05.sqlpp
index 9b68a89..19132a1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_05.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -42,17 +42,17 @@
   csxid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -60,7 +60,7 @@
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp
index 9e2c69f..a6f12a1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -43,17 +43,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -61,7 +61,7 @@
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_02.sqlpp
index 5eb7f01..5326185 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_02.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -43,17 +43,17 @@
   csxid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -61,7 +61,7 @@
 
 create  index ngram_index  on CSX (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp
index e5b4b83..a2af936 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp
@@ -34,18 +34,18 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_04.sqlpp
index 61df0a5..68c4619 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_04.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -42,17 +42,17 @@
   csxid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -62,7 +62,7 @@
 
 create  index ngram_index_CSX  on CSX (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_05.sqlpp
index 83fd6bd..d8d417b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_05.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -42,17 +42,17 @@
   csxid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -60,7 +60,7 @@
 
 create  index ngram_index  on CSX (nested.authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp
index 27dfe8c..51da2ab 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp
@@ -36,7 +36,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -45,17 +45,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -63,7 +63,7 @@
 
 create  index ngram_index  on DBLP (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.sqlpp
index 7038239..efe0ae7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -45,17 +45,17 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -63,7 +63,7 @@
 
 create  index ngram_index  on CSX (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.sqlpp
index 7313ef2..ccec588 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.sqlpp
@@ -36,18 +36,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.sqlpp
index 3ea7aca..379b7eb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.sqlpp
@@ -36,7 +36,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -44,17 +44,17 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -64,7 +64,7 @@
 
 create  index ngram_index_CSX  on CSX (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_01.sqlpp
index 199c3c5..f1d7467 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_01.sqlpp
@@ -36,7 +36,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -45,17 +45,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -63,7 +63,7 @@
 
 create  index ngram_index  on DBLP (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_02.sqlpp
index 057b5dc..6a3ade7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_02.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -45,17 +45,17 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -63,7 +63,7 @@
 
 create  index ngram_index  on CSX (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  CSX as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_03.sqlpp
index 3feddf8..cb5c545 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_03.sqlpp
@@ -36,18 +36,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_04.sqlpp
index 9f255b7..204f77e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_04.sqlpp
@@ -36,7 +36,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -44,17 +44,17 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -64,7 +64,7 @@
 
 create  index ngram_index_CSX  on CSX (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-inline.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-inline.sqlpp
index 0b34fd8..288be03 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-inline.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-inline.sqlpp
@@ -38,18 +38,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-jaccard-inline.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_ngram-jaccard-inline.adm";
 select element {'atitle':a.nested.title,'btitle':b.nested.title,'jacc':jacc}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_01.sqlpp
index ad47867..dc85897 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_01.sqlpp
@@ -36,7 +36,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -45,17 +45,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -63,7 +63,7 @@
 
 create  index ngram_index  on DBLP (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_02.sqlpp
index 42ecfd0..2360a60 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_02.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -45,17 +45,17 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -63,7 +63,7 @@
 
 create  index ngram_index  on CSX (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  CSX as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_03.sqlpp
index d57230e..c65fe7f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_03.sqlpp
@@ -36,18 +36,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index ngram_index  on DBLP (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_04.sqlpp
index 7cc7819..bbbcada 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_04.sqlpp
@@ -36,7 +36,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -44,17 +44,17 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -64,7 +64,7 @@
 
 create  index ngram_index_CSX  on CSX (nested.title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
index 396ed40..dcd9bf9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -43,17 +43,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -61,7 +61,7 @@
 
 create  index keyword_index  on DBLP (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
index 14ac42b..f469132 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -43,17 +43,17 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -61,7 +61,7 @@
 
 create  index keyword_index  on CSX (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
index e12c6d9..f3fbf21 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
@@ -34,18 +34,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index keyword_index  on DBLP (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp
index 265af81..f63503d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -42,17 +42,17 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -62,7 +62,7 @@
 
 create  index keyword_index_CSX  on CSX (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
index 13c2eab..6896d96 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
@@ -38,7 +38,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageNestedType as
 {
@@ -49,12 +49,12 @@
   `referred-topics` : {{string}},
   countA : integer,
   countB : integer
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
@@ -66,7 +66,7 @@
 
 create  index msgTextIx  on TweetMessages (nested.`message-text`:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check-after-btree-access.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check-after-btree-access.adm";
 select element {'t1':t1.nested.tweetid,'t2':t2.nested.tweetid,'sim':sim[1]}
 from  TweetMessages as t1,
       TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_01.sqlpp
index 1ddd310..86aeb19 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_01.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -43,17 +43,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -61,7 +61,7 @@
 
 create  index keyword_index  on DBLP (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_02.sqlpp
index 5b17582..2f0c0ae 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_02.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -43,17 +43,17 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -61,7 +61,7 @@
 
 create  index keyword_index  on CSX (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  CSX as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_03.sqlpp
index e47df3f..e4974c1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_03.sqlpp
@@ -34,18 +34,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index keyword_index_DBLP  on DBLP (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_04.sqlpp
index f3a42fb..c7a5c1a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_04.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -42,17 +42,17 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -62,7 +62,7 @@
 
 create  index keyword_index  on CSX (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-inline.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-inline.sqlpp
index a8fac65..bacc15e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-inline.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard-inline.sqlpp
@@ -36,18 +36,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index keyword_index  on DBLP (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_word-jaccard-inline.adm"
+write output to asterix_nc1:"rttest/inverted-index-join-noeqjoin_word-jaccard-inline.adm";
 select element {'atitle':a.nested.title,'btitle':b.nested.title,'jacc':jacc}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_01.sqlpp
index e08b76b..f9a31b3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_01.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -43,17 +43,17 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -61,7 +61,7 @@
 
 create  index keyword_index  on DBLP (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_02.sqlpp
index 827fc48..e696010 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_02.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -43,17 +43,17 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -61,7 +61,7 @@
 
 create  index keyword_index  on CSX (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  CSX as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_03.sqlpp
index a93396f..745949e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_03.sqlpp
@@ -34,18 +34,18 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
 create  index keyword_index  on DBLP (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_04.sqlpp
index 22992bc..b95c674 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/inverted-index-join/word-jaccard_04.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
 {
@@ -42,17 +42,17 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXTypetmp
-}
+};
 
 create  dataset DBLP(DBLPType) primary key nested.id;
 
@@ -62,7 +62,7 @@
 
 create  index keyword_index  on CSX (nested.title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
index 78ae7bf..5a91cdc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageNestedType as
 {
@@ -48,12 +48,12 @@
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create type test.TweetMessageType as
 {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
@@ -65,7 +65,7 @@
 
 create  index msgTextIx  on TweetMessages (nested.`message-text`) type keyword;
 
-write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_01.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_01.adm";
 select element {'tweetid1':t1.nested.tweetid,'loc1':t1.nested.`sender-location`,'nearby-message':(
         select element {'tweetid2':t2.nested.tweetid,'loc2':t2.nested.`sender-location`}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
index 5fd44ec..77d9ad0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageNestedType as
 {
@@ -48,12 +48,12 @@
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create type test.TweetMessageType as
 {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
@@ -65,7 +65,7 @@
 
 create  index msgTextIx  on TweetMessages (nested.`message-text`) type keyword;
 
-write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_02.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_02.adm";
 select element {'tweetid1':t1.nested.tweetid,'loc1':t1.nested.`sender-location`,'nearby-message':(
         select element {'tweetid2':t2.nested.tweetid,'loc2':t2.nested.`sender-location`}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_01.sqlpp
index b38a6e3..75f9de3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_01.sqlpp
@@ -39,12 +39,12 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyRecordNested as
  closed {
   nested : MyRecord
-}
+};
 
 create  dataset MyData1(MyRecordNested) primary key nested.id;
 
@@ -52,7 +52,7 @@
 
 create  index rtree_index  on MyData1 (nested.point) type rtree;
 
-write output to asterix_nc1:"rttest/index-join_rtree-spatial-intersect-point.adm"
+write output to asterix_nc1:"rttest/index-join_rtree-spatial-intersect-point.adm";
 select element {'a':a,'b':b}
 from  MyData1 as a,
       MyData2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_02.sqlpp
index 67cfc52..9d09f48 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_02.sqlpp
@@ -39,12 +39,12 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyRecordNested as
  closed {
   nested : MyRecord
-}
+};
 
 create  dataset MyData1(MyRecordNested) primary key nested.id;
 
@@ -52,7 +52,7 @@
 
 create  index rtree_index  on MyData2 (point) type rtree;
 
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm";
 select element {'a':a,'b':b}
 from  MyData1 as a,
       MyData2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_03.sqlpp
index 2fc5cc5..fa3ff7b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_03.sqlpp
@@ -39,18 +39,18 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyRecordNested as
  closed {
   nested : MyRecord
-}
+};
 
 create  dataset MyData(MyRecordNested) primary key nested.id;
 
 create  index rtree_index  on MyData (nested.point) type rtree;
 
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_03.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_03.adm";
 select element {'a':a,'b':b}
 from  MyData as a,
       MyData as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_04.sqlpp
index bf11ae2..3993450 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_04.sqlpp
@@ -38,12 +38,12 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyRecordOpen as
  closed {
   nested : MyRecordNestedOpen
-}
+};
 
 create  dataset MyData1(MyRecordOpen) primary key nested.id;
 
@@ -53,7 +53,7 @@
 
 create  index rtree_index2  on MyData2 (nested.point:point?) type rtree enforced;
 
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm";
 select element {'a':a,'b':b}
 from  MyData1 as a,
       MyData2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_05.sqlpp
index 6b7e58c..dc9059f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_05.sqlpp
@@ -38,12 +38,12 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyRecordOpen as
  closed {
   nested : MyRecordNestedOpen
-}
+};
 
 create  dataset MyData1(MyRecordOpen) primary key nested.id;
 
@@ -51,7 +51,7 @@
 
 create  index rtree_index  on MyData1 (nested.point:point?) type rtree enforced;
 
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm";
 select element {'a':a,'b':b}
 from  MyData1 as a,
       MyData2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj2.sqlpp
index eb113d7..aae756c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj2.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -78,7 +78,7 @@
 
 create  dataset Customers(CustomerType) primary key c_custkey on group1;
 
-write output to asterix_nc1:"/tmp/nested_loj.adm"
+write output to asterix_nc1:"/tmp/nested_loj.adm";
 select element {'cust':c,'orders':orders}
 from  Customers as c
 with  orders as (
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj3.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj3.sqlpp
index b8cd6d1..b54dee6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj3.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj3.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -75,7 +75,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -89,7 +89,7 @@
 
 create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
 
-write output to asterix_nc1:"/tmp/nested_loj.adm"
+write output to asterix_nc1:"/tmp/nested_loj.adm";
 select element {'cust':c,'orders':orders}
 from  Customers as c
 with  orders as (
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/disjunction-to-join.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/disjunction-to-join.sqlpp
index 895e94a..6ec8923 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/disjunction-to-join.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/disjunction-to-join.sqlpp
@@ -32,7 +32,7 @@
 {
   id : string,
   `no-idx` : string
-}
+};
 
 create  dataset TestSet(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.sqlpp
index 2995866..bf9850a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -48,13 +48,13 @@
   `referred-topics` : {{string}},
   `message-text` : string,
   countA : integer
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
 create  index msgCountBIx  on TweetMessages (countB:integer?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm";
 select element {'tweetid1':t1.tweetid,'count1':t1.countA,'t2info':(
         select element {'tweetid2':t2.tweetid,'count2':t2.countB}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.sqlpp
index bbffccc..0a94d56 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -47,7 +47,7 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
@@ -55,7 +55,7 @@
 
 create  index msgCountBIx  on TweetMessages (countB:integer?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm";
 select element {'tweetid1':t1.tweetid,'count1':t1.countA,'t2info':(
         select element {'tweetid2':t2.tweetid,'count2':t2.countB}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.sqlpp
index 28959b4..bc517cf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -48,13 +48,13 @@
   `referred-topics` : {{string}},
   `message-text` : string,
   countA : integer
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
 create  index msgCountBIx  on TweetMessages (countB:integer?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm";
 select element {'tweetid1':t1.tweetid,'count1':t1.countA,'t2info':(
         select element {'tweetid2':t2.tweetid,'count2':t2.countB}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.sqlpp
index ce88e60..0504b30 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -47,7 +47,7 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
@@ -55,7 +55,7 @@
 
 create  index msgCountBIx  on TweetMessages (countB:integer?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm";
 select element {'tweetid1':t1.tweetid,'count1':t1.countA,'t2info':(
         select element {'tweetid2':t2.tweetid,'count2':t2.countB}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_01.sqlpp
index 683fac0..1c2b803 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_01.sqlpp
@@ -32,13 +32,13 @@
 create type test.Name as
 {
   id : integer
-}
+};
 
 create  dataset Names(Name) primary key id;
 
 create  index Name_idx  on Names (fname:string?,lname:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-join_01.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_02.sqlpp
index c71faf9..7008899 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_02.sqlpp
@@ -32,13 +32,13 @@
 create type test.Name as
 {
   id : integer
-}
+};
 
 create  dataset Names(Name) primary key id;
 
 create  index Name_idx  on Names (fname:string?,lname:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-join_02.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_03.sqlpp
index e60b352..cfb31f7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_03.sqlpp
@@ -32,13 +32,13 @@
 create type test.Name as
 {
   id : integer
-}
+};
 
 create  dataset Names(Name) primary key id;
 
 create  index Name_idx  on Names (fname:string?,lname:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-join_03.adm"
+write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-join_03.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_01.sqlpp
index ec084f4..f0e8ff2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_01.sqlpp
@@ -32,13 +32,13 @@
 create type test.Name as
 {
   id : integer
-}
+};
 
 create  dataset Names(Name) primary key id;
 
 create  index Name_idx  on Names (fname:string?,lname:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_01.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_02.sqlpp
index 88c833f..400b7d1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_02.sqlpp
@@ -32,13 +32,13 @@
 create type test.Name as
 {
   id : integer
-}
+};
 
 create  dataset Names(Name) primary key id;
 
 create  index Name_idx  on Names (fname:string?,lname:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_02.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_03.sqlpp
index ac41385..39adc5c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_03.sqlpp
@@ -32,13 +32,13 @@
 create type test.Name as
 {
   id : integer
-}
+};
 
 create  dataset Names(Name) primary key id;
 
 create  index Name_idx  on Names (fname:string?,lname:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_03.adm"
+write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_03.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_04.sqlpp
index 1aed2f9..b403c1a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_04.sqlpp
@@ -32,13 +32,13 @@
 create type test.Name as
 {
   id : integer
-}
+};
 
 create  dataset Names(Name) primary key id;
 
 create  index Name_idx  on Names (fname:string?,lname:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_04.adm"
+write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_04.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_05.sqlpp
index 4bc05bd..22e6c4a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_05.sqlpp
@@ -32,13 +32,13 @@
 create type test.Name as
 {
   id : integer
-}
+};
 
 create  dataset Names(Name) primary key id;
 
 create  index Name_idx  on Names (fname:string?,lname:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_05.adm"
+write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_05.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_06.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_06.sqlpp
index 2e101c5..244f583 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_06.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_06.sqlpp
@@ -32,13 +32,13 @@
 create type test.Name as
 {
   id : integer
-}
+};
 
 create  dataset Names(Name) primary key id;
 
 create  index Name_idx  on Names (fname:string?,lname:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_06.adm"
+write output to asterix_nc1:"rttest/btree-index-join_secondary-composite-key-prefix-prefix-join_06.adm";
 select element {'emp1':emp1,'emp2':emp2}
 from  Names as emp1,
       Names as emp2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multiindex.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multiindex.sqlpp
index e2c6242..88b0584 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multiindex.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multiindex.sqlpp
@@ -36,7 +36,7 @@
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type test.FacebookUserType as
  closed {
@@ -48,7 +48,7 @@
   `user-since-copy` : datetime,
   `friend-ids` : {{integer}},
   employment : [EmploymentType]
-}
+};
 
 create type test.FacebookMessageType as
 {
@@ -58,7 +58,7 @@
   `in-response-to` : integer?,
   `sender-location` : point?,
   message : string
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
@@ -66,7 +66,7 @@
 
 create  index fbmIdxAutId  if not exists  on FacebookMessages (`author-id-copy`:integer?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multiindex.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multiindex.adm";
 select element {'fbu-ID':user.id,'fbm-auth-ID':message.`author-id`,'uname':user.name,'message':message.message}
 from  FacebookUsers as user,
       FacebookMessages as message
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multipred.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multipred.sqlpp
index bef57e1..816815a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multipred.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multipred.sqlpp
@@ -37,7 +37,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -46,7 +46,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -54,7 +54,7 @@
 
 create  index title_index  on DBLP (title:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multipred.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multipred.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_01.sqlpp
index a5d3d7b..01bf0ab 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_01.sqlpp
@@ -35,7 +35,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -44,7 +44,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index title_index  on DBLP (title:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_01.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_02.sqlpp
index 04e1a25..750d100 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_02.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -44,7 +44,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index title_index  on CSX (title:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_03.sqlpp
index a623356..3d33222 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_03.sqlpp
@@ -35,13 +35,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index title_index  on DBLP (title:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_03.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_03.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_04.sqlpp
index b0eaef0..d987e47 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_04.sqlpp
@@ -35,7 +35,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -43,7 +43,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -53,7 +53,7 @@
 
 create  index title_index  on CSX (title:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_05.sqlpp
index 050d58f..c322c44 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_05.sqlpp
@@ -36,7 +36,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -44,7 +44,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index title_index  on DBLP (title:string?) type btree enforced;
 
-write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_02.adm"
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-33.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-33.sqlpp
index 4156eb7..e4f0814 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-33.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-33.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-31.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-31.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-34.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-34.sqlpp
index c622c5e..bcea4a7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-34.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-34.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-32.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-32.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-35.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-35.sqlpp
index 0cd0de2..3d4f2d6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-35.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-35.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-33.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-33.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-36.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-36.sqlpp
index 0cd320e..bebae85 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-36.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-36.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-34.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-34.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-37.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-37.sqlpp
index 559620b..c67e089 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-37.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-37.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-35.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-35.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-38.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-38.sqlpp
index a9f60cf..39fb3ae 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-38.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-38.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-36.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-36.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-39.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-39.sqlpp
index 6a1bea8..357c6a3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-39.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-39.sqlpp
@@ -29,11 +29,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-37.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-37.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-40.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-40.sqlpp
index d731726..bdead51 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-40.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-40.sqlpp
@@ -29,11 +29,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-38.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-38.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-41.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-41.sqlpp
index dda5d82..6cb1afe 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-41.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-41.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-39.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-39.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-42.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-42.sqlpp
index adf0bf3..1fd309d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-42.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-42.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-40.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-40.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-43.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-43.sqlpp
index 332b5cc..6c33486 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-43.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-43.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-41.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-41.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-44.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-44.sqlpp
index cd4b818..f4e67d2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-44.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-44.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-42.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-42.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-45.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-45.sqlpp
index 8ab91cd..225dceb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-45.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-45.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-43.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-43.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-46.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-46.sqlpp
index 034d030..61c58de 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-46.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-46.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-44.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-44.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-47.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-47.sqlpp
index c54cefa..623e287 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-47.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-47.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-45.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-45.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-48.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-48.sqlpp
index 82390bf..df9db9c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-48.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-48.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-46.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-46.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-49.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-49.sqlpp
index c2670e9..3726ebb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-49.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-49.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-47.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-47.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-50.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-50.sqlpp
index 2596807..21a1e7c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-50.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-50.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-48.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-48.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-51.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-51.sqlpp
index 638c7f4..ae5ca02 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-51.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-51.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-49.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-49.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-52.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-52.sqlpp
index f0b0787..27c6807 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-52.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-52.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-50.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-50.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-53.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-53.sqlpp
index bbe11ba..8e9aea5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-53.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-53.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-51.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-51.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-54.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-54.sqlpp
index 9422940..64be60b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-54.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-54.sqlpp
@@ -29,11 +29,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-52.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-52.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-55.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-55.sqlpp
index 3cde8cb..6d0f320 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-55.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-55.sqlpp
@@ -29,11 +29,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-53.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-53.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-56.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-56.sqlpp
index c145b7b..5ac912b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-56.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-56.sqlpp
@@ -29,11 +29,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-54.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-54.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-57.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-57.sqlpp
index 486c75b..2de2f34 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-57.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-57.sqlpp
@@ -29,11 +29,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-55.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-55.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-58.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-58.sqlpp
index 8c33044..de54406 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-58.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-58.sqlpp
@@ -29,11 +29,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-56.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-56.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-59.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-59.sqlpp
index 68382ef..4db7f17 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-59.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-59.sqlpp
@@ -29,11 +29,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-57.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-57.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-60.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-60.sqlpp
index eff417e..a0d20aa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-60.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-60.sqlpp
@@ -29,11 +29,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-58.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-58.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-61.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-61.sqlpp
index 3561ecb..ea7e791 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-61.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-61.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-49.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-49.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-62.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-62.sqlpp
index 933954b..7897e16 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-62.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-62.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-62.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-62.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-63.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-63.sqlpp
index 75fb66e..ae70c61 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-63.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/btree-index/btree-secondary-63.sqlpp
@@ -30,11 +30,11 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-63.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-63.adm";
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains-panic.sqlpp
index 87bef97..235d076 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains-panic.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains-panic.adm";
 select element o
 from  DBLP as o
 where test.contains(o.title,'Mu')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains.sqlpp
index 985336f..d91f0a2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains.adm";
 select element o
 from  DBLP as o
 where test.contains(o.title,'Multimedia')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check-panic.sqlpp
index 7501006..d4516ed 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check-panic.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check-panic.adm";
 select element o
 from  DBLP as o
 with  ed as test.`edit-distance-check`(o.authors,'Amihay Motro',5)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check.sqlpp
index 7a7fec0..01183f7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check.adm";
 select element o
 from  DBLP as o
 where test.`edit-distance-check`(o.authors,'Amihay Motro',1)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-panic.sqlpp
index 4159d34..dbb5814 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-panic.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-panic.adm";
 select element o
 from  DBLP as o
 where (test.`edit-distance`(o.authors,'Amihay Motro') <= 5)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance.sqlpp
index 99dc892..4c3ca04 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance.adm";
 select element o
 from  DBLP as o
 where (test.`edit-distance`(o.authors,'Amihay Motro') <= 1)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-edit-distance.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-edit-distance.sqlpp
index 1fa7390..4da110a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-edit-distance.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-edit-distance.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-edit-distance.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-edit-distance.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `1`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-jaccard.sqlpp
index 07a919f..7c488d1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-jaccard.sqlpp
@@ -36,13 +36,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-jaccard.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.8f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard-check.sqlpp
index 3fe77a2..240f372 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard-check.sqlpp
@@ -36,13 +36,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard-check.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard-check.adm";
 select element o
 from  DBLP as o
 where test.`similarity-jaccard-check`(test.`gram-tokens`(o.title,3,false),test.`gram-tokens`('Transactions for Cooperative Environments',3,false),0.500000f)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard.sqlpp
index b5f5b47..28af41e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard.sqlpp
@@ -36,13 +36,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard.adm";
 select element o
 from  DBLP as o
 where (test.`similarity-jaccard`(test.`gram-tokens`(o.title,3,false),test.`gram-tokens`('Transactions for Cooperative Environments',3,false)) >= 0.500000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/word-contains.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/word-contains.sqlpp
index d835866..2e26b98 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/word-contains.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/word-contains.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_word-contains.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_word-contains.adm";
 select element o
 from  DBLP as o
 where test.contains(o.title,'Multimedia')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/word-fuzzyeq-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/word-fuzzyeq-jaccard.sqlpp
index 7ca803d..c905a53 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/word-fuzzyeq-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/word-fuzzyeq-jaccard.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_word-fuzzyeq-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_word-fuzzyeq-jaccard.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard-check.sqlpp
index f3720d6..fd0a151 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard-check.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard-check.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard-check.adm";
 select element o
 from  DBLP as o
 where test.`similarity-jaccard-check`(test.`word-tokens`(o.title),test.`word-tokens`('Transactions for Cooperative Environments'),0.500000f)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard.sqlpp
index f2539ec..b3ef666 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard.adm";
 select element o
 from  DBLP as o
 where (test.`similarity-jaccard`(test.`word-tokens`(o.title),test.`word-tokens`('Transactions for Cooperative Environments')) >= 0.500000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.sqlpp
index b132947..e569be8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.sqlpp
@@ -36,13 +36,13 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm";
 select element o
 from  DBLP as o
 with  eda as test.`edit-distance-check`(o.authors,'Amihay Motro',3),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.sqlpp
index e5d3e0c..c2402bc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.sqlpp
@@ -36,13 +36,13 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm";
 select element o
 from  DBLP as o
 with  edb as test.`edit-distance-check`(o.authors,'Amihay Motro',5),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic.sqlpp
index 7c3359a..30f29e2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic.sqlpp
@@ -35,13 +35,13 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic.adm";
 select element o
 from  DBLP as o
 with  ed as test.`edit-distance-check`(o.authors,'Amihay Motro',5)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let.sqlpp
index 73b651d..bbb060d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let.sqlpp
@@ -35,13 +35,13 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let.adm";
 select element o
 from  DBLP as o
 with  ed as test.`edit-distance-check`(o.authors,'Amihay Motro',1)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-substring.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-substring.sqlpp
index 9dcef5f..0b6b09c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-substring.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-substring.sqlpp
@@ -35,13 +35,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-substring.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-substring.adm";
 select element {'id':paper.id,'title':paper.title}
 from  DBLP as paper
 where test.`edit-distance-check`(test.substring(paper.title,0,8),'datbase',1)[0]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-word-tokens.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-word-tokens.sqlpp
index 7c7134e..dec3c89 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-word-tokens.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-word-tokens.sqlpp
@@ -35,13 +35,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-word-tokens.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-word-tokens.adm";
 select element {'id':paper.id,'title':paper.title}
 from  DBLP as paper,
       test.`word-tokens`(paper.title) as word
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-let.sqlpp
index 1079aea..8e726f1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-let.sqlpp
@@ -37,13 +37,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-let.adm";
 select element o
 from  DBLP as o
 with  jacc as test.`similarity-jaccard-check`(test.`gram-tokens`(o.title,3,false),test.`gram-tokens`('Transactions for Cooperative Environments',3,false),0.500000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-multi-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-multi-let.sqlpp
index 3c33a4d..9353af4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-multi-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-multi-let.sqlpp
@@ -37,13 +37,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-multi-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-multi-let.adm";
 select element {'Paper':paper_tokens,'Query':query_tokens}
 from  DBLP as paper
 with  paper_tokens as test.`gram-tokens`(paper.title,3,false),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-let.sqlpp
index 3dfa3d6..992bf64 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-let.sqlpp
@@ -35,13 +35,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-let.adm";
 select element o
 from  DBLP as o
 with  jacc as test.`similarity-jaccard-check`(test.`word-tokens`(o.title),test.`word-tokens`('Transactions for Cooperative Environments'),0.500000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-multi-let.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-multi-let.sqlpp
index 42a3228..168e1d3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-multi-let.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-multi-let.sqlpp
@@ -35,13 +35,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-multi-let.adm"
+write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-multi-let.adm";
 select element {'Paper':paper_tokens,'Query':query_tokens}
 from  DBLP as paper
 with  paper_tokens as test.`word-tokens`(paper.title),
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp
index 19fe8d7..34e2503 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -48,13 +48,13 @@
   `referred-topics` : {{string}},
   countA : integer,
   countB : integer
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
 create  index msgNgramIx  on TweetMessages (`message-text`:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-edit-distance-check_idx_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_leftouterjoin-probe-pidx-with-join-edit-distance-check_idx_01.adm";
 select element {'tweet':{'id':t1.tweetid,'topics':t1.`message-text`},'similar-tweets':(
         select element {'id':t2.tweetid,'topics':t2.`message-text`}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_01.sqlpp
index 8116300..cae1003 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_01.sqlpp
@@ -33,7 +33,7 @@
   id : integer,
   dblpid : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -42,7 +42,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -50,7 +50,7 @@
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-01.adm";
 select element {'title1':o1.title,'title2':o2.title}
 from  DBLP as o1,
       CSX as o2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_02.sqlpp
index cf22b7b..2ee4da7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_02.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -42,7 +42,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -50,7 +50,7 @@
 
 create  index ngram_index  on CSX (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-02.adm";
 select element {'title1':o1.title,'title2':o2.title}
 from  DBLP as o1,
       CSX as o2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_03.sqlpp
index 056eed9..a489041 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_03.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-03.adm";
 select element {'title1':o1.title,'title2':o2.title}
 from  DBLP as o1,
       DBLP as o2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_04.sqlpp
index bb9ceac..2bc986c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_04.sqlpp
@@ -33,7 +33,7 @@
   id : integer,
   dblpid : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -41,7 +41,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@
 
 create  index ngram_index_CSX  on CSX (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-04.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-contains-04.adm";
 select element {'title1':o1.title,'title2':o2.title}
 from  DBLP as o1,
       CSX as o2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_01.sqlpp
index 6e8947b..48ad150 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_01.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -43,7 +43,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_02.sqlpp
index 626043f..c07a2f3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_02.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -43,7 +43,7 @@
   csxid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@
 
 create  index ngram_index  on CSX (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_03.sqlpp
index e3fab46..82cff81 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_03.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_03.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_04.sqlpp
index 6712b47..c01b607 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_04.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -42,7 +42,7 @@
   csxid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index ngram_index_CSX  on CSX (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_05.sqlpp
index e4dcbf4..3d1c52d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_05.sqlpp
@@ -35,7 +35,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -43,7 +43,7 @@
   csxid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_inline_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_inline_03.sqlpp
index be26ff3..1c0104c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_inline_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_inline_03.sqlpp
@@ -35,13 +35,13 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_04.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-check_04.adm";
 select element {'arec':a,'brec':b,'ed':ed[1]}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-contains.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-contains.sqlpp
index 6b776b2..aabfef6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-contains.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-contains.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -43,7 +43,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-contains.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance-contains.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_01.sqlpp
index 6dbd135..9d83f4b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_01.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -43,7 +43,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_02.sqlpp
index 3dd2a00..0a6952c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_02.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -43,7 +43,7 @@
   csxid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@
 
 create  index ngram_index  on CSX (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_03.sqlpp
index e30c47e..e2ac1bb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_03.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_03.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_04.sqlpp
index 444e12d..bcdebcb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_04.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -42,7 +42,7 @@
   csxid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index ngram_index_CSX  on CSX (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_05.sqlpp
index 58370e9..f4d260c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_05.sqlpp
@@ -35,7 +35,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -43,7 +43,7 @@
   csxid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_inline_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_inline_03.sqlpp
index 56ff49e..800cf0c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_inline_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_inline_03.sqlpp
@@ -35,13 +35,13 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-edit-distance_03.adm";
 select element {'arec':a,'brec':b,'ed':ed}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp
index 6f75efe..c1c1ecb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_01.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -43,7 +43,7 @@
   csxid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@
 
 create  index ngram_index  on CSX (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_02.sqlpp
index d8cda0e..1f12373 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_02.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -43,7 +43,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp
index 1f24f2b..92eb730 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_03.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_03.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_04.sqlpp
index a45d6cf..f370d4f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_04.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -42,7 +42,7 @@
   csxid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index ngram_index_CSX  on CSX (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_05.sqlpp
index a5c2550..36a0d94 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_05.sqlpp
@@ -35,7 +35,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -43,7 +43,7 @@
   csxid : string,
   title : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@
 
 create  index ngram_index  on DBLP (authors:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-edit-distance_01.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `3`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp
index 6366cf5..ada10dc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_01.sqlpp
@@ -36,7 +36,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -45,7 +45,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -53,7 +53,7 @@
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_02.sqlpp
index 8d39eff..597c77e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_02.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -45,7 +45,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -53,7 +53,7 @@
 
 create  index ngram_index  on CSX (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_02.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_03.sqlpp
index c091978..74bb1a3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_03.sqlpp
@@ -36,13 +36,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_03.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_04.sqlpp
index 34206bf..e7d9c64 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_04.sqlpp
@@ -36,7 +36,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -44,7 +44,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -54,7 +54,7 @@
 
 create  index ngram_index_CSX  on CSX (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.sqlpp
index aef97a9..611df16 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.sqlpp
@@ -36,7 +36,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -45,7 +45,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -53,7 +53,7 @@
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.sqlpp
index ed2277b..eabf59e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -45,7 +45,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -53,7 +53,7 @@
 
 create  index ngram_index  on CSX (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.sqlpp
index 13b3126..0f1ab7d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.sqlpp
@@ -36,13 +36,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_03.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.sqlpp
index 49f4a14..813e661 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.sqlpp
@@ -36,7 +36,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -44,7 +44,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -54,7 +54,7 @@
 
 create  index ngram_index_CSX  on CSX (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.sqlpp
index c01ad52..8715f04 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.sqlpp
@@ -37,13 +37,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_04.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard-check_04.adm";
 select element {'arec':a,'brec':b,'jacc':jacc[1]}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_01.sqlpp
index 633fe4c..bf74a6f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_01.sqlpp
@@ -36,7 +36,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -45,7 +45,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -53,7 +53,7 @@
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_02.sqlpp
index fb3274c..6b88146 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_02.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -45,7 +45,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -53,7 +53,7 @@
 
 create  index ngram_index  on CSX (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.sqlpp
index 4c34aef..bbfc778 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.sqlpp
@@ -36,13 +36,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_03.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.sqlpp
index 2aa1c1f..c7b2921 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.sqlpp
@@ -36,7 +36,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -44,7 +44,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -54,7 +54,7 @@
 
 create  index ngram_index_CSX  on CSX (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.sqlpp
index 1da54bd..f87cc2b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.sqlpp
@@ -37,13 +37,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title:string?) type ngram (3) enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_04.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_ngram-jaccard_04.adm";
 select element {'arec':a,'brec':b,'jacc':jacc}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
index 4f80369..2965d41 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -43,7 +43,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@
 
 create  index keyword_index  on DBLP (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
index 5afa445..1d50ad5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -43,7 +43,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@
 
 create  index keyword_index  on CSX (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_02.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
index 4c0f319..7e4a3b4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_03.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp
index 9693ce0..e7fe3a4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -42,7 +42,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index keyword_index_CSX  on CSX (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-fuzzyeq-jaccard_01.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.5f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
index e9f647b..85f6690 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
@@ -38,7 +38,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -49,7 +49,7 @@
   `referred-topics` : {{string}},
   countA : integer,
   countB : integer
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
@@ -61,7 +61,7 @@
 
 create  index msgTextIx  on TweetMessages (`message-text`:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check-after-btree-access.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check-after-btree-access.adm";
 select element {'t1':t1.tweetid,'t2':t2.tweetid,'sim':sim[1]}
 from  TweetMessages as t1,
       TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.sqlpp
index 95db0e9..7f17dd2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -43,7 +43,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@
 
 create  index keyword_index  on DBLP (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.sqlpp
index 1532cf9..7b7c77e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -43,7 +43,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@
 
 create  index keyword_index  on CSX (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.sqlpp
index bee9fd1..2ab7191 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_03.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.sqlpp
index d1ba535..d18ca91 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -42,7 +42,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index keyword_index_CSX  on CSX (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.sqlpp
index d4793b0..591a1fd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.sqlpp
@@ -35,13 +35,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_04.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard-check_04.adm";
 select element {'arec':a,'brec':b,'jacc':jacc[1]}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.sqlpp
index b0429d0..f748ecc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -43,7 +43,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@
 
 create  index keyword_index  on DBLP (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.sqlpp
index cc0eeee..a0595e7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -43,7 +43,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@
 
 create  index keyword_index  on CSX (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_02.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_02.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.sqlpp
index 50f5f99..c00ccd3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.sqlpp
@@ -34,13 +34,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_03.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_03.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.sqlpp
index 0332e72..0b72ffb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.sqlpp
@@ -34,7 +34,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -42,7 +42,7 @@
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@
 
 create  index keyword_index_CSX  on CSX (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_01.adm";
 select element {'arec':a,'brec':b}
 from  DBLP as a,
       CSX as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.sqlpp
index a32e635..61dd4ee 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.sqlpp
@@ -35,13 +35,13 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title:string?) type keyword enforced;
 
-write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_04.adm"
+write output to asterix_nc1:"rttest/inverted-index-join_word-jaccard_04.adm";
 select element {'arec':a,'brec':b,'jacc':jacc}
 from  DBLP as a,
       DBLP as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
index 9316496..944d04e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -48,7 +48,7 @@
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
@@ -60,7 +60,7 @@
 
 create  index msgTextIx  on TweetMessages (`message-text`) type keyword;
 
-write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_01.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_01.adm";
 select element {'tweetid1':t1.tweetid,'loc1':t1.`sender-location`,'nearby-message':(
         select element {'tweetid2':t2.tweetid,'loc2':t2.`sender-location`}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
index 2e98762..fdde3eb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -48,7 +48,7 @@
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
@@ -60,7 +60,7 @@
 
 create  index msgTextIx  on TweetMessages (`message-text`) type keyword;
 
-write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_02.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_02.adm";
 select element {'tweetid1':t1.tweetid,'loc1':t1.`sender-location`,'nearby-message':(
         select element {'tweetid2':t2.tweetid,'loc2':t2.`sender-location`}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.sqlpp
index 66a2d7d..79af4c2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.sqlpp
@@ -39,7 +39,7 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyRecordOpen as
 {
@@ -50,7 +50,7 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create  dataset MyData1(MyRecordOpen) primary key id;
 
@@ -58,7 +58,7 @@
 
 create  index rtree_index  on MyData1 (point:point?) type rtree enforced;
 
-write output to asterix_nc1:"rttest/index-join_rtree-spatial-intersect-point.adm"
+write output to asterix_nc1:"rttest/index-join_rtree-spatial-intersect-point.adm";
 select element {'a':a,'b':b}
 from  MyData1 as a,
       MyData2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.sqlpp
index e9ff808..b41932d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.sqlpp
@@ -39,7 +39,7 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyRecordOpen as
 {
@@ -50,7 +50,7 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create  dataset MyData1(MyRecord) primary key id;
 
@@ -58,7 +58,7 @@
 
 create  index rtree_index  on MyData2 (point:point?) type rtree enforced;
 
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm";
 select element {'a':a,'b':b}
 from  MyData1 as a,
       MyData2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.sqlpp
index 17f34b9..634b355 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.sqlpp
@@ -38,13 +38,13 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create  dataset MyData(MyRecord) primary key id;
 
 create  index rtree_index  on MyData (point:point?) type rtree enforced;
 
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_03.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_03.adm";
 select element {'a':a,'b':b}
 from  MyData as a,
       MyData as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.sqlpp
index ed4abbc..90da1f8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.sqlpp
@@ -38,7 +38,7 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create  dataset MyData1(MyRecord) primary key id;
 
@@ -48,7 +48,7 @@
 
 create  index rtree_index2  on MyData2 (point:point?) type rtree enforced;
 
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm";
 select element {'a':a,'b':b}
 from  MyData1 as a,
       MyData2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.sqlpp
index c5482f8..22b4f78 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.sqlpp
@@ -38,7 +38,7 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create  dataset MyData1(MyRecord) primary key id;
 
@@ -46,7 +46,7 @@
 
 create  index rtree_index  on MyData1 (point:point?) type rtree enforced;
 
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm";
 select element {'a':a,'b':b}
 from  MyData1 as a,
       MyData2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orderby-desc-using-gby.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orderby-desc-using-gby.sqlpp
index 86bf00b..279adf6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orderby-desc-using-gby.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orderby-desc-using-gby.sqlpp
@@ -28,7 +28,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type `gby-using-orderby-desc`.CustomerType as
  closed {
@@ -41,7 +41,7 @@
       total : float
   }
 
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -49,7 +49,7 @@
 ;
 create  dataset Customers(CustomerType) primary key cid on group1;
 
-write output to asterix_nc1:"rttest/gby-using-orderby-desc.adm"
+write output to asterix_nc1:"rttest/gby-using-orderby-desc.adm";
 select element {'name':name,'age':age}
 from  Customers as c
 group by c.name as name
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp
index 2f0230c..f82ce53 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp
@@ -31,7 +31,7 @@
   orderpriority : string,
   clerk : string,
   total : float
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -39,7 +39,7 @@
 ;
 create  dataset Orders(OrderType) primary key oid on group1;
 
-write output to asterix_nc1:"/tmp/orders-aggreg.adm"
+write output to asterix_nc1:"/tmp/orders-aggreg.adm";
 select element {'cid':cid,'ordpercust':`orders-aggreg`.coll_count(o),'totalcust':`orders-aggreg`.coll_sum((
         select element i.total
         from  o as i
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-composite-index-search.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-composite-index-search.sqlpp
index 2870161..5d67268 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-composite-index-search.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-composite-index-search.sqlpp
@@ -34,13 +34,13 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
 create  index idx_Custkey_Orderstatus  on Orders (o_custkey,o_orderstatus) type btree;
 
-write output to asterix_nc1:"/tmp/index_search.adm"
+write output to asterix_nc1:"/tmp/index_search.adm";
 select element {'o_orderkey':o.o_orderkey,'o_custkey':o.o_custkey,'o_orderstatus':o.o_orderstatus}
 from  Orders as o
 where ((o.o_custkey = 40) and (o.o_orderstatus = 'P'))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_01.sqlpp
index 05e89ac..190f2f2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_01.sqlpp
@@ -34,7 +34,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -46,7 +46,7 @@
 
 create  index idx_Orders_Custkey  on Orders (o_custkey) type btree;
 
-write output to asterix_nc1:"/tmp/index_search-conjunctive.adm"
+write output to asterix_nc1:"/tmp/index_search-conjunctive.adm";
 select element {'o_orderkey':o.o_orderkey,'o_custkey':o.o_custkey}
 from  Orders as o
 where ((o.o_custkey = 40) and (o.o_totalprice > 150000.0))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_02.sqlpp
index 4d938a6..64e2395 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_02.sqlpp
@@ -34,7 +34,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -46,7 +46,7 @@
 
 create  index idx_Orders_Custkey  on Orders (o_custkey) type btree;
 
-write output to asterix_nc1:"/tmp/index_search-conjunctive.adm"
+write output to asterix_nc1:"/tmp/index_search-conjunctive.adm";
 select element {'o_orderkey':o.o_orderkey,'o_custkey':o.o_custkey,'o_totalprice':o.o_totalprice}
 from  Orders as o
 where ((o.o_custkey = 40) and (o.o_totalprice > 150000.0))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_01.sqlpp
index 244b6e5..4fe9e18 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_01.sqlpp
@@ -34,7 +34,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -46,7 +46,7 @@
 
 create  index idx_Orders_Custkey  on Orders (o_custkey) type btree;
 
-write output to asterix_nc1:"/tmp/index_search-conjunctive.adm"
+write output to asterix_nc1:"/tmp/index_search-conjunctive.adm";
 select element {'o_orderkey':o.o_orderkey,'o_custkey':o.o_custkey}
 from  Orders as o
 where ((o.o_custkey = 40) and (o.o_totalprice > 150000.0))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_02.sqlpp
index e6a1f7c..c16810f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_02.sqlpp
@@ -34,7 +34,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -46,7 +46,7 @@
 
 create  index idx_Orders_Custkey  on Orders (o_custkey) type btree;
 
-write output to asterix_nc1:"/tmp/index_search-conjunctive.adm"
+write output to asterix_nc1:"/tmp/index_search-conjunctive.adm";
 select element {'o_orderkey':o.o_orderkey,'o_custkey':o.o_custkey,'o_totalprice':o.o_totalprice}
 from  Orders as o
 where ((o.o_custkey = 40) and (o.o_totalprice > 150000.0))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-open.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-open.sqlpp
index 5d713d2..532f011 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-open.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-open.sqlpp
@@ -34,7 +34,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -44,7 +44,7 @@
 
 create  index idx_Orders_Custkey  on Orders (o_custkey) type btree;
 
-write output to asterix_nc1:"/tmp/index_search.adm"
+write output to asterix_nc1:"/tmp/index_search.adm";
 select element {'o_orderkey':o.o_orderkey,'o_custkey':o.o_custkey}
 from  Orders as o
 where (o.o_custkey = 40)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search.sqlpp
index e4fec15..99d8f81 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search.sqlpp
@@ -34,7 +34,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -44,7 +44,7 @@
 
 create  index idx_Orders_Custkey  on Orders (o_custkey) type btree;
 
-write output to asterix_nc1:"/tmp/index_search.adm"
+write output to asterix_nc1:"/tmp/index_search.adm";
 select element {'o_orderkey':o.o_orderkey,'o_custkey':o.o_custkey}
 from  Orders as o
 where (o.o_custkey = 40)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search-open.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search-open.sqlpp
index 69f90f9..44c7aff 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search-open.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search-open.sqlpp
@@ -34,7 +34,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -42,7 +42,7 @@
 ;
 create  dataset Orders(OrderType) primary key o_orderkey on group1;
 
-write output to asterix_nc1:"/tmp/prim_index_search.adm"
+write output to asterix_nc1:"/tmp/prim_index_search.adm";
 select element {'o_orderkey':o.o_orderkey,'o_custkey':o.o_custkey}
 from  Orders as o
 where (o.o_orderkey = 34)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search.sqlpp
index f658423..91bc4fc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search.sqlpp
@@ -34,7 +34,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -42,7 +42,7 @@
 ;
 create  dataset Orders(OrderType) primary key o_orderkey on group1;
 
-write output to asterix_nc1:"/tmp/prim_index_search.adm"
+write output to asterix_nc1:"/tmp/prim_index_search.adm";
 select element {'o_orderkey':o.o_orderkey,'o_custkey':o.o_custkey}
 from  Orders as o
 where (o.o_orderkey = 34)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/pull_select_above_eq_join.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/pull_select_above_eq_join.sqlpp
index 0d1d4b9..8634de5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/pull_select_above_eq_join.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/pull_select_above_eq_join.sqlpp
@@ -29,7 +29,7 @@
   name : string,
   city : string,
   lottery_numbers : {{integer}}
-}
+};
 
 create type `pull-select-above-eq-join`.VisitorType as
 {
@@ -37,7 +37,7 @@
   name : string,
   city : string,
   lottery_numbers : {{integer}}
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -47,7 +47,7 @@
 
 create  dataset Visitors(VisitorType) primary key vid on group1;
 
-write output to asterix_nc1:"/tmp/pull-select-above-eq-join.adm"
+write output to asterix_nc1:"/tmp/pull-select-above-eq-join.adm";
 select element {'uid':user.uid,'vid':visitor.vid}
 from  Users as user,
       Visitors as visitor
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push-project-through-group.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push-project-through-group.sqlpp
index 02b6a90..535ae58 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push-project-through-group.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push-project-through-group.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -38,7 +38,7 @@
 ;
 create  dataset DBLP(DBLPType) primary key id on group1;
 
-write output to asterix_nc1:"rttest/fuzzyjoin_080.adm"
+write output to asterix_nc1:"rttest/fuzzyjoin_080.adm";
 select element {'id':paperDBLP.id,'matches':matches}
 from  DBLP as paperDBLP
 with  matches as (
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push_limit.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push_limit.sqlpp
index 7c36684..721ad69 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push_limit.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push_limit.sqlpp
@@ -34,7 +34,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -42,7 +42,7 @@
 ;
 create  dataset Orders(OrderType) primary key o_orderkey on group1;
 
-write output to asterix_nc1:"/tmp/push_limit.adm"
+write output to asterix_nc1:"/tmp/push_limit.adm";
 select element {'price':o.o_totalprice,'date':o.o_orderdate}
 from  Orders as o
 where (o.o_totalprice > 100)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q01_pricing_summary_report_nt.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q01_pricing_summary_report_nt.sqlpp
index 637eb23..2cc5d36 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q01_pricing_summary_report_nt.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q01_pricing_summary_report_nt.sqlpp
@@ -41,13 +41,13 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
 load  dataset LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
-write output to asterix_nc1:"rttest/tpch_q1_pricing_summary_report_nt.adm"
+write output to asterix_nc1:"rttest/tpch_q1_pricing_summary_report_nt.adm";
 select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'sum_qty':tpch.coll_sum((
         select element i.l_quantity
         from  l as i
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp
index 95297b3..9c33b03 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type q3_shipping_priority.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type q3_shipping_priority.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -78,7 +78,7 @@
 
 create  dataset Customers(CustomerType) primary key c_custkey on group1;
 
-write output to asterix_nc1:"/tmp/q3_shipping_priority.adm"
+write output to asterix_nc1:"/tmp/q3_shipping_priority.adm";
 select element {'l_orderkey':l_orderkey,'revenue':revenue,'o_orderdate':o_orderdate,'o_shippriority':o_shippriority}
 from  Customers as c,
       Orders as o,
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp
index 810d0fb..b90b3ed 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type q5_local_supplier.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type q5_local_supplier.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type q5_local_supplier.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type q5_local_supplier.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type q5_local_supplier.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -110,7 +110,7 @@
 
 create  dataset Regions(RegionType) primary key r_regionkey on group1;
 
-write output to asterix_nc1:"/tmp/q5_local_supplier.adm"
+write output to asterix_nc1:"/tmp/q5_local_supplier.adm";
 select element {'n_name':n_name,'revenue':revenue}
 from  Customers as c,
       (
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q08_group_by.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q08_group_by.sqlpp
index f0310dd..4ff3d31 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q08_group_by.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q08_group_by.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type q08_group_by.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type q08_group_by.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type q08_group_by.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type q08_group_by.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type q08_group_by.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type q08_group_by.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q09_group_by.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q09_group_by.sqlpp
index e85d97d..44f4760 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q09_group_by.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q09_group_by.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type q09_group_by.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type q09_group_by.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type q09_group_by.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type q09_group_by.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type q09_group_by.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type q09_group_by.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type q09_group_by.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q1.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q1.sqlpp
index 41f7e4e..145f018 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q1.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q1.sqlpp
@@ -29,7 +29,7 @@
   city : string,
   zip : string,
   latlong : point
-}
+};
 
 create type events.UserType as
 {
@@ -43,7 +43,7 @@
           member_since : date
       }
 }}
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -51,7 +51,7 @@
 ;
 create  dataset User(UserType) primary key name on group1;
 
-write output to asterix_nc1:"/tmp/q1.adm"
+write output to asterix_nc1:"/tmp/q1.adm";
 select element {'name':user.name}
 from  User as user
 where some i in user.interests satisfies (i = 'movies')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q2.sqlpp
index 92ab003..801f6a3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q2.sqlpp
@@ -28,7 +28,7 @@
   street : string,
   city : string,
   zip : string
-}
+};
 
 create type events.EventType as
  closed {
@@ -48,7 +48,7 @@
   price : double?,
   start_time : datetime,
   end_time : datetime
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -56,7 +56,7 @@
 ;
 create  dataset Event(EventType) primary key name on group1;
 
-write output to asterix_nc1:"/tmp/q2.adm"
+write output to asterix_nc1:"/tmp/q2.adm";
 select element {'sig_name':sig_name,'total_count':sig_sponsorship_count,'chapter_breakdown':by_chapter}
 from  Event as event,
       event.sponsoring_sigs as sponsor
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue562.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue562.sqlpp
index 7d4e947..645d320 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue562.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue562.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -60,7 +60,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -72,7 +72,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue601.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue601.sqlpp
index 346c1a4..a5861be 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue601.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue601.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue697.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue697.sqlpp
index 2e26344..2ce1638 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue697.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue697.sqlpp
@@ -33,7 +33,7 @@
  closed {
   key1 : integer,
   `value` : integer
-}
+};
 
 create  dataset test(TestType) primary key key1;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue785.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue785.sqlpp
index 7b528f9..ec19977 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue785.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue785.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810-2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810-2.sqlpp
index 2b49c5f..a43ca13 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810-2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810-2.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810.sqlpp
index c7ba82c..aacbb72 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue827-2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue827-2.sqlpp
index 6c4f243..e1d8b97 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue827-2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue827-2.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849-2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849-2.sqlpp
index 34c9489..ee21bc4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849-2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849-2.sqlpp
@@ -32,7 +32,7 @@
 create type test.sType as
  closed {
   b : integer
-}
+};
 
 create  dataset s(sType) primary key b;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849.sqlpp
index d1d2b3b..5b0e7fd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849.sqlpp
@@ -32,7 +32,7 @@
 create type test.sType as
  closed {
   b : integer
-}
+};
 
 create  dataset s(sType) primary key b;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.sqlpp
index 500f2c1..cb88299 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.sqlpp
@@ -37,7 +37,7 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create  dataset TwitterUsers(TwitterUserType) primary key `screen-name`;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric.sqlpp
index 48ebde9..0460e78 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric.sqlpp
@@ -37,7 +37,7 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create  dataset TwitterUsers(TwitterUserType) primary key `screen-name`;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string-desc.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string-desc.sqlpp
index 89b0885..156e6a8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string-desc.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string-desc.sqlpp
@@ -37,7 +37,7 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create  dataset TwitterUsers(TwitterUserType) primary key `screen-name`;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string.sqlpp
index da38ad9..4bf574b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string.sqlpp
@@ -37,7 +37,7 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create  dataset TwitterUsers(TwitterUserType) primary key `screen-name`;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/record_access.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/record_access.sqlpp
index 512c556..b48dd57 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/record_access.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/record_access.sqlpp
@@ -23,5 +23,5 @@
 use test;
 
 
-write output to asterix_nc1:"/tmp/rec_access.adm"
+write output to asterix_nc1:"/tmp/rec_access.adm";
 {'a':2}.a;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/issue730.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/issue730.sqlpp
index f67eed0..0966369 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/issue730.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/issue730.sqlpp
@@ -37,7 +37,7 @@
   statuses_count : integer,
   name : string,
   followers_count : integer
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -47,13 +47,13 @@
   send_time : datetime,
   referred_topics : {{string}},
   message_text : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
 create  index twmSndLocIx  on TweetMessages (sender_location) type rtree;
 
-write output to asterix_nc1:"rttest/rtree-index-join_issue730.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_issue730.adm";
 select element {'message':t1.tweetid,'nearby-message':(
         select element t2.tweetid
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
index c7403ab..66d3762 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
  closed {
@@ -49,7 +49,7 @@
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
@@ -61,7 +61,7 @@
 
 create  index msgTextIx  on TweetMessages (`message-text`) type keyword;
 
-write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_01.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_01.adm";
 select element {'tweetid1':t1.tweetid,'loc1':t1.`sender-location`,'nearby-message':(
         select element {'tweetid2':t2.tweetid,'loc2':t2.`sender-location`}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
index 8a37269..a30f22c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
  closed {
@@ -49,7 +49,7 @@
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
@@ -61,7 +61,7 @@
 
 create  index msgTextIx  on TweetMessages (`message-text`) type keyword;
 
-write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_02.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_leftouterjoin-probe-pidx-with-join-rtree-sidx_02.adm";
 select element {'tweetid1':t1.tweetid,'loc1':t1.`sender-location`,'nearby-message':(
         select element {'tweetid2':t2.tweetid,'loc2':t2.`sender-location`}
         from  TweetMessages as t2
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/query-issue838.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/query-issue838.sqlpp
index cfbd1e1..12c29b0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/query-issue838.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/query-issue838.sqlpp
@@ -34,13 +34,13 @@
   tweetid : bigint,
   `sender-location` : point,
   text : string
-}
+};
 
 create type twitter.TweetHistorySubscription as
 {
   `subscription-id` : integer,
   location : point
-}
+};
 
 create  dataset TweetHistorySubscriptions(TweetHistorySubscription) primary key `subscription-id`;
 
@@ -50,7 +50,7 @@
 
 create  index locationIdx  on TweetMessages (`sender-location`) type rtree;
 
-write output to asterix_nc1:"rttest/query-issue838.adm"
+write output to asterix_nc1:"rttest/query-issue838.adm";
 select element {'subscription-id':sub.`subscription-id`,'changeSet':1,'execution-time':twitter.`current-datetime`(),'message-text':text}
 from  TweetHistorySubscriptions as sub,
       (
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_01.sqlpp
index b15412a..02805cd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_01.sqlpp
@@ -39,7 +39,7 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create  dataset MyData1(MyRecord) primary key id;
 
@@ -47,7 +47,7 @@
 
 create  index rtree_index  on MyData1 (point) type rtree;
 
-write output to asterix_nc1:"rttest/index-join_rtree-spatial-intersect-point.adm"
+write output to asterix_nc1:"rttest/index-join_rtree-spatial-intersect-point.adm";
 select element {'a':a,'b':b}
 from  MyData1 as a,
       MyData2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_02.sqlpp
index 3b3e18d..f87832e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_02.sqlpp
@@ -39,7 +39,7 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create  dataset MyData1(MyRecord) primary key id;
 
@@ -47,7 +47,7 @@
 
 create  index rtree_index  on MyData2 (point) type rtree;
 
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.adm";
 select element {'a':a,'b':b}
 from  MyData1 as a,
       MyData2 as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_03.sqlpp
index b700008..afe7a72 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_03.sqlpp
@@ -39,13 +39,13 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create  dataset MyData(MyRecord) primary key id;
 
 create  index rtree_index  on MyData (point) type rtree;
 
-write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_03.adm"
+write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_03.adm";
 select element {'a':a,'b':b}
 from  MyData as a,
       MyData as b
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index-open.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index-open.sqlpp
index e610c31..4300355 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index-open.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index-open.sqlpp
@@ -34,7 +34,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -46,7 +46,7 @@
 
 create  index rtree_index_point  on MyData (point) type rtree;
 
-write output to asterix_nc1:"rttest/index_rtree-secondary-index-open.adm"
+write output to asterix_nc1:"rttest/index_rtree-secondary-index-open.adm";
 select element {'id':o.id}
 from  MyData as o
 where test.`spatial-intersect`(o.point,test.`create-polygon`([4.0,1.0,4.0,4.0,12.0,4.0,12.0,1.0]))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index.sqlpp
index 4658fb9..0748c99 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index.sqlpp
@@ -34,7 +34,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -46,7 +46,7 @@
 
 create  index rtree_index_point  on MyData (point) type rtree;
 
-write output to asterix_nc1:"rttest/index_rtree-secondary-index.adm"
+write output to asterix_nc1:"rttest/index_rtree-secondary-index.adm";
 select element {'id':o.id}
 from  MyData as o
 where test.`spatial-intersect`(o.point,test.`create-polygon`([4.0,1.0,4.0,4.0,12.0,4.0,12.0,1.0]))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-all.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-all.sqlpp
index eb0b4fa..daf328d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-all.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-all.sqlpp
@@ -41,14 +41,14 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.LineIDType as
  closed {
   l_orderkey : integer,
   l_partkey : integer,
   l_suppkey : integer
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-rtree-secondary-index.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-rtree-secondary-index.sqlpp
index 3f13182..6493acd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-rtree-secondary-index.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-rtree-secondary-index.sqlpp
@@ -34,7 +34,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete.sqlpp
index ba2e869..83c12e0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete.sqlpp
@@ -41,14 +41,14 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.LineIDType as
  closed {
   l_orderkey : integer,
   l_partkey : integer,
   l_suppkey : integer
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-insert-secondary-index.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-insert-secondary-index.sqlpp
index e7ffecb..b5e9c66 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-insert-secondary-index.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-insert-secondary-index.sqlpp
@@ -41,14 +41,14 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.LineIDType as
  closed {
   l_orderkey : integer,
   l_partkey : integer,
   l_suppkey : integer
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-insert.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-insert.sqlpp
index aeed887..0bda7a0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-insert.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-insert.sqlpp
@@ -41,14 +41,14 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.LineIDType as
  closed {
   l_orderkey : integer,
   l_partkey : integer,
   l_suppkey : integer
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.sqlpp
index ef9fb92..6382029 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.sqlpp
@@ -37,11 +37,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_01.adm"
+write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_01.adm";
 select element ed
 from  DBLP as o
 with  ed as test.`edit-distance`(o.authors,'Michael J. Carey')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.sqlpp
index 209b9fd..5e9721a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.sqlpp
@@ -37,11 +37,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_02.adm"
+write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_02.adm";
 select element ed
 from  DBLP as o
 with  ed as test.`edit-distance`(o.authors,'Michael J. Carey')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.sqlpp
index 0eb8249..d2f20cc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.sqlpp
@@ -37,11 +37,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_03.adm"
+write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_03.adm";
 select element ed
 from  DBLP as o
 with  ed as test.`edit-distance`(o.authors,'Michael J. Carey')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.sqlpp
index 986caf4..98fd885 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.sqlpp
@@ -37,11 +37,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_04.adm"
+write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_04.adm";
 select element ed
 from  DBLP as o
 with  ed as test.`edit-distance`(o.authors,'Michael J. Carey')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.sqlpp
index 4bf14b6..71d76e0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.sqlpp
@@ -37,11 +37,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_05.adm"
+write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_05.adm";
 select element ed
 from  DBLP as o
 with  ed as test.`edit-distance`(o.authors,'Michael J. Carey')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.sqlpp
index c355929..0d10ba5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.sqlpp
@@ -37,11 +37,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_06.adm"
+write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_06.adm";
 select element ed
 from  DBLP as o
 with  ed as test.`edit-distance`(o.authors,'Michael J. Carey')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.sqlpp
index 9418827..2eaa38e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.sqlpp
@@ -37,11 +37,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_07.adm"
+write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_07.adm";
 select element ed
 from  DBLP as o
 with  ed as test.`edit-distance`(o.authors,'Michael J. Carey')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.sqlpp
index 3f00d20..e485c05 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.sqlpp
@@ -37,11 +37,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_08.adm"
+write output to asterix_nc1:"rttest/similarity_edit-distance-let-to-edit-distance-check_08.adm";
 select element ed
 from  DBLP as o
 with  ed as test.`edit-distance`(o.authors,'Michael J. Carey')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_01.sqlpp
index d9efdda..983e401 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_01.sqlpp
@@ -36,11 +36,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_01.adm"
+write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_01.adm";
 select element o
 from  DBLP as o
 where (test.`edit-distance`(o.authors,'Michael J. Carey') <= 2)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_02.sqlpp
index a241c87..0a3239c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_02.sqlpp
@@ -36,11 +36,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_02.adm"
+write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_02.adm";
 select element o
 from  DBLP as o
 where (2 >= test.`edit-distance`(o.authors,'Michael J. Carey'))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_03.sqlpp
index 9142c33..092ea01 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_03.sqlpp
@@ -36,11 +36,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_03.adm"
+write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_03.adm";
 select element o
 from  DBLP as o
 where (test.`edit-distance`(o.authors,'Michael J. Carey') < 3)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_04.sqlpp
index 0e72ba8..33bb84a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_04.sqlpp
@@ -36,11 +36,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_04.adm"
+write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_04.adm";
 select element o
 from  DBLP as o
 where (3 > test.`edit-distance`(o.authors,'Michael J. Carey'))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_05.sqlpp
index 483ad20..c2d9a4f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_05.sqlpp
@@ -36,11 +36,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_05.adm"
+write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_05.adm";
 select element o
 from  DBLP as o
 where (test.`edit-distance`(o.authors,'Michael J. Carey') >= 2)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_06.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_06.sqlpp
index bebfcee..c1227f2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_06.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_06.sqlpp
@@ -36,11 +36,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_06.adm"
+write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_06.adm";
 select element o
 from  DBLP as o
 where (2 <= test.`edit-distance`(o.authors,'Michael J. Carey'))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_07.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_07.sqlpp
index f24de3a..0881c0d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_07.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_07.sqlpp
@@ -36,11 +36,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_07.adm"
+write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_07.adm";
 select element o
 from  DBLP as o
 where (test.`edit-distance`(o.authors,'Michael J. Carey') > 2)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_08.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_08.sqlpp
index 64ef06d..d9f210a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_08.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_08.sqlpp
@@ -36,11 +36,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_08.adm"
+write output to asterix_nc1:"rttest/similarity_edit-distance-to-edit-distance-check_08.adm";
 select element o
 from  DBLP as o
 where (2 < test.`edit-distance`(o.authors,'Michael J. Carey'))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/fuzzyeq-to-edit-distance-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/fuzzyeq-to-edit-distance-check.sqlpp
index 6ddd07f..8e68f90 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/fuzzyeq-to-edit-distance-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/fuzzyeq-to-edit-distance-check.sqlpp
@@ -35,11 +35,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_fuzzyeq-to-edit-distance-check.adm"
+write output to asterix_nc1:"rttest/similarity_fuzzyeq-to-edit-distance-check.adm";
 set `simfunction` `edit-distance`;
 
 set `simthreshold` `1`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/fuzzyeq-to-jaccard-check.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/fuzzyeq-to-jaccard-check.sqlpp
index e891eec..c5ddbb9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/fuzzyeq-to-jaccard-check.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/fuzzyeq-to-jaccard-check.sqlpp
@@ -35,11 +35,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_fuzzyeq-to-jaccard-check.adm"
+write output to asterix_nc1:"rttest/similarity_fuzzyeq-to-jaccard-check.adm";
 set `simfunction` `jaccard`;
 
 set `simthreshold` `0.8f`;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_01.sqlpp
index e780d2d..75ca2d5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_01.sqlpp
@@ -37,11 +37,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm";
 select element jacc
 from  DBLP as paper
 with  jacc as test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments'))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_02.sqlpp
index 59cff9d..b116890 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_02.sqlpp
@@ -37,11 +37,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm";
 select element jacc
 from  DBLP as paper
 with  jacc as test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments'))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_03.sqlpp
index 142407c..3e30ef4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_03.sqlpp
@@ -37,11 +37,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm";
 select element jacc
 from  DBLP as paper
 with  jacc as test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments'))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_04.sqlpp
index d7a6ef7..26eb0f7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_04.sqlpp
@@ -37,11 +37,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm";
 select element jacc
 from  DBLP as paper
 with  jacc as test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments'))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_05.sqlpp
index d13f436..092703d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_05.sqlpp
@@ -37,11 +37,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm";
 select element jacc
 from  DBLP as paper
 with  jacc as test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments'))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_06.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_06.sqlpp
index 3facbb0..088e433 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_06.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_06.sqlpp
@@ -37,11 +37,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm";
 select element jacc
 from  DBLP as paper
 with  jacc as test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments'))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_07.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_07.sqlpp
index 35b4251..c9822d4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_07.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_07.sqlpp
@@ -37,11 +37,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm";
 select element jacc
 from  DBLP as paper
 with  jacc as test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments'))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_08.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_08.sqlpp
index 6c35c17..cdee6a6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_08.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_08.sqlpp
@@ -37,11 +37,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/similarity_jaccard-let-to-jaccard-check_01.adm";
 select element jacc
 from  DBLP as paper
 with  jacc as test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments'))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_01.sqlpp
index 826165d..b255f01 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_01.sqlpp
@@ -36,11 +36,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_01.adm"
+write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_01.adm";
 select element paper
 from  DBLP as paper
 where (test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments')) >= 0.800000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_02.sqlpp
index 4e32b8c..4bba4da 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_02.sqlpp
@@ -36,11 +36,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_02.adm"
+write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_02.adm";
 select element paper
 from  DBLP as paper
 where (0.800000f <= test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments')))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_03.sqlpp
index 2385fe3..de8c7d3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_03.sqlpp
@@ -36,11 +36,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_02.adm"
+write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_02.adm";
 select element paper
 from  DBLP as paper
 where (test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments')) > 0.800000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_04.sqlpp
index c075492..8fc6675 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_04.sqlpp
@@ -36,11 +36,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_03.adm"
+write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_03.adm";
 select element paper
 from  DBLP as paper
 where (0.800000f < test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments')))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_05.sqlpp
index 23e7802..e185c9c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_05.sqlpp
@@ -36,11 +36,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_05.adm"
+write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_05.adm";
 select element paper
 from  DBLP as paper
 where (test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments')) <= 0.800000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_06.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_06.sqlpp
index 806f59f..6f04ef8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_06.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_06.sqlpp
@@ -36,11 +36,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_06.adm"
+write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_06.adm";
 select element paper
 from  DBLP as paper
 where (0.800000f >= test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments')))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_07.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_07.sqlpp
index 8269607..78da87a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_07.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_07.sqlpp
@@ -36,11 +36,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_07.adm"
+write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_07.adm";
 select element paper
 from  DBLP as paper
 where (test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments')) < 0.800000f)
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_08.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_08.sqlpp
index 9dd3fce..59a02fc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_08.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_08.sqlpp
@@ -36,11 +36,11 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
-write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_08.adm"
+write output to asterix_nc1:"rttest/similarity_jaccard-to-jaccard-check_08.adm";
 select element paper
 from  DBLP as paper
 where (0.800000f > test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments')))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/dont-skip-primary-index-search-in-delete.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/dont-skip-primary-index-search-in-delete.sqlpp
index 6d934e9..6acd02e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/dont-skip-primary-index-search-in-delete.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/dont-skip-primary-index-search-in-delete.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,7 +48,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/dont-skip-primary-index.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/dont-skip-primary-index.sqlpp
index 1f408cd..200ed64 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/dont-skip-primary-index.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/dont-skip-primary-index.sqlpp
@@ -29,12 +29,12 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-primary-16.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-primary-16.adm";
 create type test.TestType as
 {
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-ngram-index-search-in-delete.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-ngram-index-search-in-delete.sqlpp
index 2bdf978..c5fb856 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-ngram-index-search-in-delete.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-ngram-index-search-in-delete.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-ngram-index.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-ngram-index.sqlpp
index 1cfec30..bcf5c40 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-ngram-index.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-ngram-index.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index ngram_index  on DBLP (title) type ngram (3);
 
-write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains.adm";
 select element o
 from  DBLP as o
 where  /*+ skip-index */ test.contains(o.title,'Multimedia')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-rtree-index-search-in-delete.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-rtree-index-search-in-delete.sqlpp
index f3ca2b0..cf334e1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-rtree-index-search-in-delete.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-rtree-index-search-in-delete.sqlpp
@@ -39,7 +39,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create  dataset MyData(MyRecord) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-rtree-secondary-index.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-rtree-secondary-index.sqlpp
index ee10217..00ec8dc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-rtree-secondary-index.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-rtree-secondary-index.sqlpp
@@ -39,7 +39,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -51,7 +51,7 @@
 
 create  index rtree_index_point  on MyData (point) type rtree;
 
-write output to asterix_nc1:"rttest/index_rtree-secondary-index.adm"
+write output to asterix_nc1:"rttest/index_rtree-secondary-index.adm";
 select element {'id':o.id}
 from  MyData as o
 where  /*+ skip-index */ test.`spatial-intersect`(o.point,test.`create-polygon`([4.0,1.0,4.0,4.0,12.0,4.0,12.0,1.0]))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-secondary-btree-index-2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-secondary-btree-index-2.sqlpp
index a7442bb..6235842 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-secondary-btree-index-2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-secondary-btree-index-2.sqlpp
@@ -28,13 +28,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-57.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-57.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-secondary-btree-index-search-in-delete.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-secondary-btree-index-search-in-delete.sqlpp
index 05c6849..652b580 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-secondary-btree-index-search-in-delete.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-secondary-btree-index-search-in-delete.sqlpp
@@ -33,7 +33,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-secondary-btree-index.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-secondary-btree-index.sqlpp
index fe56a0d..3ea7139 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-secondary-btree-index.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-secondary-btree-index.sqlpp
@@ -28,13 +28,13 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/btree-index_btree-secondary-57.adm"
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-57.adm";
 create type test.TestType as
 {
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-word-index-search-in-delete.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-word-index-search-in-delete.sqlpp
index e2f847a..2537cbe 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-word-index-search-in-delete.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-word-index-search-in-delete.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-word-index.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-word-index.sqlpp
index 642c253..fd4fe81 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-word-index.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-word-index.sqlpp
@@ -35,13 +35,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
 create  index keyword_index  on DBLP (title) type keyword;
 
-write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard.adm"
+write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard.adm";
 select element o
 from  DBLP as o
 with  jacc as  /*+ skip-index */ test.`similarity-jaccard`(test.`word-tokens`(o.title),test.`word-tokens`('Transactions for Cooperative Environments'))
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/sort-cust.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/sort-cust.sqlpp
index 508588e..b2e78c0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/sort-cust.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/sort-cust.sqlpp
@@ -28,7 +28,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type custlimit.CustomerType as
  closed {
@@ -41,7 +41,7 @@
       total : float
   }
 
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -49,7 +49,7 @@
 ;
 create  dataset Customers(CustomerType) primary key cid on group1;
 
-write output to asterix_nc1:"/tmp/custlimit.adm"
+write output to asterix_nc1:"/tmp/custlimit.adm";
 select element {'custname':c.name,'custage':c.age}
 from  Customers as c
 order by c.age
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/split-materialization-above-join.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/split-materialization-above-join.sqlpp
index a55609e..187e6cb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/split-materialization-above-join.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/split-materialization-above-join.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/split-materialization.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/split-materialization.sqlpp
index 8d72bc3..a32530a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/split-materialization.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/split-materialization.sqlpp
@@ -28,7 +28,7 @@
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type TinySocial.FacebookUserType as
  closed {
@@ -38,7 +38,7 @@
   `user-since` : datetime,
   `friend-ids` : {{integer}},
   employment : [EmploymentType]
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/unnest-to-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/unnest-to-join_01.sqlpp
index 4bfe413..6829a26 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/unnest-to-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/unnest-to-join_01.sqlpp
@@ -27,7 +27,7 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/unnest-to-join_01.adm"
+write output to asterix_nc1:"rttest/unnest-to-join_01.adm";
 select element y
 from  [1,2,3,4,5,6] as x,
       [4,5,6,7,8,9] as y
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/unnest-to-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/unnest-to-join_02.sqlpp
index fd4f88b..599fbc2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/unnest-to-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/unnest-to-join_02.sqlpp
@@ -27,6 +27,6 @@
 use test;
 
 
-write output to asterix_nc1:"rttest/unnest-to-join_02.adm"
+write output to asterix_nc1:"rttest/unnest-to-join_02.adm";
 select element some x in [1,2,3,4,5,6],
 y in [4,5,6,7,8,9] satisfies (x = y);
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/unnest_list_in_subplan.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/unnest_list_in_subplan.sqlpp
index 34846bb..3bdae74 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/unnest_list_in_subplan.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/unnest_list_in_subplan.sqlpp
@@ -30,13 +30,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.TOKENSRANKEDADMType as
  closed {
   token : integer,
   rank : integer
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -46,7 +46,7 @@
 
 create  dataset TOKENSRANKEDADM(TOKENSRANKEDADMType) primary key rank on group1;
 
-write output to asterix_nc1:"rttest/unnest_list_in_subplan.adm"
+write output to asterix_nc1:"rttest/unnest_list_in_subplan.adm";
 select element {'id':idDBLP,'tokens':tokensDBLP}
 from  DBLP as paperDBLP
 with  idDBLP as paperDBLP.id,
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/del-dataset.sqlpp b/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/del-dataset.sqlpp
index 79f24b8..df43aa5 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/del-dataset.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/del-dataset.sqlpp
@@ -27,7 +27,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type demo0927.CustomerType as
  closed {
@@ -40,7 +40,7 @@
       total : float
   }
 
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/load-del-dataset.sqlpp b/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/load-del-dataset.sqlpp
index 4fe2265..66c1b68 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/load-del-dataset.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/load-del-dataset.sqlpp
@@ -27,7 +27,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type demo0927.CustomerType as
  closed {
@@ -40,7 +40,7 @@
       total : float
   }
 
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.1.ddl.sqlpp
index d1f6370..782f268 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 {
   id : bigint,
   val : double
-}
+};
 
 create  dataset Test(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.1.ddl.sqlpp
index d1f6370..782f268 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 {
   id : bigint,
   val : double
-}
+};
 
 create  dataset Test(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.1.ddl.sqlpp
index 141cac1..dfde49e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 {
   id : bigint,
   val : double
-}
+};
 
 create  dataset Test(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_double_null/avg_double_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.1.ddl.sqlpp
index 078ea00..b9cd662 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.1.ddl.sqlpp
@@ -32,7 +32,7 @@
  closed {
   id : bigint,
   val : double
-}
+};
 
 create  dataset Test(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.1.ddl.sqlpp
index 8d128d6..6788afc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.1.ddl.sqlpp
index 8d128d6..6788afc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.1.ddl.sqlpp
index 8d128d6..6788afc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.1.ddl.sqlpp
index 8d128d6..6788afc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.1.ddl.sqlpp
index 8d128d6..6788afc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.1.ddl.sqlpp
index f198354..bc023b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_empty_02/count_empty_02.1.ddl.sqlpp
@@ -32,7 +32,7 @@
  closed {
   id : bigint,
   val : double
-}
+};
 
 create  dataset Test(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_null/count_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_null/count_null.1.ddl.sqlpp
index 8d128d6..6788afc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_null/count_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/count_null/count_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue395/issue395.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue395/issue395.1.ddl.sqlpp
index ee92e88..89deaf2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue395/issue395.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue395/issue395.1.ddl.sqlpp
@@ -27,7 +27,7 @@
 {
   id : bigint,
   name : string?
-}
+};
 
 create  dataset Employee(Emp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.1.ddl.sqlpp
index 75efdc4..a3fb752 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.1.ddl.sqlpp
@@ -34,7 +34,7 @@
 {
   id : bigint,
   name : string
-}
+};
 
 create  dataset t1(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/max_empty_02/max_empty_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/max_empty_02/max_empty_02.1.ddl.sqlpp
index 9b9f074..17f9066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/max_empty_02/max_empty_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/max_empty_02/max_empty_02.1.ddl.sqlpp
@@ -32,7 +32,7 @@
  closed {
   id : bigint,
   val : double
-}
+};
 
 create  dataset Test(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_empty_02/min_empty_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_empty_02/min_empty_02.1.ddl.sqlpp
index 824d48d..c759a78 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_empty_02/min_empty_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/min_empty_02/min_empty_02.1.ddl.sqlpp
@@ -32,7 +32,7 @@
  closed {
   id : bigint,
   val : double
-}
+};
 
 create  dataset Test(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.1.ddl.sqlpp
index 8d128d6..6788afc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_double_null/sum_double_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.1.ddl.sqlpp
index 35c38a9..bace8ae 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.1.ddl.sqlpp
@@ -32,7 +32,7 @@
  closed {
   id : bigint,
   val : double
-}
+};
 
 create  dataset Test(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.1.ddl.sqlpp
index 8d128d6..6788afc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_float_null/sum_float_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.1.ddl.sqlpp
index 8d128d6..6788afc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.1.ddl.sqlpp
index 8d128d6..6788afc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.1.ddl.sqlpp
index 8d128d6..6788afc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.1.ddl.sqlpp
index 8d128d6..6788afc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp
index 46be1b9..ed067b2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp
@@ -33,7 +33,7 @@
 {
   id : bigint,
   sal : bigint?
-}
+};
 
 create  dataset tdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp
index f3ac0dd..9b412c3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 {
   id : bigint,
   sal : bigint?
-}
+};
 
 create  dataset tdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec/agg_null_rec.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec/agg_null_rec.1.ddl.sqlpp
index 8f8432a..6c27445 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec/agg_null_rec.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec/agg_null_rec.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 {
   id : integer,
   val : double
-}
+};
 
 create  dataset Test(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.1.ddl.sqlpp
index 8f8432a..6c27445 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 {
   id : integer,
   val : double
-}
+};
 
 create  dataset Test(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number_rec/agg_number_rec.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number_rec/agg_number_rec.1.ddl.sqlpp
index 1f53b04..7fd947a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number_rec/agg_number_rec.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/agg_number_rec/agg_number_rec.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 {
   id : integer,
   val : double
-}
+};
 
 create  dataset Test(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double_null/avg_double_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double_null/avg_double_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double_null/avg_double_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_double_null/avg_double_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_02/avg_empty_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_02/avg_empty_02.1.ddl.sqlpp
index dfd4c64..c65aa35 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_02/avg_empty_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_empty_02/avg_empty_02.1.ddl.sqlpp
@@ -32,7 +32,7 @@
  closed {
   id : integer,
   val : double
-}
+};
 
 create  dataset Test(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float_null/avg_float_nu.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float_null/avg_float_nu.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float_null/avg_float_nu.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_float_null/avg_float_nu.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16_null/avg_int16_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16_null/avg_int16_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16_null/avg_int16_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int16_null/avg_int16_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32_null/avg_int32_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32_null/avg_int32_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32_null/avg_int32_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int32_null/avg_int32_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64_null/avg_int64_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64_null/avg_int64_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64_null/avg_int64_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int64_null/avg_int64_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8_null/avg_int8_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8_null/avg_int8_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8_null/avg_int8_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/avg_int8_null/avg_int8_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_02/count_empty_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_02/count_empty_02.1.ddl.sqlpp
index fcf5a5f..f416acc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_02/count_empty_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_empty_02/count_empty_02.1.ddl.sqlpp
@@ -32,7 +32,7 @@
  closed {
   id : integer,
   val : double
-}
+};
 
 create  dataset Test(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_null/count_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_null/count_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_null/count_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/count_null/count_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/droptype/droptype.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/droptype/droptype.1.ddl.sqlpp
index 7b8baff..4417460 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/droptype/droptype.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/droptype/droptype.1.ddl.sqlpp
@@ -32,11 +32,11 @@
 create type test.footype as
 {
   bar : integer?
-}
+};
 
 drop type test.footype;
 create type test.footype as
 {
   bar : integer?
-}
+};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/global-avg_null/global-avg_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/global-avg_null/global-avg_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/global-avg_null/global-avg_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/global-avg_null/global-avg_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue395/issue395.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue395/issue395.1.ddl.sqlpp
index f7b002b..341efed 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue395/issue395.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue395/issue395.1.ddl.sqlpp
@@ -27,7 +27,7 @@
 {
   id : integer,
   name : string?
-}
+};
 
 create  dataset Employee(Emp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.1.ddl.sqlpp
index 4b80215..81c85e2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.1.ddl.sqlpp
@@ -34,7 +34,7 @@
 {
   id : integer,
   name : string
-}
+};
 
 create  dataset t1(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_double_null/local-avg_double_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_double_null/local-avg_double_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_double_null/local-avg_double_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_double_null/local-avg_double_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_float_null/local-avg_float_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_float_null/local-avg_float_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_float_null/local-avg_float_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_float_null/local-avg_float_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_int16_null/local-avg_int16_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_int16_null/local-avg_int16_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_int16_null/local-avg_int16_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_int16_null/local-avg_int16_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_int32_null/local-avg_int32_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_int32_null/local-avg_int32_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_int32_null/local-avg_int32_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_int32_null/local-avg_int32_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_int64_null/local-avg_int64_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_int64_null/local-avg_int64_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_int64_null/local-avg_int64_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_int64_null/local-avg_int64_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_int8_null/local-avg_int8_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_int8_null/local-avg_int8_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_int8_null/local-avg_int8_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/local-avg_int8_null/local-avg_int8_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/max_empty_02/max_empty_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/max_empty_02/max_empty_02.1.ddl.sqlpp
index a33bfd8..46fcc01 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/max_empty_02/max_empty_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/max_empty_02/max_empty_02.1.ddl.sqlpp
@@ -32,7 +32,7 @@
  closed {
   id : integer,
   val : double
-}
+};
 
 create  dataset Test(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_empty_02/min_empty_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_empty_02/min_empty_02.1.ddl.sqlpp
index 44a065c..445a039 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_empty_02/min_empty_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/min_empty_02/min_empty_02.1.ddl.sqlpp
@@ -32,7 +32,7 @@
  closed {
   id : integer,
   val : double
-}
+};
 
 create  dataset Test(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_double_null/sum_double_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_double_null/sum_double_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_double_null/sum_double_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_double_null/sum_double_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_empty_02/sum_empty_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_empty_02/sum_empty_02.1.ddl.sqlpp
index 0d826fe..933e080 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_empty_02/sum_empty_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_empty_02/sum_empty_02.1.ddl.sqlpp
@@ -32,7 +32,7 @@
  closed {
   id : integer,
   val : double
-}
+};
 
 create  dataset Test(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_float_null/sum_float_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_float_null/sum_float_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_float_null/sum_float_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_float_null/sum_float_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int16_null/sum_int16_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int16_null/sum_int16_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int16_null/sum_int16_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int16_null/sum_int16_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int32_null/sum_int32_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int32_null/sum_int32_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int32_null/sum_int32_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int32_null/sum_int32_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64_null/sum_int64_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64_null/sum_int64_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64_null/sum_int64_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int64_null/sum_int64_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int8_null/sum_int8_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int8_null/sum_int8_null.1.ddl.sqlpp
index 70ff912..3f2c5bf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int8_null/sum_int8_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_int8_null/sum_int8_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp
index e5f03bd..0cb9c60 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.1.ddl.sqlpp
@@ -33,7 +33,7 @@
 {
   id : bigint,
   sal : bigint?
-}
+};
 
 create  dataset tdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp
index 02c1c05..27624da 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 {
   id : integer,
   sal : integer?
-}
+};
 
 create  dataset tdst(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_groupby-2/big_object_groupby.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_groupby-2/big_object_groupby.1.ddl.sqlpp
index ac98b64c..6862954 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_groupby-2/big_object_groupby.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_groupby-2/big_object_groupby.1.ddl.sqlpp
@@ -48,7 +48,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type test.OrderType as
  closed {
@@ -61,7 +61,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -73,7 +73,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create external  dataset Line(LineType) using `localfs`((`path`=`asterix_nc1://data/big-object/lineitem.tbl.big`),(`input-format`=`text-input-format`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_groupby/big_object_groupby.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_groupby/big_object_groupby.1.ddl.sqlpp
index 88786ab..d693cfd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_groupby/big_object_groupby.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_groupby/big_object_groupby.1.ddl.sqlpp
@@ -46,7 +46,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type test.OrderType as
  closed {
@@ -59,7 +59,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -71,7 +71,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create external  dataset Line(LineType) using `localfs`((`path`=`asterix_nc1://data/big-object/lineitem.tbl.big`),(`input-format`=`text-input-format`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_join/big_object_join.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_join/big_object_join.1.ddl.sqlpp
index 8a39ac8..abe0710 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_join/big_object_join.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_join/big_object_join.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type test.OrderType as
  closed {
@@ -60,7 +60,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -72,7 +72,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create external  dataset Line(LineType) using `localfs`((`path`=`asterix_nc1://data/big-object/lineitem.tbl.big`),(`input-format`=`text-input-format`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_load/big_object_load.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_load/big_object_load.1.ddl.sqlpp
index 06d1a7c..80d8d19 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_load/big_object_load.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_load/big_object_load.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type test.OrderType as
  closed {
@@ -60,7 +60,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -72,7 +72,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create external  dataset Line(LineType) using `localfs`((`path`=`asterix_nc1://data/big-object/lineitem.tbl.big`),(`input-format`=`text-input-format`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_load_20M/big_object_load_20M.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_load_20M/big_object_load_20M.1.ddl.sqlpp
index e81fa19..6c68020 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_load_20M/big_object_load_20M.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_load_20M/big_object_load_20M.1.ddl.sqlpp
@@ -31,6 +31,6 @@
   id: int64,
   name: string,
   hobbies: {{string}}
-}
+};
 
 create dataset testds(testtype) primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_load_20M/big_object_load_20M.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_load_20M/big_object_load_20M.2.update.sqlpp
index 09f3a69..e608210 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_load_20M/big_object_load_20M.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_load_20M/big_object_load_20M.2.update.sqlpp
@@ -25,7 +25,7 @@
 
 use testdv2;
 
-set `compiler.sortmemory` "64MB"
+set `compiler.sortmemory` "64MB";
 
 load dataset testds
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_sort/big_object_sort.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_sort/big_object_sort.1.ddl.sqlpp
index 8a39ac8..abe0710 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_sort/big_object_sort.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/big-object/big_object_sort/big_object_sort.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type test.OrderType as
  closed {
@@ -60,7 +60,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -72,7 +72,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create external  dataset Line(LineType) using `localfs`((`path`=`asterix_nc1://data/big-object/lineitem.tbl.big`),(`input-format`=`text-input-format`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/equal_join/equal_join.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/equal_join/equal_join.1.ddl.sqlpp
index d11e3b0..37b4a99 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/equal_join/equal_join.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/equal_join/equal_join.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : bigint,
   name : string,
   md5 : binary
-}
+};
 
 create  dataset User(UserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/index_join/index_join.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/index_join/index_join.1.ddl.sqlpp
index 86d1a65..cedf119 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/index_join/index_join.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/index_join/index_join.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : bigint,
   name : string,
   md5 : binary
-}
+};
 
 create  dataset User(UserType) primary key md5;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/insert/insert.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/insert/insert.1.ddl.sqlpp
index 0578d2f..99e1199 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/insert/insert.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/binary/insert/insert.1.ddl.sqlpp
@@ -26,14 +26,14 @@
 create type test.UserTypeOpen as
 {
   id : bigint
-}
+};
 
 create type test.UserTypeClose as
  closed {
   id : bigint,
   name : string,
   md5 : binary
-}
+};
 
 create  dataset UserOpen(UserTypeOpen) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/datetime_range/datetime_range.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/datetime_range/datetime_range.1.ddl.sqlpp
index 9d2a12d..f5eeeec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/datetime_range/datetime_range.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/datetime_range/datetime_range.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   loc : point,
   time : datetime,
   text : string
-}
+};
 
 create  dataset TwitterData(Tweet) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/datetime_range_between/datetime_range_between.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/datetime_range_between/datetime_range_between.1.ddl.sqlpp
index ab98cae..c100b7a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/datetime_range_between/datetime_range_between.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/comparison/datetime_range_between/datetime_range_between.1.ddl.sqlpp
@@ -30,6 +30,6 @@
   loc : point,
   time : datetime,
   text : string
-}
+};
 
 create dataset TwitterData(Tweet) primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv01/cross-dv01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv01/cross-dv01.1.ddl.sqlpp
index 0d6688a..c69c082 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv01/cross-dv01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv01/cross-dv01.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   age : bigint,
   sex : string,
   dept : string
-}
+};
 
 create type teacher.tchrType as
 {
@@ -49,7 +49,7 @@
   age : bigint,
   sex : string,
   dept : string
-}
+};
 
 create  dataset student.ugdstd(student.stdType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv02/cross-dv02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv02/cross-dv02.1.ddl.sqlpp
index e1effc3..a637a89 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv02/cross-dv02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv02/cross-dv02.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   age : integer,
   sex : string,
   dept : string
-}
+};
 
 create type teacher.tchrType as
 {
@@ -46,7 +46,7 @@
   age : integer,
   sex : string,
   dept : string
-}
+};
 
 create  dataset student.ugdstd(stdType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv03/cross-dv03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv03/cross-dv03.1.ddl.sqlpp
index b5cb9ca..3d0c899 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv03/cross-dv03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv03/cross-dv03.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   age : bigint,
   sex : string,
   dept : string
-}
+};
 
 create type teacher.tchrType as
 {
@@ -49,7 +49,7 @@
   age : bigint,
   sex : string,
   dept : string
-}
+};
 
 create  dataset student.ugdstd(stdType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv04/cross-dv04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv04/cross-dv04.1.ddl.sqlpp
index fa5dadb..50aee2c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv04/cross-dv04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv04/cross-dv04.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   age : integer,
   sex : string,
   dept : string
-}
+};
 
 create type teacher.tchrType as
 {
@@ -50,7 +50,7 @@
   age : integer,
   sex : string,
   dept : string
-}
+};
 
 create  dataset student.ugdstd(stdType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv07/cross-dv07.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv07/cross-dv07.1.ddl.sqlpp
index c4b2248..329e2e2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv07/cross-dv07.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv07/cross-dv07.1.ddl.sqlpp
@@ -33,7 +33,7 @@
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create  dataset test.employee(Emp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv09/cross-dv09.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv09/cross-dv09.1.ddl.sqlpp
index 0051906..bcc73a3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv09/cross-dv09.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv09/cross-dv09.1.ddl.sqlpp
@@ -31,8 +31,8 @@
 
 create function testdv1.fun01(){
 'function 01'
-}
+};
 
 create function testdv2.fun02(){
 'function 02'
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv11/cross-dv11.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv11/cross-dv11.1.ddl.sqlpp
index a2f295a..70ec199 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv11/cross-dv11.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv11/cross-dv11.1.ddl.sqlpp
@@ -30,8 +30,8 @@
 
 create function testdv1.fun01(){
 testdv2.fun02()
-}
+};
 
 create function testdv2.fun02(){
 'function 02'
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv12/cross-dv12.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv12/cross-dv12.1.ddl.sqlpp
index 14aac1a..4494ba2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv12/cross-dv12.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv12/cross-dv12.1.ddl.sqlpp
@@ -30,8 +30,8 @@
 
 create function testdv1.fun01(){
 'function 01'
-}
+};
 
 create function testdv2.fun02(){
 'function 02'
-}
\ No newline at end of file
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv13/cross-dv13.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv13/cross-dv13.1.ddl.sqlpp
index 8ac2081..590ece1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv13/cross-dv13.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv13/cross-dv13.1.ddl.sqlpp
@@ -31,12 +31,12 @@
 
 create function testdv1.fun01(){
 testdv2.fun02()
-}
+};
 
 create function testdv2.fun02(){
 testdv2.fun03()
-}
+};
 
 create function testdv2.fun03(){
 testdv1.fun01()
-}
\ No newline at end of file
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv14/cross-dv14.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv14/cross-dv14.1.ddl.sqlpp
index 6d6ae30..d4ba361 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv14/cross-dv14.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv14/cross-dv14.1.ddl.sqlpp
@@ -27,4 +27,4 @@
 
 create function testdv1.fun01(){
 100
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv15/cross-dv15.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv15/cross-dv15.1.ddl.sqlpp
index db48977..91981df 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv15/cross-dv15.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv15/cross-dv15.1.ddl.sqlpp
@@ -29,14 +29,14 @@
 // UDF with no inputs
 create function testdv1.fun01(){
 100
-}
+};
 
 // UDF with one input
 create function testdv1.fun02(a){
 `function 02`
-}
+};
 
 // UDF with two inputs
 create function testdv1.fun03(b,c){
 b+c
-}
\ No newline at end of file
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv16/cross-dv16.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv16/cross-dv16.1.ddl.sqlpp
index 8779035..02d0153 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv16/cross-dv16.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv16/cross-dv16.1.ddl.sqlpp
@@ -29,18 +29,18 @@
 // UDF with no inputs
 create function testdv1.fun01(){
 testdv1.fun02()
-}
+};
 
 // UDF with one input
 create function testdv1.fun02(){
 testdv1.fun03()
-}
+};
 
 // UDF with two inputs
 create function testdv1.fun03(){
 testdv1.fun04()
-}
+};
 
 create function testdv1.fun04(){
 testdv1.fun02()
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv17/cross-dv17.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv17/cross-dv17.1.ddl.sqlpp
index b277601..0907a8a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv17/cross-dv17.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv17/cross-dv17.1.ddl.sqlpp
@@ -32,11 +32,11 @@
 
 create type test.testtype as open {
 id : integer
-}
+};
 
 create type fest.testtype as open {
 id : integer
-}
+};
 
 create dataset test.t1(testtype) primary key id;
 create dataset fest.t1(testtype) primary key id;
@@ -46,6 +46,6 @@
 from `test.t1` as m,
      `fest.t1` as l
 order by m, l
-select element { 'l':l,'m':m }
+select element { 'l':l,'m':m };
 )
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv18/cross-dv18.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv18/cross-dv18.1.ddl.sqlpp
index ba8ff37..13bd1cc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv18/cross-dv18.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv18/cross-dv18.1.ddl.sqlpp
@@ -33,12 +33,12 @@
 create type test.testtype as
 {
   id : integer
-}
+};
 
 create type fest.testtype as
 {
   id : integer
-}
+};
 
 create  dataset test.t1(testtype) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv19/cross-dv19.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv19/cross-dv19.1.ddl.sqlpp
index 0783879..c7914da 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv19/cross-dv19.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv19/cross-dv19.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   name : string,
   loc : point,
   time : datetime
-}
+};
 
 create type test2.testtype as
 {
@@ -42,7 +42,7 @@
   name : string?,
   loc : point,
   time : datetime
-}
+};
 
 create type test1.Tweet as
 {
@@ -51,7 +51,7 @@
   loc : point,
   time : datetime,
   text : string
-}
+};
 
 create  dataset test1.t1(testtype) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv20/cross-dv20.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv20/cross-dv20.1.ddl.sqlpp
index 3ee9f3d..96b87b6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv20/cross-dv20.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/cross-dv20/cross-dv20.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   age : bigint,
   sex : string,
   dept : string
-}
+};
 
 create type teacher.tchrType as
 {
@@ -46,7 +46,7 @@
   age : bigint,
   sex : string,
   dept : string
-}
+};
 
 create  dataset student.ugdstd(stdType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/drop_dataset/drop_dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/drop_dataset/drop_dataset.1.ddl.sqlpp
index 78d4b2d..f50238c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/drop_dataset/drop_dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/drop_dataset/drop_dataset.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -40,9 +40,9 @@
   lastorder : {
       oid : integer,
       total : float
-  }
+  };
 
-}
+};
 
 create  dataset test.Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/insert_across_dataverses/insert_across_dataverses.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/insert_across_dataverses/insert_across_dataverses.1.ddl.sqlpp
index 0942333..7dcbad0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/insert_across_dataverses/insert_across_dataverses.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/insert_across_dataverses/insert_across_dataverses.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test1.CustomerType as
  closed {
@@ -42,14 +42,14 @@
       total : float
   }
 
-}
+};
 
 create type test2.AddressType as
 {
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test2.CustomerType as
  closed {
@@ -63,7 +63,7 @@
       total : float
   }
 
-}
+};
 
 create  dataset test1.Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.1.ddl.sqlpp
index a2b72e0..78e72e4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/insert_from_source_dataset/insert_from_source_dataset.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 {
   id : integer,
   name : string
-}
+};
 
 create  dataset test.t1(testtype) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/join_across_dataverses/join_across_dataverses.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/join_across_dataverses/join_across_dataverses.1.ddl.sqlpp
index 699a511..1c70adb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/join_across_dataverses/join_across_dataverses.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/cross-dataverse/join_across_dataverses/join_across_dataverses.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test1.CustomerType as
  closed {
@@ -42,7 +42,7 @@
       total : float
   }
 
-}
+};
 
 create  dataset test1.Customers(CustomerType) primary key cid;
 
@@ -55,7 +55,7 @@
   clerk : string,
   total : float,
   items : [bigint]
-}
+};
 
 create  dataset test2.Orders(OrderType) primary key oid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/csv/basic-types/basic-types.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/csv/basic-types/basic-types.1.ddl.sqlpp
index 0346c62..d836212 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/csv/basic-types/basic-types.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/csv/basic-types/basic-types.1.ddl.sqlpp
@@ -46,5 +46,5 @@
   circle : circle,
   binary : binary,
   uuid : uuid
-}
+};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/co/co.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/co/co.1.ddl.sqlpp
index 0ffe834..7f26c9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/co/co.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/co/co.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type custord.CustomerType as
 {
@@ -39,9 +39,9 @@
   lastorder : {
       oid : integer,
       total : float
-  }
+  };
 
-}
+};
 
 create type custord.OrderType as
 {
@@ -51,14 +51,14 @@
   orderpriority : string,
   clerk : string,
   total : float
-}
+};
 
 create type custord.CustomerOrdersType as
 {
   cid : integer,
   cust : CustomerType,
   orders : [OrderType]
-}
+};
 
 create  dataset Customers3(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_01/customer_q_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_01/customer_q_01.1.ddl.sqlpp
index ae71544..132cfb5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_01/customer_q_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_01/customer_q_01.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,7 +42,7 @@
       total : float
   }
 
-}
+};
 
 create external  dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/nontagged/customerData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_02/customer_q_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_02/customer_q_02.1.ddl.sqlpp
index 3d78d5d..6b12ed9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_02/customer_q_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_02/customer_q_02.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,7 +42,7 @@
       total : float
   }
 
-}
+};
 
 create external  dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/nontagged/customerData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_03/customer_q_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_03/customer_q_03.1.ddl.sqlpp
index 3d78d5d..6b12ed9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_03/customer_q_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_03/customer_q_03.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,7 +42,7 @@
       total : float
   }
 
-}
+};
 
 create external  dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/nontagged/customerData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_04/customer_q_04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_04/customer_q_04.1.ddl.sqlpp
index 3d78d5d..6b12ed9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_04/customer_q_04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_04/customer_q_04.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,7 +42,7 @@
       total : float
   }
 
-}
+};
 
 create external  dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/nontagged/customerData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_05/customer_q_05.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_05/customer_q_05.1.ddl.sqlpp
index 3d78d5d..6b12ed9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_05/customer_q_05.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_05/customer_q_05.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,7 +42,7 @@
       total : float
   }
 
-}
+};
 
 create external  dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/nontagged/customerData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_06/customer_q_06.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_06/customer_q_06.1.ddl.sqlpp
index ae71544..132cfb5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_06/customer_q_06.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_06/customer_q_06.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,7 +42,7 @@
       total : float
   }
 
-}
+};
 
 create external  dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/nontagged/customerData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_07/customer_q_07.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_07/customer_q_07.1.ddl.sqlpp
index ae71544..132cfb5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_07/customer_q_07.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_07/customer_q_07.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,7 +42,7 @@
       total : float
   }
 
-}
+};
 
 create external  dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/nontagged/customerData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_08/customer_q_08.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_08/customer_q_08.1.ddl.sqlpp
index ae71544..132cfb5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_08/customer_q_08.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/customer_q_08/customer_q_08.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,7 +42,7 @@
       total : float
   }
 
-}
+};
 
 create external  dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/nontagged/customerData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/denorm-cust-order_01/denorm-cust-order_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/denorm-cust-order_01/denorm-cust-order_01.1.ddl.sqlpp
index 4b73887..23a26d9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/denorm-cust-order_01/denorm-cust-order_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/denorm-cust-order_01/denorm-cust-order_01.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
 {
@@ -39,9 +39,9 @@
   lastorder : {
       oid : bigint,
       total : float
-  }
+  };
 
-}
+};
 
 create type test.OrderType as
 {
@@ -51,14 +51,14 @@
   orderpriority : string,
   clerk : string,
   total : float
-}
+};
 
 create type test.CustomerOrdersType as
 {
   cid : bigint,
   cust : CustomerType,
   orders : [OrderType]
-}
+};
 
 create  dataset Customers1(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/denorm-cust-order_02/denorm-cust-order_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/denorm-cust-order_02/denorm-cust-order_02.1.ddl.sqlpp
index bdb22e0..6eef7a9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/denorm-cust-order_02/denorm-cust-order_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/denorm-cust-order_02/denorm-cust-order_02.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
 {
@@ -41,7 +41,7 @@
       total : float
   }
 
-}
+};
 
 create type test.OrderType as
 {
@@ -51,14 +51,14 @@
   orderpriority : string,
   clerk : string,
   total : float
-}
+};
 
 create type test.CustomerOrdersType as
 {
   cid : bigint,
   cust : CustomerType,
   orders : [OrderType]
-}
+};
 
 create  dataset Customers2(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/denorm-cust-order_03/denorm-cust-order_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/denorm-cust-order_03/denorm-cust-order_03.1.ddl.sqlpp
index ba188ed..023e287 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/denorm-cust-order_03/denorm-cust-order_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/denorm-cust-order_03/denorm-cust-order_03.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
 {
@@ -41,7 +41,7 @@
       total : float
   }
 
-}
+};
 
 create type test.OrderType as
 {
@@ -51,14 +51,14 @@
   orderpriority : string,
   clerk : string,
   total : float
-}
+};
 
 create type test.CustomerOrdersType as
 {
   cid : bigint,
   cust : CustomerType,
   orders : [OrderType]
-}
+};
 
 create  dataset Customers3(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/freq-clerk/freq-clerk.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/freq-clerk/freq-clerk.1.ddl.sqlpp
index c24b930..60f24fa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/freq-clerk/freq-clerk.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/freq-clerk/freq-clerk.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerOrderType as
 {
@@ -37,7 +37,7 @@
   age : integer?,
   address : AddressType?,
   orders : [OrderType]
-}
+};
 
 create type test.OrderType as
 {
@@ -47,7 +47,7 @@
   orderpriority : string,
   clerk : string,
   total : float
-}
+};
 
 create  dataset CustomerOrders(CustomerOrderType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_01/join_q_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_01/join_q_01.1.ddl.sqlpp
index 0cc56ed..1e1ecfb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_01/join_q_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_01/join_q_01.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,7 +42,7 @@
       total : float
   }
 
-}
+};
 
 create type test.OrderType as
 {
@@ -53,7 +53,7 @@
   clerk : string,
   total : float,
   items : [bigint]
-}
+};
 
 create external  dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/nontagged/customerData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_02/join_q_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_02/join_q_02.1.ddl.sqlpp
index 0cc56ed..1e1ecfb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_02/join_q_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_02/join_q_02.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,7 +42,7 @@
       total : float
   }
 
-}
+};
 
 create type test.OrderType as
 {
@@ -53,7 +53,7 @@
   clerk : string,
   total : float,
   items : [bigint]
-}
+};
 
 create external  dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/nontagged/customerData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_03/join_q_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_03/join_q_03.1.ddl.sqlpp
index 0cc56ed..1e1ecfb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_03/join_q_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_03/join_q_03.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,7 +42,7 @@
       total : float
   }
 
-}
+};
 
 create type test.OrderType as
 {
@@ -53,7 +53,7 @@
   clerk : string,
   total : float,
   items : [bigint]
-}
+};
 
 create external  dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/nontagged/customerData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_04/join_q_04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_04/join_q_04.1.ddl.sqlpp
index 43d3ab3..61e10c1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_04/join_q_04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_04/join_q_04.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -45,7 +45,7 @@
       total : float
   }
 
-}
+};
 
 create type test.OrderType as
 {
@@ -56,7 +56,7 @@
   clerk : string,
   total : float,
   items : [bigint]
-}
+};
 
 create external  dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/nontagged/customerData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_05/join_q_05.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_05/join_q_05.1.ddl.sqlpp
index 36e49aa..68273b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_05/join_q_05.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_05/join_q_05.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,7 +42,7 @@
       total : float
   }
 
-}
+};
 
 create type test.OrderType as
 {
@@ -53,7 +53,7 @@
   clerk : string,
   total : float,
   items : [bigint]
-}
+};
 
 create external dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/nontagged/customerData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_06/join_q_06.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_06/join_q_06.1.ddl.sqlpp
index 16ea16e..8dfcf8f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_06/join_q_06.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_06/join_q_06.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,6 +42,6 @@
       total : float
   }
 
-}
+};
 
 create external dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/nontagged/customerData.json`),(`format`=`adm`));
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_07/join_q_07.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_07/join_q_07.1.ddl.sqlpp
index 16ea16e..8dfcf8f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_07/join_q_07.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_07/join_q_07.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,6 +42,6 @@
       total : float
   }
 
-}
+};
 
 create external dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/nontagged/customerData.json`),(`format`=`adm`));
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_08/join_q_08.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_08/join_q_08.1.ddl.sqlpp
index 36e49aa..68273b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_08/join_q_08.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_08/join_q_08.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,7 +42,7 @@
       total : float
   }
 
-}
+};
 
 create type test.OrderType as
 {
@@ -53,7 +53,7 @@
   clerk : string,
   total : float,
   items : [bigint]
-}
+};
 
 create external dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/nontagged/customerData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_09/join_q_09.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_09/join_q_09.1.ddl.sqlpp
index 36e49aa..68273b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_09/join_q_09.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/join_q_09/join_q_09.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,7 +42,7 @@
       total : float
   }
 
-}
+};
 
 create type test.OrderType as
 {
@@ -53,7 +53,7 @@
   clerk : string,
   total : float,
   items : [bigint]
-}
+};
 
 create external dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/nontagged/customerData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/load-test/load-test.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/load-test/load-test.1.ddl.sqlpp
index 471ed0c..0492762 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/load-test/load-test.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/load-test/load-test.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
 {
@@ -41,7 +41,7 @@
       total : float
   }
 
-}
+};
 
 create  dataset c1(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_01/order_q_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_01/order_q_01.1.ddl.sqlpp
index 5481e8d..26100ad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_01/order_q_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_01/order_q_01.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   clerk : string,
   total : float,
   items : [bigint]
-}
+};
 
 create external  dataset Orders(OrderType) using localfs((`path`=`asterix_nc1://data/nontagged/orderData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_02/order_q_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_02/order_q_02.1.ddl.sqlpp
index 5481e8d..26100ad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_02/order_q_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_02/order_q_02.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   clerk : string,
   total : float,
   items : [bigint]
-}
+};
 
 create external  dataset Orders(OrderType) using localfs((`path`=`asterix_nc1://data/nontagged/orderData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_03/order_q_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_03/order_q_03.1.ddl.sqlpp
index 5481e8d..26100ad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_03/order_q_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_03/order_q_03.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   clerk : string,
   total : float,
   items : [bigint]
-}
+};
 
 create external  dataset Orders(OrderType) using localfs((`path`=`asterix_nc1://data/nontagged/orderData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_04/order_q_04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_04/order_q_04.1.ddl.sqlpp
index 5481e8d..26100ad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_04/order_q_04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_04/order_q_04.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   clerk : string,
   total : float,
   items : [bigint]
-}
+};
 
 create external  dataset Orders(OrderType) using localfs((`path`=`asterix_nc1://data/nontagged/orderData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_05/order_q_05.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_05/order_q_05.1.ddl.sqlpp
index 5481e8d..26100ad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_05/order_q_05.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_05/order_q_05.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   clerk : string,
   total : float,
   items : [bigint]
-}
+};
 
 create external  dataset Orders(OrderType) using localfs((`path`=`asterix_nc1://data/nontagged/orderData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_06/order_q_06.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_06/order_q_06.1.ddl.sqlpp
index 5481e8d..26100ad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_06/order_q_06.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/order_q_06/order_q_06.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   clerk : string,
   total : float,
   items : [bigint]
-}
+};
 
 create external  dataset Orders(OrderType) using localfs((`path`=`asterix_nc1://data/nontagged/orderData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/query-ASTERIXDB-1754/query-ASTERIXDB-1754.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/query-ASTERIXDB-1754/query-ASTERIXDB-1754.1.ddl.sqlpp
index 7eb1cd1..3644b1e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/query-ASTERIXDB-1754/query-ASTERIXDB-1754.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/custord/query-ASTERIXDB-1754/query-ASTERIXDB-1754.1.ddl.sqlpp
@@ -25,12 +25,12 @@
 create type CustomerType as
 {
   cid : bigint
-}
+};
 
 create type OrderType as
 {
   oid : bigint
-}
+};
 
 create external dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/nontagged/customerData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q1/q1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q1/q1.1.ddl.sqlpp
index e5762df..f07d18d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q1/q1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q1/q1.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   city : string,
   zip : string,
   latlong : point
-}
+};
 
 create type test.UserType as
 {
@@ -43,7 +43,7 @@
           member_since : date
       }
 }}
-}
+};
 
 create external  dataset User(UserType) using localfs((`path`=`asterix_nc1://data/events/tiny/user.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-10/q2-10.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-10/q2-10.1.ddl.sqlpp
index c039637..301a9b7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-10/q2-10.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-10/q2-10.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   city : string,
   zip : string,
   latlong : point
-}
+};
 
 create type test.EventType as
  closed {
@@ -49,7 +49,7 @@
   price : double?,
   start_time : datetime,
   end_time : datetime
-}
+};
 
 create external  dataset Event(EventType) using localfs((`path`=`asterix_nc1://data/events/tiny/event.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-11/q2-11.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-11/q2-11.1.ddl.sqlpp
index c039637..301a9b7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-11/q2-11.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-11/q2-11.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   city : string,
   zip : string,
   latlong : point
-}
+};
 
 create type test.EventType as
  closed {
@@ -49,7 +49,7 @@
   price : double?,
   start_time : datetime,
   end_time : datetime
-}
+};
 
 create external  dataset Event(EventType) using localfs((`path`=`asterix_nc1://data/events/tiny/event.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-12/q2-12.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-12/q2-12.1.ddl.sqlpp
index c039637..301a9b7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-12/q2-12.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-12/q2-12.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   city : string,
   zip : string,
   latlong : point
-}
+};
 
 create type test.EventType as
  closed {
@@ -49,7 +49,7 @@
   price : double?,
   start_time : datetime,
   end_time : datetime
-}
+};
 
 create external  dataset Event(EventType) using localfs((`path`=`asterix_nc1://data/events/tiny/event.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-2-negative/q2-2-negative.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-2-negative/q2-2-negative.1.ddl.sqlpp
index c039637..301a9b7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-2-negative/q2-2-negative.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-2-negative/q2-2-negative.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   city : string,
   zip : string,
   latlong : point
-}
+};
 
 create type test.EventType as
  closed {
@@ -49,7 +49,7 @@
   price : double?,
   start_time : datetime,
   end_time : datetime
-}
+};
 
 create external  dataset Event(EventType) using localfs((`path`=`asterix_nc1://data/events/tiny/event.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-2/q2-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-2/q2-2.1.ddl.sqlpp
index c039637..301a9b7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-2/q2-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-2/q2-2.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   city : string,
   zip : string,
   latlong : point
-}
+};
 
 create type test.EventType as
  closed {
@@ -49,7 +49,7 @@
   price : double?,
   start_time : datetime,
   end_time : datetime
-}
+};
 
 create external  dataset Event(EventType) using localfs((`path`=`asterix_nc1://data/events/tiny/event.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-3/q2-3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-3/q2-3.1.ddl.sqlpp
index c039637..301a9b7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-3/q2-3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-3/q2-3.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   city : string,
   zip : string,
   latlong : point
-}
+};
 
 create type test.EventType as
  closed {
@@ -49,7 +49,7 @@
   price : double?,
   start_time : datetime,
   end_time : datetime
-}
+};
 
 create external  dataset Event(EventType) using localfs((`path`=`asterix_nc1://data/events/tiny/event.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-4/q2-4.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-4/q2-4.1.ddl.sqlpp
index c039637..301a9b7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-4/q2-4.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-4/q2-4.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   city : string,
   zip : string,
   latlong : point
-}
+};
 
 create type test.EventType as
  closed {
@@ -49,7 +49,7 @@
   price : double?,
   start_time : datetime,
   end_time : datetime
-}
+};
 
 create external  dataset Event(EventType) using localfs((`path`=`asterix_nc1://data/events/tiny/event.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-5/q2-5.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-5/q2-5.1.ddl.sqlpp
index c039637..301a9b7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-5/q2-5.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-5/q2-5.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   city : string,
   zip : string,
   latlong : point
-}
+};
 
 create type test.EventType as
  closed {
@@ -49,7 +49,7 @@
   price : double?,
   start_time : datetime,
   end_time : datetime
-}
+};
 
 create external  dataset Event(EventType) using localfs((`path`=`asterix_nc1://data/events/tiny/event.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-6/q2-6.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-6/q2-6.1.ddl.sqlpp
index c039637..301a9b7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-6/q2-6.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-6/q2-6.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   city : string,
   zip : string,
   latlong : point
-}
+};
 
 create type test.EventType as
  closed {
@@ -49,7 +49,7 @@
   price : double?,
   start_time : datetime,
   end_time : datetime
-}
+};
 
 create external  dataset Event(EventType) using localfs((`path`=`asterix_nc1://data/events/tiny/event.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-7/q2-7.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-7/q2-7.1.ddl.sqlpp
index c039637..301a9b7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-7/q2-7.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-7/q2-7.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   city : string,
   zip : string,
   latlong : point
-}
+};
 
 create type test.EventType as
  closed {
@@ -49,7 +49,7 @@
   price : double?,
   start_time : datetime,
   end_time : datetime
-}
+};
 
 create external  dataset Event(EventType) using localfs((`path`=`asterix_nc1://data/events/tiny/event.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-8/q2-8.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-8/q2-8.1.ddl.sqlpp
index c039637..301a9b7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-8/q2-8.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-8/q2-8.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   city : string,
   zip : string,
   latlong : point
-}
+};
 
 create type test.EventType as
  closed {
@@ -49,7 +49,7 @@
   price : double?,
   start_time : datetime,
   end_time : datetime
-}
+};
 
 create external  dataset Event(EventType) using localfs((`path`=`asterix_nc1://data/events/tiny/event.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-9/q2-9.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-9/q2-9.1.ddl.sqlpp
index c039637..301a9b7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-9/q2-9.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2-9/q2-9.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   city : string,
   zip : string,
   latlong : point
-}
+};
 
 create type test.EventType as
  closed {
@@ -49,7 +49,7 @@
   price : double?,
   start_time : datetime,
   end_time : datetime
-}
+};
 
 create external  dataset Event(EventType) using localfs((`path`=`asterix_nc1://data/events/tiny/event.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2/q2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2/q2.1.ddl.sqlpp
index c039637..301a9b7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2/q2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q2/q2.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   city : string,
   zip : string,
   latlong : point
-}
+};
 
 create type test.EventType as
  closed {
@@ -49,7 +49,7 @@
   price : double?,
   start_time : datetime,
   end_time : datetime
-}
+};
 
 create external  dataset Event(EventType) using localfs((`path`=`asterix_nc1://data/events/tiny/event.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q3/q3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q3/q3.1.ddl.sqlpp
index 8092c50..d9b2bc3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q3/q3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dapd/q3/q3.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   city : string,
   zip : string,
   latlong : point2d
-}
+};
 
 create type test.UserType as
 {
@@ -42,7 +42,7 @@
           member_since : date
       }
 }}
-}
+};
 
 create  dataset User(UserType) primary key name;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.1.ddl.sqlpp
index 2a1438f..3c9611a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.1.ddl.sqlpp
@@ -48,7 +48,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/create-drop-cltype/create-drop-cltype.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/create-drop-cltype/create-drop-cltype.1.ddl.sqlpp
index 5cc49f1..658129e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/create-drop-cltype/create-drop-cltype.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/create-drop-cltype/create-drop-cltype.1.ddl.sqlpp
@@ -39,7 +39,7 @@
   dt : date?,
   tm : time,
   pt : point?
-}
+};
 
 drop type test.TestType;
 create type test.TestType as
@@ -52,5 +52,5 @@
   dt : date?,
   tm : time,
   pt : point?
-}
+};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/create-drop-opntype/create-drop-opntype.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/create-drop-opntype/create-drop-opntype.1.ddl.sqlpp
index 3ea37d9..a310988 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/create-drop-opntype/create-drop-opntype.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/create-drop-opntype/create-drop-opntype.1.ddl.sqlpp
@@ -39,7 +39,7 @@
   dt : date?,
   tm : time,
   pt : point?
-}
+};
 
 drop type test.TestType;
 create type test.TestType as
@@ -52,5 +52,5 @@
   dt : date?,
   tm : time,
   pt : point?
-}
+};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
index 7025805..f5fee2f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp
index 7025805..f5fee2f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/delete-multi-statement/delete-multi-statement.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/delete-multi-statement/delete-multi-statement.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/delete-multi-statement/delete-multi-statement.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/delete-multi-statement/delete-multi-statement.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/delete-syntax-change/delete-syntax-change.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/delete-syntax-change/delete-syntax-change.1.ddl.sqlpp
index 2032e59..5b60ee6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/delete-syntax-change/delete-syntax-change.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/delete-syntax-change/delete-syntax-change.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp
index ba3498a..d93f069 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp
@@ -33,12 +33,12 @@
 {
   first : string,
   last : string
-}
+};
 
 create type test.Person as
 {
   name : Name
-}
+};
 
 create type test.TestType as
 {
@@ -47,7 +47,7 @@
   locn : point,
   zip : string,
   person : Person
-}
+};
 
 create  dataset t1(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/drop-index/drop-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/drop-index/drop-index.1.ddl.sqlpp
index 93db44a..a15b276 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/drop-index/drop-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/drop-index/drop-index.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   stringu1 : string,
   stringu2 : string,
   string4 : string
-}
+};
 
 create  dataset t1(Schema) primary key unique2;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp
index 8bf5899..751bdeb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-and-scan-dataset-with-index-on-open-field/insert-and-scan-dataset-with-index-on-open-field.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-and-scan-dataset-with-index-on-open-field/insert-and-scan-dataset-with-index-on-open-field.1.ddl.sqlpp
index 4d0ff03..9f8d2cb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-and-scan-dataset-with-index-on-open-field/insert-and-scan-dataset-with-index-on-open-field.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-and-scan-dataset-with-index-on-open-field/insert-and-scan-dataset-with-index-on-open-field.1.ddl.sqlpp
@@ -33,7 +33,7 @@
   lname : string,
   age : integer,
   dept : string
-}
+};
 
 create type test.EmpClosed as
  closed {
@@ -42,7 +42,7 @@
   lname : string,
   age : integer,
   dept : string
-}
+};
 
 create  dataset test.employee(Emp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp
index 4d7f484..1bff150 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create  dataset test.employee(Emp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
index 908b2c6..6da5c2e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
@@ -33,7 +33,7 @@
 create type test.myDataType as
 {
   id : bigint
-}
+};
 
 create  dataset myData(myDataType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.1.ddl.sqlpp
index 48fd574..eb78709 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.1.ddl.sqlpp
@@ -34,7 +34,7 @@
 create type test.myDataType as
 {
   id : bigint
-}
+};
 
 create  dataset myData(myDataType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-duplicated-keys/insert-duplicated-keys.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-duplicated-keys/insert-duplicated-keys.1.ddl.sqlpp
index 8ec2d05..2cb2f83 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-duplicated-keys/insert-duplicated-keys.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-duplicated-keys/insert-duplicated-keys.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   tags : string,
   categories : string,
   phone : string
-}
+};
 
 create  dataset SimpleGeoPlace(SimpleGeoPlaceType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.1.ddl.sqlpp
index 1edf6c7..3a7ffe8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   l_orderkey : bigint,
   l_linenumber : bigint,
   l_suppkey : bigint
-}
+};
 
 create  dataset LineID(LineIDType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-empty-dataset/insert-into-empty-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-empty-dataset/insert-into-empty-dataset.1.ddl.sqlpp
index 537cc76..311a06a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-empty-dataset/insert-into-empty-dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-empty-dataset/insert-into-empty-dataset.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   l_orderkey : bigint,
   l_linenumber : bigint,
   l_suppkey : bigint
-}
+};
 
 create  dataset LineID(LineIDType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.1.ddl.sqlpp
index 25924b1..3a3f382 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   l_orderkey : bigint,
   l_linenumber : bigint,
   l_suppkey : bigint
-}
+};
 
 create  dataset LineID(LineIDType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.1.ddl.sqlpp
index d2dcab1..6fe6e62 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.1.ddl.sqlpp
@@ -41,14 +41,14 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type test.LineIDType as
  closed {
   l_orderkey : bigint,
   l_linenumber : bigint,
   l_suppkey : bigint
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-loaded-dataset_01/insert-into-loaded-dataset_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-loaded-dataset_01/insert-into-loaded-dataset_01.1.ddl.sqlpp
index 25924b1..3a3f382 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-loaded-dataset_01/insert-into-loaded-dataset_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-loaded-dataset_01/insert-into-loaded-dataset_01.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   l_orderkey : bigint,
   l_linenumber : bigint,
   l_suppkey : bigint
-}
+};
 
 create  dataset LineID(LineIDType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-loaded-dataset_02/insert-into-loaded-dataset_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-loaded-dataset_02/insert-into-loaded-dataset_02.1.ddl.sqlpp
index ec9cc92..8b9d8d8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-loaded-dataset_02/insert-into-loaded-dataset_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-into-loaded-dataset_02/insert-into-loaded-dataset_02.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   stringu1 : string,
   stringu2 : string,
   string4 : string
-}
+};
 
 create  dataset onektup(Schema) primary key unique2;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-record-function/insert-record-function.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-record-function/insert-record-function.1.ddl.sqlpp
index ed8fa11..bdde026 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-record-function/insert-record-function.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-record-function/insert-record-function.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   l_orderkey : integer,
   l_linenumber : integer,
   l_suppkey : integer
-}
+};
 
 create  dataset LineID(LineIDType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-return-records/insert-return-records.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-return-records/insert-return-records.1.ddl.sqlpp
index 5c66655..d89269d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-return-records/insert-return-records.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-return-records/insert-return-records.1.ddl.sqlpp
@@ -30,7 +30,7 @@
 create type TweetMessageTypeuuid as closed {
   tweetid: int,
   `message-text`: string
-}
+};
 
 create dataset TweetMessageuuids(TweetMessageTypeuuid)
-primary key tweetid;
\ No newline at end of file
+primary key tweetid;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-returning-fieldname-implicit/insert-returning-fieldname-implicit.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-returning-fieldname-implicit/insert-returning-fieldname-implicit.1.ddl.sqlpp
index f20fcbe..ff45c01 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-returning-fieldname-implicit/insert-returning-fieldname-implicit.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-returning-fieldname-implicit/insert-returning-fieldname-implicit.1.ddl.sqlpp
@@ -31,7 +31,7 @@
 create type TweetMessageTypeuuid as closed {
   tweetid: uuid,
   `message-text`: string
-}
+};
 
 create dataset TweetMessageuuids(TweetMessageTypeuuid)
-primary key tweetid autogenerated;
\ No newline at end of file
+primary key tweetid autogenerated;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-returning-fieldname/insert-returning-fieldname.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-returning-fieldname/insert-returning-fieldname.1.ddl.sqlpp
index f20fcbe..ff45c01 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-returning-fieldname/insert-returning-fieldname.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-returning-fieldname/insert-returning-fieldname.1.ddl.sqlpp
@@ -31,7 +31,7 @@
 create type TweetMessageTypeuuid as closed {
   tweetid: uuid,
   `message-text`: string
-}
+};
 
 create dataset TweetMessageuuids(TweetMessageTypeuuid)
-primary key tweetid autogenerated;
\ No newline at end of file
+primary key tweetid autogenerated;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-returning-udf/insert-returning-udf.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-returning-udf/insert-returning-udf.1.ddl.sqlpp
index 885c347..604378a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-returning-udf/insert-returning-udf.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-returning-udf/insert-returning-udf.1.ddl.sqlpp
@@ -31,11 +31,11 @@
 create type TweetMessageTypeuuid as closed {
   tweetid: uuid,
   `message-text`: string
-}
+};
 
 create dataset TweetMessageuuids(TweetMessageTypeuuid)
 primary key tweetid autogenerated;
 
 create function project(foo){
     foo.`message-text`
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-src-dst-01/insert-src-dst-01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-src-dst-01/insert-src-dst-01.1.ddl.sqlpp
index 98f239c..b326651 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-src-dst-01/insert-src-dst-01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-src-dst-01/insert-src-dst-01.1.ddl.sqlpp
@@ -33,12 +33,12 @@
  closed {
   id : string,
   name : string?
-}
+};
 
 create type testdv2.testtype02 as
  closed {
   id : string
-}
+};
 
 create  dataset testds01(testtype01) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-syntax/insert-syntax.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-syntax/insert-syntax.1.ddl.sqlpp
index 29fc85d..275dbb6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-syntax/insert-syntax.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-syntax/insert-syntax.1.ddl.sqlpp
@@ -33,7 +33,7 @@
 {
   id : bigint,
   name : string
-}
+};
 
 create  dataset testds(testtype) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-with-autogenerated-pk_adm_01/insert-with-autogenerated-pk_adm_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-with-autogenerated-pk_adm_01/insert-with-autogenerated-pk_adm_01.1.ddl.sqlpp
index 7d8fbdc..a745cb2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-with-autogenerated-pk_adm_01/insert-with-autogenerated-pk_adm_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-with-autogenerated-pk_adm_01/insert-with-autogenerated-pk_adm_01.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id autogenerated ;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-with-autogenerated-pk_adm_02/insert-with-autogenerated-pk_adm_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-with-autogenerated-pk_adm_02/insert-with-autogenerated-pk_adm_02.1.ddl.sqlpp
index 7d8fbdc..a745cb2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-with-autogenerated-pk_adm_02/insert-with-autogenerated-pk_adm_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-with-autogenerated-pk_adm_02/insert-with-autogenerated-pk_adm_02.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id autogenerated ;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-with-autogenerated-pk_adm_03/insert-with-autogenerated-pk_adm_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-with-autogenerated-pk_adm_03/insert-with-autogenerated-pk_adm_03.1.ddl.sqlpp
index 564f626..59f0da1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-with-autogenerated-pk_adm_03/insert-with-autogenerated-pk_adm_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-with-autogenerated-pk_adm_03/insert-with-autogenerated-pk_adm_03.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-with-bad-return/insert-with-bad-return.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-with-bad-return/insert-with-bad-return.1.ddl.sqlpp
index 5c66655..d89269d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-with-bad-return/insert-with-bad-return.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert-with-bad-return/insert-with-bad-return.1.ddl.sqlpp
@@ -30,7 +30,7 @@
 create type TweetMessageTypeuuid as closed {
   tweetid: int,
   `message-text`: string
-}
+};
 
 create dataset TweetMessageuuids(TweetMessageTypeuuid)
-primary key tweetid;
\ No newline at end of file
+primary key tweetid;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert/insert.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert/insert.1.ddl.sqlpp
index d2dcab1..6fe6e62 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert/insert.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert/insert.1.ddl.sqlpp
@@ -41,14 +41,14 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type test.LineIDType as
  closed {
   l_orderkey : bigint,
   l_linenumber : bigint,
   l_suppkey : bigint
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert_less_nc/insert_less_nc.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert_less_nc/insert_less_nc.1.ddl.sqlpp
index d2dcab1..6fe6e62 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert_less_nc/insert_less_nc.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/insert_less_nc/insert_less_nc.1.ddl.sqlpp
@@ -41,14 +41,14 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type test.LineIDType as
  closed {
   l_orderkey : bigint,
   l_linenumber : bigint,
   l_suppkey : bigint
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-from-hdfs/load-from-hdfs.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-from-hdfs/load-from-hdfs.1.ddl.sqlpp
index 25e3a2a..4fe877f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-from-hdfs/load-from-hdfs.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-from-hdfs/load-from-hdfs.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_adm_01/load-with-autogenerated-pk_adm_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_adm_01/load-with-autogenerated-pk_adm_01.1.ddl.sqlpp
index 7d8fbdc..a745cb2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_adm_01/load-with-autogenerated-pk_adm_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_adm_01/load-with-autogenerated-pk_adm_01.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id autogenerated ;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_adm_02/load-with-autogenerated-pk_adm_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_adm_02/load-with-autogenerated-pk_adm_01.1.ddl.sqlpp
index 7d8fbdc..a745cb2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_adm_02/load-with-autogenerated-pk_adm_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_adm_02/load-with-autogenerated-pk_adm_01.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id autogenerated ;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_adm_03/load-with-autogenerated-pk_adm_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_adm_03/load-with-autogenerated-pk_adm_03.1.ddl.sqlpp
index 9836bad..2877686 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_adm_03/load-with-autogenerated-pk_adm_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_adm_03/load-with-autogenerated-pk_adm_03.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id autogenerated ;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_adm_04/load-with-autogenerated-pk_adm_04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_adm_04/load-with-autogenerated-pk_adm_04.1.ddl.sqlpp
index 564f626..59f0da1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_adm_04/load-with-autogenerated-pk_adm_04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_adm_04/load-with-autogenerated-pk_adm_04.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_csv_01/load-with-autogenerated-pk_csv_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_csv_01/load-with-autogenerated-pk_csv_01.1.ddl.sqlpp
index f4b7ef8..16eaa16 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_csv_01/load-with-autogenerated-pk_csv_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_csv_01/load-with-autogenerated-pk_csv_01.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : uuid,
   title : string,
   authors : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id autogenerated ;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_csv_02/load-with-autogenerated-pk_csv_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_csv_02/load-with-autogenerated-pk_csv_02.1.ddl.sqlpp
index f4b7ef8..16eaa16 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_csv_02/load-with-autogenerated-pk_csv_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_csv_02/load-with-autogenerated-pk_csv_02.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : uuid,
   title : string,
   authors : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id autogenerated ;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_txt_01/load-with-autogenerated-pk_txt_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_txt_01/load-with-autogenerated-pk_txt_01.1.ddl.sqlpp
index f4b7ef8..16eaa16 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_txt_01/load-with-autogenerated-pk_txt_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-pk_txt_01/load-with-autogenerated-pk_txt_01.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : uuid,
   title : string,
   authors : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id autogenerated ;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-index-open/load-with-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-index-open/load-with-index-open.1.ddl.sqlpp
index 9078b35..29a5cb7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-index-open/load-with-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-index-open/load-with-index-open.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type test.LineItemTypeOpen as
 {
@@ -60,7 +60,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItemOpen(LineItemTypeOpen) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-index/load-with-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-index/load-with-index.1.ddl.sqlpp
index 2f106ac..b2d43a6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-index/load-with-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-index/load-with-index.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-ngram-index-open/load-with-ngram-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-ngram-index-open/load-with-ngram-index-open.1.ddl.sqlpp
index 3841c39..6648587 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-ngram-index-open/load-with-ngram-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-ngram-index-open/load-with-ngram-index-open.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPTypeOpen as
 {
@@ -38,7 +38,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-ngram-index/load-with-ngram-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-ngram-index/load-with-ngram-index.1.ddl.sqlpp
index d99acc8..668ffa4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-ngram-index/load-with-ngram-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-ngram-index/load-with-ngram-index.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-rtree-index-open/load-with-rtree-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-rtree-index-open/load-with-rtree-index-open.1.ddl.sqlpp
index f688d36..baf1828 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-rtree-index-open/load-with-rtree-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-rtree-index-open/load-with-rtree-index-open.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyRecordOpen as
 {
@@ -46,7 +46,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create  dataset MyData(MyRecord) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-rtree-index/load-with-rtree-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-rtree-index/load-with-rtree-index.1.ddl.sqlpp
index 302547f..02fcfc3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-rtree-index/load-with-rtree-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-rtree-index/load-with-rtree-index.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create  dataset MyData(MyRecord) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-word-index-open/load-with-word-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-word-index-open/load-with-word-index-open.1.ddl.sqlpp
index 733c458..3d87279 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-word-index-open/load-with-word-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-word-index-open/load-with-word-index-open.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPTypeOpen as
 {
@@ -38,7 +38,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-word-index/load-with-word-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-word-index/load-with-word-index.1.ddl.sqlpp
index ba91836..141ee2d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-word-index/load-with-word-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-word-index/load-with-word-index.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-c2o-recursive/opentype-c2o-recursive.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-c2o-recursive/opentype-c2o-recursive.1.ddl.sqlpp
index 342c3c3..2952d07 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-c2o-recursive/opentype-c2o-recursive.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-c2o-recursive/opentype-c2o-recursive.1.ddl.sqlpp
@@ -32,13 +32,13 @@
 {
   street : string,
   city : string
-}
+};
 
 create type testdv2.Dept as
 {
   name : string,
   id : bigint
-}
+};
 
 create type testdv2.testtype as
  closed {
@@ -46,13 +46,13 @@
   id : string,
   address : AddressType?,
   department : {{Dept}}?
-}
+};
 
 create type testdv2.testtype2 as
 {
   name : string,
   id : string
-}
+};
 
 create  dataset testds(testtype) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-c2o/opentype-c2o.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-c2o/opentype-c2o.1.ddl.sqlpp
index 361d70d..ab3b012 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-c2o/opentype-c2o.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-c2o/opentype-c2o.1.ddl.sqlpp
@@ -34,12 +34,12 @@
   id : string,
   name : string,
   hobby : {{string}}?
-}
+};
 
 create type testdv2.testtype2 as
 {
   id : string
-}
+};
 
 create  dataset testds(testtype) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-closed-optional/opentype-closed-optional.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-closed-optional/opentype-closed-optional.1.ddl.sqlpp
index 4f8e864..0003e3b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-closed-optional/opentype-closed-optional.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-closed-optional/opentype-closed-optional.1.ddl.sqlpp
@@ -32,7 +32,7 @@
  closed {
   name : string?,
   id : string
-}
+};
 
 create  dataset testds(testtype) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert/opentype-insert.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert/opentype-insert.1.ddl.sqlpp
index 9d4b13d..eb77e34 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert/opentype-insert.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert/opentype-insert.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 {
   id : string,
   name : string
-}
+};
 
 create  dataset testds(testtype) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert2/opentype-insert2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert2/opentype-insert2.1.ddl.sqlpp
index cb80b8e..8166804 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert2/opentype-insert2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-insert2/opentype-insert2.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 create type test.TestType as
 {
   id : bigint
-}
+};
 
 create  dataset testds(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-noexpand/opentype-noexpand.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-noexpand/opentype-noexpand.1.ddl.sqlpp
index 2f6a3f8..c895d95 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-noexpand/opentype-noexpand.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-noexpand/opentype-noexpand.1.ddl.sqlpp
@@ -33,7 +33,7 @@
 {
   name : string?,
   id : string
-}
+};
 
 create  dataset testds(testtype) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-o2c-recursive/opentype-o2c-recursive.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-o2c-recursive/opentype-o2c-recursive.1.ddl.sqlpp
index 5af0ed6..e25481d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-o2c-recursive/opentype-o2c-recursive.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-o2c-recursive/opentype-o2c-recursive.1.ddl.sqlpp
@@ -32,19 +32,19 @@
 {
   street : string,
   city : string
-}
+};
 
 create type testdv2.Dept as
  closed {
   name : string,
   id : bigint
-}
+};
 
 create type testdv2.testtype as
 {
   name : string,
   id : string
-}
+};
 
 create type testdv2.testtype2 as
  closed {
@@ -52,7 +52,7 @@
   id : string,
   address : AddressType?,
   department : {{Dept}}?
-}
+};
 
 create  dataset testds(testtype) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-o2c/opentype-o2c.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-o2c/opentype-o2c.1.ddl.sqlpp
index 5527546..a222864 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-o2c/opentype-o2c.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-o2c/opentype-o2c.1.ddl.sqlpp
@@ -33,14 +33,14 @@
 {
   id : string,
   name : string
-}
+};
 
 create type testdv2.testtype2 as
  closed {
   hobby : {{string}}?,
   id : string,
   name : string
-}
+};
 
 create  dataset testds(testtype) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-o2o/opentype-o2o.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-o2o/opentype-o2o.1.ddl.sqlpp
index f477eca..fbdaac2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-o2o/opentype-o2o.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/opentype-o2o/opentype-o2o.1.ddl.sqlpp
@@ -33,14 +33,14 @@
 {
   name : string,
   id : string
-}
+};
 
 create type testdv2.testtype2 as
 {
   id : string,
   name : string,
   hobby : string
-}
+};
 
 create  dataset testds(testtype) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/query-issue205/query-issue205.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/query-issue205/query-issue205.1.ddl.sqlpp
index 9f9e0a7..b0c119b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/query-issue205/query-issue205.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/query-issue205/query-issue205.1.ddl.sqlpp
@@ -33,14 +33,14 @@
 {
   age : bigint,
   salary : bigint
-}
+};
 
 create type test.EmployeeType as
  closed {
   id : string,
   stat : EmployeeStat,
   deptCode : bigint
-}
+};
 
 create  dataset Employees(EmployeeType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/query-issue288/query-issue288.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/query-issue288/query-issue288.1.ddl.sqlpp
index 8ca4e51..d7d462b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/query-issue288/query-issue288.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/query-issue288/query-issue288.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   l_orderkey : bigint,
   l_linenumber : bigint,
   l_suppkey : bigint
-}
+};
 
 create  dataset LineID(LineIDType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/query-issue382/query-issue382.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/query-issue382/query-issue382.1.ddl.sqlpp
index a2df6e7..c57fe8f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/query-issue382/query-issue382.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/query-issue382/query-issue382.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type SocialNetworkData.FacebookUserType as
  closed {
@@ -40,7 +40,7 @@
   `user-since-copy` : datetime,
   `friend-ids` : {{bigint}},
   employment : [EmploymentType]
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/query-issue433/query-issue433.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/query-issue433/query-issue433.1.ddl.sqlpp
index 4257ac3..5caf58c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/query-issue433/query-issue433.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/query-issue433/query-issue433.1.ddl.sqlpp
@@ -33,14 +33,14 @@
  closed {
   n : string,
   e : bigint?
-}
+};
 
 create type insertIssue.elem as
  closed {
   id : bigint,
   name : string,
   sub : [subElem]
-}
+};
 
 create  dataset myDataset(elem) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/recreate-index/recreate-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/recreate-index/recreate-index.1.ddl.sqlpp
index 80ef192..79f376a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/recreate-index/recreate-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/recreate-index/recreate-index.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create  dataset test.employee(Emp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-correlated-secondary-index-nullable/scan-delete-btree-correlated-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-correlated-secondary-index-nullable/scan-delete-btree-correlated-secondary-index-nullable.1.ddl.sqlpp
index 64a9d9b..43b3b0d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-correlated-secondary-index-nullable/scan-delete-btree-correlated-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-correlated-secondary-index-nullable/scan-delete-btree-correlated-secondary-index-nullable.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -49,7 +49,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create dataset Customers(CustomerType) primary key cid
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-correlated-secondary-index-open/scan-delete-btree-correlated-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-correlated-secondary-index-open/scan-delete-btree-correlated-secondary-index-open.1.ddl.sqlpp
index 7d54035..4ede65d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-correlated-secondary-index-open/scan-delete-btree-correlated-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-correlated-secondary-index-open/scan-delete-btree-correlated-secondary-index-open.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -49,7 +49,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerOpenType as
 {
@@ -62,7 +62,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create dataset Customers(CustomerType) primary key cid
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.1.ddl.sqlpp
index 85688a5..1f18526 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,7 +48,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-secondary-index-open/scan-delete-btree-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-secondary-index-open/scan-delete-btree-secondary-index-open.1.ddl.sqlpp
index 9e04ac9..4cb57c5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-secondary-index-open/scan-delete-btree-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-btree-secondary-index-open/scan-delete-btree-secondary-index-open.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,7 +48,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerOpenType as
 {
@@ -61,7 +61,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index-nullable/scan-delete-inverted-index-ngram-correlated-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index-nullable/scan-delete-inverted-index-ngram-correlated-secondary-index-nullable.1.ddl.sqlpp
index 74be0ef..e79276a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index-nullable/scan-delete-inverted-index-ngram-correlated-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index-nullable/scan-delete-inverted-index-ngram-correlated-secondary-index-nullable.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   title : string?,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index-open/scan-delete-inverted-index-ngram-correlated-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index-open/scan-delete-inverted-index-ngram-correlated-secondary-index-open.1.ddl.sqlpp
index c59a9d3..2b5788e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index-open/scan-delete-inverted-index-ngram-correlated-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index-open/scan-delete-inverted-index-ngram-correlated-secondary-index-open.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -44,7 +44,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index/scan-delete-inverted-index-ngram-correlated-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index/scan-delete-inverted-index-ngram-correlated-secondary-index.1.ddl.sqlpp
index 0ca47f4..9622774 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index/scan-delete-inverted-index-ngram-correlated-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-correlated-secondary-index/scan-delete-inverted-index-ngram-correlated-secondary-index.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.1.ddl.sqlpp
index 4c71dc7..fdda71b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string?,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-open/scan-delete-inverted-index-ngram-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-open/scan-delete-inverted-index-ngram-secondary-index-open.1.ddl.sqlpp
index 8e1926e..15aaed6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-open/scan-delete-inverted-index-ngram-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-open/scan-delete-inverted-index-ngram-secondary-index-open.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -44,7 +44,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.1.ddl.sqlpp
index cda18e7..4c9bae5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index-nullable/scan-delete-inverted-index-word-correlated-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index-nullable/scan-delete-inverted-index-word-correlated-secondary-index-nullable.1.ddl.sqlpp
index 8e63f7f..4750e17 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index-nullable/scan-delete-inverted-index-word-correlated-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index-nullable/scan-delete-inverted-index-word-correlated-secondary-index-nullable.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   title : string?,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id
 using compaction policy `correlated-prefix`
@@ -48,4 +48,4 @@
 ((`path`=`asterix_nc1://data/dblp-small/dblp-small-nulls.adm`),
 (`format`=`adm`),
 (`type-name`=`DBLPType`),
-(`tuple-interval`=`10`));
\ No newline at end of file
+(`tuple-interval`=`10`));
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index-open/scan-delete-inverted-index-word-correlated-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index-open/scan-delete-inverted-index-word-correlated-secondary-index-open.1.ddl.sqlpp
index 929adc2..7a08dd2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index-open/scan-delete-inverted-index-word-correlated-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index-open/scan-delete-inverted-index-word-correlated-secondary-index-open.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -45,7 +45,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index/scan-delete-inverted-index-word-correlated-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index/scan-delete-inverted-index-word-correlated-secondary-index.1.ddl.sqlpp
index 58956d7..4bb975e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index/scan-delete-inverted-index-word-correlated-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-correlated-secondary-index/scan-delete-inverted-index-word-correlated-secondary-index.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.1.ddl.sqlpp
index 21278f2..000cfb9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string?,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-open/scan-delete-inverted-index-word-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-open/scan-delete-inverted-index-word-secondary-index-open.1.ddl.sqlpp
index 69e4005..7d9e935 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-open/scan-delete-inverted-index-word-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-open/scan-delete-inverted-index-word-secondary-index-open.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -44,7 +44,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.1.ddl.sqlpp
index 1bc3577..546b7fd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index-nullable/scan-delete-rtree-correlated-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index-nullable/scan-delete-rtree-correlated-secondary-index-nullable.1.ddl.sqlpp
index bd93783..3e1b6d5d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index-nullable/scan-delete-rtree-correlated-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index-nullable/scan-delete-rtree-correlated-secondary-index-nullable.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create  dataset MyData(MyRecord) primary key id
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index-open/scan-delete-rtree-correlated-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index-open/scan-delete-rtree-correlated-secondary-index-open.1.ddl.sqlpp
index 002228c..cc505c2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index-open/scan-delete-rtree-correlated-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index-open/scan-delete-rtree-correlated-secondary-index-open.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyRecordOpen as
 {
@@ -53,7 +53,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create  dataset MyData(MyRecord) primary key id
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index/scan-delete-rtree-correlated-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index/scan-delete-rtree-correlated-secondary-index.1.ddl.sqlpp
index d2fa3db..00cdd5b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index/scan-delete-rtree-correlated-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-correlated-secondary-index/scan-delete-rtree-correlated-secondary-index.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create dataset MyData(MyRecord) primary key id
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.1.ddl.sqlpp
index 87315c2..dabe0ec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.1.ddl.sqlpp
@@ -39,7 +39,7 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create  dataset MyData(MyRecord) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-secondary-index-open/scan-delete-rtree-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-secondary-index-open/scan-delete-rtree-secondary-index-open.1.ddl.sqlpp
index 5be81d9..50cad7d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-secondary-index-open/scan-delete-rtree-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-secondary-index-open/scan-delete-rtree-secondary-index-open.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyRecordOpen as
 {
@@ -52,7 +52,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create  dataset MyData(MyRecord) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
index afcf123..04672cf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create  dataset MyData(MyRecord) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-btree-correlated-secondary-index-nullable/scan-insert-btree-correlated-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-btree-correlated-secondary-index-nullable/scan-insert-btree-correlated-secondary-index-nullable.1.ddl.sqlpp
index ab982b3..ef0237f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-btree-correlated-secondary-index-nullable/scan-insert-btree-correlated-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-btree-correlated-secondary-index-nullable/scan-insert-btree-correlated-secondary-index-nullable.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -49,7 +49,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-btree-correlated-secondary-index-open/scan-insert-btree-correlated-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-btree-correlated-secondary-index-open/scan-insert-btree-correlated-secondary-index-open.1.ddl.sqlpp
index d43a96d..d467308 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-btree-correlated-secondary-index-open/scan-insert-btree-correlated-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-btree-correlated-secondary-index-open/scan-insert-btree-correlated-secondary-index-open.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,7 +48,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerOpenType as
 {
@@ -61,7 +61,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.1.ddl.sqlpp
index 2ea898e..152f18d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,7 +48,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-btree-secondary-index-open/scan-insert-btree-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-btree-secondary-index-open/scan-insert-btree-secondary-index-open.1.ddl.sqlpp
index fbcb022..e80d3e3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-btree-secondary-index-open/scan-insert-btree-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-btree-secondary-index-open/scan-insert-btree-secondary-index-open.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,7 +48,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerOpenType as
 {
@@ -61,7 +61,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-ngram-correlated-secondary-index-nullable/scan-insert-inverted-index-ngram-correlated-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-ngram-correlated-secondary-index-nullable/scan-insert-inverted-index-ngram-correlated-secondary-index-nullable.1.ddl.sqlpp
index 0773e99..c28e580 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-ngram-correlated-secondary-index-nullable/scan-insert-inverted-index-ngram-correlated-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-ngram-correlated-secondary-index-nullable/scan-insert-inverted-index-ngram-correlated-secondary-index-nullable.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   title : string?,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-ngram-correlated-secondary-index-open/scan-insert-inverted-index-ngram-correlated-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-ngram-correlated-secondary-index-open/scan-insert-inverted-index-ngram-correlated-secondary-index-open.1.ddl.sqlpp
index 50c691a..aaf1888 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-ngram-correlated-secondary-index-open/scan-insert-inverted-index-ngram-correlated-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-ngram-correlated-secondary-index-open/scan-insert-inverted-index-ngram-correlated-secondary-index-open.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -45,7 +45,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-ngram-correlated-secondary-index/scan-insert-inverted-index-ngram-correlated-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-ngram-correlated-secondary-index/scan-insert-inverted-index-ngram-correlated-secondary-index.1.ddl.sqlpp
index 2010c30..b788e1a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-ngram-correlated-secondary-index/scan-insert-inverted-index-ngram-correlated-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-ngram-correlated-secondary-index/scan-insert-inverted-index-ngram-correlated-secondary-index.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.1.ddl.sqlpp
index 8666bb5..1c78493 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string?,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-open/scan-insert-inverted-index-ngram-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-open/scan-insert-inverted-index-ngram-secondary-index-open.1.ddl.sqlpp
index 160ae99..1ea6435 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-open/scan-insert-inverted-index-ngram-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-open/scan-insert-inverted-index-ngram-secondary-index-open.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -44,7 +44,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.1.ddl.sqlpp
index dc431d5..e743739 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-word-correlated-secondary-index-nullable/scan-insert-inverted-index-word-correlated-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-word-correlated-secondary-index-nullable/scan-insert-inverted-index-word-correlated-secondary-index-nullable.1.ddl.sqlpp
index a196e40..61c8447 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-word-correlated-secondary-index-nullable/scan-insert-inverted-index-word-correlated-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-word-correlated-secondary-index-nullable/scan-insert-inverted-index-word-correlated-secondary-index-nullable.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   title : string?,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-word-correlated-secondary-index-open/scan-insert-inverted-index-word-correlated-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-word-correlated-secondary-index-open/scan-insert-inverted-index-word-correlated-secondary-index-open.1.ddl.sqlpp
index 0cf8927..a858394 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-word-correlated-secondary-index-open/scan-insert-inverted-index-word-correlated-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-word-correlated-secondary-index-open/scan-insert-inverted-index-word-correlated-secondary-index-open.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -45,7 +45,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-word-correlated-secondary-index/scan-insert-inverted-index-word-correlated-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-word-correlated-secondary-index/scan-insert-inverted-index-word-correlated-secondary-index.1.ddl.sqlpp
index 2085f30..1067c80 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-word-correlated-secondary-index/scan-insert-inverted-index-word-correlated-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-word-correlated-secondary-index/scan-insert-inverted-index-word-correlated-secondary-index.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.1.ddl.sqlpp
index a013657..97f0b28 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string?,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-open/scan-insert-inverted-index-word-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-open/scan-insert-inverted-index-word-secondary-index-open.1.ddl.sqlpp
index 9d0264c..46d8a9b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-open/scan-insert-inverted-index-word-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-open/scan-insert-inverted-index-word-secondary-index-open.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -44,7 +44,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.1.ddl.sqlpp
index 025c79f..71ea317 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index-nullable/scan-insert-rtree-correlated-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index-nullable/scan-insert-rtree-correlated-secondary-index-nullable.1.ddl.sqlpp
index 7994440..849f7d1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index-nullable/scan-insert-rtree-correlated-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index-nullable/scan-insert-rtree-correlated-secondary-index-nullable.1.ddl.sqlpp
@@ -40,13 +40,13 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyMiniRecord as
  closed {
   id : bigint,
   point : point?
-}
+};
 
 create  dataset MyData(MyRecord) primary key id
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index-open/scan-insert-rtree-correlated-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index-open/scan-insert-rtree-correlated-secondary-index-open.1.ddl.sqlpp
index 051c378..510cc51 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index-open/scan-insert-rtree-correlated-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index-open/scan-insert-rtree-correlated-secondary-index-open.1.ddl.sqlpp
@@ -41,12 +41,12 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyOpenRecord as
 {
   id : bigint
-}
+};
 
 create  dataset MyData(MyRecord) primary key id
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index/scan-insert-rtree-correlated-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index/scan-insert-rtree-correlated-secondary-index.1.ddl.sqlpp
index 5e7bb43..e986bb6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index/scan-insert-rtree-correlated-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-correlated-secondary-index/scan-insert-rtree-correlated-secondary-index.1.ddl.sqlpp
@@ -33,13 +33,13 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyMiniRecord as
  closed {
   id : bigint,
   point : point
-}
+};
 
 create  dataset MyData(MyRecord) primary key id
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.1.ddl.sqlpp
index 34b6923..791c905 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.1.ddl.sqlpp
@@ -39,13 +39,13 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyMiniRecord as
  closed {
   id : bigint,
   point : point?
-}
+};
 
 create  dataset MyData(MyRecord) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-secondary-index-open/scan-insert-rtree-secondary-index-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-secondary-index-open/scan-insert-rtree-secondary-index-open.1.ddl.sqlpp
index ce55481..ca7c51d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-secondary-index-open/scan-insert-rtree-secondary-index-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-secondary-index-open/scan-insert-rtree-secondary-index-open.1.ddl.sqlpp
@@ -40,12 +40,12 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyOpenRecord as
 {
   id : bigint
-}
+};
 
 create  dataset MyData(MyRecord) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
index 0e7f441..e57ea72 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
@@ -34,13 +34,13 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyMiniRecord as
  closed {
   id : bigint,
   point : point
-}
+};
 
 create  dataset MyData(MyRecord) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/upsert-dataset-with-meta/upsert-dataset-with-meta.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/upsert-dataset-with-meta/upsert-dataset-with-meta.1.ddl.sqlpp
index d77f990..d62635a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/upsert-dataset-with-meta/upsert-dataset-with-meta.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/upsert-dataset-with-meta/upsert-dataset-with-meta.1.ddl.sqlpp
@@ -33,4 +33,4 @@
 id:string
 };
 
-create dataset DatasetWithMeta(RecordType) with meta(MetaType)primary key meta().id;
\ No newline at end of file
+create dataset DatasetWithMeta(RecordType) with meta(MetaType)primary key meta().id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/upsert-return-custom-result/upsert-return-custom-result.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/upsert-return-custom-result/upsert-return-custom-result.1.ddl.sqlpp
index 40768db..b4415dc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/upsert-return-custom-result/upsert-return-custom-result.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/upsert-return-custom-result/upsert-return-custom-result.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   tweetid: int,
   `message-text`: string,
   location:point
-}
+};
 
 create dataset TweetMessageuuids(TweetMessageTypeuuid)
-primary key tweetid;
\ No newline at end of file
+primary key tweetid;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-constant-merge-policy/using-constant-merge-policy.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-constant-merge-policy/using-constant-merge-policy.1.ddl.sqlpp
index 0e2e494..14b2ad1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-constant-merge-policy/using-constant-merge-policy.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-constant-merge-policy/using-constant-merge-policy.1.ddl.sqlpp
@@ -48,7 +48,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber using compaction policy `constant`((`num-components`=`2`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-correlated-prefix-merge-policy-with-feed/using-correlated-prefix-merge-policy-with-feed.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-correlated-prefix-merge-policy-with-feed/using-correlated-prefix-merge-policy-with-feed.1.ddl.sqlpp
index f86b5a3..0acd01f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-correlated-prefix-merge-policy-with-feed/using-correlated-prefix-merge-policy-with-feed.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-correlated-prefix-merge-policy-with-feed/using-correlated-prefix-merge-policy-with-feed.1.ddl.sqlpp
@@ -46,7 +46,7 @@
   l_shipinstruct: string,
   l_shipmode: string,
   l_comment: string
-}
+};
 
 create dataset LineItem(LineItemType)
   primary key l_orderkey, l_linenumber using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-correlated-prefix-merge-policy/using-correlated-prefix-merge-policy.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-correlated-prefix-merge-policy/using-correlated-prefix-merge-policy.1.ddl.sqlpp
index bc25f65..9fb610e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-correlated-prefix-merge-policy/using-correlated-prefix-merge-policy.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-correlated-prefix-merge-policy/using-correlated-prefix-merge-policy.1.ddl.sqlpp
@@ -48,7 +48,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber using compaction policy `correlated-prefix`((`max-mergable-component-size`=`1048576`),(`max-tolerance-component-count`=`3`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-no-merge-policy/using-no-merge-policy.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-no-merge-policy/using-no-merge-policy.1.ddl.sqlpp
index 04b20d0..8ea402c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-no-merge-policy/using-no-merge-policy.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-no-merge-policy/using-no-merge-policy.1.ddl.sqlpp
@@ -48,7 +48,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber using compaction policy `no-merge`;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-prefix-merge-policy/using-prefix-merge-policy.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-prefix-merge-policy/using-prefix-merge-policy.1.ddl.sqlpp
index 9cb48a2..b04c631 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-prefix-merge-policy/using-prefix-merge-policy.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/using-prefix-merge-policy/using-prefix-merge-policy.1.ddl.sqlpp
@@ -48,7 +48,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber using compaction policy `prefix`((`max-mergable-component-size`=`1048576`),(`max-tolerance-component-count`=`3`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/employee/q_01/q_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/employee/q_01/q_01.1.ddl.sqlpp
index 3000891..0247af7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/employee/q_01/q_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/employee/q_01/q_01.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   age : bigint?,
   interests : {{string}}?,
   children : [string]?
-}
+};
 
 create external  dataset Emp(EmpType) using localfs((`path`=`asterix_nc1://data/nontagged/employee.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/employee/q_02/q_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/employee/q_02/q_02.1.ddl.sqlpp
index 3000891..0247af7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/employee/q_02/q_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/employee/q_02/q_02.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   age : bigint?,
   interests : {{string}}?,
   children : [string]?
-}
+};
 
 create external  dataset Emp(EmpType) using localfs((`path`=`asterix_nc1://data/nontagged/employee.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/explain/explain_field_access/explain_field_access.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/explain/explain_field_access/explain_field_access.1.ddl.sqlpp
index 866804c..ad9bb5c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/explain/explain_field_access/explain_field_access.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/explain/explain_field_access/explain_field_access.1.ddl.sqlpp
@@ -24,6 +24,6 @@
 
 CREATE TYPE EmployeeType AS {
   id : string
-}
+};
 
 CREATE DATASET Employee(EmployeeType) PRIMARY KEY id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/explain/explain_field_access_closed/explain_field_access_closed.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/explain/explain_field_access_closed/explain_field_access_closed.1.ddl.sqlpp
index aaa62aa..e4cdd0d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/explain/explain_field_access_closed/explain_field_access_closed.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/explain/explain_field_access_closed/explain_field_access_closed.1.ddl.sqlpp
@@ -26,6 +26,6 @@
   id : string,
   department_id: string,
   salary : float
-}
+};
 
 CREATE DATASET Employee(EmployeeType) PRIMARY KEY id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
index 24dc561..c801bd0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
@@ -49,7 +49,7 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create external  dataset TweetMessages(TweetMessageType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/tw_for_indexleftouterjoin.adm`),(`input-format`=`text-input-format`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
index 6a6b961..6cbeb79 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
@@ -49,7 +49,7 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create external  dataset TweetMessages(TweetMessageType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/tw_for_indexleftouterjoin.adm`),(`input-format`=`text-input-format`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/rc-format/rc-format.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/rc-format/rc-format.1.ddl.sqlpp
index 50e5097..a3e79a0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/rc-format/rc-format.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/rc-format/rc-format.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   id : bigint,
   name : string,
   age : bigint
-}
+};
 
 create external  dataset EmployeeDataset(EmployeeType) using `hdfs`(
 (`hdfs`=`hdfs://127.0.0.1:31888`),
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
index 322b5e4..6e87e38 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create external  dataset MyData(MyRecord) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/spatialData.json`),(`input-format`=`text-input-format`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/sequence-format/sequence-format.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/sequence-format/sequence-format.1.ddl.sqlpp
index ab669fe..f366b4a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/sequence-format/sequence-format.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/sequence-format/sequence-format.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   id : bigint,
   name : string,
   age : bigint
-}
+};
 
 create external  dataset EmployeeDataset(EmployeeType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/external-indexing-test.seq`),(`input-format`=`sequence-input-format`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/text-format/text-format.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/text-format/text-format.1.ddl.sqlpp
index c15ef05..ca874e5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/text-format/text-format.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-indexing/text-format/text-format.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   id : bigint,
   name : string,
   age : bigint
-}
+};
 
 create external  dataset EmployeeDataset(EmployeeType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/external-indexing-test.txt`),(`input-format`=`text-input-format`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/group_by_failure/group_by_failure.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/group_by_failure/group_by_failure.1.ddl.sqlpp
index 6b277db..19e40fa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/group_by_failure/group_by_failure.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/group_by_failure/group_by_failure.1.ddl.sqlpp
@@ -41,6 +41,6 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/group_by_hash_failure/group_by_hash_failure.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/group_by_hash_failure/group_by_hash_failure.1.ddl.sqlpp
index 6b277db..19e40fa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/group_by_hash_failure/group_by_hash_failure.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/group_by_hash_failure/group_by_hash_failure.1.ddl.sqlpp
@@ -41,6 +41,6 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/order_by_failure/order_by_failure.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/order_by_failure/order_by_failure.1.ddl.sqlpp
index 6b277db..19e40fa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/order_by_failure/order_by_failure.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/order_by_failure/order_by_failure.1.ddl.sqlpp
@@ -41,6 +41,6 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/q01_pricing_summary_report_failure/q01_pricing_summary_report_failure.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/q01_pricing_summary_report_failure/q01_pricing_summary_report_failure.1.ddl.sqlpp
index 5ebec80..69a952d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/q01_pricing_summary_report_failure/q01_pricing_summary_report_failure.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/q01_pricing_summary_report_failure/q01_pricing_summary_report_failure.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/q18_large_volume_customer_failure/q18_large_volume_customer_failure.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/q18_large_volume_customer_failure/q18_large_volume_customer_failure.1.ddl.sqlpp
index 9e64c15..4b3484e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/q18_large_volume_customer_failure/q18_large_volume_customer_failure.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/failure/q18_large_volume_customer_failure/q18_large_volume_customer_failure.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type OrderType as {
   o_orderkey : bigint,
@@ -52,7 +52,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type CustomerType as {
   c_custkey : bigint,
@@ -63,7 +63,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/create-policy-from-file/create-policy-from-file.3.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/create-policy-from-file/create-policy-from-file.3.ddl.sqlpp
index 1e8d6d9..8598564 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/create-policy-from-file/create-policy-from-file.3.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/create-policy-from-file/create-policy-from-file.3.ddl.sqlpp
@@ -24,4 +24,4 @@
 
 use experiments;
 drop ingestion policy testPolicy;
-drop dataverse experiments;
\ No newline at end of file
+drop dataverse experiments;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_01/feeds_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_01/feeds_01.1.ddl.sqlpp
index 40b6ba2..7f79467 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_01/feeds_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_01/feeds_01.1.ddl.sqlpp
@@ -35,9 +35,9 @@
   location : string,
   text : string,
   timestamp : string
-}
+};
 
 create  dataset Tweets(TweetType) primary key id;
 
 create feed TweetFeed using localfs
-((`type-name`=`TweetType`),(`path`=`asterix_nc1://data/twitter/obamatweets.adm`),(`format`=`adm`),(`tuple-interval`=`10`));
\ No newline at end of file
+((`type-name`=`TweetType`),(`path`=`asterix_nc1://data/twitter/obamatweets.adm`),(`format`=`adm`),(`tuple-interval`=`10`));
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.1.ddl.sqlpp
index cbf8b87..a0d01c2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_02/feeds_02.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   location : string,
   text : string,
   timestamp : string
-}
+};
 
 create  dataset Tweets(TweetType) primary key id;
 create  feed TweetFeed using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_03/feeds_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_03/feeds_03.1.ddl.sqlpp
index 5bc362f..7b8e70c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_03/feeds_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_03/feeds_03.1.ddl.sqlpp
@@ -32,14 +32,14 @@
   location : string,
   text : string,
   timestamp : string
-}
+};
 
 create dataset Tweets(TweetType)
 primary key id;
 
 create function feed_processor(x) {
 x
-}
+};
 
 create feed TweetFeed
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.1.ddl.sqlpp
index d2f4543..5553694 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_07/feeds_07.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   status_count: integer,
   name: string,
   followers_count: integer
-}
+};
 
 create type feeds.TweetMessageType as
  closed {
@@ -41,7 +41,7 @@
   message_text : string,
   created_at : string,
   country : string
-}
+};
 
 create dataset SyntheticTweets(TweetMessageType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.1.ddl.sqlpp
index 957226f..3b78e5a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_08/feeds_08.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   status_count : integer,
   name : string,
   followers_count : integer
-}
+};
 
 create type feeds.TweetMessageType as
  closed {
@@ -41,7 +41,7 @@
   message_text : string,
   created_at : string,
   country : string
-}
+};
 
 create  dataset SyntheticTweets(TweetMessageType) primary key id;
 create  index ngram_index  on SyntheticTweets (message_text) type ngram (3);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.1.ddl.sqlpp
index 8b45833..f979a3a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_09/feeds_09.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   status_count : integer,
   name : string,
   followers_count : integer
-}
+};
 
 create type feeds_09.TweetMessageType as
  closed {
@@ -42,7 +42,7 @@
   message_text : string,
   created_at : string,
   country : string
-}
+};
 create  dataset SyntheticTweets(TweetMessageType) primary key id;
 create  index message_text  on SyntheticTweets (message_text) type btree;
 create  feed SyntheticTweetFeed using stream ((`duration`=`5`),
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_10/feeds_10.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_10/feeds_10.1.ddl.sqlpp
index 5413b55..8898864 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_10/feeds_10.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_10/feeds_10.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   location : string,
   text : string,
   timestamp : string
-}
+};
 
 create  dataset Tweets(TweetType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_11/feeds_11.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_11/feeds_11.1.ddl.sqlpp
index 8e96b78..84c8047 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_11/feeds_11.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_11/feeds_11.1.ddl.sqlpp
@@ -28,11 +28,11 @@
   location : string,
   text : string,
   timestamp : string
-}
+};
 
 create  dataset Tweets(TweetType) primary key id;
 create  feed TweetFeed using localfs
 ((`path`=`asterix_nc1://data/twitter/obamatweets.adm`),
 (`format`=`adm`),
 (`type-name`=`TweetType`),
-(`tuple-interval`=`10`));
\ No newline at end of file
+(`tuple-interval`=`10`));
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_12/feeds_12.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_12/feeds_12.1.ddl.sqlpp
index 0abb2e3..9f1ce3a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_12/feeds_12.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/feeds_12/feeds_12.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   location : string,
   text : string,
   timestamp : string
-}
+};
 
 create  dataset Tweets(TweetType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/issue_230_feeds/issue_230_feeds.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/issue_230_feeds/issue_230_feeds.1.ddl.sqlpp
index c102e01..3141627 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/issue_230_feeds/issue_230_feeds.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/issue_230_feeds/issue_230_feeds.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   location : string,
   text : string,
   timestamp : string
-}
+};
 
 create  dataset Tweets(TweetType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/upsert-feed/upsert-feed.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/upsert-feed/upsert-feed.1.ddl.sqlpp
index d426687..4573f89 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/upsert-feed/upsert-feed.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/upsert-feed/upsert-feed.1.ddl.sqlpp
@@ -43,4 +43,4 @@
     ("type-name"="TwitterUser"),
     ("format"="adm"),
     ("upsert-feed"="true")
-);
\ No newline at end of file
+);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/upsert-feed/upsert-feed.8.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/upsert-feed/upsert-feed.8.ddl.sqlpp
index 8ba3fcd..2d29f2f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/upsert-feed/upsert-feed.8.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/feeds/upsert-feed/upsert-feed.8.ddl.sqlpp
@@ -24,4 +24,4 @@
  * Date         : 13th Aug 2016
  */
 use experiments;
-drop dataverse experiments;
\ No newline at end of file
+drop dataverse experiments;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/delete/delete.11.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/delete/delete.11.ddl.sqlpp
index da9bd3a..8d6aa5a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/delete/delete.11.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/delete/delete.11.ddl.sqlpp
@@ -24,4 +24,4 @@
  * Date         : 24th Feb 2016
  */
 
-drop dataverse test;
\ No newline at end of file
+drop dataverse test;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/equality-predicate/equality-predicate.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/equality-predicate/equality-predicate.1.ddl.sqlpp
index d10030d..d19b75d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/equality-predicate/equality-predicate.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/equality-predicate/equality-predicate.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   `sender-location` : point?,
   message : string,
   `send-time` : datetime
-}
+};
 
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id` with filter on `send-time`;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-correlated-secondary-btree/insert-with-correlated-secondary-btree.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-correlated-secondary-btree/insert-with-correlated-secondary-btree.1.ddl.sqlpp
index 7568e18..a76d678 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-correlated-secondary-btree/insert-with-correlated-secondary-btree.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-correlated-secondary-btree/insert-with-correlated-secondary-btree.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   `sender-location` : point?,
   message : string,
   `send-time` : datetime
-}
+};
 
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-correlated-secondary-inverted-ngram/insert-with-correlated-secondary-inverted-ngram.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-correlated-secondary-inverted-ngram/insert-with-correlated-secondary-inverted-ngram.1.ddl.sqlpp
index d2bff51..abec9e5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-correlated-secondary-inverted-ngram/insert-with-correlated-secondary-inverted-ngram.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-correlated-secondary-inverted-ngram/insert-with-correlated-secondary-inverted-ngram.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   `sender-location` : point?,
   message : string,
   `send-time` : datetime
-}
+};
 
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-correlated-secondary-inverted-word/insert-with-correlated-secondary-inverted-word.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-correlated-secondary-inverted-word/insert-with-correlated-secondary-inverted-word.1.ddl.sqlpp
index 55940ba..d2eb504 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-correlated-secondary-inverted-word/insert-with-correlated-secondary-inverted-word.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-correlated-secondary-inverted-word/insert-with-correlated-secondary-inverted-word.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   `sender-location` : point?,
   message : string,
   `send-time` : datetime
-}
+};
 
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-correlated-secondary-rtree/insert-with-correlated-secondary-rtree.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-correlated-secondary-rtree/insert-with-correlated-secondary-rtree.1.ddl.sqlpp
index 4bbff39..3727b9c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-correlated-secondary-rtree/insert-with-correlated-secondary-rtree.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-correlated-secondary-rtree/insert-with-correlated-secondary-rtree.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   `sender-location` : point?,
   message : string,
   `send-time` : datetime
-}
+};
 
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-secondary-btree/insert-with-secondary-btree.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-secondary-btree/insert-with-secondary-btree.1.ddl.sqlpp
index 30fcc28..56bd0b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-secondary-btree/insert-with-secondary-btree.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-secondary-btree/insert-with-secondary-btree.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   `sender-location` : point?,
   message : string,
   `send-time` : datetime
-}
+};
 
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-secondary-inverted-ngram/insert-with-secondary-inverted-ngram.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-secondary-inverted-ngram/insert-with-secondary-inverted-ngram.1.ddl.sqlpp
index 637a34e..c752102 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-secondary-inverted-ngram/insert-with-secondary-inverted-ngram.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-secondary-inverted-ngram/insert-with-secondary-inverted-ngram.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   `sender-location` : point?,
   message : string,
   `send-time` : datetime
-}
+};
 
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-secondary-inverted-word/insert-with-secondary-inverted-word.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-secondary-inverted-word/insert-with-secondary-inverted-word.1.ddl.sqlpp
index 5083830..569bfb7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-secondary-inverted-word/insert-with-secondary-inverted-word.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-secondary-inverted-word/insert-with-secondary-inverted-word.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   `sender-location` : point?,
   message : string,
   `send-time` : datetime
-}
+};
 
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-secondary-rtree/insert-with-secondary-rtree.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-secondary-rtree/insert-with-secondary-rtree.1.ddl.sqlpp
index 3ad1719..07a3f26 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-secondary-rtree/insert-with-secondary-rtree.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert-with-secondary-rtree/insert-with-secondary-rtree.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   `sender-location` : point?,
   message : string,
   `send-time` : datetime
-}
+};
 
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert/insert.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert/insert.1.ddl.sqlpp
index 4666402..d869be2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert/insert.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/insert/insert.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   `sender-location` : point?,
   message : string,
   `send-time` : datetime
-}
+};
 
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load-with-secondary-btree/load-with-secondary-btree.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load-with-secondary-btree/load-with-secondary-btree.1.ddl.sqlpp
index 8b08036..c097b3e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load-with-secondary-btree/load-with-secondary-btree.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load-with-secondary-btree/load-with-secondary-btree.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   `sender-location` : point?,
   message : string,
   `send-time` : datetime
-}
+};
 
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id` with filter on `send-time`;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load-with-secondary-inverted-ngram/load-with-secondary-inverted-ngram.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load-with-secondary-inverted-ngram/load-with-secondary-inverted-ngram.1.ddl.sqlpp
index 76a8281..04c1c01 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load-with-secondary-inverted-ngram/load-with-secondary-inverted-ngram.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load-with-secondary-inverted-ngram/load-with-secondary-inverted-ngram.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   `sender-location` : point?,
   message : string,
   `send-time` : datetime
-}
+};
 
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id` with filter on `send-time`;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load-with-secondary-inverted-word/load-with-secondary-inverted-word.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load-with-secondary-inverted-word/load-with-secondary-inverted-word.1.ddl.sqlpp
index f97239c..6f0506f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load-with-secondary-inverted-word/load-with-secondary-inverted-word.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load-with-secondary-inverted-word/load-with-secondary-inverted-word.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   `sender-location` : point?,
   message : string,
   `send-time` : datetime
-}
+};
 
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id` with filter on `send-time`;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.1.ddl.sqlpp
index 636af2b..3cbb103 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   `sender-location` : point?,
   message : string,
   `send-time` : datetime
-}
+};
 
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id` with filter on `send-time`;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load/load.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load/load.1.ddl.sqlpp
index 34ea9fd..a1bf14e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load/load.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/load/load.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   `sender-location` : point?,
   message : string,
   `send-time` : datetime
-}
+};
 
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id` with filter on `send-time`;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/nested-filter-equality-predicate/equality-predicate.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/nested-filter-equality-predicate/equality-predicate.1.ddl.sqlpp
index 2b1fb09..8c01266 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/nested-filter-equality-predicate/equality-predicate.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/nested-filter-equality-predicate/equality-predicate.1.ddl.sqlpp
@@ -36,12 +36,12 @@
   `sender-location` : point?,
   message : string,
   `send-time` : datetime
-}
+};
 
 create type test.FacebookMessageType as
  closed {
   nested : FacebookMessageTypeTmp
-}
+};
 
 create  dataset FacebookMessagesTmp(FacebookMessageTypeTmp) primary key `message-id`;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/upsert/upsert.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/upsert/upsert.1.ddl.sqlpp
index 417f841..fd65d71 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/upsert/upsert.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/upsert/upsert.1.ddl.sqlpp
@@ -42,7 +42,7 @@
     followers_count: int32,
     friends_count: int32,
     statues_count: int64
-}
+};
 
 create type typePlace if not exists as open{
     country : string,
@@ -52,7 +52,7 @@
     name : string,
     place_type : string,
     bounding_box : rectangle
-}
+};
 
 create type typeGeoTag if not exists as open {
     stateID: int32,
@@ -61,7 +61,7 @@
     countyName: string,
     cityID: int32?,
     cityName: string?
-}
+};
 
 create type typeTweet if not exists as open{
     create_at : datetime,
@@ -79,7 +79,7 @@
     user : typeUser,
     place : typePlace?,
     geo_tag: typeGeoTag
-}
+};
 
 create dataset Tweet(typeTweet) primary key id
 using compaction policy prefix (("max-mergable-component-size"="32768"),("max-tolerance-component-count"="32"))
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/upsert/upsert.11.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/upsert/upsert.11.ddl.sqlpp
index da9bd3a..8d6aa5a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/upsert/upsert.11.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/filters/upsert/upsert.11.ddl.sqlpp
@@ -24,4 +24,4 @@
  * Date         : 24th Feb 2016
  */
 
-drop dataverse test;
\ No newline at end of file
+drop dataverse test;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.1.ddl.sqlpp
index d608e65..33a1d3a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at00/at00.1.ddl.sqlpp
@@ -46,7 +46,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at01/at01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at01/at01.1.ddl.sqlpp
index f5af371..46c61e0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at01/at01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at01/at01.1.ddl.sqlpp
@@ -33,7 +33,7 @@
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type test.FacebookUserType as
  closed {
@@ -43,7 +43,7 @@
   `user-since` : datetime,
   `friend-ids` : {{bigint}},
   employment : [EmploymentType]
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at02/at02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at02/at02.1.ddl.sqlpp
index e963b17..0491413 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at02/at02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at02/at02.1.ddl.sqlpp
@@ -33,7 +33,7 @@
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type test.FacebookUserType as
  closed {
@@ -43,7 +43,7 @@
   `user-since` : datetime,
   `friend-ids` : {{bigint}},
   employment : [EmploymentType]
-}
+};
 
 create type test.FacebookMessageType as
  closed {
@@ -52,7 +52,7 @@
   `in-response-to` : bigint?,
   `sender-location` : point?,
   message : string
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at03/at03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at03/at03.1.ddl.sqlpp
index 1ace089..0c57156 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at03/at03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at03/at03.1.ddl.sqlpp
@@ -33,7 +33,7 @@
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type test.FacebookUserType as
  closed {
@@ -43,7 +43,7 @@
   `user-since` : datetime,
   `friend-ids` : {{bigint}},
   employment : [EmploymentType]
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at04/at04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at04/at04.1.ddl.sqlpp
index 8e8c074..2eb8497 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at04/at04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at04/at04.1.ddl.sqlpp
@@ -39,7 +39,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at05/at05.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at05/at05.1.ddl.sqlpp
index 8e8c074..2eb8497 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at05/at05.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at05/at05.1.ddl.sqlpp
@@ -39,7 +39,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at06/at06.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at06/at06.1.ddl.sqlpp
index d608e65..33a1d3a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at06/at06.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/at06/at06.1.ddl.sqlpp
@@ -46,7 +46,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/let33/let33.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/let33/let33.1.ddl.sqlpp
index 8071be8..68138ef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/let33/let33.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/let33/let33.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 {
   id : integer,
   name : string
-}
+};
 
 create  dataset fb(fbuser) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/query-ASTERIXDB-883/query-ASTERIXDB-883.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/query-ASTERIXDB-883/query-ASTERIXDB-883.1.ddl.sqlpp
index 6590a8f..edf785c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/query-ASTERIXDB-883/query-ASTERIXDB-883.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/flwor/query-ASTERIXDB-883/query-ASTERIXDB-883.1.ddl.sqlpp
@@ -22,7 +22,7 @@
 use test;
 
 create type page_info_type as {
-}
+};
 
 create type page_views_type as closed {
   user: string,
@@ -34,13 +34,13 @@
   estimated_revenue: double,
   page_info: page_info_type,
   page_links: {{ page_info_type}}
-}
+};
 
 create dataset page_views(page_views_type) primary key user;
 
 create type tmp_type as closed {
   id: uuid,
   groups: [page_views_type]
-}
+};
 
 create dataset tmp(tmp_type) primary key id autogenerated;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-01/fulltext-01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-01/fulltext-01.1.ddl.sqlpp
index 2812177..8d959eb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-01/fulltext-01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-01/fulltext-01.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   poly2: polygon,
   rec: rectangle,
   circle: circle
-}
+};
 
 create dataset MyData(MyRecord)
   primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-02/fulltext-02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-02/fulltext-02.1.ddl.sqlpp
index 6bff4a1..770a405 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-02/fulltext-02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-02/fulltext-02.1.ddl.sqlpp
@@ -51,7 +51,7 @@
   poly2: polygon,
   rec: rectangle,
   circle: circle
-}
+};
 
 create dataset MyData(MyRecord)
   primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-01/fulltext-index-01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-01/fulltext-index-01.1.ddl.sqlpp
index ef7c98d..227cc5a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-01/fulltext-index-01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-01/fulltext-index-01.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   poly2: polygon,
   rec: rectangle,
   circle: circle
-}
+};
 
 create dataset MyData(MyRecord)
   primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-02/fulltext-index-02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-02/fulltext-index-02.1.ddl.sqlpp
index 63b0a65..bf633e2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-02/fulltext-index-02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-02/fulltext-index-02.1.ddl.sqlpp
@@ -51,7 +51,7 @@
   poly2: polygon,
   rec: rectangle,
   circle: circle
-}
+};
 
 create dataset MyData(MyRecord)
   primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-1_1/dblp-1_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-1_1/dblp-1_1.1.ddl.sqlpp
index 4404819..6a7c885 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-1_1/dblp-1_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-1_1/dblp-1_1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.1.1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.1.1.1.ddl.sqlpp
index 50b6044..98607e4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.1.1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.1.1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.1.1.ddl.sqlpp
index c6aa93e..ea79640 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.1.ddl.sqlpp
index c6aa93e..ea79640 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.1_5.3.1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.1_5.3.1.1.ddl.sqlpp
index b157b85..bbadddf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.1_5.3.1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.1_5.3.1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.2.1.ddl.sqlpp
index 52c34ba..030d935 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.2.1.ddl.sqlpp
@@ -30,13 +30,13 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.TOKENSRANKEDADMType as
  closed {
   token : bigint,
   rank : bigint
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_1/dblp-2_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_1/dblp-2_1.1.ddl.sqlpp
index 4404819..6a7c885 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_1/dblp-2_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_1/dblp-2_1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.1.ddl.sqlpp
index 4404819..6a7c885 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.1.ddl.sqlpp
index 4404819..6a7c885 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.1.ddl.sqlpp
index 4404819..6a7c885 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.1.1.ddl.sqlpp
index 4404819..6a7c885 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.2.1.ddl.sqlpp
index 4404819..6a7c885 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.2.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.1.1.ddl.sqlpp
index b157b85..bbadddf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.1.ddl.sqlpp
index 4404819..6a7c885 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.1.ddl.sqlpp
index 4404819..6a7c885 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.1.1.ddl.sqlpp
index 4404819..6a7c885 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.2.1.ddl.sqlpp
index 4404819..6a7c885 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.2.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.1.ddl.sqlpp
index 4404819..6a7c885 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.1.ddl.sqlpp
index b157b85..bbadddf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.1.ddl.sqlpp
index 71b5db4..4e9add4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.1.ddl.sqlpp
@@ -34,7 +34,7 @@
 create type fuzzyjoin.DBLPType as
 {
   id : bigint
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.1.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.2.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.2.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.1.1.ddl.sqlpp
index 34ae557..f3e278a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
  closed {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.1.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.2.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.2.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.1.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.4.1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.4.1.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.4.1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.4.1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.4.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.4.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.4.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.4.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-dblp-aqlplus_1/dblp-csx-dblp-aqlplus_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-dblp-aqlplus_1/dblp-csx-dblp-aqlplus_1.1.ddl.sqlpp
index 85431dc..614fa9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-dblp-aqlplus_1/dblp-csx-dblp-aqlplus_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-csx-dblp-aqlplus_1/dblp-csx-dblp-aqlplus_1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type fuzzyjoin.CSXType as
 {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-lookup_1/dblp-lookup_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-lookup_1/dblp-lookup_1.1.ddl.sqlpp
index 4404819..6a7c885 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-lookup_1/dblp-lookup_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-lookup_1/dblp-lookup_1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-splits-3_1/dblp-splits-3_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-splits-3_1/dblp-splits-3_1.1.ddl.sqlpp
index eed435c..cacf3dc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-splits-3_1/dblp-splits-3_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/dblp-splits-3_1/dblp-splits-3_1.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create external  dataset DBLP(DBLPType) using localfs((`path`=`asterix_nc1://data/pub-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/events-users-aqlplus_1/events-users-aqlplus_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/events-users-aqlplus_1/events-users-aqlplus_1.1.ddl.sqlpp
index 7c2f136..f3ab883 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/events-users-aqlplus_1/events-users-aqlplus_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/events-users-aqlplus_1/events-users-aqlplus_1.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   city : string,
   zip : string,
   latlong : point
-}
+};
 
 create type fuzzyjoin.UserType as
 {
@@ -40,9 +40,9 @@
           sig_id : bigint,
           chapter_name : string,
           member_since : date
-      }
-}}
-}
+      };
+}};
+};
 
 create  dataset User(UserType) primary key name;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/opentype/opentype.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/opentype/opentype.1.ddl.sqlpp
index 7919621..a124628 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/opentype/opentype.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/opentype/opentype.1.ddl.sqlpp
@@ -26,7 +26,7 @@
 create type TinySocial.TweetMessageType as
 {
   tweetid : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid hints (`CARDINALITY`=`100`);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-int-aqlplus_1/user-int-aqlplus_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-int-aqlplus_1/user-int-aqlplus_1.1.ddl.sqlpp
index a0d6cfc..2fe0318 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-int-aqlplus_1/user-int-aqlplus_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-int-aqlplus_1/user-int-aqlplus_1.1.ddl.sqlpp
@@ -28,8 +28,8 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-int-aqlplus_2/user-int-aqlplus_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-int-aqlplus_2/user-int-aqlplus_2.1.ddl.sqlpp
index a0d6cfc..2fe0318 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-int-aqlplus_2/user-int-aqlplus_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-int-aqlplus_2/user-int-aqlplus_2.1.ddl.sqlpp
@@ -28,8 +28,8 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-int-aqlplus_3/user-int-aqlplus_3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-int-aqlplus_3/user-int-aqlplus_3.1.ddl.sqlpp
index a0d6cfc..2fe0318 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-int-aqlplus_3/user-int-aqlplus_3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-int-aqlplus_3/user-int-aqlplus_3.1.ddl.sqlpp
@@ -28,8 +28,8 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-lot-aqlplus_1.1/user-lot-aqlplus_1.1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-lot-aqlplus_1.1/user-lot-aqlplus_1.1.1.ddl.sqlpp
index a0d6cfc..2fe0318 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-lot-aqlplus_1.1/user-lot-aqlplus_1.1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-lot-aqlplus_1.1/user-lot-aqlplus_1.1.1.ddl.sqlpp
@@ -28,8 +28,8 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-lot-aqlplus_1/user-lot-aqlplus_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-lot-aqlplus_1/user-lot-aqlplus_1.1.ddl.sqlpp
index a0d6cfc..2fe0318 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-lot-aqlplus_1/user-lot-aqlplus_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-lot-aqlplus_1/user-lot-aqlplus_1.1.ddl.sqlpp
@@ -28,8 +28,8 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-lot-aqlplus_2/user-lot-aqlplus_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-lot-aqlplus_2/user-lot-aqlplus_2.1.ddl.sqlpp
index a0d6cfc..2fe0318 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-lot-aqlplus_2/user-lot-aqlplus_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-lot-aqlplus_2/user-lot-aqlplus_2.1.ddl.sqlpp
@@ -28,8 +28,8 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-lot-aqlplus_3/user-lot-aqlplus_3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-lot-aqlplus_3/user-lot-aqlplus_3.1.ddl.sqlpp
index a0d6cfc..2fe0318 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-lot-aqlplus_3/user-lot-aqlplus_3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-lot-aqlplus_3/user-lot-aqlplus_3.1.ddl.sqlpp
@@ -28,8 +28,8 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-3_1/user-vis-int-3_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-3_1/user-vis-int-3_1.1.ddl.sqlpp
index f888b08..286da3b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-3_1/user-vis-int-3_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-3_1/user-vis-int-3_1.1.ddl.sqlpp
@@ -28,16 +28,16 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create type fuzzyjoin.VisitorType as
 {
   vid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-aqlplus_1/user-vis-int-aqlplus_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-aqlplus_1/user-vis-int-aqlplus_1.1.ddl.sqlpp
index f888b08..286da3b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-aqlplus_1/user-vis-int-aqlplus_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-aqlplus_1/user-vis-int-aqlplus_1.1.ddl.sqlpp
@@ -28,16 +28,16 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create type fuzzyjoin.VisitorType as
 {
   vid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-aqlplus_2/user-vis-int-aqlplus_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-aqlplus_2/user-vis-int-aqlplus_2.1.ddl.sqlpp
index f888b08..286da3b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-aqlplus_2/user-vis-int-aqlplus_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-aqlplus_2/user-vis-int-aqlplus_2.1.ddl.sqlpp
@@ -28,16 +28,16 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create type fuzzyjoin.VisitorType as
 {
   vid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-aqlplus_3/user-vis-int-aqlplus_3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-aqlplus_3/user-vis-int-aqlplus_3.1.ddl.sqlpp
index f888b08..286da3b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-aqlplus_3/user-vis-int-aqlplus_3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-aqlplus_3/user-vis-int-aqlplus_3.1.ddl.sqlpp
@@ -28,16 +28,16 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create type fuzzyjoin.VisitorType as
 {
   vid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1/user-vis-int-vis-user-lot-aqlplus_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1/user-vis-int-vis-user-lot-aqlplus_1.1.ddl.sqlpp
index f888b08..286da3b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1/user-vis-int-vis-user-lot-aqlplus_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-int-vis-user-lot-aqlplus_1/user-vis-int-vis-user-lot-aqlplus_1.1.ddl.sqlpp
@@ -28,16 +28,16 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create type fuzzyjoin.VisitorType as
 {
   vid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-3_1/user-vis-lot-3_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-3_1/user-vis-lot-3_1.1.ddl.sqlpp
index f888b08..286da3b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-3_1/user-vis-lot-3_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-3_1/user-vis-lot-3_1.1.ddl.sqlpp
@@ -28,16 +28,16 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create type fuzzyjoin.VisitorType as
 {
   vid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_1/user-vis-lot-aqlplus_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_1/user-vis-lot-aqlplus_1.1.ddl.sqlpp
index f888b08..286da3b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_1/user-vis-lot-aqlplus_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_1/user-vis-lot-aqlplus_1.1.ddl.sqlpp
@@ -28,16 +28,16 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create type fuzzyjoin.VisitorType as
 {
   vid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_2/user-vis-lot-aqlplus_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_2/user-vis-lot-aqlplus_2.1.ddl.sqlpp
index f888b08..286da3b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_2/user-vis-lot-aqlplus_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_2/user-vis-lot-aqlplus_2.1.ddl.sqlpp
@@ -28,16 +28,16 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create type fuzzyjoin.VisitorType as
 {
   vid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_3/user-vis-lot-aqlplus_3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_3/user-vis-lot-aqlplus_3.1.ddl.sqlpp
index f888b08..286da3b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_3/user-vis-lot-aqlplus_3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_3/user-vis-lot-aqlplus_3.1.ddl.sqlpp
@@ -28,16 +28,16 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create type fuzzyjoin.VisitorType as
 {
   vid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_4/user-vis-lot-aqlplus_4.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_4/user-vis-lot-aqlplus_4.1.ddl.sqlpp
index f888b08..286da3b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_4/user-vis-lot-aqlplus_4.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_4/user-vis-lot-aqlplus_4.1.ddl.sqlpp
@@ -28,16 +28,16 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create type fuzzyjoin.VisitorType as
 {
   vid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_5/user-vis-lot-aqlplus_5.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_5/user-vis-lot-aqlplus_5.1.ddl.sqlpp
index f888b08..286da3b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_5/user-vis-lot-aqlplus_5.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-aqlplus_5/user-vis-lot-aqlplus_5.1.ddl.sqlpp
@@ -28,16 +28,16 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create type fuzzyjoin.VisitorType as
 {
   vid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-int-aqlplus_1/user-vis-lot-int-aqlplus_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-int-aqlplus_1/user-vis-lot-int-aqlplus_1.1.ddl.sqlpp
index f888b08..286da3b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-int-aqlplus_1/user-vis-lot-int-aqlplus_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-int-aqlplus_1/user-vis-lot-int-aqlplus_1.1.ddl.sqlpp
@@ -28,16 +28,16 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create type fuzzyjoin.VisitorType as
 {
   vid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-int-aqlplus_2/user-vis-lot-int-aqlplus_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-int-aqlplus_2/user-vis-lot-int-aqlplus_2.1.ddl.sqlpp
index f888b08..286da3b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-int-aqlplus_2/user-vis-lot-int-aqlplus_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fuzzyjoin/user-vis-lot-int-aqlplus_2/user-vis-lot-int-aqlplus_2.1.ddl.sqlpp
@@ -28,16 +28,16 @@
   uid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create type fuzzyjoin.VisitorType as
 {
   vid : bigint,
   name : string,
   lottery_numbers : [bigint],
-  interests : {{string}}
-}
+  interests : {{string}};
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q01/q01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q01/q01.1.ddl.sqlpp
index 4b542df..4a3c109 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q01/q01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q01/q01.1.ddl.sqlpp
@@ -26,21 +26,21 @@
 create type TinySocial.TwitterUserType as
 {
   `screen-name` : string
-}
+};
 
 create type TinySocial.TweetMessageType as {
   tweetid : string
-}
+};
 
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
  open {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q02/q02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q02/q02.1.ddl.sqlpp
index 4b542df..4a3c109 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q02/q02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q02/q02.1.ddl.sqlpp
@@ -26,21 +26,21 @@
 create type TinySocial.TwitterUserType as
 {
   `screen-name` : string
-}
+};
 
 create type TinySocial.TweetMessageType as {
   tweetid : string
-}
+};
 
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
  open {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q03/q03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q03/q03.1.ddl.sqlpp
index 4b542df..4a3c109 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q03/q03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q03/q03.1.ddl.sqlpp
@@ -26,21 +26,21 @@
 create type TinySocial.TwitterUserType as
 {
   `screen-name` : string
-}
+};
 
 create type TinySocial.TweetMessageType as {
   tweetid : string
-}
+};
 
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
  open {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q04/q04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q04/q04.1.ddl.sqlpp
index 4b542df..4a3c109 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q04/q04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q04/q04.1.ddl.sqlpp
@@ -26,21 +26,21 @@
 create type TinySocial.TwitterUserType as
 {
   `screen-name` : string
-}
+};
 
 create type TinySocial.TweetMessageType as {
   tweetid : string
-}
+};
 
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
  open {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q05_error/q05_error.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q05_error/q05_error.1.ddl.sqlpp
index 4b542df..4a3c109 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q05_error/q05_error.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q05_error/q05_error.1.ddl.sqlpp
@@ -26,21 +26,21 @@
 create type TinySocial.TwitterUserType as
 {
   `screen-name` : string
-}
+};
 
 create type TinySocial.TweetMessageType as {
   tweetid : string
-}
+};
 
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
  open {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q06_error/q06_error.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q06_error/q06_error.1.ddl.sqlpp
index 4b542df..4a3c109 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q06_error/q06_error.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q06_error/q06_error.1.ddl.sqlpp
@@ -26,21 +26,21 @@
 create type TinySocial.TwitterUserType as
 {
   `screen-name` : string
-}
+};
 
 create type TinySocial.TweetMessageType as {
   tweetid : string
-}
+};
 
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
  open {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q07_error/q07_error.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q07_error/q07_error.1.ddl.sqlpp
index 4b542df..4a3c109 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q07_error/q07_error.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q07_error/q07_error.1.ddl.sqlpp
@@ -26,21 +26,21 @@
 create type TinySocial.TwitterUserType as
 {
   `screen-name` : string
-}
+};
 
 create type TinySocial.TweetMessageType as {
   tweetid : string
-}
+};
 
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
  open {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q08/q08.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q08/q08.1.ddl.sqlpp
index 4b542df..4a3c109 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q08/q08.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q08/q08.1.ddl.sqlpp
@@ -26,21 +26,21 @@
 create type TinySocial.TwitterUserType as
 {
   `screen-name` : string
-}
+};
 
 create type TinySocial.TweetMessageType as {
   tweetid : string
-}
+};
 
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
  open {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q09/q09.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q09/q09.1.ddl.sqlpp
index 4b542df..4a3c109 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q09/q09.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q09/q09.1.ddl.sqlpp
@@ -26,21 +26,21 @@
 create type TinySocial.TwitterUserType as
 {
   `screen-name` : string
-}
+};
 
 create type TinySocial.TweetMessageType as {
   tweetid : string
-}
+};
 
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
  open {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q10/q10.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q10/q10.1.ddl.sqlpp
index 4b542df..4a3c109 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q10/q10.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q10/q10.1.ddl.sqlpp
@@ -26,21 +26,21 @@
 create type TinySocial.TwitterUserType as
 {
   `screen-name` : string
-}
+};
 
 create type TinySocial.TweetMessageType as {
   tweetid : string
-}
+};
 
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
  open {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 create  dataset FacebookMessages(FacebookMessageType) primary key `message-id`;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q11/q11.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q11/q11.1.ddl.sqlpp
index 0b7df1b..fc6407b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q11/q11.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q11/q11.1.ddl.sqlpp
@@ -25,6 +25,6 @@
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q12_error/q12_error.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q12_error/q12_error.1.ddl.sqlpp
index 0b7df1b..fc6407b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q12_error/q12_error.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/q12_error/q12_error.1.ddl.sqlpp
@@ -25,6 +25,6 @@
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-159/query-ASTERIXDB-159.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-159/query-ASTERIXDB-159.1.ddl.sqlpp
index bbe6fc1..98ec444 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-159/query-ASTERIXDB-159.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-159/query-ASTERIXDB-159.1.ddl.sqlpp
@@ -25,7 +25,7 @@
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-159/query-ASTERIXDB-159.4.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-159/query-ASTERIXDB-159.4.ddl.sqlpp
index 3509f58..2228161 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-159/query-ASTERIXDB-159.4.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-159/query-ASTERIXDB-159.4.ddl.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-drop  dataverse TinySocial if exists;
\ No newline at end of file
+drop  dataverse TinySocial if exists;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-1626-2/query-ASTERIXDB-1626-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-1626-2/query-ASTERIXDB-1626-2.1.ddl.sqlpp
index bbe6fc1..98ec444 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-1626-2/query-ASTERIXDB-1626-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-1626-2/query-ASTERIXDB-1626-2.1.ddl.sqlpp
@@ -25,7 +25,7 @@
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-1626-2/query-ASTERIXDB-1626-2.4.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-1626-2/query-ASTERIXDB-1626-2.4.ddl.sqlpp
index 3509f58..2228161 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-1626-2/query-ASTERIXDB-1626-2.4.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-1626-2/query-ASTERIXDB-1626-2.4.ddl.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-drop  dataverse TinySocial if exists;
\ No newline at end of file
+drop  dataverse TinySocial if exists;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-1626/query-ASTERIXDB-1626.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-1626/query-ASTERIXDB-1626.1.ddl.sqlpp
index bbe6fc1..98ec444 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-1626/query-ASTERIXDB-1626.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-1626/query-ASTERIXDB-1626.1.ddl.sqlpp
@@ -25,7 +25,7 @@
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-1626/query-ASTERIXDB-1626.4.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-1626/query-ASTERIXDB-1626.4.ddl.sqlpp
index 3509f58..2228161 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-1626/query-ASTERIXDB-1626.4.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/global-aggregate/query-ASTERIXDB-1626/query-ASTERIXDB-1626.4.ddl.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-drop  dataverse TinySocial if exists;
\ No newline at end of file
+drop  dataverse TinySocial if exists;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/graph/pregel-q01/pregel-q01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/graph/pregel-q01/pregel-q01.1.ddl.sqlpp
index 0c990b8..3ffbbf4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/graph/pregel-q01/pregel-q01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/graph/pregel-q01/pregel-q01.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   statuses_count : integer,
   name : string,
   followers_count : integer
-}
+};
 
 create type Pregelix.TweetMessageType as
 {
@@ -43,7 +43,7 @@
   `message-text` : string,
   `retweeted-from` : bigint,
   `forwarded-from` : bigint
-}
+};
 
 create  dataset TwitterMsgs(TweetMessageType) primary key tweetid;
 
@@ -53,14 +53,14 @@
 {
   tweetid : bigint,
   `value` : float?
-}
+};
 
 create type Pregelix.TMGraph as
 {
   tweetid : bigint,
   `rank-value` : double?,
-  `populated-by` : {{TMEdge}}
-}
+  `populated-by` : {{TMEdge}};
+};
 
 create  dataset MyInputGraph(TMGraph) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/graph/pregel-q02/pregel-q02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/graph/pregel-q02/pregel-q02.1.ddl.sqlpp
index 6d6bf55..c9e6b15 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/graph/pregel-q02/pregel-q02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/graph/pregel-q02/pregel-q02.1.ddl.sqlpp
@@ -27,14 +27,14 @@
 {
   destVertexId : bigint,
   `value` : float?
-}
+};
 
 create type Pregelix.NodeType as
 {
   id : bigint,
   `value` : bigint?,
-  edges : {{EdgeType}}
-}
+  edges : {{EdgeType}};
+};
 
 create  dataset InputGraph(NodeType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/graph/pregel-q03/pregel-q03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/graph/pregel-q03/pregel-q03.1.ddl.sqlpp
index e84b599..d56e013 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/graph/pregel-q03/pregel-q03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/graph/pregel-q03/pregel-q03.1.ddl.sqlpp
@@ -27,14 +27,14 @@
 {
   destVertexId : bigint,
   cost : float?
-}
+};
 
 create type Pregelix.NodeType as
 {
   id : bigint,
   `value` : double?,
-  edges : {{EdgeType}}
-}
+  edges : {{EdgeType}};
+};
 
 create  dataset InputGraph(NodeType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-01-error/core-01-error.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-01-error/core-01-error.1.ddl.sqlpp
index 7cb4811..0330592 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-01-error/core-01-error.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-01-error/core-01-error.1.ddl.sqlpp
@@ -24,6 +24,6 @@
 
 CREATE TYPE EmpType AS {
   name : string
-}
+};
 
 CREATE DATASET Employee(EmpType) PRIMARY KEY name;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-01/core-01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-01/core-01.1.ddl.sqlpp
index 7cb4811..0330592 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-01/core-01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-01/core-01.1.ddl.sqlpp
@@ -24,6 +24,6 @@
 
 CREATE TYPE EmpType AS {
   name : string
-}
+};
 
 CREATE DATASET Employee(EmpType) PRIMARY KEY name;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-02-error/core-02-error.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-02-error/core-02-error.1.ddl.sqlpp
index 7cb4811..0330592 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-02-error/core-02-error.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-02-error/core-02-error.1.ddl.sqlpp
@@ -24,6 +24,6 @@
 
 CREATE TYPE EmpType AS {
   name : string
-}
+};
 
 CREATE DATASET Employee(EmpType) PRIMARY KEY name;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-02/core-02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-02/core-02.1.ddl.sqlpp
index a0fb671..c3d110f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-02/core-02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-02/core-02.1.ddl.sqlpp
@@ -24,15 +24,15 @@
 
 CREATE TYPE EmployeeType AS {
   id : string
-}
+};
 
 CREATE TYPE IncentiveType AS {
   job_category: string
-}
+};
 
 CREATE TYPE SuperStarType AS {
   id : string
-}
+};
 
 CREATE DATASET Employee(EmployeeType) PRIMARY KEY id;
 CREATE DATASET Incentive(IncentiveType) PRIMARY KEY job_category;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-02/core-02.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-02/core-02.2.update.sqlpp
index 19f0c1f..36c6e79 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-02/core-02.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-02/core-02.2.update.sqlpp
@@ -32,11 +32,11 @@
   { 'job_category': 'Cook',
     'bonus': 1000
   }
-)
+);
 
 INSERT INTO SuperStars (
   {
     'id': '123'
   }
-)
+);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-03/core-02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-03/core-02.1.ddl.sqlpp
index a0fb671..c3d110f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-03/core-02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-03/core-02.1.ddl.sqlpp
@@ -24,15 +24,15 @@
 
 CREATE TYPE EmployeeType AS {
   id : string
-}
+};
 
 CREATE TYPE IncentiveType AS {
   job_category: string
-}
+};
 
 CREATE TYPE SuperStarType AS {
   id : string
-}
+};
 
 CREATE DATASET Employee(EmployeeType) PRIMARY KEY id;
 CREATE DATASET Incentive(IncentiveType) PRIMARY KEY job_category;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-03/core-02.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-03/core-02.2.update.sqlpp
index 19f0c1f..36c6e79 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-03/core-02.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-03/core-02.2.update.sqlpp
@@ -32,11 +32,11 @@
   { 'job_category': 'Cook',
     'bonus': 1000
   }
-)
+);
 
 INSERT INTO SuperStars (
   {
     'id': '123'
   }
-)
+);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-04/core-04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-04/core-04.1.ddl.sqlpp
index a0fb671..c3d110f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-04/core-04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-04/core-04.1.ddl.sqlpp
@@ -24,15 +24,15 @@
 
 CREATE TYPE EmployeeType AS {
   id : string
-}
+};
 
 CREATE TYPE IncentiveType AS {
   job_category: string
-}
+};
 
 CREATE TYPE SuperStarType AS {
   id : string
-}
+};
 
 CREATE DATASET Employee(EmployeeType) PRIMARY KEY id;
 CREATE DATASET Incentive(IncentiveType) PRIMARY KEY job_category;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-04/core-04.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-04/core-04.2.update.sqlpp
index 52443b5..fe33d45 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-04/core-04.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-04/core-04.2.update.sqlpp
@@ -45,11 +45,11 @@
     'bonus': 2000
   }
  ]
-)
+);
 
 INSERT INTO SuperStars (
   {
     'id': '123'
   }
-)
+);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-05/core-05.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-05/core-05.1.ddl.sqlpp
index 5e023e2..7ffac17 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-05/core-05.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-05/core-05.1.ddl.sqlpp
@@ -24,11 +24,11 @@
 
 CREATE TYPE CarType AS {
   cid : string
-}
+};
 
 CREATE TYPE TireType AS {
   tid: string
-}
+};
 
 CREATE DATASET Car(CarType) PRIMARY KEY cid;
 CREATE DATASET Tire(TireType) PRIMARY KEY tid;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-05/core-05.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-05/core-05.2.update.sqlpp
index 275e4fc..4f44d3c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-05/core-05.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/core-05/core-05.2.update.sqlpp
@@ -55,5 +55,5 @@
         'price': 100
     }
  ]
-)
+);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-2/gby-expr-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-2/gby-expr-2.1.ddl.sqlpp
index bf3c7e0..fa9ccad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-2/gby-expr-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-2/gby-expr-2.1.ddl.sqlpp
@@ -24,15 +24,15 @@
 
 CREATE TYPE EmployeeType AS {
   id : string
-}
+};
 
 CREATE TYPE IncentiveType AS {
   job_category: string
-}
+};
 
 CREATE TYPE SuperStarType AS {
   id : string
-}
+};
 
 CREATE DATASET Employee(EmployeeType) PRIMARY KEY id;
 CREATE DATASET Incentive(IncentiveType) PRIMARY KEY job_category;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-2/gby-expr-2.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-2/gby-expr-2.2.update.sqlpp
index e6545e0..cfa1f24 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-2/gby-expr-2.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-2/gby-expr-2.2.update.sqlpp
@@ -33,11 +33,11 @@
   { 'job_category': 'Cook',
     'bonus': 1000
   }
-)
+);
 
 INSERT INTO SuperStars (
   {
     'id': '123'
   }
-)
+);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-3/gby-expr-3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-3/gby-expr-3.1.ddl.sqlpp
index bf3c7e0..fa9ccad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-3/gby-expr-3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-3/gby-expr-3.1.ddl.sqlpp
@@ -24,15 +24,15 @@
 
 CREATE TYPE EmployeeType AS {
   id : string
-}
+};
 
 CREATE TYPE IncentiveType AS {
   job_category: string
-}
+};
 
 CREATE TYPE SuperStarType AS {
   id : string
-}
+};
 
 CREATE DATASET Employee(EmployeeType) PRIMARY KEY id;
 CREATE DATASET Incentive(IncentiveType) PRIMARY KEY job_category;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-3/gby-expr-3.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-3/gby-expr-3.2.update.sqlpp
index e6545e0..cfa1f24 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-3/gby-expr-3.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr-3/gby-expr-3.2.update.sqlpp
@@ -33,11 +33,11 @@
   { 'job_category': 'Cook',
     'bonus': 1000
   }
-)
+);
 
 INSERT INTO SuperStars (
   {
     'id': '123'
   }
-)
+);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr/gby-expr.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr/gby-expr.1.ddl.sqlpp
index bf3c7e0..fa9ccad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr/gby-expr.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr/gby-expr.1.ddl.sqlpp
@@ -24,15 +24,15 @@
 
 CREATE TYPE EmployeeType AS {
   id : string
-}
+};
 
 CREATE TYPE IncentiveType AS {
   job_category: string
-}
+};
 
 CREATE TYPE SuperStarType AS {
   id : string
-}
+};
 
 CREATE DATASET Employee(EmployeeType) PRIMARY KEY id;
 CREATE DATASET Incentive(IncentiveType) PRIMARY KEY job_category;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr/gby-expr.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr/gby-expr.2.update.sqlpp
index e6545e0..cfa1f24 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr/gby-expr.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/gby-expr/gby-expr.2.update.sqlpp
@@ -33,11 +33,11 @@
   { 'job_category': 'Cook',
     'bonus': 1000
   }
-)
+);
 
 INSERT INTO SuperStars (
   {
     'id': '123'
   }
-)
+);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/having-2/having-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/having-2/having-2.1.ddl.sqlpp
index bf3c7e0..fa9ccad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/having-2/having-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/having-2/having-2.1.ddl.sqlpp
@@ -24,15 +24,15 @@
 
 CREATE TYPE EmployeeType AS {
   id : string
-}
+};
 
 CREATE TYPE IncentiveType AS {
   job_category: string
-}
+};
 
 CREATE TYPE SuperStarType AS {
   id : string
-}
+};
 
 CREATE DATASET Employee(EmployeeType) PRIMARY KEY id;
 CREATE DATASET Incentive(IncentiveType) PRIMARY KEY job_category;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/having-2/having-2.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/having-2/having-2.2.update.sqlpp
index e6545e0..cfa1f24 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/having-2/having-2.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/having-2/having-2.2.update.sqlpp
@@ -33,11 +33,11 @@
   { 'job_category': 'Cook',
     'bonus': 1000
   }
-)
+);
 
 INSERT INTO SuperStars (
   {
     'id': '123'
   }
-)
+);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/having/having.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/having/having.1.ddl.sqlpp
index bf3c7e0..fa9ccad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/having/having.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/having/having.1.ddl.sqlpp
@@ -24,15 +24,15 @@
 
 CREATE TYPE EmployeeType AS {
   id : string
-}
+};
 
 CREATE TYPE IncentiveType AS {
   job_category: string
-}
+};
 
 CREATE TYPE SuperStarType AS {
   id : string
-}
+};
 
 CREATE DATASET Employee(EmployeeType) PRIMARY KEY id;
 CREATE DATASET Incentive(IncentiveType) PRIMARY KEY job_category;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/having/having.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/having/having.2.update.sqlpp
index e6545e0..cfa1f24 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/having/having.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/having/having.2.update.sqlpp
@@ -33,11 +33,11 @@
   { 'job_category': 'Cook',
     'bonus': 1000
   }
-)
+);
 
 INSERT INTO SuperStars (
   {
     'id': '123'
   }
-)
+);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy-02/policy-02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy-02/policy-02.1.ddl.sqlpp
index 0242f1c..13bcc07 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy-02/policy-02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy-02/policy-02.1.ddl.sqlpp
@@ -24,6 +24,6 @@
 
 CREATE TYPE PolicyType AS {
     id: UUID
-}
+};
 
 CREATE DATASET policies(PolicyType) PRIMARY KEY id AUTOGENERATED;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy-03/policy-03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy-03/policy-03.1.ddl.sqlpp
index 0242f1c..13bcc07 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy-03/policy-03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy-03/policy-03.1.ddl.sqlpp
@@ -24,6 +24,6 @@
 
 CREATE TYPE PolicyType AS {
     id: UUID
-}
+};
 
 CREATE DATASET policies(PolicyType) PRIMARY KEY id AUTOGENERATED;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy-04/policy-04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy-04/policy-04.1.ddl.sqlpp
index 0242f1c..13bcc07 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy-04/policy-04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy-04/policy-04.1.ddl.sqlpp
@@ -24,6 +24,6 @@
 
 CREATE TYPE PolicyType AS {
     id: UUID
-}
+};
 
 CREATE DATASET policies(PolicyType) PRIMARY KEY id AUTOGENERATED;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy-05/policy-05.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy-05/policy-05.1.ddl.sqlpp
index 0242f1c..13bcc07 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy-05/policy-05.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy-05/policy-05.1.ddl.sqlpp
@@ -24,6 +24,6 @@
 
 CREATE TYPE PolicyType AS {
     id: UUID
-}
+};
 
 CREATE DATASET policies(PolicyType) PRIMARY KEY id AUTOGENERATED;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy/policy.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy/policy.1.ddl.sqlpp
index 0242f1c..13bcc07 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy/policy.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/policy/policy.1.ddl.sqlpp
@@ -24,6 +24,6 @@
 
 CREATE TYPE PolicyType AS {
     id: UUID
-}
+};
 
 CREATE DATASET policies(PolicyType) PRIMARY KEY id AUTOGENERATED;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01-2/sugar-01-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01-2/sugar-01-2.1.ddl.sqlpp
index 7cb4811..0330592 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01-2/sugar-01-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01-2/sugar-01-2.1.ddl.sqlpp
@@ -24,6 +24,6 @@
 
 CREATE TYPE EmpType AS {
   name : string
-}
+};
 
 CREATE DATASET Employee(EmpType) PRIMARY KEY name;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01-negative/sugar-01-negative.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01-negative/sugar-01-negative.1.ddl.sqlpp
index 7cb4811..0330592 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01-negative/sugar-01-negative.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01-negative/sugar-01-negative.1.ddl.sqlpp
@@ -24,6 +24,6 @@
 
 CREATE TYPE EmpType AS {
   name : string
-}
+};
 
 CREATE DATASET Employee(EmpType) PRIMARY KEY name;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01/sugar-01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01/sugar-01.1.ddl.sqlpp
index 7cb4811..0330592 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01/sugar-01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01/sugar-01.1.ddl.sqlpp
@@ -24,6 +24,6 @@
 
 CREATE TYPE EmpType AS {
   name : string
-}
+};
 
 CREATE DATASET Employee(EmpType) PRIMARY KEY name;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-02-2/sugar-02-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-02-2/sugar-02-2.1.ddl.sqlpp
index bf3c7e0..fa9ccad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-02-2/sugar-02-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-02-2/sugar-02-2.1.ddl.sqlpp
@@ -24,15 +24,15 @@
 
 CREATE TYPE EmployeeType AS {
   id : string
-}
+};
 
 CREATE TYPE IncentiveType AS {
   job_category: string
-}
+};
 
 CREATE TYPE SuperStarType AS {
   id : string
-}
+};
 
 CREATE DATASET Employee(EmployeeType) PRIMARY KEY id;
 CREATE DATASET Incentive(IncentiveType) PRIMARY KEY job_category;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-02-2/sugar-02-2.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-02-2/sugar-02-2.2.update.sqlpp
index e6545e0..cfa1f24 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-02-2/sugar-02-2.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-02-2/sugar-02-2.2.update.sqlpp
@@ -33,11 +33,11 @@
   { 'job_category': 'Cook',
     'bonus': 1000
   }
-)
+);
 
 INSERT INTO SuperStars (
   {
     'id': '123'
   }
-)
+);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-02/sugar-02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-02/sugar-02.1.ddl.sqlpp
index bf3c7e0..fa9ccad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-02/sugar-02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-02/sugar-02.1.ddl.sqlpp
@@ -24,15 +24,15 @@
 
 CREATE TYPE EmployeeType AS {
   id : string
-}
+};
 
 CREATE TYPE IncentiveType AS {
   job_category: string
-}
+};
 
 CREATE TYPE SuperStarType AS {
   id : string
-}
+};
 
 CREATE DATASET Employee(EmployeeType) PRIMARY KEY id;
 CREATE DATASET Incentive(IncentiveType) PRIMARY KEY job_category;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-02/sugar-02.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-02/sugar-02.2.update.sqlpp
index e6545e0..cfa1f24 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-02/sugar-02.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-02/sugar-02.2.update.sqlpp
@@ -33,11 +33,11 @@
   { 'job_category': 'Cook',
     'bonus': 1000
   }
-)
+);
 
 INSERT INTO SuperStars (
   {
     'id': '123'
   }
-)
+);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-03-2/sugar-03-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-03-2/sugar-03-2.1.ddl.sqlpp
index a0fb671..c3d110f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-03-2/sugar-03-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-03-2/sugar-03-2.1.ddl.sqlpp
@@ -24,15 +24,15 @@
 
 CREATE TYPE EmployeeType AS {
   id : string
-}
+};
 
 CREATE TYPE IncentiveType AS {
   job_category: string
-}
+};
 
 CREATE TYPE SuperStarType AS {
   id : string
-}
+};
 
 CREATE DATASET Employee(EmployeeType) PRIMARY KEY id;
 CREATE DATASET Incentive(IncentiveType) PRIMARY KEY job_category;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-03-2/sugar-03-2.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-03-2/sugar-03-2.2.update.sqlpp
index 19f0c1f..36c6e79 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-03-2/sugar-03-2.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-03-2/sugar-03-2.2.update.sqlpp
@@ -32,11 +32,11 @@
   { 'job_category': 'Cook',
     'bonus': 1000
   }
-)
+);
 
 INSERT INTO SuperStars (
   {
     'id': '123'
   }
-)
+);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-03/sugar-03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-03/sugar-03.1.ddl.sqlpp
index a0fb671..c3d110f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-03/sugar-03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-03/sugar-03.1.ddl.sqlpp
@@ -24,15 +24,15 @@
 
 CREATE TYPE EmployeeType AS {
   id : string
-}
+};
 
 CREATE TYPE IncentiveType AS {
   job_category: string
-}
+};
 
 CREATE TYPE SuperStarType AS {
   id : string
-}
+};
 
 CREATE DATASET Employee(EmployeeType) PRIMARY KEY id;
 CREATE DATASET Incentive(IncentiveType) PRIMARY KEY job_category;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-03/sugar-03.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-03/sugar-03.2.update.sqlpp
index 19f0c1f..36c6e79 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-03/sugar-03.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-03/sugar-03.2.update.sqlpp
@@ -32,11 +32,11 @@
   { 'job_category': 'Cook',
     'bonus': 1000
   }
-)
+);
 
 INSERT INTO SuperStars (
   {
     'id': '123'
   }
-)
+);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-04-2/sugar-04-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-04-2/sugar-04-2.1.ddl.sqlpp
index a0fb671..c3d110f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-04-2/sugar-04-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-04-2/sugar-04-2.1.ddl.sqlpp
@@ -24,15 +24,15 @@
 
 CREATE TYPE EmployeeType AS {
   id : string
-}
+};
 
 CREATE TYPE IncentiveType AS {
   job_category: string
-}
+};
 
 CREATE TYPE SuperStarType AS {
   id : string
-}
+};
 
 CREATE DATASET Employee(EmployeeType) PRIMARY KEY id;
 CREATE DATASET Incentive(IncentiveType) PRIMARY KEY job_category;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-04-2/sugar-04-2.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-04-2/sugar-04-2.2.update.sqlpp
index 52443b5..fe33d45 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-04-2/sugar-04-2.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-04-2/sugar-04-2.2.update.sqlpp
@@ -45,11 +45,11 @@
     'bonus': 2000
   }
  ]
-)
+);
 
 INSERT INTO SuperStars (
   {
     'id': '123'
   }
-)
+);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-04/sugar-04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-04/sugar-04.1.ddl.sqlpp
index a0fb671..c3d110f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-04/sugar-04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-04/sugar-04.1.ddl.sqlpp
@@ -24,15 +24,15 @@
 
 CREATE TYPE EmployeeType AS {
   id : string
-}
+};
 
 CREATE TYPE IncentiveType AS {
   job_category: string
-}
+};
 
 CREATE TYPE SuperStarType AS {
   id : string
-}
+};
 
 CREATE DATASET Employee(EmployeeType) PRIMARY KEY id;
 CREATE DATASET Incentive(IncentiveType) PRIMARY KEY job_category;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-04/sugar-04.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-04/sugar-04.2.update.sqlpp
index 52443b5..fe33d45 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-04/sugar-04.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-04/sugar-04.2.update.sqlpp
@@ -45,11 +45,11 @@
     'bonus': 2000
   }
  ]
-)
+);
 
 INSERT INTO SuperStars (
   {
     'id': '123'
   }
-)
+);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-05-2/sugar-05-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-05-2/sugar-05-2.1.ddl.sqlpp
index 5e023e2..7ffac17 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-05-2/sugar-05-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-05-2/sugar-05-2.1.ddl.sqlpp
@@ -24,11 +24,11 @@
 
 CREATE TYPE CarType AS {
   cid : string
-}
+};
 
 CREATE TYPE TireType AS {
   tid: string
-}
+};
 
 CREATE DATASET Car(CarType) PRIMARY KEY cid;
 CREATE DATASET Tire(TireType) PRIMARY KEY tid;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-05/sugar-05.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-05/sugar-05.1.ddl.sqlpp
index 5e023e2..7ffac17 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-05/sugar-05.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-05/sugar-05.1.ddl.sqlpp
@@ -24,11 +24,11 @@
 
 CREATE TYPE CarType AS {
   cid : string
-}
+};
 
 CREATE TYPE TireType AS {
   tid: string
-}
+};
 
 CREATE DATASET Car(CarType) PRIMARY KEY cid;
 CREATE DATASET Tire(TireType) PRIMARY KEY tid;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-05/sugar-05.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-05/sugar-05.2.update.sqlpp
index 275e4fc..4f44d3c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-05/sugar-05.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-05/sugar-05.2.update.sqlpp
@@ -55,5 +55,5 @@
         'price': 100
     }
  ]
-)
+);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hdfs/hdfs_02/hdfs_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hdfs/hdfs_02/hdfs_02.1.ddl.sqlpp
index 32ed7fa..68ae7b2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hdfs/hdfs_02/hdfs_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hdfs/hdfs_02/hdfs_02.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 create type test.LineType as
  closed {
   content : string
-}
+};
 
 create external  dataset TextDataset(LineType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/textFileS`),(`input-format`=`sequence-input-format`),(`format`=`delimited-text`),(`delimiter`=`.`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hdfs/hdfs_03/hdfs_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hdfs/hdfs_03/hdfs_03.1.ddl.sqlpp
index fe4850c..11b64df 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hdfs/hdfs_03/hdfs_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hdfs/hdfs_03/hdfs_03.1.ddl.sqlpp
@@ -34,7 +34,7 @@
 create type test.LineType as
  closed {
   content : string
-}
+};
 
 create external  dataset TextDataset(LineType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/large_text`),(`input-format`=`text-input-format`),(`format`=`delimited-text`),(`delimiter`=`.`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hdfs/hdfs_shortcircuit/hdfs_shortcircuit.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hdfs/hdfs_shortcircuit/hdfs_shortcircuit.1.ddl.sqlpp
index 3e551f0..45ae5df 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hdfs/hdfs_shortcircuit/hdfs_shortcircuit.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hdfs/hdfs_shortcircuit/hdfs_shortcircuit.1.ddl.sqlpp
@@ -33,7 +33,7 @@
 create type test.LineType as
  closed {
   content : string
-}
+};
 
 create external  dataset TextDataset(LineType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/textFileS`),(`input-format`=`sequence-input-format`),(`format`=`delimited-text`),(`delimiter`=`.`),(`local-socket-path`=`/var/lib/hadoop-hdfs/dn_socket`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hdfs/issue_245_hdfs/issue_245_hdfs.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hdfs/issue_245_hdfs/issue_245_hdfs.1.ddl.sqlpp
index 0a15a9c..16bccc7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hdfs/issue_245_hdfs/issue_245_hdfs.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hdfs/issue_245_hdfs/issue_245_hdfs.1.ddl.sqlpp
@@ -33,7 +33,7 @@
 create type test.LineType as
  closed {
   line : string
-}
+};
 
 create external  dataset TextDataset(LineType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/asterix_info.txt`),(`input-format`=`text-input-format`),(`format`=`delimited-text`),(`delimiter`=`.`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hints/issue_251_dataset_hint_5/issue_251_dataset_hint_5.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hints/issue_251_dataset_hint_5/issue_251_dataset_hint_5.1.ddl.sqlpp
index 32933a1..05c2482 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hints/issue_251_dataset_hint_5/issue_251_dataset_hint_5.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hints/issue_251_dataset_hint_5/issue_251_dataset_hint_5.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLPadm(DBLPType) primary key id hints (`CARDINALITY`=`200`);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.1.ddl.sqlpp
index 84691c1..314a769 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.1.ddl.sqlpp
@@ -33,7 +33,7 @@
 create type test.LineType as
  closed {
   content : string
-}
+};
 
 create external  dataset TextDataset(LineType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/textFileS`),(`input-format`=`sequence-input-format`),(`format`=`delimited-text`),(`delimiter`=`.`)) hints (`CARDINALITY`=`10`);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.1.ddl.sqlpp
index 44a8f76..ec7ede9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   location : string,
   text : string,
   timestamp : string
-}
+};
 
 create  dataset Tweets(TweetType) primary key id hints (`CARDINALITY`=`200`);
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-index-nested-loop-join/btree-index-nested-loop-join.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-index-nested-loop-join/btree-index-nested-loop-join.1.ddl.sqlpp
index 4fe0678..3a08389 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-index-nested-loop-join/btree-index-nested-loop-join.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-index-nested-loop-join/btree-index-nested-loop-join.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   statuses_count : integer,
   name : string,
   followers_count : integer
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -47,13 +47,13 @@
   `retweet-from` : bigint,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create type test.ResultType as
 {
   vertexid : bigint,
   rank : double
-}
+};
 
 create  dataset TwitterUsers(TwitterUserType) primary key `screen-name`;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-primary-equi-join/btree-primary-equi-join.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-primary-equi-join/btree-primary-equi-join.1.ddl.sqlpp
index 6f2ccb2..2ab0b06 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-primary-equi-join/btree-primary-equi-join.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-primary-equi-join/btree-primary-equi-join.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,7 +48,7 @@
       total : float
   }
 
-}
+};
 
 create type test.OrderType as
 {
@@ -59,7 +59,7 @@
   clerk : string,
   total : float,
   items : [bigint]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-secondary-equi-join_01/btree-secondary-equi-join_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-secondary-equi-join_01/btree-secondary-equi-join_01.1.ddl.sqlpp
index 76aa46b..10c140d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-secondary-equi-join_01/btree-secondary-equi-join_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-secondary-equi-join_01/btree-secondary-equi-join_01.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-secondary-equi-join_02/btree-secondary-equi-join_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-secondary-equi-join_02/btree-secondary-equi-join_02.1.ddl.sqlpp
index 7bb13c1..fd6ae78 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-secondary-equi-join_02/btree-secondary-equi-join_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-secondary-equi-join_02/btree-secondary-equi-join_02.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -45,7 +45,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-secondary-equi-join_03/btree-secondary-equi-join_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-secondary-equi-join_03/btree-secondary-equi-join_03.1.ddl.sqlpp
index 6ac66f5..cb48e43 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-secondary-equi-join_03/btree-secondary-equi-join_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/btree-secondary-equi-join_03/btree-secondary-equi-join_03.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -46,7 +46,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp
index 5449a8e..bde7f36 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create  dataset MyData1(MyRecord) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp
index c32997b..504c816 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
@@ -49,7 +49,7 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp
index c32997b..504c816 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
@@ -49,7 +49,7 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.1.ddl.sqlpp
index 4e73cc8..de7060c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
@@ -49,7 +49,7 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp
index 4e73cc8..de7060c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
@@ -49,7 +49,7 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp
index 2a50538..98ca7a8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
@@ -49,7 +49,7 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
index 2a50538..98ca7a8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/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/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
@@ -49,7 +49,7 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
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.1.ddl.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.1.ddl.sqlpp
index 135f7d0..56ed797 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.1.ddl.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.1.ddl.sqlpp
@@ -39,7 +39,7 @@
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create  dataset employee(Emp) primary key id;
 
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 7b16dc8..fca4744 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
@@ -38,7 +38,7 @@
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create  dataset employee(Emp) primary key id;
 
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 ae2fe18..a1c2143 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
@@ -41,7 +41,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
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 bbda2b7..eb8c919 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
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
 {
@@ -42,7 +42,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
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 7e75a7e..e2400b8 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
@@ -28,7 +28,7 @@
   id : string,
   idx : string,
   `no-idx` : string
-}
+};
 
 create  dataset TestSet(TestType) primary key id;
 
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 afd9634..9bf6d4d 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
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
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 afd9634..9bf6d4d 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
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
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 afd9634..9bf6d4d 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
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
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 afd9634..9bf6d4d 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
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
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 afd9634..9bf6d4d 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
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
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 afd9634..9bf6d4d 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
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
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 c1f4f43..f25e779 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
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,7 +42,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1
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 c1f4f43..f25e779 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
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,7 +42,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1
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 c1f4f43..f25e779 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
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,7 +42,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1
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 2305e04..97e4c49 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
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -42,7 +42,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1
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 afd9634..9bf6d4d 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
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
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 afd9634..9bf6d4d 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
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
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 27c84a5..238d65e 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
@@ -34,7 +34,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
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 aa3ff43..771641f 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
@@ -34,7 +34,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
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 147e000..2d91636 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
@@ -34,7 +34,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
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 aa3ff43..771641f 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
@@ -34,7 +34,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
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 6b99589..416fe12 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
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
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 616d56c..ff1d0f4 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
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
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 afcf123..04672cf 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
@@ -34,7 +34,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create  dataset MyData(MyRecord) primary key id;
 
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 5ecf5ef..6613034 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
@@ -33,7 +33,7 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create  dataset MyData(MyRecord) primary key id;
 
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 a02545c..0cfb5a8 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
@@ -33,7 +33,7 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create  dataset MyData(MyRecord) primary key id;
 
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 afcf123..04672cf 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
@@ -34,7 +34,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create  dataset MyData(MyRecord) primary key id;
 
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 2b34f4b..36342f4 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
@@ -35,7 +35,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
 {
@@ -49,7 +49,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
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 129f35f..0597e5a 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
@@ -34,7 +34,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
 {
@@ -48,7 +48,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
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 48f950c..ef1250c 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
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -46,7 +46,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
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 91ce1d3..aec0b46 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
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -45,7 +45,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
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 6e427814..87011b9 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
@@ -35,7 +35,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
 {
@@ -49,7 +49,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
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 168bb53..8fceb6f 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
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
 {
@@ -48,7 +48,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
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 15746e8..c41d915 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
@@ -35,7 +35,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -49,7 +49,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
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 3da5e06..70706a5 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
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,7 +48,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.sqlpp
index e6d0ab2..b1944bd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -49,7 +49,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.1.ddl.sqlpp
index e49d136..546f3ff 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,7 +48,7 @@
           age : integer?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
index 8599c64..a58fe10 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -46,7 +46,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.1.ddl.sqlpp
index c81d84a..f11b5d6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -45,7 +45,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
index 9c05c66..b7e043d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
 {
@@ -48,7 +48,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
index cc86bb1..05f0696 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
@@ -33,7 +33,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
 {
@@ -47,7 +47,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
index f43e4c2..305fcd8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -45,7 +45,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
index de7a9ee..55ecf5f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -44,7 +44,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.sqlpp
index 426f1a2..22328e3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
 {
@@ -48,7 +48,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-edit-distance/olist-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-edit-distance/olist-edit-distance.1.ddl.sqlpp
index 3e486b2..a70399f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-edit-distance/olist-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-edit-distance/olist-edit-distance.1.ddl.sqlpp
@@ -33,7 +33,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
 {
@@ -47,7 +47,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.1.ddl.sqlpp
index 1e90145..da0aa6d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,7 +48,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-jaccard/olist-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-jaccard/olist-jaccard.1.ddl.sqlpp
index c3eb159..dd07687 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-jaccard/olist-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/olist-jaccard/olist-jaccard.1.ddl.sqlpp
@@ -33,7 +33,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.sqlpp
index 4939a11..27d246c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,7 +48,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.1.ddl.sqlpp
index a82a5a5..49a3a73 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.1.ddl.sqlpp
@@ -33,7 +33,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -47,7 +47,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
index 3d0722b..1eeb95c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -45,7 +45,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/word-jaccard/word-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
index 038c626..90b2950 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/inverted-index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -44,7 +44,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/loj-01-core/loj-01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/loj-01-core/loj-01.1.ddl.sqlpp
index 76aa46b..10c140d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/loj-01-core/loj-01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/loj-01-core/loj-01.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/loj-01-sugar/loj-01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/loj-01-sugar/loj-01.1.ddl.sqlpp
index 76aa46b..10c140d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/loj-01-sugar/loj-01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/loj-01-sugar/loj-01.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue285-2/query_issue285-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue285-2/query_issue285-2.1.ddl.sqlpp
index e0ee5db..fefc407 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue285-2/query_issue285-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue285-2/query_issue285-2.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -45,7 +45,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue285/query_issue285.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue285/query_issue285.1.ddl.sqlpp
index 6d6edb8..eadd695 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue285/query_issue285.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue285/query_issue285.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -49,7 +49,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue658/query_issue658.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue658/query_issue658.1.ddl.sqlpp
index 0970fd8..f38b3f0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue658/query_issue658.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue658/query_issue658.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -43,7 +43,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue849-2/query_issue849-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue849-2/query_issue849-2.1.ddl.sqlpp
index 2a0ed77..2cc9d2d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue849-2/query_issue849-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue849-2/query_issue849-2.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 create type test.sType as
  closed {
   b : bigint
-}
+};
 
 create  dataset s(sType) primary key b;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue849/query_issue849.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue849/query_issue849.1.ddl.sqlpp
index 2a0ed77..2cc9d2d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue849/query_issue849.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/leftouterjoin/query_issue849/query_issue849.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 create type test.sType as
  closed {
   b : bigint
-}
+};
 
 create  dataset s(sType) primary key b;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-2/query-ASTERIXDB-159-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-2/query-ASTERIXDB-159-2.1.ddl.sqlpp
index bbe6fc1..98ec444 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-2/query-ASTERIXDB-159-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-2/query-ASTERIXDB-159-2.1.ddl.sqlpp
@@ -25,7 +25,7 @@
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-2/query-ASTERIXDB-159-2.4.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-2/query-ASTERIXDB-159-2.4.ddl.sqlpp
index 3509f58..2228161 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-2/query-ASTERIXDB-159-2.4.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-2/query-ASTERIXDB-159-2.4.ddl.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-drop  dataverse TinySocial if exists;
\ No newline at end of file
+drop  dataverse TinySocial if exists;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-3/query-ASTERIXDB-159-3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-3/query-ASTERIXDB-159-3.1.ddl.sqlpp
index bbe6fc1..98ec444 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-3/query-ASTERIXDB-159-3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-3/query-ASTERIXDB-159-3.1.ddl.sqlpp
@@ -25,7 +25,7 @@
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-3/query-ASTERIXDB-159-3.4.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-3/query-ASTERIXDB-159-3.4.ddl.sqlpp
index 3509f58..2228161 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-3/query-ASTERIXDB-159-3.4.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/list/query-ASTERIXDB-159-3/query-ASTERIXDB-159-3.4.ddl.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-drop  dataverse TinySocial if exists;
\ No newline at end of file
+drop  dataverse TinySocial if exists;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/adm_binary/adm_bianry.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/adm_binary/adm_bianry.1.ddl.sqlpp
index 464ca77..49c8a0b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/adm_binary/adm_bianry.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/adm_binary/adm_bianry.1.ddl.sqlpp
@@ -26,7 +26,7 @@
 create type temp.test as
 {
   ba : binary
-}
+};
 
 create  dataset testds(test) primary key ba;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_01/csv_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_01/csv_01.1.ddl.sqlpp
index ccc5483..6cc2612 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_01/csv_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_01/csv_01.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   date : string?,
   time : string?,
   datetime : string?
-}
+};
 
 create  dataset testds(test) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_02/csv_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_02/csv_02.1.ddl.sqlpp
index aa2fc7b..52150b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_02/csv_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_02/csv_02.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   date : string,
   time : string,
   datetime : string
-}
+};
 
 create  dataset testds(test) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_03/csv_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_03/csv_03.1.ddl.sqlpp
index 235027f..ae6a79e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_03/csv_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_03/csv_03.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   doubleq : double?,
   string : string,
   stringq : string?
-}
+};
 
 create  dataset testds(test) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_04/csv_04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_04/csv_04.1.ddl.sqlpp
index 2728e3a..262d909 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_04/csv_04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_04/csv_04.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   float : float,
   stringa : string,
   stringb : string?
-}
+};
 
 create  dataset testds(test) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_05/csv_05.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_05/csv_05.1.ddl.sqlpp
index 6c07027..ab9ea73 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_05/csv_05.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_05/csv_05.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   float : float,
   stringa : string,
   stringb : string?
-}
+};
 
 create  dataset testds(test) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_06/csv_06.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_06/csv_06.1.ddl.sqlpp
index dd2f7c3..dda1d83 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_06/csv_06.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_06/csv_06.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   float : float,
   stringa : string,
   stringb : string?
-}
+};
 
 create  dataset testds(test) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_07/csv_07.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_07/csv_07.1.ddl.sqlpp
index 25441aa..de6394a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_07/csv_07.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_07/csv_07.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   float : float,
   stringa : string,
   stringb : string?
-}
+};
 
 create  dataset testds(test) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_cr/csv_08.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_cr/csv_08.1.ddl.sqlpp
index ccc5483..6cc2612 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_cr/csv_08.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_cr/csv_08.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   date : string?,
   time : string?,
   datetime : string?
-}
+};
 
 create  dataset testds(test) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_crlf/csv_08.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_crlf/csv_08.1.ddl.sqlpp
index ccc5483..6cc2612 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_crlf/csv_08.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_crlf/csv_08.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   date : string?,
   time : string?,
   datetime : string?
-}
+};
 
 create  dataset testds(test) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_lf/csv_08.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_lf/csv_08.1.ddl.sqlpp
index ccc5483..6cc2612 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_lf/csv_08.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/csv_08_header_lf/csv_08.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   date : string?,
   time : string?,
   datetime : string?
-}
+};
 
 create  dataset testds(test) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/duplicate-key-error/duplicate-key-error.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/duplicate-key-error/duplicate-key-error.1.ddl.sqlpp
index 0263605..35ee7cb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/duplicate-key-error/duplicate-key-error.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/duplicate-key-error/duplicate-key-error.1.ddl.sqlpp
@@ -31,7 +31,7 @@
 create type test.Schema as
  closed {
   id : integer
-}
+};
 
 create  dataset mydataset(Schema) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/escapes-err-1/escapes-err-1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/escapes-err-1/escapes-err-1.1.ddl.sqlpp
index 8a05fe1..af1e0ad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/escapes-err-1/escapes-err-1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/escapes-err-1/escapes-err-1.1.ddl.sqlpp
@@ -26,7 +26,7 @@
 create type TestDataverse.TestType as
 {
   id : string
-}
+};
 
 create  dataset TestSet(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/escapes01/escapes01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/escapes01/escapes01.1.ddl.sqlpp
index 8a05fe1..af1e0ad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/escapes01/escapes01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/escapes01/escapes01.1.ddl.sqlpp
@@ -26,7 +26,7 @@
 create type TestDataverse.TestType as
 {
   id : string
-}
+};
 
 create  dataset TestSet(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/escapes02/escapes02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/escapes02/escapes02.1.ddl.sqlpp
index 8a05fe1..af1e0ad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/escapes02/escapes02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/escapes02/escapes02.1.ddl.sqlpp
@@ -26,7 +26,7 @@
 create type TestDataverse.TestType as
 {
   id : string
-}
+};
 
 create  dataset TestSet(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue14_query/issue14_query.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue14_query/issue14_query.1.ddl.sqlpp
index 009a861..c9d003b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue14_query/issue14_query.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue14_query/issue14_query.1.ddl.sqlpp
@@ -33,7 +33,7 @@
   id : integer,
   age : integer,
   name : string
-}
+};
 
 create  dataset onektup(Schema) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue289_query/issue289_query.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue289_query/issue289_query.1.ddl.sqlpp
index fc8e6f5..6cc93a9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue289_query/issue289_query.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue289_query/issue289_query.1.ddl.sqlpp
@@ -33,7 +33,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -46,7 +46,7 @@
       total : float
   }
 
-}
+};
 
 create  dataset Customers(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue315_query/issue315_query.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue315_query/issue315_query.1.ddl.sqlpp
index 19a2090..e88d2c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue315_query/issue315_query.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue315_query/issue315_query.1.ddl.sqlpp
@@ -33,7 +33,7 @@
   id : integer,
   age : integer,
   name : string
-}
+};
 
 create  dataset onektup(Schema) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue610_adm_token_end_collection/issue610_adm_token_end_collection.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue610_adm_token_end_collection/issue610_adm_token_end_collection.1.ddl.sqlpp
index a30c89b..f04c606 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue610_adm_token_end_collection/issue610_adm_token_end_collection.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue610_adm_token_end_collection/issue610_adm_token_end_collection.1.ddl.sqlpp
@@ -35,7 +35,7 @@
       id : integer
   }
 
-}
+};
 
 create  dataset baz(bartype) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue650_query/issue650_query.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue650_query/issue650_query.1.ddl.sqlpp
index 2f6f7da..5b9bf3c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue650_query/issue650_query.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/issue650_query/issue650_query.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   name : string,
   lottery_numbers : [integer],
   interests : {{string}}
-}
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/type_promotion_0/type_promotion_0.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/type_promotion_0/type_promotion_0.1.ddl.sqlpp
index 0c3c160..5f818ae 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/type_promotion_0/type_promotion_0.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/load/type_promotion_0/type_promotion_0.1.ddl.sqlpp
@@ -44,7 +44,7 @@
   float_o : [float]?,
   double_u : {{double}}?,
   double_o : [double]?
-}
+};
 
 create  dataset TestSet(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/materialization/assign-reuse/assign-reuse.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/materialization/assign-reuse/assign-reuse.1.ddl.sqlpp
index 072724d..cdb4962 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/materialization/assign-reuse/assign-reuse.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/materialization/assign-reuse/assign-reuse.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type TinySocial.FacebookUserType as
  closed {
@@ -38,7 +38,7 @@
   `user-since` : datetime,
   `friend-ids` : {{bigint}},
   employment : [EmploymentType]
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/dataset_nodegroup/dataset_nodegroup.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/dataset_nodegroup/dataset_nodegroup.1.ddl.sqlpp
index 1a9b76f..6f76b1a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/dataset_nodegroup/dataset_nodegroup.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/dataset_nodegroup/dataset_nodegroup.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   loc : point,
   time : datetime,
   text : string
-}
+};
 
 create dataset TwitterData(Tweet) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/flushtest/flushtest.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/flushtest/flushtest.1.ddl.sqlpp
index 162525b..42dc295 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/flushtest/flushtest.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/flushtest/flushtest.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type DMLTest.FacebookUserType as
  closed {
@@ -40,7 +40,7 @@
   `user-since-copy` : datetime,
   `friend-ids` : {{bigint}},
   employment : [EmploymentType]
-}
+};
 
 create  dataset FacebookUsers1(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/flushtest/flushtest.5.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/flushtest/flushtest.5.ddl.sqlpp
index 399a7f2..dd92ba1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/flushtest/flushtest.5.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/flushtest/flushtest.5.ddl.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-drop  dataverse DMLTest;
\ No newline at end of file
+drop  dataverse DMLTest;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.1.ddl.sqlpp
index e4977a5..2284ef1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   loc : point,
   time : datetime,
   text : string
-}
+};
 
 create external  dataset TwitterData(Tweet) using localfs((`path`=`asterix_nc1://data/twitter/extrasmalltweets.txt`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.1.ddl.sqlpp
index b721378..14fa1c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   name : string,
   lottery_numbers : [bigint],
   interests : {{string}}
-}
+};
 
 create type test.VisitorType as
 {
@@ -37,7 +37,7 @@
   name : string,
   lottery_numbers : [bigint],
   interests : {{string}}
-}
+};
 
 create  dataset Users(UserType) primary key uid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.1.ddl.sqlpp
index 6663d00..a933ed3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.1.ddl.sqlpp
@@ -31,7 +31,7 @@
 create type test.TestType as
 {
   name1 : string
-}
+};
 
 create  dataset testds(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/prefix-search/prefix-search.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/prefix-search/prefix-search.1.ddl.sqlpp
index 32ae2c7..224ad55 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/prefix-search/prefix-search.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/prefix-search/prefix-search.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-1531/query-ASTERIXDB-1531.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-1531/query-ASTERIXDB-1531.1.ddl.sqlpp
index b60439d..7d62608 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-1531/query-ASTERIXDB-1531.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-1531/query-ASTERIXDB-1531.1.ddl.sqlpp
@@ -24,6 +24,6 @@
 
 create type TweetMessageType as {
   tweetid : string
-}
+};
 
 create dataset TweetMessages(TweetMessageType) primary key tweetid;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-1671-2/query-ASTERIXDB-1671-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-1671-2/query-ASTERIXDB-1671-2.1.ddl.sqlpp
index aa21431..6f378c6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-1671-2/query-ASTERIXDB-1671-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-1671-2/query-ASTERIXDB-1671-2.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-1671/query-ASTERIXDB-1671.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-1671/query-ASTERIXDB-1671.1.ddl.sqlpp
index aa21431..6f378c6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-1671/query-ASTERIXDB-1671.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-1671/query-ASTERIXDB-1671.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-971/query-ASTERIXDB-971.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-971/query-ASTERIXDB-971.1.ddl.sqlpp
index edec216..8d2b0df 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-971/query-ASTERIXDB-971.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-971/query-ASTERIXDB-971.1.ddl.sqlpp
@@ -22,7 +22,7 @@
 use test;
 
 create type account as open
-{ id: integer, sum:integer }
+{ id: integer, sum:integer };
 
 create dataset Accounts(account) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-971/query-ASTERIXDB-971.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-971/query-ASTERIXDB-971.2.update.sqlpp
index 3af2128..0141adb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-971/query-ASTERIXDB-971.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-971/query-ASTERIXDB-971.2.update.sqlpp
@@ -21,7 +21,7 @@
 
 insert into Accounts(
 {"id": 1, "sum":100}
-)
+);
 insert into Accounts(
 {"id": 2, "sum":150}
-)
+);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query_issue267/query_issue267.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query_issue267/query_issue267.1.ddl.sqlpp
index 4775f16..dc267da 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query_issue267/query_issue267.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query_issue267/query_issue267.1.ddl.sqlpp
@@ -31,7 +31,7 @@
 create type test.TestType as
 {
   name : string
-}
+};
 
 create  dataset t1(TestType) primary key name;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/stable_sort/stable_sort.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/stable_sort/stable_sort.1.ddl.sqlpp
index 7d457d5..d7a912e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/stable_sort/stable_sort.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/stable_sort/stable_sort.1.ddl.sqlpp
@@ -46,7 +46,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/string_eq_01/string_eq_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/string_eq_01/string_eq_01.1.ddl.sqlpp
index 6e08aab..0c380be 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/string_eq_01/string_eq_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/string_eq_01/string_eq_01.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type TinySocial.FacebookUserType as
  closed {
@@ -38,7 +38,7 @@
   `user-since` : datetime,
   `friend-ids` : {{bigint}},
   employment : [EmploymentType]
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/unsupported_parameter/unsupported_parameter.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/unsupported_parameter/unsupported_parameter.1.query.sqlpp
index b0c83c4..23dc8af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/unsupported_parameter/unsupported_parameter.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/unsupported_parameter/unsupported_parameter.1.query.sqlpp
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-SET `compiler.joinmem` "4MB"
+SET `compiler.joinmem` "4MB";
 
 SELECT 1;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/unsupported_parameter_value/unsupported_parameter_value.1.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/unsupported_parameter_value/unsupported_parameter_value.1.query.sqlpp
index 3fb33b8..fd9578d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/unsupported_parameter_value/unsupported_parameter_value.1.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/unsupported_parameter_value/unsupported_parameter_value.1.query.sqlpp
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-SET `compiler.joinmemory` "4LS"
+SET `compiler.joinmemory` "4LS";
 
 SELECT 1;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.1.ddl.sqlpp
index b86727d..48d6068 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.1.ddl.sqlpp
@@ -48,12 +48,12 @@
   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;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
index 547a22a..7445b72 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create type TinySocial.TweetMessageType as
  closed {
@@ -41,7 +41,7 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/drop-index/drop-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/drop-index/drop-index.1.ddl.sqlpp
index 34f1cd4..1a3a9a5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/drop-index/drop-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/drop-index/drop-index.1.ddl.sqlpp
@@ -47,12 +47,12 @@
   stringu1 : string,
   stringu2 : string,
   string4 : string
-}
+};
 
 create type test.Schema as
  closed {
   nested : Schematmp
-}
+};
 
 create  dataset t1tmp(Schematmp) primary key unique2;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.1.ddl.sqlpp
index 176168e..3fbde05 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create type TinySocial.TweetMessageType as
  closed {
@@ -47,7 +47,7 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.1.ddl.sqlpp
index 547a22a..7445b72 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create type TinySocial.TweetMessageType as
  closed {
@@ -41,7 +41,7 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.1.ddl.sqlpp
index 547a22a..7445b72 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create type TinySocial.TweetMessageType as
  closed {
@@ -41,7 +41,7 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/load-with-index/load-with-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/load-with-index/load-with-index.1.ddl.sqlpp
index 683bba8..9377229 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/load-with-index/load-with-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/load-with-index/load-with-index.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create type TinySocial.TweetMessageType as
  closed {
@@ -41,7 +41,7 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/load-with-ngram-index/load-with-ngram-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/load-with-ngram-index/load-with-ngram-index.1.ddl.sqlpp
index 46fc9de..35afae1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/load-with-ngram-index/load-with-ngram-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/load-with-ngram-index/load-with-ngram-index.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create type TinySocial.TweetMessageType as
  closed {
@@ -41,7 +41,7 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/load-with-rtree-index/load-with-rtree-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/load-with-rtree-index/load-with-rtree-index.1.ddl.sqlpp
index 26582e4..424fa37 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/load-with-rtree-index/load-with-rtree-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/load-with-rtree-index/load-with-rtree-index.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   name : string,
   followers_count : bigint,
   `sender-location` : point?
-}
+};
 
 create type TinySocial.TweetMessageType as
  closed {
@@ -41,7 +41,7 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/load-with-word-index/load-with-word-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/load-with-word-index/load-with-word-index.1.ddl.sqlpp
index 65c79ba..217c359 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/load-with-word-index/load-with-word-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/load-with-word-index/load-with-word-index.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create type TinySocial.TweetMessageType as
  closed {
@@ -41,7 +41,7 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/nested-uuid-insert/nested-uuid-insert.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/nested-uuid-insert/nested-uuid-insert.1.ddl.sqlpp
index 0da9b61..00e80d8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/nested-uuid-insert/nested-uuid-insert.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/nested-uuid-insert/nested-uuid-insert.1.ddl.sqlpp
@@ -34,17 +34,17 @@
  closed {
   id : uuid,
   `message-text` : string
-}
+};
 
 create type twitter.`nest` as
  closed {
   nested : TweetMessageType
-}
+};
 
 create type twitter.doublenest as
  closed {
   nested : `nest`
-}
+};
 
 create  dataset doublenests(doublenest) primary key nested.nested.id autogenerated ;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/nested-uuid-load/nested-uuid-load.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/nested-uuid-load/nested-uuid-load.1.ddl.sqlpp
index e0c8c72..c8d579a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/nested-uuid-load/nested-uuid-load.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/nested-uuid-load/nested-uuid-load.1.ddl.sqlpp
@@ -39,7 +39,7 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create type twitter.TweetMessageType as
  closed {
@@ -49,7 +49,7 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key user.userid autogenerated ;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.1.ddl.sqlpp
index 955d0db..9fc549d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -48,12 +48,12 @@
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customerstmp(CustomerTypetmp) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.1.ddl.sqlpp
index 4b55a5c..eea4f0f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.1.ddl.sqlpp
@@ -36,12 +36,12 @@
   title : string?,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLPtmp(DBLPTypetmp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.1.ddl.sqlpp
index 5a598df..6f78858 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.1.ddl.sqlpp
@@ -36,12 +36,12 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLPtmp(DBLPTypetmp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.1.ddl.sqlpp
index 18bf1cd..29d4def 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.1.ddl.sqlpp
@@ -36,12 +36,12 @@
   title : string?,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLPtmp(DBLPTypetmp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.1.ddl.sqlpp
index c1d4e8c..ce8b9f1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.1.ddl.sqlpp
@@ -36,12 +36,12 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLPtmp(DBLPTypetmp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.1.ddl.sqlpp
index d66e012..3ae5fc3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.1.ddl.sqlpp
@@ -39,12 +39,12 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyRecord as
  closed {
   nested : MyRecordtmp
-}
+};
 
 create  dataset MyDatatmp(MyRecordtmp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
index 39c7321..cdaa412 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
@@ -34,12 +34,12 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyRecord as
  closed {
   nested : MyRecordtmp
-}
+};
 
 create  dataset MyDatatmp(MyRecordtmp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.1.ddl.sqlpp
index ecd7dcd..7d074cf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index-dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -48,12 +48,12 @@
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customerstmp(CustomerTypetmp) primary key cid;
 
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 @@
   title : string?,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLPtmp(DBLPTypetmp) primary key id;
 
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 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLPtmp(DBLPTypetmp) primary key id;
 
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 @@
   title : string?,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLPtmp(DBLPTypetmp) primary key id;
 
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 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  dataset DBLPtmp(DBLPTypetmp) primary key id;
 
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 @@
   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;
 
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 @@
   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;
 
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 @@
   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`));
 
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 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,12 +49,12 @@
   `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`));
 
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 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,12 +49,12 @@
   `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`));
 
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 @@
   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`));
 
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 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -48,7 +48,7 @@
       total : float
   }
 
-}
+};
 
 create type test.OrderTypetmp as
 {
@@ -59,17 +59,17 @@
   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;
 
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 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -45,17 +45,17 @@
   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;
 
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 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerNestedType as
  closed {
@@ -48,12 +48,12 @@
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerNestedType
-}
+};
 
 create  dataset Customerstmp(CustomerNestedType) primary key cid;
 
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 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerNestedType as
  closed {
@@ -47,12 +47,12 @@
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerNestedType
-}
+};
 
 create  dataset Customerstmp(CustomerNestedType) primary key cid;
 
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 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPNestedType
-}
+};
 
 create type test.CSXNestedType as
  closed {
@@ -50,12 +50,12 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXNestedType
-}
+};
 
 create  dataset DBLPtmp(DBLPNestedType) primary key id;
 
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 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPNestedType
-}
+};
 
 create type test.CSXNestedType as
  closed {
@@ -49,12 +49,12 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXNestedType
-}
+};
 
 create  dataset DBLPtmp(DBLPNestedType) primary key id;
 
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 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyRecord as
  closed {
   nested : MyRecordtmp
-}
+};
 
 create  dataset MyData1tmp(MyRecordtmp) primary key id;
 
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 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPNestedType
-}
+};
 
 create type test.CSXNestedType as
  closed {
@@ -50,12 +50,12 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXNestedType
-}
+};
 
 create  dataset DBLPtmp(DBLPNestedType) primary key id;
 
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 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPNestedType
-}
+};
 
 create type test.CSXNestedType as
  closed {
@@ -49,12 +49,12 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
   nested : CSXNestedType
-}
+};
 
 create  dataset DBLPtmp(DBLPNestedType) primary key id;
 
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 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,12 +49,12 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
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 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,12 +49,12 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
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 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,12 +49,12 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
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 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,12 +49,12 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
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 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,12 +49,12 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
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 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
  closed {
@@ -49,12 +49,12 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
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 @@
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create type test.Nested as
  closed {
@@ -48,12 +48,12 @@
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create type test.Emp as
  closed {
   nested : Nested
-}
+};
 
 create  dataset employeeTmp(EmpTmp) primary key id;
 
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 @@
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create type test.Nested as
  closed {
@@ -47,12 +47,12 @@
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create type test.Emp as
  closed {
   nested : Nested
-}
+};
 
 create  dataset employeeTmp(EmpTmp) primary key id;
 
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 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.Nested as
 {
@@ -54,12 +54,12 @@
   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;
 
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 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
 {
@@ -42,12 +42,12 @@
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
 {
   nested : CustomerTypetmp
-}
+};
 
 create  dataset Customerstmp(CustomerTypetmp) primary key cid;
 
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 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
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 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -39,7 +39,7 @@
 create type test.DBLPType as
  closed {
   nested : DBLPNestedType
-}
+};
 
 create  dataset DBLPtmp(DBLPNestedType) primary key id on group1;
 
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 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
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 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -39,7 +39,7 @@
 create type test.DBLPType as
  closed {
   nested : DBLPNestedType
-}
+};
 
 create  dataset DBLPtmp(DBLPNestedType) primary key id on group1;
 
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 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
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 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
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 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -42,12 +42,12 @@
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1
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 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -42,12 +42,12 @@
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1
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 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -42,12 +42,12 @@
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1
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 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerTypetmp as
  closed {
@@ -42,12 +42,12 @@
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
   nested : CustomerTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1
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 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
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 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPTypetmp
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
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 @@
   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;
 
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 @@
   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;
 
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 @@
   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;
 
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 @@
   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;
 
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 @@
   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;
 
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 @@
   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;
 
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 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyRecord as
  closed {
   nested : MyRecordtmp
-}
+};
 
 create  dataset MyDatatmp(MyRecordtmp) primary key id;
 
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 @@
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyRecord as
 {
   nested : MyRecordtmp
-}
+};
 
 create  dataset MyDatatmp(MyRecordtmp) primary key id;
 
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 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyRecord as
  closed {
   nested : MyRecordtmp
-}
+};
 
 create  dataset MyDatatmp(MyRecordtmp) primary key id;
 
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 @@
   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`));
 
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 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
 {
@@ -45,12 +45,12 @@
   `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`));
 
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 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
 {
@@ -46,12 +46,12 @@
   `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`));
 
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 @@
   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`));
 
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 @@
  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;
 
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 @@
  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;
 
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..3757c8cc 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 @@
 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;
 
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 @@
 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;
 
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 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -44,7 +44,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -53,17 +53,17 @@
   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;
 
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 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerOpenNestedType as
 {
@@ -47,7 +47,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerNestedType as
  closed {
@@ -61,17 +61,17 @@
           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;
 
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 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerOpenNestedType as
 {
@@ -46,7 +46,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerNestedType as
  closed {
@@ -60,17 +60,17 @@
           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;
 
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 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -44,7 +44,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -53,17 +53,17 @@
   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;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
index 4374c3e..3629cc5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -43,7 +43,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -52,17 +52,17 @@
   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;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp
index 429e452..d5c9bd9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyRecordOpen as
 {
@@ -52,12 +52,12 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyRecord as
  closed {
   nested : MyRecordOpen
-}
+};
 
 create  dataset MyData1tmp(MyRecordtmp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
index be91a77..dc75553 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -44,7 +44,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -53,17 +53,17 @@
   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;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/word-jaccard/word-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
index ec2cf6d..b1311dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -43,7 +43,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXTypetmp as
  closed {
@@ -52,17 +52,17 @@
   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;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp
index 6e37155..5bbeda0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
 {
@@ -48,12 +48,12 @@
   `referred-topics` : {{string}},
   `message-text` : string,
   countA : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp
index 6e37155..5bbeda0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
 {
@@ -48,12 +48,12 @@
   `referred-topics` : {{string}},
   `message-text` : string,
   countA : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp
index e68577f..01e97f6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
 {
@@ -48,12 +48,12 @@
   `referred-topics` : {{string}},
   countA : bigint,
   countB : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp
index c5263d4..1e39bdd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
 {
@@ -48,12 +48,12 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
index c5263d4..1e39bdd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageNestedType as
 {
@@ -48,12 +48,12 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
   nested : TweetMessageNestedType
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key nested.tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp
index 0976c58..146aefe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp
@@ -39,19 +39,19 @@
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create type test.Nested as
 {
   id : bigint,
   age : bigint,
   dept : string
-}
+};
 
 create type test.Emp as
  closed {
   nested : Nested
-}
+};
 
 create  dataset employeeTmp(EmpTmp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
index 8a6c6ae..0015283 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
@@ -38,19 +38,19 @@
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create type test.Nested as
 {
   id : bigint,
   age : bigint,
   dept : string
-}
+};
 
 create type test.Emp as
  closed {
   nested : Nested
-}
+};
 
 create  dataset employeeTmp(EmpTmp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
index cc53be6..38423b5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.Nested as
 {
@@ -53,12 +53,12 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
   nested : Nested
-}
+};
 
 create  dataset Orders(OrderType) primary key nested.o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
index 30d0146..04a8caa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -38,12 +38,12 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPOpenType
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
index 7d47719..fa5931a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPClosedType as
  closed {
@@ -38,7 +38,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -47,7 +47,7 @@
 create type test.DBLPType as
  closed {
   nested : DBLPOpenType
-}
+};
 
 create  dataset DBLPtmp(DBLPClosedType) primary key id on group1;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
index 6db5c61..db282da 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -38,12 +38,12 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPOpenType
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
index 7d47719..fa5931a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPClosedType as
  closed {
@@ -38,7 +38,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -47,7 +47,7 @@
 create type test.DBLPType as
  closed {
   nested : DBLPOpenType
-}
+};
 
 create  dataset DBLPtmp(DBLPClosedType) primary key id on group1;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
index 6db5c61..db282da 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -38,12 +38,12 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPOpenType
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
index 30d0146..04a8caa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -38,12 +38,12 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPOpenType
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
index 30d0146..04a8caa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -38,12 +38,12 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPOpenType
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
index 30d0146..04a8caa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -38,12 +38,12 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
   nested : DBLPOpenType
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
index 6e6e8d4..89a6c98 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-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-open-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.OrderOpenType as
 {
@@ -46,12 +46,12 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
   nested : OrderOpenType
-}
+};
 
 create  dataset Orderstmp(OrderTypetmp) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
index 6e6e8d4..89a6c98 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.OrderOpenType as
 {
@@ -46,12 +46,12 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
   nested : OrderOpenType
-}
+};
 
 create  dataset Orderstmp(OrderTypetmp) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/range-search/range-search.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/range-search/range-search.1.ddl.sqlpp
index 5932992..d0176ec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/range-search/range-search.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/range-search/range-search.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type test.LineItemOpenType as
 {
@@ -60,12 +60,12 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type test.LineItemType as
  closed {
   nested : LineItemOpenType
-}
+};
 
 create  dataset LineItemtmp(LineItemTypetmp) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
index ac81f4b..1a88558 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
@@ -33,12 +33,12 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyRecord as
  closed {
   nested : MyRecordtmp
-}
+};
 
 create  dataset MyDatatmp(MyRecordtmp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nestrecords/nestrecord/nestrecord.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nestrecords/nestrecord/nestrecord.1.ddl.sqlpp
index d2d4819..64fde1c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nestrecords/nestrecord/nestrecord.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nestrecords/nestrecord/nestrecord.1.ddl.sqlpp
@@ -32,14 +32,14 @@
 {
   street : string,
   city : string
-}
+};
 
 create type testdv2.testtype as
 {
   name : string,
   id : string,
   address : AddressType?
-}
+};
 
 create  dataset testds(testtype) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/group-by-from-dataset/group-by-from-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/group-by-from-dataset/group-by-from-dataset.1.ddl.sqlpp
index 7bff4ad..9ac564e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/group-by-from-dataset/group-by-from-dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/group-by-from-dataset/group-by-from-dataset.1.ddl.sqlpp
@@ -26,7 +26,7 @@
 
 create type TestType as {
    b: bigint
-}
+};
 
 create dataset data(TestType) primary key b;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/order-by-from-dataset/order-by-from-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/order-by-from-dataset/order-by-from-dataset.1.ddl.sqlpp
index 7bff4ad..9ac564e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/order-by-from-dataset/order-by-from-dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/order-by-from-dataset/order-by-from-dataset.1.ddl.sqlpp
@@ -26,7 +26,7 @@
 
 create type TestType as {
    b: bigint
-}
+};
 
 create dataset data(TestType) primary key b;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/print-ASTERIXDB-1885/print-ASTERIXDB-1885.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/print-ASTERIXDB-1885/print-ASTERIXDB-1885.1.ddl.sqlpp
index 9970f4e..a8e2711 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/print-ASTERIXDB-1885/print-ASTERIXDB-1885.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/null-missing/print-ASTERIXDB-1885/print-ASTERIXDB-1885.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   intervalField : interval?,
   yearMonthDurationField : `year_month_duration`?,
   dayTimeDurationField : `day_time_duration`?
-}
+};
 
 create external  dataset testds(testtype) using localfs((`path`=`asterix_nc1://data/temporal/temporalData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/infinity/infinity.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/infinity/infinity.1.ddl.sqlpp
index 7059c72..f8801d2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/infinity/infinity.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/numeric/infinity/infinity.1.ddl.sqlpp
@@ -23,6 +23,6 @@
 
 create type test as {
    id: int
-}
+};
 
 create dataset test(test) primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.1.ddl.sqlpp
index 43d7787..c074534 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/access-nested-fields/access-nested-fields.1.ddl.sqlpp
@@ -31,58 +31,58 @@
 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;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.1.ddl.sqlpp
index 6a0673b..1dc56ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 {
   id : integer,
   name : string
-}
+};
 
 create  dataset testds(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.1.ddl.sqlpp
index a190e2a..e8cc380 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.1.ddl.sqlpp
@@ -32,61 +32,61 @@
  closed {
   id : bigint,
   Species : string
-}
+};
 
 create type test.GS as
  closed {
   id : bigint,
   Genus : string,
   lower : S
-}
+};
 
 create type test.FGS as
  closed {
   id : bigint,
   Family : string,
   lower : GS
-}
+};
 
 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
  closed {
   id : bigint,
   Kingdom : string,
   lower : PCOFGS
-}
+};
 
 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;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.1.ddl.sqlpp
index 0ed17a9..61307a0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.1.ddl.sqlpp
@@ -31,58 +31,58 @@
 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
 {
   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;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.1.ddl.sqlpp
index b4e3046..6a3120f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.1.ddl.sqlpp
@@ -31,53 +31,53 @@
 create type test.S as
 {
   id : bigint
-}
+};
 
 create type test.GS as
 {
   id : bigint,
   Genus : string
-}
+};
 
 create type test.FGS as
 {
   id : bigint,
   Family : string
-}
+};
 
 create type test.OFGS as
 {
   id : bigint,
   `Order` : string
-}
+};
 
 create type test.COFGS as
 {
   id : bigint,
   Class : string
-}
+};
 
 create type test.PCOFGS as
 {
   id : bigint,
   Phylum : string
-}
+};
 
 create type test.KPCOFGS as
 {
   id : bigint,
   Kingdom : string
-}
+};
 
 create type test.Classification as
 {
   id : bigint
-}
+};
 
 create type test.Animal as
 {
   id : bigint
-}
+};
 
 create  dataset Animals(Animal) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.1.ddl.sqlpp
index ab17433..3f0e361 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create type TinySocial.TweetMessageType as
  closed {
@@ -46,14 +46,14 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create type TinySocial.EmploymentType as
 {
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type TinySocial.FacebookUserType as
  closed {
@@ -63,7 +63,7 @@
   `user-since` : datetime,
   `friend-ids` : {{bigint}},
   employment : [EmploymentType]
-}
+};
 
 create type TinySocial.FacebookMessageType as
  closed {
@@ -72,5 +72,5 @@
   `in-response-to` : bigint?,
   `sender-location` : point?,
   message : string
-}
+};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ddl.sqlpp
index e6d7a9b..f31d63a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   lang : string,
   friends_count : bigint,
   statuses_count : bigint
-}
+};
 
 create type TinySocial.TweetMessageType as
  closed {
@@ -44,14 +44,14 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create type TinySocial.EmploymentType as
 {
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type TinySocial.FacebookUserType as
  closed {
@@ -61,7 +61,7 @@
   `user-since` : datetime,
   `friend-ids` : {{bigint}},
   employment : [EmploymentType]
-}
+};
 
 create type TinySocial.FacebookMessageType as
  closed {
@@ -70,7 +70,7 @@
   `in-response-to` : bigint?,
   `sender-location` : point?,
   message : string
-}
+};
 
 create type TinySocial.TwitterUserAlternateType as
 {
@@ -78,7 +78,7 @@
   lang : string,
   friends_count : bigint,
   statuses_count : bigint
-}
+};
 
 create type TinySocial.TweetMessageAlternateType as
  closed {
@@ -86,14 +86,14 @@
   `sender-location` : point?,
   `send-time` : datetime,
   `message-text` : string
-}
+};
 
 create type TinySocial.EmploymentAlternateType as
 {
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type TinySocial.FacebookUserAlternateType as
  closed {
@@ -101,7 +101,7 @@
   alias : string,
   name : string,
   `user-since` : datetime
-}
+};
 
 create type TinySocial.FacebookMessageAlternateType as
  closed {
@@ -110,5 +110,5 @@
   `in-response-to` : bigint?,
   `sender-location` : point?,
   message : string
-}
+};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ddl.sqlpp
index 4abc9e9..6793870 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   lang : string,
   friends_count : bigint,
   statuses_count : bigint
-}
+};
 
 create type TinySocial.TweetMessageType as
  closed {
@@ -44,14 +44,14 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create type TinySocial.EmploymentType as
 {
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type TinySocial.FacebookUserType as
  closed {
@@ -61,7 +61,7 @@
   `user-since` : datetime,
   `friend-ids` : {{bigint}},
   employment : [EmploymentType]
-}
+};
 
 create type TinySocial.FacebookMessageType as
  closed {
@@ -70,7 +70,7 @@
   `in-response-to` : bigint?,
   `sender-location` : point?,
   message : string
-}
+};
 
 create type TinySocial.TwitterUserAlternateType as
 {
@@ -78,7 +78,7 @@
   lang : string,
   friends_count : bigint,
   statuses_count : bigint
-}
+};
 
 create type TinySocial.TweetMessageAlternateType as
  closed {
@@ -87,14 +87,14 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create type TinySocial.EmploymentAlternateType as
 {
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type TinySocial.FacebookUserAlternateType as
  closed {
@@ -103,7 +103,7 @@
   name : string,
   `friend-ids` : {{bigint}},
   `user-since` : datetime
-}
+};
 
 create type TinySocial.FacebookMessageAlternateType as
  closed {
@@ -112,5 +112,5 @@
   `in-response-to` : bigint?,
   `sender-location` : point?,
   message : string
-}
+};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ddl.sqlpp
index 825ff4b..a23dcf9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   lang : string,
   friends_count : bigint,
   statuses_count : bigint
-}
+};
 
 create type TinySocial.TweetMessageType as
  closed {
@@ -44,14 +44,14 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create type TinySocial.EmploymentType as
 {
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type TinySocial.FacebookUserType as
  closed {
@@ -61,7 +61,7 @@
   `user-since` : datetime,
   `friend-ids` : {{bigint}},
   employment : [EmploymentType]
-}
+};
 
 create type TinySocial.FacebookMessageType as
  closed {
@@ -70,7 +70,7 @@
   `in-response-to` : bigint?,
   `sender-location` : point?,
   message : string
-}
+};
 
 create type TinySocial.TwitterUserAlternateType as
 {
@@ -78,7 +78,7 @@
   lang : string,
   friends_count : bigint,
   statuses_count : bigint
-}
+};
 
 create type TinySocial.TweetMessageAlternateType as
  closed {
@@ -87,14 +87,14 @@
   `sender-location` : point?,
   `send-time` : datetime,
   `message-text` : string
-}
+};
 
 create type TinySocial.EmploymentAlternateType as
 {
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type TinySocial.FacebookUserAlternateType as
  closed {
@@ -103,7 +103,7 @@
   name : string,
   `user-since` : datetime,
   employment : EmploymentAlternateType
-}
+};
 
 create type TinySocial.FacebookMessageAlternateType as
  closed {
@@ -112,5 +112,5 @@
   `in-response-to` : bigint?,
   `sender-location` : point?,
   message : string
-}
+};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.1.ddl.sqlpp
index 9c61cd1..48d40c5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/get-object-fields/tiny-social-example/tiny-social-example.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   lang : string,
   friends_count : bigint,
   statuses_count : bigint
-}
+};
 
 create type TinySocial.TweetMessageType as
  closed {
@@ -44,14 +44,14 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create type TinySocial.EmploymentType as
 {
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type TinySocial.FacebookUserType as
  closed {
@@ -61,7 +61,7 @@
   `user-since` : datetime,
   `friend-ids` : {{bigint}},
   employment : [EmploymentType]
-}
+};
 
 create type TinySocial.FacebookMessageType as
  closed {
@@ -70,5 +70,5 @@
   `in-response-to` : bigint?,
   `sender-location` : point?,
   message : string
-}
+};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_pairs-2/object_pairs.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_pairs-2/object_pairs.1.ddl.sqlpp
index 96752bf..30c5e02 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_pairs-2/object_pairs.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_pairs-2/object_pairs.1.ddl.sqlpp
@@ -25,6 +25,6 @@
 create type FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ddl.sqlpp
index caeb821..156b2e9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 {
   id : integer,
   fname : string
-}
+};
 
 create  dataset testds(opentype) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ddl.sqlpp
index 0551c84..fd6d36f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 {
   fname1 : string,
   fname2 : string
-}
+};
 
 create  dataset testds(opentype) primary key fname1;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c-w-optional/c2c-w-option.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c-w-optional/c2c-w-option.1.ddl.sqlpp
index ad99903..eadefcd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c-w-optional/c2c-w-option.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c-w-optional/c2c-w-option.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   description : string,
   name : string,
   optnl_fld : string?
-}
+};
 
 create  dataset T1(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c-wo-optional/c2c-wo-optional.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c-wo-optional/c2c-wo-optional.1.ddl.sqlpp
index 249456f..546f21c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c-wo-optional/c2c-wo-optional.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c-wo-optional/c2c-wo-optional.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   description : string,
   name : string,
   optnl_fld : string?
-}
+};
 
 create  dataset T1(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c/c2c.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c/c2c.1.ddl.sqlpp
index b6c0395..3c446b0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c/c2c.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/c2c/c2c.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   id : integer,
   description : string,
   name : string
-}
+};
 
 create  dataset T1(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list-ordered01/heterog-list-ordered01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list-ordered01/heterog-list-ordered01.1.ddl.sqlpp
index 6a025f1..9930932 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list-ordered01/heterog-list-ordered01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list-ordered01/heterog-list-ordered01.1.ddl.sqlpp
@@ -34,7 +34,7 @@
 {
   id : bigint,
   descrpt : string
-}
+};
 
 create type test.TestType as
  closed {
@@ -42,7 +42,7 @@
   description : string,
   name : string,
   batters : [[BatterType]]
-}
+};
 
 create  dataset T1(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list01/heterog-list01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list01/heterog-list01.1.ddl.sqlpp
index 853e580..a99e550 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list01/heterog-list01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list01/heterog-list01.1.ddl.sqlpp
@@ -34,7 +34,7 @@
 {
   id : bigint,
   descrpt : string
-}
+};
 
 create type test.TestType as
  closed {
@@ -42,7 +42,7 @@
   description : string,
   name : string,
   batters : {{BatterType}}
-}
+};
 
 create  dataset T1(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list02/heterog-list02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list02/heterog-list02.1.ddl.sqlpp
index 7f847d8..e55527e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list02/heterog-list02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list02/heterog-list02.1.ddl.sqlpp
@@ -34,7 +34,7 @@
 {
   id : integer,
   descrpt : string
-}
+};
 
 create type test.TestType as
 {
@@ -42,7 +42,7 @@
   description : string,
   name : string,
   batters : [[BatterType]]
-}
+};
 
 create  dataset T1(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list03/heterog-list03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list03/heterog-list03.1.ddl.sqlpp
index 44f8aed..67a74dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list03/heterog-list03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/heterog-list03/heterog-list03.1.ddl.sqlpp
@@ -35,7 +35,7 @@
 {
   id : integer,
   descrpt : string
-}
+};
 
 create type test.TestType as
 {
@@ -43,7 +43,7 @@
   description : string,
   name : string,
   batters : [[BatterType]]?
-}
+};
 
 create  dataset T1(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-01/open-closed-01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-01/open-closed-01.1.ddl.sqlpp
index 43197d7..73724d4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-01/open-closed-01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-01/open-closed-01.1.ddl.sqlpp
@@ -33,7 +33,7 @@
 {
   id : bigint,
   name : string
-}
+};
 
 create  dataset testds(testType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-12/open-closed-12.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-12/open-closed-12.1.ddl.sqlpp
index 1fb94bc..011a31c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-12/open-closed-12.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-12/open-closed-12.1.ddl.sqlpp
@@ -34,13 +34,13 @@
 {
   id : string,
   name : string
-}
+};
 
 create type testdv2.testtype02 as
 {
   id : string,
   name : string
-}
+};
 
 create  dataset testds01(testtype01) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-14/open-closed-14.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-14/open-closed-14.1.ddl.sqlpp
index 8e77b33..f516ded 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-14/open-closed-14.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-14/open-closed-14.1.ddl.sqlpp
@@ -34,12 +34,12 @@
  closed {
   id : string,
   name : string?
-}
+};
 
 create type testdv2.testtype02 as
  closed {
   id : string
-}
+};
 
 create  dataset testds01(testtype01) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-15/open-closed-15.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-15/open-closed-15.1.ddl.sqlpp
index 8baedfa..afd6dc3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-15/open-closed-15.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-15/open-closed-15.1.ddl.sqlpp
@@ -43,7 +43,7 @@
   tm : time,
   dt_tm : datetime,
   lat_lon : point
-}
+};
 
 create  dataset tdtst(Schema) primary key id_32;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-16/open-closed-16.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-16/open-closed-16.1.ddl.sqlpp
index c60d6a9..ffdfe17 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-16/open-closed-16.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-16/open-closed-16.1.ddl.sqlpp
@@ -43,7 +43,7 @@
   tm : time,
   dt_tm : datetime,
   lat_lon : point
-}
+};
 
 create  dataset tdtst(Schema) primary key id_32;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-17/open-closed-17.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-17/open-closed-17.1.ddl.sqlpp
index 6bc4008..734b93a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-17/open-closed-17.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-17/open-closed-17.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   tm : time,
   dt_tm : datetime,
   lat_lon : point
-}
+};
 
 create  dataset tdtst(Schema) primary key id_32;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-20/open-closed-20.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-20/open-closed-20.1.ddl.sqlpp
index fe4d0a4..3545161 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-20/open-closed-20.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-20/open-closed-20.1.ddl.sqlpp
@@ -34,7 +34,7 @@
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset dtst01(TestType) primary key id;
 
@@ -45,7 +45,7 @@
   age : tinyint,
   sex : string?,
   dob : date?
-}
+};
 
 create  dataset employee(Emp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-21/open-closed-21.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-21/open-closed-21.1.ddl.sqlpp
index a9b7ee0..6b6e7bb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-21/open-closed-21.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-21/open-closed-21.1.ddl.sqlpp
@@ -33,7 +33,7 @@
 create type test.TestType as
 {
   id : integer
-}
+};
 
 create  dataset dtst01(TestType) primary key id;
 
@@ -44,7 +44,7 @@
   age : tinyint,
   sex : string,
   dob : date
-}
+};
 
 create  dataset employee(Emp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-22/open-closed-22.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-22/open-closed-22.1.ddl.sqlpp
index a50bcf9..2a467c8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-22/open-closed-22.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-22/open-closed-22.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   dept : string?,
   sex : string,
   dob : date?
-}
+};
 
 create  dataset employee(Emp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-24/open-closed-24.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-24/open-closed-24.1.ddl.sqlpp
index fb84205..c878a95 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-24/open-closed-24.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-24/open-closed-24.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   id : bigint,
   name : string,
   opt_tag : {{string}}
-}
+};
 
 create  dataset testds(testType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-25/open-closed-25.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-25/open-closed-25.1.ddl.sqlpp
index d4da2a6..a89b5e6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-25/open-closed-25.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-25/open-closed-25.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   id : bigint,
   name : string,
   opt_tag : {{string}}?
-}
+};
 
 create  dataset testds(testType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-26/open-closed-26.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-26/open-closed-26.1.ddl.sqlpp
index 7d449db..206f3be 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-26/open-closed-26.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-26/open-closed-26.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   id : bigint,
   name : string,
   opt_tag : {{string}}?
-}
+};
 
 create  dataset testds(testType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-28/open-closed-28.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-28/open-closed-28.1.ddl.sqlpp
index 4068ba3..6033fa6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-28/open-closed-28.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-28/open-closed-28.1.ddl.sqlpp
@@ -34,13 +34,13 @@
 {
   id : string,
   name : string
-}
+};
 
 create type testdv2.testtype02 as
 {
   id : string,
   name : string
-}
+};
 
 create  dataset testds01(testtype01) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-29/open-closed-29.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-29/open-closed-29.1.ddl.sqlpp
index c68b913..249ec85 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-29/open-closed-29.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-29/open-closed-29.1.ddl.sqlpp
@@ -34,13 +34,13 @@
 {
   id : string,
   name : string
-}
+};
 
 create type testdv2.testtype02 as
 {
   id : string,
   name : string
-}
+};
 
 create  dataset testds01(testtype01) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-30/open-closed-30.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-30/open-closed-30.1.ddl.sqlpp
index e4b5afa..79d056e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-30/open-closed-30.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-30/open-closed-30.1.ddl.sqlpp
@@ -33,13 +33,13 @@
 create type testdv2.testtype01 as
 {
   id : string
-}
+};
 
 create type testdv2.testtype02 as
 {
   id : string,
   name : string
-}
+};
 
 create  dataset testds01(testtype01) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-31/open-closed-31.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-31/open-closed-31.1.ddl.sqlpp
index 05b96a3..6769ed2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-31/open-closed-31.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-31/open-closed-31.1.ddl.sqlpp
@@ -32,13 +32,13 @@
 create type testdv2.testtype01 as
 {
   id : string
-}
+};
 
 create type testdv2.testtype02 as
 {
   id : string,
   name : string
-}
+};
 
 create  dataset testds01(testtype01) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-32/open-closed-32.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-32/open-closed-32.1.ddl.sqlpp
index 5dade52..2c10fc2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-32/open-closed-32.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-32/open-closed-32.1.ddl.sqlpp
@@ -33,7 +33,7 @@
 create type testdv2.testtype01 as
 {
   id : string
-}
+};
 
 create type testdv2.testtype02 as
  closed {
@@ -43,7 +43,7 @@
   dept : string,
   salary : integer,
   interests : {{string}}
-}
+};
 
 create  dataset testds01(testtype01) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-33/open-closed-33.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-33/open-closed-33.1.ddl.sqlpp
index 2638a39..fccc14c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-33/open-closed-33.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/open-closed-33/open-closed-33.1.ddl.sqlpp
@@ -34,7 +34,7 @@
 create type testdv2.testtype01 as
 {
   id : string
-}
+};
 
 create type testdv2.testtype02 as
  closed {
@@ -44,7 +44,7 @@
   dept : string,
   salary : integer,
   interests : {{string}}?
-}
+};
 
 create  dataset testds01(testtype01) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue196/query-issue196.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue196/query-issue196.1.ddl.sqlpp
index 0744efc..9e7d639 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue196/query-issue196.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue196/query-issue196.1.ddl.sqlpp
@@ -32,12 +32,12 @@
 create type test.testtype1 as
 {
   id : bigint
-}
+};
 
 create type test.testtype2 as
 {
   id : bigint
-}
+};
 
 create  dataset t1(testtype1) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue208/query-issue208.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue208/query-issue208.1.ddl.sqlpp
index 50a476a..cf48176 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue208/query-issue208.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue208/query-issue208.1.ddl.sqlpp
@@ -37,14 +37,14 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create type OpenSocialNetworkData.TweetMessageType as
 {
   tweetid : string,
   `tweetid-copy` : string,
   `send-time-copy` : datetime
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue236/query-issue236.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue236/query-issue236.1.ddl.sqlpp
index 763057e..ecdbe00 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue236/query-issue236.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue236/query-issue236.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create type SocialNetworkData.TweetMessageType as
  closed {
@@ -49,7 +49,7 @@
   `send-time-copy` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue258/query-issue258.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue258/query-issue258.1.ddl.sqlpp
index 323a8df..faf82de 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue258/query-issue258.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue258/query-issue258.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 create type test.t1 as
  closed {
   id : bigint
-}
+};
 
 create  dataset ds1(t1) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue343-2/query-issue343-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue343-2/query-issue343-2.1.ddl.sqlpp
index 10c4b1c..02626d5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue343-2/query-issue343-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue343-2/query-issue343-2.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.AllType as
 {
@@ -55,13 +55,13 @@
   line : line,
   polygon : polygon,
   circle : circle
-}
+};
 
 create type test.MyListType as
 {
   id : bigint,
   mylist : [string]
-}
+};
 
 create  dataset `All`(AllType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue343/query-issue343.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue343/query-issue343.1.ddl.sqlpp
index 72e4c8f..14a6552 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue343/query-issue343.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue343/query-issue343.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.AllType as
 {
@@ -55,7 +55,7 @@
   line : line,
   polygon : polygon,
   circle : circle
-}
+};
 
 create  dataset `All`(AllType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue350-2/query-issue350-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue350-2/query-issue350-2.1.ddl.sqlpp
index 3d24792..d60e9f8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue350-2/query-issue350-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue350-2/query-issue350-2.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 create type TinySocial.TweetMessageType as
 {
   tweetid : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue350/query-issue350.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue350/query-issue350.1.ddl.sqlpp
index 3d24792..d60e9f8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue350/query-issue350.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue350/query-issue350.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 create type TinySocial.TweetMessageType as
 {
   tweetid : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue377/query-issue377.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue377/query-issue377.1.ddl.sqlpp
index 2485a26..d6bf172 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue377/query-issue377.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue377/query-issue377.1.ddl.sqlpp
@@ -32,22 +32,22 @@
 create type TinySocial.TwitterUserType as
 {
   `screen-name` : string
-}
+};
 
 create type TinySocial.TweetMessageType as
 {
   tweetid : string
-}
+};
 
 create type TinySocial.FacebookUserType as
 {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
 {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue410/query-issue410.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue410/query-issue410.1.ddl.sqlpp
index b1f092d..ed6c184 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue410/query-issue410.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue410/query-issue410.1.ddl.sqlpp
@@ -33,7 +33,7 @@
 {
   id : integer,
   name : string
-}
+};
 
 create  dataset Employee(Emp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue423-2/query-issue423-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue423-2/query-issue423-2.1.ddl.sqlpp
index 83d13d8..a21fe53 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue423-2/query-issue423-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue423-2/query-issue423-2.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset t2(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue423/query-issue423.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue423/query-issue423.1.ddl.sqlpp
index 101106f..adbe77f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue423/query-issue423.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue423/query-issue423.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset t2(TestType) primary key fname,lname;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue453-2/query-issue453-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue453-2/query-issue453-2.1.ddl.sqlpp
index 1470776..22646b7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue453-2/query-issue453-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue453-2/query-issue453-2.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   int_o : bigint?,
   string_m : string,
   string_o : string?
-}
+};
 
 create  dataset DataOpen(TypeOpen) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue453/query-issue453.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue453/query-issue453.1.ddl.sqlpp
index 1470776..22646b7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue453/query-issue453.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue453/query-issue453.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   int_o : bigint?,
   string_m : string,
   string_o : string?
-}
+};
 
 create  dataset DataOpen(TypeOpen) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue456/query-issue456.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue456/query-issue456.1.ddl.sqlpp
index 4c95e28..213619a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue456/query-issue456.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue456/query-issue456.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   int_o : bigint?,
   string_m : string,
   string_o : string?
-}
+};
 
 create  dataset DataOpen(TypeOpen) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue487/query-issue487.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue487/query-issue487.1.ddl.sqlpp
index 285dab1..c623a42 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue487/query-issue487.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue487/query-issue487.1.ddl.sqlpp
@@ -33,7 +33,7 @@
 {
   id : integer,
   name : string
-}
+};
 
 create  dataset Employee(EmpType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue592/query-issue592.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue592/query-issue592.1.ddl.sqlpp
index 83f71de..1d95f98 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue592/query-issue592.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue592/query-issue592.1.ddl.sqlpp
@@ -32,13 +32,13 @@
 create type fooverse.bartype as
 {
   baz : bigint
-}
+};
 
 create type fooverse.footype as
 {
   id : bigint,
   bars : [bartype]?
-}
+};
 
 create  dataset fooset(footype) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue625/query-issue625.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue625/query-issue625.1.ddl.sqlpp
index 5a14110..b2cd43b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue625/query-issue625.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue625/query-issue625.1.ddl.sqlpp
@@ -33,7 +33,7 @@
 {
   id : bigint,
   numbers : [bigint]
-}
+};
 
 create  dataset Foo(FooType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue656/query-issue656.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue656/query-issue656.1.ddl.sqlpp
index ae70f46..4f9b9c9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue656/query-issue656.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-issue656/query-issue656.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 create type test.bartype as
 {
   id : uuid
-}
+};
 
 create  dataset barset(bartype) primary key id autogenerated ;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-proposal/query-proposal.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-proposal/query-proposal.1.ddl.sqlpp
index 5550c87..8611d1c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-proposal/query-proposal.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-proposal/query-proposal.1.ddl.sqlpp
@@ -45,7 +45,7 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-proposal02/query-proposal02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-proposal02/query-proposal02.1.ddl.sqlpp
index 84fd45a..f3877f6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-proposal02/query-proposal02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-closed/query-proposal02/query-proposal02.1.ddl.sqlpp
@@ -46,7 +46,7 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/enforced-field-name-collision/enforced-field-name-collision.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/enforced-field-name-collision/enforced-field-name-collision.1.ddl.sqlpp
index 7fdb027..d9b4b2e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/enforced-field-name-collision/enforced-field-name-collision.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/enforced-field-name-collision/enforced-field-name-collision.1.ddl.sqlpp
@@ -27,7 +27,7 @@
 {
   id : integer,
   `value` : string
-}
+};
 
 create  dataset testDS(testType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/enforced-field-type-collision/enforced-field-name-collision.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/enforced-field-type-collision/enforced-field-name-collision.1.ddl.sqlpp
index 7ae0485..302f3f7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/enforced-field-type-collision/enforced-field-name-collision.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/enforced-field-type-collision/enforced-field-name-collision.1.ddl.sqlpp
@@ -27,7 +27,7 @@
 {
   id : integer,
   `value` : string
-}
+};
 
 create  dataset testDS(testType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/index-on-closed-type/index-on-closed-type.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/index-on-closed-type/index-on-closed-type.1.ddl.sqlpp
index d7c6279..a48c80b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/index-on-closed-type/index-on-closed-type.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/index-on-closed-type/index-on-closed-type.1.ddl.sqlpp
@@ -26,7 +26,7 @@
 create type test.testType as
  closed {
   id : integer
-}
+};
 
 create  dataset testDS(testType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/missing-enforce-statement/missing-enforce-statement.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/missing-enforce-statement/missing-enforce-statement.1.ddl.sqlpp
index 9dc2368..41cc54c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/missing-enforce-statement/missing-enforce-statement.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/missing-enforce-statement/missing-enforce-statement.1.ddl.sqlpp
@@ -26,7 +26,7 @@
 create type test.testType as
 {
   id : integer
-}
+};
 
 create  dataset testDS(testType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/missing-optionality/missing-optionality.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/missing-optionality/missing-optionality.1.ddl.sqlpp
index 8dab33e..8831196 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/missing-optionality/missing-optionality.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/error-checking/missing-optionality/missing-optionality.1.ddl.sqlpp
@@ -22,7 +22,7 @@
 
 create type testType as open {
    `id`: integer
-}
+};
 
 create dataset testDS(testType) primary key id;
 create index testIdx on testDS(`value`: string) enforced;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/adm-format/adm-format.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/adm-format/adm-format.1.ddl.sqlpp
index 5a182f8..7cafed2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/adm-format/adm-format.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/adm-format/adm-format.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create external  dataset MyData(MyRecord) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/spatialData.json`),(`input-format`=`text-input-format`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
index 2a9a89a..f7000eb1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -45,7 +45,7 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create external  dataset TweetMessages(TweetMessageType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/tw_for_indexleftouterjoin.adm`),(`input-format`=`text-input-format`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
index acd0397..fcd4f77 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -46,7 +46,7 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create external  dataset TweetMessages(TweetMessageType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/tw_for_indexleftouterjoin.adm`),(`input-format`=`text-input-format`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
index 3e1c1a0..9b94759 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/external-indexing/rtree-index/rtree-index.1.ddl.sqlpp
@@ -33,7 +33,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create external  dataset MyData(MyRecord) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/spatialData.json`),(`input-format`=`text-input-format`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp
index d0916ec..843bc73 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/btree-secondary-equi-join/btree-secondary-equi-join.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -44,7 +44,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -53,7 +53,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
index 90f8358..92641d4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -48,7 +48,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerOpenType as
 {
@@ -61,7 +61,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerOpenType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
index 54dc417..3f3fb15 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-edit-distance/ngram-edit-distance.1.ddl.sqlpp
@@ -33,7 +33,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerOpenType as
 {
@@ -46,7 +46,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create type test.CustomerType as
  closed {
@@ -60,7 +60,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create  dataset Customers(CustomerOpenType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
index 5d7dc99..ccbc3da 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-jaccard-inline/ngram-jaccard-inline.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -44,7 +44,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -53,7 +53,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
index f5f3225..9ef7ef9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/ngram-jaccard/ngram-jaccard.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -43,7 +43,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -52,7 +52,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp
index 7c8a22a..330da91 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyRecordOpen as
 {
@@ -52,7 +52,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create  dataset MyData1tmp(MyRecord) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
index 205df03..285d0bc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/word-jaccard-inline/word-jaccard-inline.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -44,7 +44,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -53,7 +53,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/word-jaccard/word-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
index 0ef34a4..ddeb6fc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-join/word-jaccard/word-jaccard.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -43,7 +43,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -52,7 +52,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp
index 1aed597..083200c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -48,7 +48,7 @@
   `referred-topics` : {{string}},
   `message-text` : string,
   countA : bigint
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp
index 1aed597..083200c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -48,7 +48,7 @@
   `referred-topics` : {{string}},
   `message-text` : string,
   countA : bigint
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp
index bcc2ce1..4ff0a38 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -48,7 +48,7 @@
   `referred-topics` : {{string}},
   countA : bigint,
   countB : bigint
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp
index 7735b46..05b3708 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -48,7 +48,7 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
index 7735b46..05b3708 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -48,7 +48,7 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp
index cd84b8d..0346b1d4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.1.ddl.sqlpp
@@ -39,14 +39,14 @@
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create type test.EmpOpen as
 {
   id : bigint,
   age : bigint,
   dept : string
-}
+};
 
 create  dataset employee(Emp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
index 87baa8a..87e6812 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-composite-key/btree-index-composite-key.1.ddl.sqlpp
@@ -38,14 +38,14 @@
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create type test.EmpOpen as
 {
   id : bigint,
   age : bigint,
   dept : string
-}
+};
 
 create  dataset employee(Emp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
index aff170f..69cebef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.OrderOpenType as
 {
@@ -53,7 +53,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
index 52f0ec7..199b34c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -38,7 +38,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
index d1dfe16..c5af04a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
@@ -38,7 +38,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
index 90ee306..412bd06 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -38,7 +38,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
index d1dfe16..c5af04a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
@@ -29,7 +29,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPType as
  closed {
@@ -38,7 +38,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
index 90ee306..412bd06 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/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/open-index-enforced/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -38,7 +38,7 @@
   dblpid : string,
   title : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
index 52f0ec7..199b34c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -38,7 +38,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
index 52f0ec7..199b34c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -38,7 +38,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
index 52f0ec7..199b34c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.DBLPOpenType as
 {
@@ -38,7 +38,7 @@
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
index 0fcaac4..89c7cb1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.OrderOpenType as
 {
@@ -46,7 +46,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
index 0fcaac4..89c7cb1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/orders-index-custkey/orders-index-custkey.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.OrderOpenType as
 {
@@ -46,7 +46,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/range-search/range-search.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/range-search/range-search.1.ddl.sqlpp
index f339be3..be113a5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/range-search/range-search.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/range-search/range-search.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type test.LineItemOpenType as
 {
@@ -60,7 +60,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
index e6053eb..2522e4d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/rtree-secondary-index/rtree-secondary-index.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyRecordOpen as
 {
@@ -46,7 +46,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create  dataset MyData(MyRecord) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/type-checking/enforced-type-delete/enforced-type-delete.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/type-checking/enforced-type-delete/enforced-type-delete.1.ddl.sqlpp
index 12ca0ea..975359a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/type-checking/enforced-type-delete/enforced-type-delete.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/type-checking/enforced-type-delete/enforced-type-delete.1.ddl.sqlpp
@@ -27,7 +27,7 @@
 
 create type OrderOpenType as open {
   o_orderkey: int64
-}
+};
 
 create dataset OrdersOpen(OrderOpenType)
-primary key o_orderkey;
\ No newline at end of file
+primary key o_orderkey;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/type-checking/enforced-type-delete/enforced-type-delete.3.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/type-checking/enforced-type-delete/enforced-type-delete.3.ddl.sqlpp
index 0309109..f7f7af0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/type-checking/enforced-type-delete/enforced-type-delete.3.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/type-checking/enforced-type-delete/enforced-type-delete.3.ddl.sqlpp
@@ -24,4 +24,4 @@
 use test;
 
 create index idx_Orders_Custkey on
-OrdersOpen(o_custkey:int32?) enforced;
\ No newline at end of file
+OrdersOpen(o_custkey:int32?) enforced;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/type-checking/enforced-type-upsert/enforced-type-upsert.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/type-checking/enforced-type-upsert/enforced-type-upsert.1.ddl.sqlpp
index 8ed8c77..64923a9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/type-checking/enforced-type-upsert/enforced-type-upsert.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/type-checking/enforced-type-upsert/enforced-type-upsert.1.ddl.sqlpp
@@ -27,7 +27,7 @@
 
 create type OrderOpenType as open {
   o_orderkey: int64
-}
+};
 
 create dataset OrdersOpen(OrderOpenType)
-primary key o_orderkey;
\ No newline at end of file
+primary key o_orderkey;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/type-checking/enforced-type-upsert/enforced-type-upsert.3.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/type-checking/enforced-type-upsert/enforced-type-upsert.3.ddl.sqlpp
index d7885cd..47d14b2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/type-checking/enforced-type-upsert/enforced-type-upsert.3.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/type-checking/enforced-type-upsert/enforced-type-upsert.3.ddl.sqlpp
@@ -24,4 +24,4 @@
 use test;
 
 create index idx_Orders_Custkey on
-OrdersOpen(o_custkey:int32?) enforced;
\ No newline at end of file
+OrdersOpen(o_custkey:int32?) enforced;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-non-enforced/correlated-index-selection/btree-index-01/btree-index-01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-non-enforced/correlated-index-selection/btree-index-01/btree-index-01.1.ddl.sqlpp
index cea4c40..caa7ca4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-non-enforced/correlated-index-selection/btree-index-01/btree-index-01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-non-enforced/correlated-index-selection/btree-index-01/btree-index-01.1.ddl.sqlpp
@@ -27,9 +27,9 @@
 
 create type TestOpenType as open {
   c_id: int64
-}
+};
 
 create dataset TestOpen(TestOpenType)
 primary key c_id
 using compaction policy `correlated-prefix`
-((`max-mergable-component-size`="16384"),(`max-tolerance-component-count`="3"));
\ No newline at end of file
+((`max-mergable-component-size`="16384"),(`max-tolerance-component-count`="3"));
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-non-enforced/index-join/btree-equi-join-01/btree-equi-join-01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-non-enforced/index-join/btree-equi-join-01/btree-equi-join-01.1.ddl.sqlpp
index 3edf47b..ae78e4f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-non-enforced/index-join/btree-equi-join-01/btree-equi-join-01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-non-enforced/index-join/btree-equi-join-01/btree-equi-join-01.1.ddl.sqlpp
@@ -27,7 +27,7 @@
 
 create type TestOpenType as open {
   c_id: int64
-}
+};
 
 create dataset TestOpen1(TestOpenType)
 primary key c_id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-non-enforced/index-selection/btree-index-01/btree-index-01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-non-enforced/index-selection/btree-index-01/btree-index-01.1.ddl.sqlpp
index 750ac72..b9fba2b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-non-enforced/index-selection/btree-index-01/btree-index-01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-non-enforced/index-selection/btree-index-01/btree-index-01.1.ddl.sqlpp
@@ -27,7 +27,7 @@
 
 create type TestOpenType as open {
   c_id: int64
-}
+};
 
 create dataset TestOpen(TestOpenType)
-primary key c_id;
\ No newline at end of file
+primary key c_id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-non-enforced/index-selection/btree-index-02/btree-index-02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-non-enforced/index-selection/btree-index-02/btree-index-02.1.ddl.sqlpp
index 68e0eb4..e91c647 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-non-enforced/index-selection/btree-index-02/btree-index-02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-non-enforced/index-selection/btree-index-02/btree-index-02.1.ddl.sqlpp
@@ -28,7 +28,7 @@
 
 create type TestOpenType as open {
   c_id: int64
-}
+};
 
 create dataset TestOpen(TestOpenType)
-primary key c_id;
\ No newline at end of file
+primary key c_id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/quantifiers/query-ASTERIXDB-1005/query-ASTERIXDB-1005.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/quantifiers/query-ASTERIXDB-1005/query-ASTERIXDB-1005.1.ddl.sqlpp
index 8c45228..e3c557d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/quantifiers/query-ASTERIXDB-1005/query-ASTERIXDB-1005.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/quantifiers/query-ASTERIXDB-1005/query-ASTERIXDB-1005.1.ddl.sqlpp
@@ -29,13 +29,13 @@
 
 // Dish served by a restaurant
 create type DishesType as open
-{ name: string, price: double }
+{ name: string, price: double };
 
 // Bank account type
 create type BankAccountType as open{
  bank_account_number: string,
  bank_account_routing_number: string
-}
+};
 
 // Restaurant's information
 create type RestaurantsType as open {
@@ -46,7 +46,7 @@
 last_bank_transaction_datetime: datetime,
 cuisine: {{ string }},
 dish: {{ DishesType }}
-}
+};
 
 // Creating datasets for Users, Restaurants, and Orders
 create dataset Restaurants(RestaurantsType)
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/quantifiers/query-ASTERIXDB-1674/query-ASTERIXDB-1674.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/quantifiers/query-ASTERIXDB-1674/query-ASTERIXDB-1674.1.ddl.sqlpp
index 5f8e5a9..064ce8e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/quantifiers/query-ASTERIXDB-1674/query-ASTERIXDB-1674.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/quantifiers/query-ASTERIXDB-1674/query-ASTERIXDB-1674.1.ddl.sqlpp
@@ -26,12 +26,12 @@
 create type FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create type FacebookMessageType as
  open {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/quantifiers/somesat_02/somesat_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/quantifiers/somesat_02/somesat_02.1.ddl.sqlpp
index 5f979ef..aa25f24 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/quantifiers/somesat_02/somesat_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/quantifiers/somesat_02/somesat_02.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
 {
@@ -41,7 +41,7 @@
       total : float
   }
 
-}
+};
 
 create type test.OrderType as
 {
@@ -51,7 +51,7 @@
   orderpriority : string,
   clerk : string,
   total : float
-}
+};
 
 create  dataset CustomerSomeSat02(CustomerType) primary key cid;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/range-hints/order-by-exception_01/order-by-exception_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/range-hints/order-by-exception_01/order-by-exception_01.1.ddl.sqlpp
index 6d249e4..5ca1f53 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/range-hints/order-by-exception_01/order-by-exception_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/range-hints/order-by-exception_01/order-by-exception_01.1.ddl.sqlpp
@@ -31,5 +31,5 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/range-hints/order-by-exception_02/order-by-exception_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/range-hints/order-by-exception_02/order-by-exception_02.1.ddl.sqlpp
index 6d249e4..5ca1f53 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/range-hints/order-by-exception_02/order-by-exception_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/range-hints/order-by-exception_02/order-by-exception_02.1.ddl.sqlpp
@@ -31,5 +31,5 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/range-hints/order-by/order-by.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/range-hints/order-by/order-by.1.ddl.sqlpp
index 6d249e4..5ca1f53 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/range-hints/order-by/order-by.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/range-hints/order-by/order-by.1.ddl.sqlpp
@@ -31,5 +31,5 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets/all_datasets.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets/all_datasets.1.ddl.sqlpp
index 1b1b096..0f3cd0f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets/all_datasets.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/all_datasets/all_datasets.1.ddl.sqlpp
@@ -42,7 +42,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch2.OrderType as
  closed {
@@ -55,7 +55,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create dataset tpch1.LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/duplicate_location/duplicate_location.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/duplicate_location/duplicate_location.1.ddl.sqlpp
index 92698ab..0c14a5f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/duplicate_location/duplicate_location.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/duplicate_location/duplicate_location.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/empty_location/empty_location.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/empty_location/empty_location.1.ddl.sqlpp
index 92698ab..0c14a5f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/empty_location/empty_location.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/empty_location/empty_location.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/identical_location/identical_location.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/identical_location/identical_location.1.ddl.sqlpp
index 92698ab..0c14a5f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/identical_location/identical_location.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/identical_location/identical_location.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/miss_dataverse/miss_dataverse.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/miss_dataverse/miss_dataverse.1.ddl.sqlpp
index aa21431..6f378c6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/miss_dataverse/miss_dataverse.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/miss_dataverse/miss_dataverse.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset/single_dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset/single_dataset.1.ddl.sqlpp
index 92698ab..0c14a5f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset/single_dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset/single_dataset.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index/single_dataset_with_index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index/single_dataset_with_index.1.ddl.sqlpp
index 93efc34..ba5995c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index/single_dataset_with_index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataset_with_index/single_dataset_with_index.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse/single_dataverse.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse/single_dataverse.1.ddl.sqlpp
index 5d7b8f4..ab4bfd2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse/single_dataverse.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/rebalance/single_dataverse/single_dataverse.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.4.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.4.ddl.sqlpp
index ae4aef6..41a57f2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.4.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified/fullyqualified.4.ddl.sqlpp
@@ -18,4 +18,4 @@
  */
 
 drop dataverse test1;
-drop dataverse test;
\ No newline at end of file
+drop dataverse test;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.4.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.4.ddl.sqlpp
index ae4aef6..41a57f2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.4.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/resolution/fullyqualified2/fullyqualified2.4.ddl.sqlpp
@@ -18,4 +18,4 @@
  */
 
 drop dataverse test1;
-drop dataverse test;
\ No newline at end of file
+drop dataverse test;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/10/10.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/10/10.1.ddl.sqlpp
index d46c424..74d7a15 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/10/10.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/10/10.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP1(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/20/20.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/20/20.1.ddl.sqlpp
index edd0477..b8d7f6d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/20/20.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/20/20.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLPadm(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/30/30.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/30/30.1.ddl.sqlpp
index 635bda5..f1358dc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/30/30.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/30/30.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create external  dataset DBLPsplits(DBLPType) using localfs((`path`=`asterix_nc1://data/dblp-small/dblp-small.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/alltypes_01/alltypes_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/alltypes_01/alltypes_01.1.ddl.sqlpp
index 0e3fc23..94b6507 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/alltypes_01/alltypes_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/alltypes_01/alltypes_01.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.AllType as
 {
@@ -56,7 +56,7 @@
   circle : circle,
   binary : binary,
   uuid : uuid
-}
+};
 
 create external  dataset `All`(AllType) using localfs((`path`=`asterix_nc1://data/nontagged/allData.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/alltypes_02/alltypes_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/alltypes_02/alltypes_02.1.ddl.sqlpp
index 46a8608..751dfbe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/alltypes_02/alltypes_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/alltypes_02/alltypes_02.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.AllType as
 {
@@ -62,7 +62,7 @@
   circle : circle,
   binary : binary,
   uuid : uuid
-}
+};
 
 create external  dataset `All`(AllType) using localfs((`path`=`asterix_nc1://data/nontagged/allData.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/invalid-scan-syntax/invalid-scan-syntax.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/invalid-scan-syntax/invalid-scan-syntax.1.ddl.sqlpp
index 75babad..89e302d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/invalid-scan-syntax/invalid-scan-syntax.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/invalid-scan-syntax/invalid-scan-syntax.1.ddl.sqlpp
@@ -33,7 +33,7 @@
   id : integer,
   name : string,
   salary : integer
-}
+};
 
 create  dataset Office(Employee) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/issue238_query_1/issue238_query_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/issue238_query_1/issue238_query_1.1.ddl.sqlpp
index 0fdffb7..966d47b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/issue238_query_1/issue238_query_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/issue238_query_1/issue238_query_1.1.ddl.sqlpp
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLPadm(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/issue238_query_2/issue238_query_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/issue238_query_2/issue238_query_2.1.ddl.sqlpp
index b8650c8..9bd5268 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/issue238_query_2/issue238_query_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/issue238_query_2/issue238_query_2.1.ddl.sqlpp
@@ -39,7 +39,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLPadm(DBLPType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/numeric_types_01/numeric_types_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/numeric_types_01/numeric_types_01.1.ddl.sqlpp
index 2f4719d..a3f6bbb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/numeric_types_01/numeric_types_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/numeric_types_01/numeric_types_01.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   int64Field : bigint?,
   floatField : float?,
   doubleField : double?
-}
+};
 
 create external  dataset Numeric(NumericType) using localfs((`path`=`asterix_nc1://data/nontagged/numericData.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/spatial_types_01/spatial_types_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/spatial_types_01/spatial_types_01.1.ddl.sqlpp
index 4b0b8f9..d5d1d36 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/spatial_types_01/spatial_types_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/spatial_types_01/spatial_types_01.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   line : line,
   polygon : polygon,
   circle : circle
-}
+};
 
 create external  dataset Spatial(SpatialType) using localfs((`path`=`asterix_nc1://data/nontagged/spatialData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/spatial_types_02/spatial_types_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/spatial_types_02/spatial_types_02.1.ddl.sqlpp
index bf14de1..6ad9abc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/spatial_types_02/spatial_types_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/spatial_types_02/spatial_types_02.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   line : line,
   polygon : polygon,
   circle : circle
-}
+};
 
 create  dataset Spatial2(SpatialType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/temp_types_01/temp_types_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/temp_types_01/temp_types_01.1.ddl.sqlpp
index 11f5101..25ad3ea 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/temp_types_01/temp_types_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/temp_types_01/temp_types_01.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   time : time,
   datetime : datetime,
   duration : duration
-}
+};
 
 create external  dataset Temp(TempType) using localfs((`path`=`asterix_nc1://data/nontagged/tempData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/temp_types_02/temp_types_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/temp_types_02/temp_types_02.1.ddl.sqlpp
index 242abb0..72d337a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/temp_types_02/temp_types_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/scan/temp_types_02/temp_types_02.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   time : time,
   datetime : datetime,
   duration : duration
-}
+};
 
 create  dataset Temp2(TempType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/from/from.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/from/from.1.ddl.sqlpp
index 407f7dc9..9e6601b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/from/from.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/from/from.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/group_by/group_by.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/group_by/group_by.1.ddl.sqlpp
index 3cbe494..9ee2e7f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/group_by/group_by.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/group_by/group_by.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Regions_group_no_agg(RegionType) primary key r_regionkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/join/join.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/join/join.1.ddl.sqlpp
index 407f7dc9..9e6601b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/join/join.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/join/join.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/mixed/mixed.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/mixed/mixed.1.ddl.sqlpp
index 407f7dc9..9e6601b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/mixed/mixed.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/mixed/mixed.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/no_star/no_star.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/no_star/no_star.1.ddl.sqlpp
index 407f7dc9..9e6601b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/no_star/no_star.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/select-star/no_star/no_star.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/semistructured/count-nullable/count-nullable.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/semistructured/count-nullable/count-nullable.1.ddl.sqlpp
index 40c1d91..7733774 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/semistructured/count-nullable/count-nullable.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/semistructured/count-nullable/count-nullable.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
 {
@@ -42,7 +42,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create external  dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/semistructured/tiny01/customer.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/semistructured/cust-filter/cust-filter.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/semistructured/cust-filter/cust-filter.1.ddl.sqlpp
index 40c1d91..7733774 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/semistructured/cust-filter/cust-filter.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/semistructured/cust-filter/cust-filter.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   number : bigint,
   street : string,
   city : string
-}
+};
 
 create type test.CustomerType as
 {
@@ -42,7 +42,7 @@
           age : bigint?
       }
 ]
-}
+};
 
 create external  dataset Customers(CustomerType) using localfs((`path`=`asterix_nc1://data/semistructured/tiny01/customer.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/semistructured/has-param1/has-param1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/semistructured/has-param1/has-param1.1.ddl.sqlpp
index 296fa21..5377dbc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/semistructured/has-param1/has-param1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/semistructured/has-param1/has-param1.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   orderpriority : string,
   clerk : string,
   total : float
-}
+};
 
 create external  dataset Orders(OrderType) using localfs((`path`=`asterix_nc1://data/semistructured/tiny01/orders.adm`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.1.ddl.sqlpp
index afd9634..9bf6d4d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.1.ddl.sqlpp
index afd9634..9bf6d4d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.1.ddl.sqlpp
index afd9634..9bf6d4d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.1.ddl.sqlpp
index 23ba484..8778274 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.1.ddl.sqlpp
index afd9634..9bf6d4d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard_query/similarity-jaccard_query.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard_query/similarity-jaccard_query.1.ddl.sqlpp
index afd9634..9bf6d4d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard_query/similarity-jaccard_query.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard_query/similarity-jaccard_query.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.1.ddl.sqlpp
index e9734e8..d9fb7ec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   loc : point,
   time : datetime,
   text : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation/cell-aggregation.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation/cell-aggregation.1.ddl.sqlpp
index 9461ef8..440fbff 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation/cell-aggregation.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation/cell-aggregation.1.ddl.sqlpp
@@ -27,7 +27,7 @@
 {
   id : bigint,
   loc : point
-}
+};
 
 create external  dataset MyData(MyRecord) using localfs((`path`=`asterix_nc1://data/spatial/spatialDataAggregation.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/circle-intersect-circle/circle-intersect-circle.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/circle-intersect-circle/circle-intersect-circle.1.ddl.sqlpp
index 5869e6d..ae27a33 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/circle-intersect-circle/circle-intersect-circle.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/circle-intersect-circle/circle-intersect-circle.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : bigint,
   point : point,
   kwds : string
-}
+};
 
 create external  dataset MyData(MyRecord) using localfs((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/create-rtree-index/create-rtree-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/create-rtree-index/create-rtree-index.1.ddl.sqlpp
index 01f8f6e..38ace9c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/create-rtree-index/create-rtree-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/create-rtree-index/create-rtree-index.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   poly1 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create  dataset MyData(SpatialType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/distance-between-points/distance-between-points.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/distance-between-points/distance-between-points.1.ddl.sqlpp
index 5869e6d..ae27a33 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/distance-between-points/distance-between-points.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/distance-between-points/distance-between-points.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : bigint,
   point : point,
   kwds : string
-}
+};
 
 create external  dataset MyData(MyRecord) using localfs((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-circle/line-intersect-circle.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-circle/line-intersect-circle.1.ddl.sqlpp
index 5869e6d..ae27a33 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-circle/line-intersect-circle.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-circle/line-intersect-circle.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : bigint,
   point : point,
   kwds : string
-}
+};
 
 create external  dataset MyData(MyRecord) using localfs((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-line/line-intersect-line.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-line/line-intersect-line.1.ddl.sqlpp
index 5869e6d..ae27a33 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-line/line-intersect-line.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-line/line-intersect-line.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : bigint,
   point : point,
   kwds : string
-}
+};
 
 create external  dataset MyData(MyRecord) using localfs((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-polygon/line-intersect-polygon.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-polygon/line-intersect-polygon.1.ddl.sqlpp
index 5869e6d..ae27a33 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-polygon/line-intersect-polygon.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-polygon/line-intersect-polygon.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : bigint,
   point : point,
   kwds : string
-}
+};
 
 create external  dataset MyData(MyRecord) using localfs((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-rectangle/line-intersect-rectangle.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-rectangle/line-intersect-rectangle.1.ddl.sqlpp
index 5869e6d..ae27a33 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-rectangle/line-intersect-rectangle.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/line-intersect-rectangle/line-intersect-rectangle.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : bigint,
   point : point,
   kwds : string
-}
+};
 
 create external  dataset MyData(MyRecord) using localfs((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-equals-point/point-equals-point.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-equals-point/point-equals-point.1.ddl.sqlpp
index 5869e6d..ae27a33 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-equals-point/point-equals-point.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-equals-point/point-equals-point.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : bigint,
   point : point,
   kwds : string
-}
+};
 
 create external  dataset MyData(MyRecord) using localfs((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-circle/point-in-circle.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-circle/point-in-circle.1.ddl.sqlpp
index 5869e6d..ae27a33 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-circle/point-in-circle.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-circle/point-in-circle.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : bigint,
   point : point,
   kwds : string
-}
+};
 
 create external  dataset MyData(MyRecord) using localfs((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-polygon/point-in-polygon.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-polygon/point-in-polygon.1.ddl.sqlpp
index 5869e6d..ae27a33 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-polygon/point-in-polygon.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-polygon/point-in-polygon.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : bigint,
   point : point,
   kwds : string
-}
+};
 
 create external  dataset MyData(MyRecord) using localfs((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-rectangle/point-in-rectangle.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-rectangle/point-in-rectangle.1.ddl.sqlpp
index 5869e6d..ae27a33 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-rectangle/point-in-rectangle.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-in-rectangle/point-in-rectangle.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : bigint,
   point : point,
   kwds : string
-}
+};
 
 create external  dataset MyData(MyRecord) using localfs((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-on-line/point-on-line.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-on-line/point-on-line.1.ddl.sqlpp
index 5869e6d..ae27a33 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-on-line/point-on-line.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/point-on-line/point-on-line.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : bigint,
   point : point,
   kwds : string
-}
+};
 
 create external  dataset MyData(MyRecord) using localfs((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.1.ddl.sqlpp
index 5869e6d..ae27a33 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : bigint,
   point : point,
   kwds : string
-}
+};
 
 create external  dataset MyData(MyRecord) using localfs((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.1.ddl.sqlpp
index 5869e6d..ae27a33 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : bigint,
   point : point,
   kwds : string
-}
+};
 
 create external  dataset MyData(MyRecord) using localfs((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.1.ddl.sqlpp
index 5869e6d..ae27a33 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : bigint,
   point : point,
   kwds : string
-}
+};
 
 create external  dataset MyData(MyRecord) using localfs((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.1.ddl.sqlpp
index 5869e6d..ae27a33 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : bigint,
   point : point,
   kwds : string
-}
+};
 
 create external  dataset MyData(MyRecord) using localfs((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.1.ddl.sqlpp
index 5869e6d..ae27a33 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : bigint,
   point : point,
   kwds : string
-}
+};
 
 create external  dataset MyData(MyRecord) using localfs((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/spatial-area/spatial-area.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/spatial-area/spatial-area.1.ddl.sqlpp
index 2ce79a1..cbfda1e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/spatial-area/spatial-area.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/spatial-area/spatial-area.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   id : integer,
   point : point,
   kwds : string
-}
+};
 
 create external  dataset MyData(MyRecord) using localfs((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/cpttostr01/cpttostr01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/cpttostr01/cpttostr01.1.ddl.sqlpp
index 3c5922a..9c19c44 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/cpttostr01/cpttostr01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/cpttostr01/cpttostr01.1.ddl.sqlpp
@@ -34,7 +34,7 @@
 {
   id : integer,
   cpt : [integer]
-}
+};
 
 create  dataset testds(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/ends-with8/ends-with8.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/ends-with8/ends-with8.1.ddl.sqlpp
index d79f701..838d095 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/ends-with8/ends-with8.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/ends-with8/ends-with8.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 create type test.TestType as
 {
   name : string
-}
+};
 
 create  dataset testds(TestType) primary key name;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/matches05/matches05.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/matches05/matches05.1.ddl.sqlpp
index 9b21a8d..7eafd3f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/matches05/matches05.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/matches05/matches05.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   fname : string,
   lname : string,
   id : bigint
-}
+};
 
 create  dataset testds1(TestType1) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/starts-with8/starts-with8.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/starts-with8/starts-with8.1.ddl.sqlpp
index f3844d7..eed461c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/starts-with8/starts-with8.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/starts-with8/starts-with8.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 create type test.TestType as
 {
   name : string
-}
+};
 
 create  dataset testds(TestType) primary key name;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/strconcat01/strconcat01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/strconcat01/strconcat01.1.ddl.sqlpp
index ec476f9..426e723 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/strconcat01/strconcat01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/strconcat01/strconcat01.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   id : integer,
   fname : string,
   lname : string
-}
+};
 
 create  dataset testds(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/strlen03/strlen03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/strlen03/strlen03.1.ddl.sqlpp
index 25f21b1..8938d71 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/strlen03/strlen03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/strlen03/strlen03.1.ddl.sqlpp
@@ -31,7 +31,7 @@
 create type test.TestType as
 {
   name : string
-}
+};
 
 create  dataset testds(TestType) primary key name;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/substr05/substr05.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/substr05/substr05.1.ddl.sqlpp
index f23e999..dfecba8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/substr05/substr05.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/substr05/substr05.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 create type test.TestType as
 {
   name : string
-}
+};
 
 create  dataset testdst(TestType) primary key name;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/substr06/substr06.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/substr06/substr06.1.ddl.sqlpp
index b45b14a..a15431e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/substr06/substr06.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/substr06/substr06.1.ddl.sqlpp
@@ -31,7 +31,7 @@
 create type test.TestType as
 {
   name : string
-}
+};
 
 create  dataset testdst(TestType) primary key name;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/toLowerCase03/toLowerCase03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/toLowerCase03/toLowerCase03.1.ddl.sqlpp
index 6050361..2520d2a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/toLowerCase03/toLowerCase03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/toLowerCase03/toLowerCase03.1.ddl.sqlpp
@@ -33,7 +33,7 @@
 create type test.TestType as
 {
   name : string
-}
+};
 
 create  dataset testds(TestType) primary key name;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/varlen-encoding/varlen-encoding.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/varlen-encoding/varlen-encoding.3.query.sqlpp
index cf5f211..43a246d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/varlen-encoding/varlen-encoding.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/string/varlen-encoding/varlen-encoding.3.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-set inline_with "false"
+set inline_with "false";
 
 let str127 = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
 , str128 = `string-concat`([ 'y', str127 ])
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/aggregate_join_external/aggregate_join_external.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/aggregate_join_external/aggregate_join_external.1.ddl.sqlpp
index ecd4d11..42c6d28 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/aggregate_join_external/aggregate_join_external.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/aggregate_join_external/aggregate_join_external.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   o_clerk: string,
   o_shippriority: integer,
   o_comment: string
-}
+};
 
 CREATE TYPE CustomerType AS CLOSED {
   c_custkey: integer,
@@ -43,7 +43,7 @@
   c_acctbal: double,
   c_mktsegment: string,
   c_comment: string
-}
+};
 
 
 CREATE EXTERNAL DATASET Customers(CustomerType) USING `localfs`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id/decorrelate_with_unique_id.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id/decorrelate_with_unique_id.1.ddl.sqlpp
index ecd4d11..42c6d28 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id/decorrelate_with_unique_id.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id/decorrelate_with_unique_id.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   o_clerk: string,
   o_shippriority: integer,
   o_comment: string
-}
+};
 
 CREATE TYPE CustomerType AS CLOSED {
   c_custkey: integer,
@@ -43,7 +43,7 @@
   c_acctbal: double,
   c_mktsegment: string,
   c_comment: string
-}
+};
 
 
 CREATE EXTERNAL DATASET Customers(CustomerType) USING `localfs`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id_2/decorrelate_with_unique_id_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id_2/decorrelate_with_unique_id_2.1.ddl.sqlpp
index 653fbbd..d124116 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id_2/decorrelate_with_unique_id_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/decorrelate_with_unique_id_2/decorrelate_with_unique_id_2.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   `statuses-count` : bigint,
   name : string,
   `followers-count` : bigint
-}
+};
 
 create type test.TweetMessageType as
  closed {
@@ -43,7 +43,7 @@
   `message-text` : string,
   countA : bigint,
   countB : bigint
-}
+};
 
 create external  dataset TweetMessages(TweetMessageType) using `hdfs`((`hdfs`=`hdfs://127.0.0.1:31888`),(`path`=`/asterix/tw_for_indexleftouterjoin.adm`),(`input-format`=`text-input-format`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/exists/exists.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/exists/exists.1.ddl.sqlpp
index 5df5c73..c6b41539 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/exists/exists.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/exists/exists.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   o_clerk: string,
   o_shippriority: integer,
   o_comment: string
-}
+};
 
 CREATE TYPE CustomerType AS CLOSED {
   c_custkey: integer,
@@ -43,7 +43,7 @@
   c_acctbal: double,
   c_mktsegment: string,
   c_comment: string
-}
+};
 
 
 CREATE EXTERNAL DATASET Customer(CustomerType) USING `localfs`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/gby_inline/gby_inline.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/gby_inline/gby_inline.1.ddl.sqlpp
index ecd4d11..42c6d28 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/gby_inline/gby_inline.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/gby_inline/gby_inline.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   o_clerk: string,
   o_shippriority: integer,
   o_comment: string
-}
+};
 
 CREATE TYPE CustomerType AS CLOSED {
   c_custkey: integer,
@@ -43,7 +43,7 @@
   c_acctbal: double,
   c_mktsegment: string,
   c_comment: string
-}
+};
 
 
 CREATE EXTERNAL DATASET Customers(CustomerType) USING `localfs`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/in/in.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/in/in.1.ddl.sqlpp
index ecd4d11..42c6d28 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/in/in.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/in/in.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   o_clerk: string,
   o_shippriority: integer,
   o_comment: string
-}
+};
 
 CREATE TYPE CustomerType AS CLOSED {
   c_custkey: integer,
@@ -43,7 +43,7 @@
   c_acctbal: double,
   c_mktsegment: string,
   c_comment: string
-}
+};
 
 
 CREATE EXTERNAL DATASET Customers(CustomerType) USING `localfs`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/in_correlated/in_correlated.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/in_correlated/in_correlated.1.ddl.sqlpp
index ecd4d11..42c6d28 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/in_correlated/in_correlated.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/in_correlated/in_correlated.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   o_clerk: string,
   o_shippriority: integer,
   o_comment: string
-}
+};
 
 CREATE TYPE CustomerType AS CLOSED {
   c_custkey: integer,
@@ -43,7 +43,7 @@
   c_acctbal: double,
   c_mktsegment: string,
   c_comment: string
-}
+};
 
 
 CREATE EXTERNAL DATASET Customers(CustomerType) USING `localfs`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/not_exists/not_exists.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/not_exists/not_exists.1.ddl.sqlpp
index 5df5c73..c6b41539 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/not_exists/not_exists.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/not_exists/not_exists.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   o_clerk: string,
   o_shippriority: integer,
   o_comment: string
-}
+};
 
 CREATE TYPE CustomerType AS CLOSED {
   c_custkey: integer,
@@ -43,7 +43,7 @@
   c_acctbal: double,
   c_mktsegment: string,
   c_comment: string
-}
+};
 
 
 CREATE EXTERNAL DATASET Customer(CustomerType) USING `localfs`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/not_in/not_in.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/not_in/not_in.1.ddl.sqlpp
index ecd4d11..42c6d28 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/not_in/not_in.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/not_in/not_in.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   o_clerk: string,
   o_shippriority: integer,
   o_comment: string
-}
+};
 
 CREATE TYPE CustomerType AS CLOSED {
   c_custkey: integer,
@@ -43,7 +43,7 @@
   c_acctbal: double,
   c_mktsegment: string,
   c_comment: string
-}
+};
 
 
 CREATE EXTERNAL DATASET Customers(CustomerType) USING `localfs`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1168/query-ASTERIXDB-1168.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1168/query-ASTERIXDB-1168.1.ddl.sqlpp
index 36c0cc7..ecdb448 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1168/query-ASTERIXDB-1168.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1168/query-ASTERIXDB-1168.1.ddl.sqlpp
@@ -22,6 +22,6 @@
 use test;
 
 create type TType as closed
-{ id: bigint, content: string }
+{ id: bigint, content: string };
 
 create dataset TData (TType) primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1674/query-ASTERIXDB-1674.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1674/query-ASTERIXDB-1674.1.ddl.sqlpp
index 5f8e5a9..064ce8e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1674/query-ASTERIXDB-1674.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1674/query-ASTERIXDB-1674.1.ddl.sqlpp
@@ -26,12 +26,12 @@
 create type FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create type FacebookMessageType as
  open {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.1.ddl.sqlpp
index 0db6e12..79da301 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division/relational_division.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   o_clerk: string,
   o_shippriority: integer,
   o_comment: string
-}
+};
 
 CREATE TYPE CustomerType AS CLOSED {
   c_custkey: integer,
@@ -43,7 +43,7 @@
   c_acctbal: double,
   c_mktsegment: string,
   c_comment: string
-}
+};
 
 
 CREATE DATASET Customer(CustomerType) PRIMARY KEY c_custkey;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.1.ddl.sqlpp
index 0db6e12..79da301 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division2/relational_division2.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   o_clerk: string,
   o_shippriority: integer,
   o_comment: string
-}
+};
 
 CREATE TYPE CustomerType AS CLOSED {
   c_custkey: integer,
@@ -43,7 +43,7 @@
   c_acctbal: double,
   c_mktsegment: string,
   c_comment: string
-}
+};
 
 
 CREATE DATASET Customer(CustomerType) PRIMARY KEY c_custkey;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.1.ddl.sqlpp
index 0db6e12..79da301 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/relational_division3/relational_division3.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   o_clerk: string,
   o_shippriority: integer,
   o_comment: string
-}
+};
 
 CREATE TYPE CustomerType AS CLOSED {
   c_custkey: integer,
@@ -43,7 +43,7 @@
   c_acctbal: double,
   c_mktsegment: string,
   c_comment: string
-}
+};
 
 
 CREATE DATASET Customer(CustomerType) PRIMARY KEY c_custkey;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
index 1b1484b..016b37e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create temporary dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp
index a4eb713..617f5c9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create temporary dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp
index eb52258..1072a85 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp
@@ -33,12 +33,12 @@
 {
   first : string,
   last : string
-}
+};
 
 create type test.Person as
 {
   name : Name
-}
+};
 
 create type test.TestType as
 {
@@ -47,7 +47,7 @@
   locn : point,
   zip : string,
   person : Person
-}
+};
 
 create temporary dataset t1(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.1.ddl.sqlpp
index 33feb8a..00e7e20 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   stringu1 : string,
   stringu2 : string,
   string4 : string
-}
+};
 
 create temporary dataset t1(Schema) primary key unique2;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp
index ef45232..d51ed99 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp
@@ -46,7 +46,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create temporary dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.1.ddl.sqlpp
index c591a8e..6c1595df 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.1.ddl.sqlpp
@@ -34,7 +34,7 @@
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create temporary dataset test.employee(Emp) primary key id
 using compaction policy `correlated-prefix`
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp
index 4532f3c..ac3d7da 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp
@@ -33,7 +33,7 @@
   lname : string,
   age : bigint,
   dept : string
-}
+};
 
 create temporary dataset test.employee(Emp) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
index 46fcd68..c716bbe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 create type test.myDataType as
 {
   id : bigint
-}
+};
 
 create temporary dataset myData(myDataType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
index d14c703..45cde93 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
@@ -46,7 +46,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create temporary dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
index 6fe3764..7e0f9cc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
@@ -39,7 +39,7 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create temporary dataset MyData(MyRecord) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.sqlpp
index 88b957e..b352768 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.sqlpp
@@ -40,13 +40,13 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyMiniRecord as
  closed {
   id : bigint,
   point : point
-}
+};
 
 create  dataset MyData(MyRecord) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
index e41796b..8d1110a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
@@ -40,13 +40,13 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyMiniRecord as
  closed {
   id : bigint,
   point : point
-}
+};
 
 create temporary dataset MyData(MyRecord) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.sqlpp
index 41c192c..f7e32ab 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.sqlpp
@@ -40,13 +40,13 @@
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create type test.MyMiniRecord as
  closed {
   id : bigint,
   point : point
-}
+};
 
 create temporary dataset MyData(MyRecord) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.1.ddl.sqlpp
index 64e6570..df469e8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_max/agg_max.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   datetime : datetime,
   dtduration : `day_time_duration`,
   ymduration : `year_month_duration`
-}
+};
 
 create  dataset tsdata(Schema) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.1.ddl.sqlpp
index 64e6570..df469e8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/agg_min/agg_min.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   datetime : datetime,
   dtduration : `day_time_duration`,
   ymduration : `year_month_duration`
-}
+};
 
 create  dataset tsdata(Schema) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.1.ddl.sqlpp
index 10c6d29..8044b38 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   intervalField : interval?,
   yearMonthDurationField : `year_month_duration`?,
   dayTimeDurationField : `day_time_duration`?
-}
+};
 
 create external  dataset testds(testtype) using localfs((`path`=`asterix_nc1://data/temporal/temporalData.json`),(`format`=`adm`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.1.ddl.sqlpp
index 0ad459c..1496279 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.1.ddl.sqlpp
@@ -39,7 +39,7 @@
   `date-interval` : interval,
   `time-interval` : interval,
   `datetime-interval` : interval
-}
+};
 
 create  dataset timeData(timesType) primary key date;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.1.ddl.sqlpp
index 8bd2355..c8b923b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.1.ddl.sqlpp
@@ -31,7 +31,7 @@
  closed {
   id : bigint,
   timestamp : datetime
-}
+};
 
 create  dataset tsdata(Schema) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.1.ddl.sqlpp
index 8bd2355..c8b923b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.1.ddl.sqlpp
@@ -31,7 +31,7 @@
  closed {
   id : bigint,
   timestamp : datetime
-}
+};
 
 create  dataset tsdata(Schema) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.1.ddl.sqlpp
index c2e083b..f94a8eb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   id : integer,
   time : time,
   duration : `day_time_duration`
-}
+};
 
 create  dataset tsdata(Schema) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.1.ddl.sqlpp
index c2e083b..f94a8eb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.1.ddl.sqlpp
@@ -32,7 +32,7 @@
   id : integer,
   time : time,
   duration : `day_time_duration`
-}
+};
 
 create  dataset tsdata(Schema) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.1.ddl.sqlpp
index 275df35..e6ecbed 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.1.ddl.sqlpp
@@ -33,7 +33,7 @@
   time : time,
   duration : integer,
   app : string
-}
+};
 
 create  dataset logs(LogType) primary key row_id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.1.ddl.sqlpp
index 7b303315..8ad21d7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.1.ddl.sqlpp
@@ -26,19 +26,19 @@
 create type TinySocial.TwitterUserType as
 {
   `screen-name` : string
-}
+};
 
 create type TinySocial.TweetMessageType as {
   tweetid : string
-}
+};
 
 create type TinySocial.FacebookUserType as
  open {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
  open {
   `message-id` : bigint
-}
+};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.1.ddl.sqlpp
index 1de9aa5..2f937cf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create type TinySocial.TweetMessageType as
  closed {
@@ -41,14 +41,14 @@
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string
-}
+};
 
 create type TinySocial.EmploymentType as
 {
   `organization-name` : string,
   `start-date` : date,
   `end-date` : date?
-}
+};
 
 create type TinySocial.FacebookUserType as
  closed {
@@ -58,7 +58,7 @@
   `user-since` : datetime,
   `friend-ids` : {{bigint}},
   employment : [EmploymentType]
-}
+};
 
 create type TinySocial.FacebookMessageType as
  closed {
@@ -67,5 +67,5 @@
   `in-response-to` : bigint?,
   `sender-location` : point?,
   message : string
-}
+};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q01/q01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q01/q01.1.ddl.sqlpp
index 46c5073..769c5e7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q01/q01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q01/q01.1.ddl.sqlpp
@@ -45,7 +45,7 @@
   sr_reversed_charge : double?,
   sr_store_credit : double?,
   sr_net_loss : double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -77,7 +77,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.store_type as
  closed {
@@ -110,7 +110,7 @@
   s_country : string?,
   s_gmt_offset : double?,
   s_tax_precentage : double?
-}
+};
 
 create type tpcds.customer_type as
  closed {
@@ -132,7 +132,7 @@
   c_login : string?,
   c_email_address : string?,
   c_last_review_date : string?
-}
+};
 
 create dataset store_returns (store_returns_type) primary key sr_item_sk, sr_ticket_number;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q03/q03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q03/q03.1.ddl.sqlpp
index acd3953..5ed28b5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q03/q03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q03/q03.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   i_container : string?,
   i_manager_id : bigint?,
   i_product_name : string?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -79,7 +79,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.store_sales_type as
  closed {
@@ -106,7 +106,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create dataset item (item_type) primary key i_item_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q07/q07.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q07/q07.1.ddl.sqlpp
index 5b5281f..9d41280 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q07/q07.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q07/q07.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   i_container : string?,
   i_manager_id : bigint?,
   i_product_name : string?
-}
+};
 
 create type tpcds.customer_demographics_type as
  closed {
@@ -60,7 +60,7 @@
   cd_dep_count : bigint?,
   cd_dep_employed_count : bigint?,
   cd_dep_college_count : bigint?
-}
+};
 
 create type tpcds.store_sales_type as
  closed {
@@ -87,7 +87,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -119,7 +119,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.promotion_type as
  closed {
@@ -142,7 +142,7 @@
   p_channel_details : string?,
   p_purpose : string?,
   p_discount_active : string?
-}
+};
 
 create dataset item (item_type) primary key i_item_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q09/q09.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q09/q09.1.ddl.sqlpp
index 9dd7f40..b885dff 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q09/q09.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q09/q09.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   r_reason_sk : int64,
   r_reason_id : string,
   r_reason_desc : string?
-}
+};
 create type tpcds.store_sales_type as
  closed {
   ss_sold_date_sk:           int64?,
@@ -54,8 +54,8 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
-create dataset reason(reason_type) primary key r_reason_sk
+create dataset reason(reason_type) primary key r_reason_sk;
 
 create dataset store_sales (store_sales_type) primary key ss_item_sk, ss_ticket_number;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q09/q09.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q09/q09.3.query.sqlpp
index e0ae61c..41c02ce 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q09/q09.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q09/q09.3.query.sqlpp
@@ -20,8 +20,8 @@
 
 use tpcds;
 
-set `compiler.joinmemory` "4MB"
-set `compiler.groupmemory` "4MB"
+set `compiler.joinmemory` "4MB";
+set `compiler.groupmemory` "4MB";
 
 select case when (select value count(ss)
                   from store_sales ss
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q15/q15.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q15/q15.1.ddl.sqlpp
index 5a9dea9..3c40721 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q15/q15.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q15/q15.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   ca_country : string?,
   ca_gmt_offset : double?,
   ca_location_type : string?
- }
+ };
 
 create type tpcds.catalog_sales_type as
  closed {
@@ -75,7 +75,7 @@
   cs_net_paid_inc_ship:      double?,
   cs_net_paid_inc_ship_tax:  double?,
   cs_net_profit:             double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -107,7 +107,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.customer_type as
  closed {
@@ -129,7 +129,7 @@
   c_login : string?,
   c_email_address : string?,
   c_last_review_date : string?
-}
+};
 
 create dataset customer_address(customer_address_type) primary key ca_address_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q19/q19.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q19/q19.1.ddl.sqlpp
index 1b30bcd..b2c6e40 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q19/q19.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q19/q19.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   ca_country : string?,
   ca_gmt_offset : double?,
   ca_location_type : string?
- }
+ };
 
 create type tpcds.item_type as
  closed {
@@ -64,7 +64,7 @@
   i_container : string?,
   i_manager_id : bigint?,
   i_product_name : string?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -96,7 +96,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.store_sales_type as
  closed {
@@ -123,7 +123,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.store_type as
  closed {
@@ -156,7 +156,7 @@
   s_country : string?,
   s_gmt_offset : double?,
   s_tax_precentage : double?
-}
+};
 
 create type tpcds.customer_type as
  closed {
@@ -178,7 +178,7 @@
   c_login : string?,
   c_email_address : string?,
   c_last_review_date : string?
-}
+};
 
 create dataset customer_address(customer_address_type) primary key ca_address_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q21/q21.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q21/q21.1.ddl.sqlpp
index de454ba..083f081 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q21/q21.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q21/q21.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   i_container : string?,
   i_manager_id : bigint?,
   i_product_name : string?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -79,7 +79,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.inventory_type as
  closed {
@@ -87,7 +87,7 @@
   inv_item_sk : bigint,
   inv_warehouse_sk : bigint,
   inv_quantity_on_hand : bigint?
-}
+};
 
 create type tpcds.warehouse_type as
  closed {
@@ -105,7 +105,7 @@
   w_zip : string?,
   w_country : string?,
   w_gmt_offset : double?
-}
+};
 
 create dataset item (item_type) primary key i_item_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q24a/q24a.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q24a/q24a.1.ddl.sqlpp
index b7b449f..4b879c0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q24a/q24a.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q24a/q24a.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   ca_country : string?,
   ca_gmt_offset : double?,
   ca_location_type : string?
- }
+ };
 
 create type tpcds.item_type as
  closed {
@@ -64,7 +64,7 @@
   i_container : string?,
   i_manager_id : bigint?,
   i_product_name : string?
-}
+};
 
 create type tpcds.store_returns_type as
  closed {
@@ -88,7 +88,7 @@
   sr_reversed_charge : double?,
   sr_store_credit : double?,
   sr_net_loss : double?
-}
+};
 
 create type tpcds.store_sales_type as
  closed {
@@ -115,7 +115,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.store_type as
  closed {
@@ -148,7 +148,7 @@
   s_country : string?,
   s_gmt_offset : double?,
   s_tax_precentage : double?
-}
+};
 
 create type tpcds.customer_type as
  closed {
@@ -170,7 +170,7 @@
   c_login : string?,
   c_email_address : string?,
   c_last_review_date : string?
-}
+};
 
 create dataset customer_address(customer_address_type) primary key ca_address_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q24b/q24b.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q24b/q24b.1.ddl.sqlpp
index b7b449f..4b879c0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q24b/q24b.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q24b/q24b.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   ca_country : string?,
   ca_gmt_offset : double?,
   ca_location_type : string?
- }
+ };
 
 create type tpcds.item_type as
  closed {
@@ -64,7 +64,7 @@
   i_container : string?,
   i_manager_id : bigint?,
   i_product_name : string?
-}
+};
 
 create type tpcds.store_returns_type as
  closed {
@@ -88,7 +88,7 @@
   sr_reversed_charge : double?,
   sr_store_credit : double?,
   sr_net_loss : double?
-}
+};
 
 create type tpcds.store_sales_type as
  closed {
@@ -115,7 +115,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.store_type as
  closed {
@@ -148,7 +148,7 @@
   s_country : string?,
   s_gmt_offset : double?,
   s_tax_precentage : double?
-}
+};
 
 create type tpcds.customer_type as
  closed {
@@ -170,7 +170,7 @@
   c_login : string?,
   c_email_address : string?,
   c_last_review_date : string?
-}
+};
 
 create dataset customer_address(customer_address_type) primary key ca_address_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q25/q25.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q25/q25.1.ddl.sqlpp
index 418a756..8391405 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q25/q25.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q25/q25.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   i_container : string?,
   i_manager_id : bigint?,
   i_product_name : string?
-}
+};
 
 create type tpcds.store_returns_type as
  closed {
@@ -71,7 +71,7 @@
   sr_reversed_charge : double?,
   sr_store_credit : double?,
   sr_net_loss : double?
-}
+};
 
 create type tpcds.store_sales_type as
  closed {
@@ -98,7 +98,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.catalog_sales_type as
  closed {
@@ -135,7 +135,7 @@
   cs_net_paid_inc_ship:      double?,
   cs_net_paid_inc_ship_tax:  double?,
   cs_net_profit:             double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -167,7 +167,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.store_type as
  closed {
@@ -200,7 +200,7 @@
   s_country : string?,
   s_gmt_offset : double?,
   s_tax_precentage : double?
-}
+};
 
 create dataset item (item_type) primary key i_item_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q26/q26.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q26/q26.1.ddl.sqlpp
index 2a668dd..1320742 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q26/q26.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q26/q26.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   i_container : string?,
   i_manager_id : bigint?,
   i_product_name : string?
-}
+};
 
 create type tpcds.customer_demographics_type as
  closed {
@@ -60,7 +60,7 @@
   cd_dep_count : bigint?,
   cd_dep_employed_count : bigint?,
   cd_dep_college_count : bigint?
-}
+};
 create type tpcds.catalog_sales_type as
  closed {
   cs_sold_date_sk:           bigint?,
@@ -96,7 +96,7 @@
   cs_net_paid_inc_ship:      double?,
   cs_net_paid_inc_ship_tax:  double?,
   cs_net_profit:             double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -128,7 +128,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.promotion_type as
  closed {
@@ -151,7 +151,7 @@
   p_channel_details : string?,
   p_purpose : string?,
   p_discount_active : string?
-}
+};
 
 create dataset item (item_type) primary key i_item_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q29/q29.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q29/q29.1.ddl.sqlpp
index 418a756..8391405 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q29/q29.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q29/q29.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   i_container : string?,
   i_manager_id : bigint?,
   i_product_name : string?
-}
+};
 
 create type tpcds.store_returns_type as
  closed {
@@ -71,7 +71,7 @@
   sr_reversed_charge : double?,
   sr_store_credit : double?,
   sr_net_loss : double?
-}
+};
 
 create type tpcds.store_sales_type as
  closed {
@@ -98,7 +98,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.catalog_sales_type as
  closed {
@@ -135,7 +135,7 @@
   cs_net_paid_inc_ship:      double?,
   cs_net_paid_inc_ship_tax:  double?,
   cs_net_profit:             double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -167,7 +167,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.store_type as
  closed {
@@ -200,7 +200,7 @@
   s_country : string?,
   s_gmt_offset : double?,
   s_tax_precentage : double?
-}
+};
 
 create dataset item (item_type) primary key i_item_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q30/q30.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q30/q30.1.ddl.sqlpp
index 86c6792..1b494b0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q30/q30.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q30/q30.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   ca_country : string?,
   ca_gmt_offset : double?,
   ca_location_type : string?
- }
+ };
 
 create type tpcds.date_dim_type as
  closed {
@@ -70,7 +70,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.web_returns_type as
  closed {
@@ -98,7 +98,7 @@
   wr_reversed_charge: double?,
   wr_account_credit: double?,
   wr_net_loss: double?
-}
+};
 
 create type tpcds.customer_type as
  closed {
@@ -120,7 +120,7 @@
   c_login : string?,
   c_email_address : string?,
   c_last_review_date : string?
-}
+};
 
 create dataset customer_address(customer_address_type) primary key ca_address_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q31/q31.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q31/q31.1.ddl.sqlpp
index 3762222..ba20f6e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q31/q31.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q31/q31.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   ca_country : string?,
   ca_gmt_offset : double?,
   ca_location_type : string?
- }
+ };
 
 create type tpcds.web_sales_type as
  closed {
@@ -76,7 +76,7 @@
   ws_net_paid_inc_ship : double?,
   ws_net_paid_inc_ship_tax : double?,
   ws_net_profit : double?
-}
+};
 
 create type tpcds.store_sales_type as
  closed {
@@ -103,7 +103,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -135,7 +135,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create dataset customer_address(customer_address_type) primary key ca_address_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q34/q34.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q34/q34.1.ddl.sqlpp
index f7a6453..b7e5750 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q34/q34.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q34/q34.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   hd_buy_potential : string?,
   hd_dep_count : bigint?,
   hd_vehicle_count : bigint?
-}
+};
 create type tpcds.store_sales_type as
  closed {
   ss_sold_date_sk:           bigint?,
@@ -56,7 +56,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -88,7 +88,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.store_type as
  closed {
@@ -121,7 +121,7 @@
   s_country : string?,
   s_gmt_offset : double?,
   s_tax_precentage : double?
-}
+};
 
 create type tpcds.customer_type as
  closed {
@@ -143,7 +143,7 @@
   c_login : string?,
   c_email_address : string?,
   c_last_review_date : string?
-}
+};
 
 create dataset household_demographics (household_demographics_type) primary key hd_demo_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q37/q37.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q37/q37.1.ddl.sqlpp
index cb90a52..24cbaa4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q37/q37.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q37/q37.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   i_container : string?,
   i_manager_id : bigint?,
   i_product_name : string?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -79,7 +79,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.catalog_sales_type as
  closed {
@@ -116,7 +116,7 @@
   cs_net_paid_inc_ship:      double?,
   cs_net_paid_inc_ship_tax:  double?,
   cs_net_profit:             double?
-}
+};
 
 create type tpcds.inventory_type as
  closed {
@@ -124,7 +124,7 @@
   inv_item_sk : bigint,
   inv_warehouse_sk : bigint,
   inv_quantity_on_hand : bigint?
-}
+};
 
 create dataset item (item_type) primary key i_item_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q41/q41.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q41/q41.1.ddl.sqlpp
index 8bc86f0..067995f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q41/q41.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q41/q41.1.ddl.sqlpp
@@ -47,6 +47,6 @@
   i_container : string?,
   i_manager_id : bigint?,
   i_product_name : string?
-}
+};
 
 create dataset item (item_type) primary key i_item_sk;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q42/q42.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q42/q42.1.ddl.sqlpp
index acd3953..5ed28b5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q42/q42.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q42/q42.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   i_container : string?,
   i_manager_id : bigint?,
   i_product_name : string?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -79,7 +79,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.store_sales_type as
  closed {
@@ -106,7 +106,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create dataset item (item_type) primary key i_item_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q43/q43.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q43/q43.1.ddl.sqlpp
index 1c86ec3..5692658 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q43/q43.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q43/q43.1.ddl.sqlpp
@@ -53,7 +53,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.store_sales_type as
  closed {
@@ -80,7 +80,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.store_type as
  closed {
@@ -113,7 +113,7 @@
   s_country : string?,
   s_gmt_offset : double?,
   s_tax_precentage : double?
-}
+};
 
 create dataset date_dim(date_dim_type) primary key d_date_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q45/q45.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q45/q45.1.ddl.sqlpp
index 4eebc51..fbc86c2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q45/q45.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q45/q45.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   ca_country : string?,
   ca_gmt_offset : double?,
   ca_location_type : string?
- }
+ };
 
 create type tpcds.item_type as
  closed {
@@ -64,7 +64,7 @@
   i_container : string?,
   i_manager_id : bigint?,
   i_product_name : string?
-}
+};
 
 create type tpcds.web_sales_type as
  closed {
@@ -102,7 +102,7 @@
   ws_net_paid_inc_ship : double?,
   ws_net_paid_inc_ship_tax : double?,
   ws_net_profit : double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -134,7 +134,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.customer_type as
  closed {
@@ -156,7 +156,7 @@
   c_login : string?,
   c_email_address : string?,
   c_last_review_date : string?
-}
+};
 
 create dataset customer_address(customer_address_type) primary key ca_address_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q46/q46.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q46/q46.1.ddl.sqlpp
index 67e2de3..37e2b15 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q46/q46.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q46/q46.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   ca_country : string?,
   ca_gmt_offset : double?,
   ca_location_type : string?
- }
+ };
 
 create type tpcds.household_demographics_type as
  closed {
@@ -47,7 +47,7 @@
   hd_buy_potential : string?,
   hd_dep_count : bigint?,
   hd_vehicle_count : bigint?
-}
+};
 
 create type tpcds.store_sales_type as
  closed {
@@ -74,7 +74,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -106,7 +106,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.store_type as
  closed {
@@ -139,7 +139,7 @@
   s_country : string?,
   s_gmt_offset : double?,
   s_tax_precentage : double?
-}
+};
 
 create type tpcds.customer_type as
  closed {
@@ -161,7 +161,7 @@
   c_login : string?,
   c_email_address : string?,
   c_last_review_date : string?
-}
+};
 
 create dataset customer_address(customer_address_type) primary key ca_address_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q50/q50.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q50/q50.1.ddl.sqlpp
index 8779419..058a5dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q50/q50.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q50/q50.1.ddl.sqlpp
@@ -45,7 +45,7 @@
   sr_reversed_charge : double?,
   sr_store_credit : double?,
   sr_net_loss : double?
-}
+};
 
 create type tpcds.store_sales_type as
  closed {
@@ -72,7 +72,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -104,7 +104,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.store_type as
  closed {
@@ -137,7 +137,7 @@
   s_country : string?,
   s_gmt_offset : double?,
   s_tax_precentage : double?
-}
+};
 
 create dataset store_returns (store_returns_type) primary key sr_item_sk, sr_ticket_number;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q52/q52.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q52/q52.1.ddl.sqlpp
index acd3953..5ed28b5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q52/q52.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q52/q52.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   i_container : string?,
   i_manager_id : bigint?,
   i_product_name : string?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -79,7 +79,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.store_sales_type as
  closed {
@@ -106,7 +106,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create dataset item (item_type) primary key i_item_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q55/q55.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q55/q55.1.ddl.sqlpp
index acd3953..5ed28b5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q55/q55.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q55/q55.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   i_container : string?,
   i_manager_id : bigint?,
   i_product_name : string?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -79,7 +79,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.store_sales_type as
  closed {
@@ -106,7 +106,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create dataset item (item_type) primary key i_item_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q59/q59.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q59/q59.1.ddl.sqlpp
index fb4779f..dcf5df0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q59/q59.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q59/q59.1.ddl.sqlpp
@@ -48,7 +48,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -80,7 +80,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.store_type as
  closed {
@@ -113,7 +113,7 @@
   s_country : string?,
   s_gmt_offset : double?,
   s_tax_precentage : double?
-}
+};
 
 create dataset store_sales (store_sales_type) primary key ss_item_sk, ss_ticket_number;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q62/q62.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q62/q62.1.ddl.sqlpp
index f9d0500..a870454 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q62/q62.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q62/q62.1.ddl.sqlpp
@@ -59,7 +59,7 @@
   ws_net_paid_inc_ship : double?,
   ws_net_paid_inc_ship_tax : double?,
   ws_net_profit : double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -91,7 +91,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.web_site_type as
  closed {
@@ -121,7 +121,7 @@
   web_country:               string?,
   web_gmt_offset:            double?,
   web_tax_percentage:        double?
-}
+};
 
 create type tpcds.warehouse_type as
  closed {
@@ -139,7 +139,7 @@
   w_zip : string?,
   w_country : string?,
   w_gmt_offset : double?
-}
+};
 
 create type tpcds.ship_mode_type as
  closed {
@@ -149,7 +149,7 @@
   sm_code : string?,
   sm_carrier : string?,
   sm_contract : string?
-}
+};
 
 create dataset web_sales (web_sales_type) primary key ws_item_sk, ws_order_number;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q68/q68.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q68/q68.1.ddl.sqlpp
index 3d99b67..7bf7b35 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q68/q68.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q68/q68.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   ca_country : string?,
   ca_gmt_offset : double?,
   ca_location_type : string?
- }
+ };
 
 create type tpcds.household_demographics_type as
  closed {
@@ -47,7 +47,7 @@
   hd_buy_potential : string?,
   hd_dep_count : bigint?,
   hd_vehicle_count : bigint?
-}
+};
 create type tpcds.store_sales_type as
  closed {
   ss_sold_date_sk:           bigint?,
@@ -73,7 +73,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -105,7 +105,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.store_type as
  closed {
@@ -138,7 +138,7 @@
   s_country : string?,
   s_gmt_offset : double?,
   s_tax_precentage : double?
-}
+};
 
 create type tpcds.customer_type as
  closed {
@@ -160,7 +160,7 @@
   c_login : string?,
   c_email_address : string?,
   c_last_review_date : string?
-}
+};
 
 create dataset customer_address(customer_address_type) primary key ca_address_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q73/q73.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q73/q73.1.ddl.sqlpp
index f7a6453..b7e5750 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q73/q73.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q73/q73.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   hd_buy_potential : string?,
   hd_dep_count : bigint?,
   hd_vehicle_count : bigint?
-}
+};
 create type tpcds.store_sales_type as
  closed {
   ss_sold_date_sk:           bigint?,
@@ -56,7 +56,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -88,7 +88,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.store_type as
  closed {
@@ -121,7 +121,7 @@
   s_country : string?,
   s_gmt_offset : double?,
   s_tax_precentage : double?
-}
+};
 
 create type tpcds.customer_type as
  closed {
@@ -143,7 +143,7 @@
   c_login : string?,
   c_email_address : string?,
   c_last_review_date : string?
-}
+};
 
 create dataset household_demographics (household_demographics_type) primary key hd_demo_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q79/q79.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q79/q79.1.ddl.sqlpp
index f7a6453..b7e5750 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q79/q79.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q79/q79.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   hd_buy_potential : string?,
   hd_dep_count : bigint?,
   hd_vehicle_count : bigint?
-}
+};
 create type tpcds.store_sales_type as
  closed {
   ss_sold_date_sk:           bigint?,
@@ -56,7 +56,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -88,7 +88,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.store_type as
  closed {
@@ -121,7 +121,7 @@
   s_country : string?,
   s_gmt_offset : double?,
   s_tax_precentage : double?
-}
+};
 
 create type tpcds.customer_type as
  closed {
@@ -143,7 +143,7 @@
   c_login : string?,
   c_email_address : string?,
   c_last_review_date : string?
-}
+};
 
 create dataset household_demographics (household_demographics_type) primary key hd_demo_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q81/q81.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q81/q81.1.ddl.sqlpp
index 724dde8..1928fe7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q81/q81.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q81/q81.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   ca_country : string?,
   ca_gmt_offset : double?,
   ca_location_type : string?
- }
+ };
 
 create type tpcds.date_dim_type as
  closed {
@@ -70,7 +70,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.catalog_returns_type as
  closed {
@@ -101,7 +101,7 @@
   cr_reversed_charge : double?,
   cr_store_credit : double?,
   cr_net_loss : double?
-}
+};
 
 create type tpcds.customer_type as
  closed {
@@ -123,7 +123,7 @@
   c_login : string?,
   c_email_address : string?,
   c_last_review_date : string?
-}
+};
 
 create dataset customer_address(customer_address_type) primary key ca_address_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q82/q82.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q82/q82.1.ddl.sqlpp
index c2cc51b..7e9fb67 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q82/q82.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q82/q82.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   i_container : string?,
   i_manager_id : bigint?,
   i_product_name : string?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -79,7 +79,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.store_sales_type as
  closed {
@@ -106,7 +106,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.inventory_type as
  closed {
@@ -114,7 +114,7 @@
   inv_item_sk : bigint,
   inv_warehouse_sk : bigint,
   inv_quantity_on_hand : bigint?
-}
+};
 
 create dataset item (item_type) primary key i_item_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q85/q85.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q85/q85.1.ddl.sqlpp
index 2354901..c235423 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q85/q85.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q85/q85.1.ddl.sqlpp
@@ -39,7 +39,7 @@
   wp_link_count : int64?,
   wp_image_count : int64?,
   wp_max_ad_count : int64?
-}
+};
 
 
 create type tpcds.customer_address_type as  closed {
@@ -56,14 +56,14 @@
   ca_country : string?,
   ca_gmt_offset : double?,
   ca_location_type : string?
- }
+ };
 
 create type tpcds.reason_type as
  closed {
   r_reason_sk : int64,
   r_reason_id : string,
   r_reason_desc : string?
-}
+};
 
 create type tpcds.customer_demographics_type as
  closed {
@@ -76,7 +76,7 @@
   cd_dep_count : int64?,
   cd_dep_employed_count : int64?,
   cd_dep_college_count : int64?
-}
+};
 
 create type tpcds.web_sales_type as
  closed {
@@ -114,7 +114,7 @@
   ws_net_paid_inc_ship : double?,
   ws_net_paid_inc_ship_tax : double?,
   ws_net_profit : double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -146,7 +146,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.web_returns_type as
  closed {
@@ -174,13 +174,13 @@
   wr_reversed_charge: double?,
   wr_account_credit: double?,
   wr_net_loss: double?
-}
+};
 
 create dataset web_page (web_page_type) primary key wp_web_page_sk;
 
 create dataset customer_address(customer_address_type) primary key ca_address_sk;
 
-create dataset reason(reason_type) primary key r_reason_sk
+create dataset reason(reason_type) primary key r_reason_sk;
 
 create dataset customer_demographics(customer_demographics_type) primary key cd_demo_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q88/q88.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q88/q88.1.ddl.sqlpp
index 342fecd..1751318 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q88/q88.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q88/q88.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   hd_buy_potential : string?,
   hd_dep_count : bigint?,
   hd_vehicle_count : bigint?
-}
+};
 create type tpcds.time_dim_type as
  closed {
   t_time_sk : bigint,
@@ -43,7 +43,7 @@
   t_shift : string?,
   t_sub_shift : string?,
   t_meal_time : string?
-}
+};
 create type tpcds.store_sales_type as
  closed {
   ss_sold_date_sk:           bigint?,
@@ -69,7 +69,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.store_type as
  closed {
@@ -102,11 +102,11 @@
   s_country : string?,
   s_gmt_offset : double?,
   s_tax_precentage : double?
-}
+};
 
 create dataset household_demographics (household_demographics_type) primary key hd_demo_sk;
 
-create dataset tpcds.time_dim(time_dim_type) primary key t_time_sk
+create dataset tpcds.time_dim(time_dim_type) primary key t_time_sk;
 
 create dataset store_sales (store_sales_type) primary key ss_item_sk, ss_ticket_number;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q90/q90.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q90/q90.1.ddl.sqlpp
index f6cc711..ba0dbf1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q90/q90.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q90/q90.1.ddl.sqlpp
@@ -39,7 +39,7 @@
   wp_link_count : int64?,
   wp_image_count : int64?,
   wp_max_ad_count : int64?
-}
+};
 
 create type tpcds.household_demographics_type as
  closed {
@@ -48,7 +48,7 @@
   hd_buy_potential : string?,
   hd_dep_count : int64?,
   hd_vehicle_count : int64?
-}
+};
 create type tpcds.time_dim_type as
  closed {
   t_time_sk : int64,
@@ -61,7 +61,7 @@
   t_shift : string?,
   t_sub_shift : string?,
   t_meal_time : string?
-}
+};
 create type tpcds.web_sales_type as
  closed {
   ws_sold_date_sk : int64?,
@@ -98,12 +98,12 @@
   ws_net_paid_inc_ship : double?,
   ws_net_paid_inc_ship_tax : double?,
   ws_net_profit : double?
-}
+};
 
 create dataset web_page (web_page_type) primary key wp_web_page_sk;
 
 create dataset household_demographics (household_demographics_type) primary key hd_demo_sk;
 
-create dataset tpcds.time_dim(time_dim_type) primary key t_time_sk
+create dataset tpcds.time_dim(time_dim_type) primary key t_time_sk;
 
 create dataset web_sales (web_sales_type) primary key ws_item_sk, ws_order_number;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q91/q91.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q91/q91.1.ddl.sqlpp
index 5497be1..7ab4ec6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q91/q91.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q91/q91.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   ca_country : string?,
   ca_gmt_offset : double?,
   ca_location_type : string?
- }
+ };
 
 create type tpcds.call_center_type as
  closed {
@@ -73,7 +73,7 @@
   cc_country : string?,
   cc_gmt_offset : double?,
   cc_tax_percentage : double?
-}
+};
 
 create type tpcds.household_demographics_type as
  closed {
@@ -82,7 +82,7 @@
   hd_buy_potential : string?,
   hd_dep_count : bigint?,
   hd_vehicle_count : bigint?
-}
+};
 create type tpcds.customer_demographics_type as
  closed {
   cd_demo_sk : bigint,
@@ -94,7 +94,7 @@
   cd_dep_count : bigint?,
   cd_dep_employed_count : bigint?,
   cd_dep_college_count : bigint?
-}
+};
 create type tpcds.date_dim_type as
  closed {
   d_date_sk : bigint,
@@ -125,7 +125,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.catalog_returns_type as
  closed {
@@ -156,7 +156,7 @@
   cr_reversed_charge : double?,
   cr_store_credit : double?,
   cr_net_loss : double?
-}
+};
 
 create type tpcds.customer_type as
  closed {
@@ -178,7 +178,7 @@
   c_login : string?,
   c_email_address : string?,
   c_last_review_date : string?
-}
+};
 
 create dataset customer_address(customer_address_type) primary key ca_address_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q92/q92.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q92/q92.1.ddl.sqlpp
index bc536d6..18972cd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q92/q92.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q92/q92.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   i_container : string?,
   i_manager_id : int64?,
   i_product_name : string?
-}
+};
 
 create type tpcds.web_sales_type as
  closed {
@@ -85,7 +85,7 @@
   ws_net_paid_inc_ship : double?,
   ws_net_paid_inc_ship_tax : double?,
   ws_net_profit : double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -117,7 +117,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create dataset item (item_type) primary key i_item_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q94/q94.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q94/q94.1.ddl.sqlpp
index 027a556..806c5b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q94/q94.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q94/q94.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   ca_country : string?,
   ca_gmt_offset : double?,
   ca_location_type : string?
- }
+ };
 
 create type tpcds.web_sales_type as
  closed {
@@ -76,7 +76,7 @@
   ws_net_paid_inc_ship : double?,
   ws_net_paid_inc_ship_tax : double?,
   ws_net_profit : double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -108,7 +108,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.web_returns_type as
  closed {
@@ -136,7 +136,7 @@
   wr_reversed_charge: double?,
   wr_account_credit: double?,
   wr_net_loss: double?
-}
+};
 
 create type tpcds.web_site_type as
  closed {
@@ -166,7 +166,7 @@
   web_country:               string?,
   web_gmt_offset:            double?,
   web_tax_percentage:        double?
-}
+};
 
 create dataset customer_address(customer_address_type) primary key ca_address_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q95/q95.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q95/q95.1.ddl.sqlpp
index 027a556..806c5b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q95/q95.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q95/q95.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   ca_country : string?,
   ca_gmt_offset : double?,
   ca_location_type : string?
- }
+ };
 
 create type tpcds.web_sales_type as
  closed {
@@ -76,7 +76,7 @@
   ws_net_paid_inc_ship : double?,
   ws_net_paid_inc_ship_tax : double?,
   ws_net_profit : double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -108,7 +108,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create type tpcds.web_returns_type as
  closed {
@@ -136,7 +136,7 @@
   wr_reversed_charge: double?,
   wr_account_credit: double?,
   wr_net_loss: double?
-}
+};
 
 create type tpcds.web_site_type as
  closed {
@@ -166,7 +166,7 @@
   web_country:               string?,
   web_gmt_offset:            double?,
   web_tax_percentage:        double?
-}
+};
 
 create dataset customer_address(customer_address_type) primary key ca_address_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q96/q96.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q96/q96.1.ddl.sqlpp
index 342fecd..1751318 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q96/q96.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q96/q96.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   hd_buy_potential : string?,
   hd_dep_count : bigint?,
   hd_vehicle_count : bigint?
-}
+};
 create type tpcds.time_dim_type as
  closed {
   t_time_sk : bigint,
@@ -43,7 +43,7 @@
   t_shift : string?,
   t_sub_shift : string?,
   t_meal_time : string?
-}
+};
 create type tpcds.store_sales_type as
  closed {
   ss_sold_date_sk:           bigint?,
@@ -69,7 +69,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.store_type as
  closed {
@@ -102,11 +102,11 @@
   s_country : string?,
   s_gmt_offset : double?,
   s_tax_precentage : double?
-}
+};
 
 create dataset household_demographics (household_demographics_type) primary key hd_demo_sk;
 
-create dataset tpcds.time_dim(time_dim_type) primary key t_time_sk
+create dataset tpcds.time_dim(time_dim_type) primary key t_time_sk;
 
 create dataset store_sales (store_sales_type) primary key ss_item_sk, ss_ticket_number;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q98/q98.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q98/q98.1.ddl.sqlpp
index 4769c9c..ca9625c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q98/q98.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/q98/q98.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   i_container : string?,
   i_manager_id : bigint?,
   i_product_name : string?
-}
+};
 
 create type tpcds.store_sales_type as
  closed {
@@ -74,7 +74,7 @@
   ss_net_paid:               double?,
   ss_net_paid_inc_tax:       double?,
   ss_net_profit:             double?
-}
+};
 
 create type tpcds.date_dim_type as
  closed {
@@ -106,7 +106,7 @@
   d_current_month : string?,
   d_current_quarter : string?,
   d_current_year : string?
-}
+};
 
 create dataset item (item_type) primary key i_item_sk;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.1.ddl.sqlpp
index 52b0a89..5aaa57d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1580/query-ASTERIXDB-1580.1.ddl.sqlpp
@@ -36,7 +36,7 @@
     ca_country:                 string?,
     ca_gmt_offset:              double?,
     ca_location_type:           string?
-}
+};
 
 create type tpcds.customer_type as closed {
     c_customer_sk:             bigint,
@@ -57,7 +57,7 @@
     c_login:                   string?,
     c_email_address:           string?,
     c_last_review_date:        string?
-}
+};
 
 create type tpcds.store_sales_type as closed {
     ss_sold_date_sk:           bigint?,
@@ -83,7 +83,7 @@
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 create type tpcds.date_dim_type as closed {
     d_date_sk:                 bigint,
@@ -114,7 +114,7 @@
     d_current_month:           string?,
     d_current_quarter:         string?,
     d_current_year:            string?
-}
+};
 
 create type tpcds.item_type as closed {
     i_item_sk:                 bigint,
@@ -139,7 +139,7 @@
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset customer (customer_type)
 primary key c_customer_sk;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-2/query-ASTERIXDB-1581-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-2/query-ASTERIXDB-1581-2.1.ddl.sqlpp
index 23b6fa3..aab8bd3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-2/query-ASTERIXDB-1581-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-2/query-ASTERIXDB-1581-2.1.ddl.sqlpp
@@ -47,7 +47,7 @@
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 
 create type tpcds.item_type as closed {
@@ -73,7 +73,7 @@
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset store_sales (store_sales_type)
 primary key ss_item_sk, ss_ticket_number;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-3/query-ASTERIXDB-1581-3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-3/query-ASTERIXDB-1581-3.1.ddl.sqlpp
index 23b6fa3..aab8bd3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-3/query-ASTERIXDB-1581-3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-3/query-ASTERIXDB-1581-3.1.ddl.sqlpp
@@ -47,7 +47,7 @@
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 
 create type tpcds.item_type as closed {
@@ -73,7 +73,7 @@
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset store_sales (store_sales_type)
 primary key ss_item_sk, ss_ticket_number;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-4/query-ASTERIXDB-1581-4.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-4/query-ASTERIXDB-1581-4.1.ddl.sqlpp
index 23b6fa3..aab8bd3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-4/query-ASTERIXDB-1581-4.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-4/query-ASTERIXDB-1581-4.1.ddl.sqlpp
@@ -47,7 +47,7 @@
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 
 create type tpcds.item_type as closed {
@@ -73,7 +73,7 @@
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset store_sales (store_sales_type)
 primary key ss_item_sk, ss_ticket_number;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-5/query-ASTERIXDB-1581-5.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-5/query-ASTERIXDB-1581-5.1.ddl.sqlpp
index 23b6fa3..aab8bd3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-5/query-ASTERIXDB-1581-5.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-5/query-ASTERIXDB-1581-5.1.ddl.sqlpp
@@ -47,7 +47,7 @@
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 
 create type tpcds.item_type as closed {
@@ -73,7 +73,7 @@
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset store_sales (store_sales_type)
 primary key ss_item_sk, ss_ticket_number;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-6/query-ASTERIXDB-1581-6.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-6/query-ASTERIXDB-1581-6.1.ddl.sqlpp
index 23b6fa3..aab8bd3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-6/query-ASTERIXDB-1581-6.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-6/query-ASTERIXDB-1581-6.1.ddl.sqlpp
@@ -47,7 +47,7 @@
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 
 create type tpcds.item_type as closed {
@@ -73,7 +73,7 @@
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset store_sales (store_sales_type)
 primary key ss_item_sk, ss_ticket_number;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated-2/query-ASTERIXDB-1581-correlated-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated-2/query-ASTERIXDB-1581-correlated-2.1.ddl.sqlpp
index 23b6fa3..aab8bd3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated-2/query-ASTERIXDB-1581-correlated-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated-2/query-ASTERIXDB-1581-correlated-2.1.ddl.sqlpp
@@ -47,7 +47,7 @@
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 
 create type tpcds.item_type as closed {
@@ -73,7 +73,7 @@
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset store_sales (store_sales_type)
 primary key ss_item_sk, ss_ticket_number;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated/query-ASTERIXDB-1581-correlated.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated/query-ASTERIXDB-1581-correlated.1.ddl.sqlpp
index 23b6fa3..aab8bd3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated/query-ASTERIXDB-1581-correlated.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581-correlated/query-ASTERIXDB-1581-correlated.1.ddl.sqlpp
@@ -47,7 +47,7 @@
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 
 create type tpcds.item_type as closed {
@@ -73,7 +73,7 @@
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset store_sales (store_sales_type)
 primary key ss_item_sk, ss_ticket_number;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581/query-ASTERIXDB-1581.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581/query-ASTERIXDB-1581.1.ddl.sqlpp
index 23b6fa3..aab8bd3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581/query-ASTERIXDB-1581.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1581/query-ASTERIXDB-1581.1.ddl.sqlpp
@@ -47,7 +47,7 @@
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 
 create type tpcds.item_type as closed {
@@ -73,7 +73,7 @@
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset store_sales (store_sales_type)
 primary key ss_item_sk, ss_ticket_number;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1591/query-ASTERIXDB-1591.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1591/query-ASTERIXDB-1591.1.ddl.sqlpp
index 6ee8559..2e1364d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1591/query-ASTERIXDB-1591.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1591/query-ASTERIXDB-1591.1.ddl.sqlpp
@@ -36,7 +36,7 @@
     ca_country:                 string?,
     ca_gmt_offset:              double?,
     ca_location_type:           string?
-}
+};
 
 create type customer_type as closed {
     c_customer_sk:             bigint,
@@ -57,7 +57,7 @@
     c_login:                   string?,
     c_email_address:           string?,
     c_last_review_date:        string?
-}
+};
 
 create type store_sales_type as closed {
     ss_sold_date_sk:           bigint?,
@@ -83,7 +83,7 @@
     ss_net_paid:               double?,
     ss_net_paid_inc_tax:       double?,
     ss_net_profit:             double?
-}
+};
 
 create type catalog_sales_type as closed {
     cs_sold_date_sk:           bigint?,
@@ -120,7 +120,7 @@
     cs_net_paid_inc_ship:      double?,
     cs_net_paid_inc_ship_tax:  double?,
     cs_net_profit:             double?
-}
+};
 
 create type catalog_returns_type as closed {
     cr_returned_date_sk:       bigint?,
@@ -150,7 +150,7 @@
     cr_reversed_charge:        double?,
     cr_store_credit:           double?,
     cr_net_loss:               double?
-}
+};
 
 create type tpcds.date_dim_type as closed {
     d_date_sk:                 bigint,
@@ -181,7 +181,7 @@
     d_current_month:           string?,
     d_current_quarter:         string?,
     d_current_year:            string?
-}
+};
 
 create type item_type as closed {
     i_item_sk:                 bigint,
@@ -206,7 +206,7 @@
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create type web_sales_type as closed {
     ws_sold_date_sk:           bigint?,
@@ -243,7 +243,7 @@
     ws_net_paid_inc_ship:      double?,
     ws_net_paid_inc_ship_tax:  double?,
     ws_net_profit:             double?
-}
+};
 
 create dataset customer (customer_type)
 primary key c_customer_sk;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1596/query-ASTERIXDB-1596.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1596/query-ASTERIXDB-1596.1.ddl.sqlpp
index 04b10cc..41a51b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1596/query-ASTERIXDB-1596.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1596/query-ASTERIXDB-1596.1.ddl.sqlpp
@@ -57,7 +57,7 @@
     cs_net_paid_inc_ship:      double?,
     cs_net_paid_inc_ship_tax:  double?,
     cs_net_profit:             double?
-}
+};
 
 create type tpcds.catalog_returns_type as closed {
     cr_returned_date_sk:       bigint?,
@@ -87,7 +87,7 @@
     cr_reversed_charge:        double?,
     cr_store_credit:           double?,
     cr_net_loss:               double?
-}
+};
 
 create type tpcds.item_type as closed {
     i_item_sk:                 bigint,
@@ -112,7 +112,7 @@
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset catalog_sales (catalog_sales_type)
 primary key cs_item_sk, cs_order_number;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.1.ddl.sqlpp
index 63808f7..8416f6b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.1.ddl.sqlpp
@@ -51,7 +51,7 @@
     d_current_month:           string?,
     d_current_quarter:         string?,
     d_current_year:            string?
-}
+};
 
 create type tpcds.item_type as closed {
     i_item_sk:                 bigint,
@@ -76,7 +76,7 @@
     i_container:               string?,
     i_manager_id:              bigint?,
     i_product_name:            string?
-}
+};
 
 create dataset item (item_type)
 primary key i_item_sk;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
index dce9f5e..4aff790 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
index e42ce21..f47341a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
@@ -19,7 +19,7 @@
 
 use tpch;
 
-set hash_merge "true"
+set hash_merge "true";
 
 select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'sum_qty':COLL_SUM((
         select element i.l.l_quantity
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.1.ddl.sqlpp
index 921898b..9754354 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
index b055e7c..6566066 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue601/query-issue601.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue601/query-issue601.1.ddl.sqlpp
index b906c60..e42600f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue601/query-issue601.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue601/query-issue601.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  collection LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue638/query-issue638.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue638/query-issue638.1.ddl.sqlpp
index 327f1cd..1f11933 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue638/query-issue638.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue638/query-issue638.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -60,7 +60,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -72,7 +72,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -83,7 +83,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -91,14 +91,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -111,7 +111,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -120,7 +120,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create external  collection LineItem(LineItemType) using `localfs`((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.1.ddl.sqlpp
index bd0e8f5..88b5d5d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  collection Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue785/query-issue785.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue785/query-issue785.1.ddl.sqlpp
index bd0e8f5..88b5d5d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue785/query-issue785.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue785/query-issue785.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  collection Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue786/query-issue786.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue786/query-issue786.1.ddl.sqlpp
index c20e577..603015c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue786/query-issue786.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/query-issue786/query-issue786.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create  collection Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/distinct_by/distinct_by.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/distinct_by/distinct_by.1.ddl.sqlpp
index d50dd81..95afadd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/distinct_by/distinct_by.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/distinct_by/distinct_by.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/group_no_agg/group_no_agg.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/group_no_agg/group_no_agg.1.ddl.sqlpp
index 3cbe494..9ee2e7f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/group_no_agg/group_no_agg.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/group_no_agg/group_no_agg.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Regions_group_no_agg(RegionType) primary key r_regionkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/nest_aggregate/nest_aggregate.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/nest_aggregate/nest_aggregate.1.ddl.sqlpp
index 089efc3..ac5b5fc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/nest_aggregate/nest_aggregate.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/nest_aggregate/nest_aggregate.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
index 089efc3..ac5b5fc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_2/q01_pricing_summary_report_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_2/q01_pricing_summary_report_2.1.ddl.sqlpp
index 92698ab..0c14a5f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_2/q01_pricing_summary_report_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_2/q01_pricing_summary_report_2.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
index 92698ab..0c14a5f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_parallelism/q01_pricing_summary_report_parallelism.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_parallelism/q01_pricing_summary_report_parallelism.1.ddl.sqlpp
index 92698ab..0c14a5f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_parallelism/q01_pricing_summary_report_parallelism.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_parallelism/q01_pricing_summary_report_parallelism.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_parallelism/q01_pricing_summary_report_parallelism.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_parallelism/q01_pricing_summary_report_parallelism.3.query.sqlpp
index a4876a2d..ab03b60 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_parallelism/q01_pricing_summary_report_parallelism.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_parallelism/q01_pricing_summary_report_parallelism.3.query.sqlpp
@@ -19,7 +19,7 @@
 
 USE tpch;
 
-SET `compiler.parallelism` "5"
+SET `compiler.parallelism` "5";
 
 SELECT  l_returnflag,
         l_linestatus,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_parameter/q01_pricing_summary_report_parameter.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_parameter/q01_pricing_summary_report_parameter.1.ddl.sqlpp
index 92698ab..0c14a5f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_parameter/q01_pricing_summary_report_parameter.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_parameter/q01_pricing_summary_report_parameter.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_parameter/q01_pricing_summary_report_parameter.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_parameter/q01_pricing_summary_report_parameter.3.query.sqlpp
index 3124274..db699e3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_parameter/q01_pricing_summary_report_parameter.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q01_pricing_summary_report_parameter/q01_pricing_summary_report_parameter.3.query.sqlpp
@@ -19,8 +19,8 @@
 
 USE tpch;
 
-SET `compiler.groupmemory` "-10GB"
-SET `compiler.sortmemory` "-7GB"
+SET `compiler.groupmemory` "-10GB";
+SET `compiler.sortmemory` "-7GB";
 
 SELECT  l_returnflag,
         l_linestatus,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q04_order_priority/q04_order_priority.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q04_order_priority/q04_order_priority.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q04_order_priority/q04_order_priority.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q04_order_priority/q04_order_priority.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q09_product_type_profit_parameter/q09_product_type_profit_parameter.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q09_product_type_profit_parameter/q09_product_type_profit_parameter.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q09_product_type_profit_parameter/q09_product_type_profit_parameter.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q09_product_type_profit_parameter/q09_product_type_profit_parameter.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q09_product_type_profit_parameter/q09_product_type_profit_parameter.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q09_product_type_profit_parameter/q09_product_type_profit_parameter.3.query.sqlpp
index 4ab8816..d7ab8ec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q09_product_type_profit_parameter/q09_product_type_profit_parameter.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q09_product_type_profit_parameter/q09_product_type_profit_parameter.3.query.sqlpp
@@ -19,7 +19,7 @@
 
 USE tpch;
 
-SET `compiler.joinmemory` "-32GB"
+SET `compiler.joinmemory` "-32GB";
 
 SELECT nation, o_year, sum(amount) AS sum_profit
 FROM
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q10_returned_item/q10_returned_item.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q10_returned_item/q10_returned_item.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q10_returned_item/q10_returned_item.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q10_returned_item/q10_returned_item.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q11_important_stock/q11_important_stock.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q11_important_stock/q11_important_stock.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q11_important_stock/q11_important_stock.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q11_important_stock/q11_important_stock.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q12_shipping/q12_shipping.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q12_shipping/q12_shipping.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q12_shipping/q12_shipping.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q12_shipping/q12_shipping.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q12_shipping_broadcast/q12_shipping_broadcast.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q12_shipping_broadcast/q12_shipping_broadcast.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q12_shipping_broadcast/q12_shipping_broadcast.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q12_shipping_broadcast/q12_shipping_broadcast.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_large_gby_variant_parameter/q17_large_gby_variant_parameter.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_large_gby_variant_parameter/q17_large_gby_variant_parameter.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_large_gby_variant_parameter/q17_large_gby_variant_parameter.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_large_gby_variant_parameter/q17_large_gby_variant_parameter.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_large_gby_variant_parameter/q17_large_gby_variant_parameter.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_large_gby_variant_parameter/q17_large_gby_variant_parameter.3.query.sqlpp
index b16b388..21a44eb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_large_gby_variant_parameter/q17_large_gby_variant_parameter.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_large_gby_variant_parameter/q17_large_gby_variant_parameter.3.query.sqlpp
@@ -19,7 +19,7 @@
 
 use tpch;
 
-SET `compiler.groupmemory` "-10GB"
+SET `compiler.groupmemory` "-10GB";
 
 SELECT l_partkey t_partkey,
        count(1) t_count,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue562/query-issue562.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue562/query-issue562.1.ddl.sqlpp
index 98ee9a2..7ea7980 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue562/query-issue562.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue562/query-issue562.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -60,7 +60,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -72,7 +72,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -83,7 +83,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -91,14 +91,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -111,7 +111,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -120,7 +120,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue601/query-issue601.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue601/query-issue601.1.ddl.sqlpp
index b4d7fb4..758e645 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue601/query-issue601.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue601/query-issue601.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue638/query-issue638.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue638/query-issue638.1.ddl.sqlpp
index 84121b9..9898629 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue638/query-issue638.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue638/query-issue638.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -60,7 +60,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -72,7 +72,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -83,7 +83,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -91,14 +91,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -111,7 +111,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -120,7 +120,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create external  dataset LineItem(LineItemType) using `localfs`((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue785-2/query-issue785-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue785-2/query-issue785-2.1.ddl.sqlpp
index 65152ef..73a2341 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue785-2/query-issue785-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue785-2/query-issue785-2.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue785/query-issue785.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue785/query-issue785.1.ddl.sqlpp
index 65152ef..73a2341 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue785/query-issue785.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue785/query-issue785.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue786/query-issue786.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue786/query-issue786.1.ddl.sqlpp
index 2f927dd..fb751d0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue786/query-issue786.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue786/query-issue786.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-2/query-issue810-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-2/query-issue810-2.1.ddl.sqlpp
index b2a395f..655b6c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-2/query-issue810-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-2/query-issue810-2.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-3/query-issue810-3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-3/query-issue810-3.1.ddl.sqlpp
index b2a395f..655b6c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-3/query-issue810-3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810-3/query-issue810-3.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810/query-issue810.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810/query-issue810.1.ddl.sqlpp
index b2a395f..655b6c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810/query-issue810.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-sugar/query-issue810/query-issue810.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/distinct_by/distinct_by.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/distinct_by/distinct_by.1.ddl.sqlpp
index d50dd81..95afadd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/distinct_by/distinct_by.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/distinct_by/distinct_by.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/group_no_agg/group_no_agg.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/group_no_agg/group_no_agg.1.ddl.sqlpp
index 3cbe494..9ee2e7f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/group_no_agg/group_no_agg.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/group_no_agg/group_no_agg.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Regions_group_no_agg(RegionType) primary key r_regionkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/nest_aggregate/nest_aggregate.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/nest_aggregate/nest_aggregate.1.ddl.sqlpp
index 089efc3..ac5b5fc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/nest_aggregate/nest_aggregate.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/nest_aggregate/nest_aggregate.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
index 089efc3..ac5b5fc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
index 92698ab..0c14a5f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q04_order_priority/q04_order_priority.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q04_order_priority/q04_order_priority.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q04_order_priority/q04_order_priority.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q04_order_priority/q04_order_priority.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q07_volume_shipping/q07_volume_shipping.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q07_volume_shipping/q07_volume_shipping.3.query.sqlpp
index 43fd594..46837fa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q07_volume_shipping/q07_volume_shipping.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q07_volume_shipping/q07_volume_shipping.3.query.sqlpp
@@ -30,7 +30,7 @@
           Nation as n2
     where n2.n_name = 'GERMANY' or n1.n_name = 'GERMANY'
 )
-}
+};
 
 SELECT supp_nation AS supp_nation,
        cust_nation AS cust_nation,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q10_returned_item/q10_returned_item.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q10_returned_item/q10_returned_item.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q10_returned_item/q10_returned_item.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q10_returned_item/q10_returned_item.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q11_important_stock/q11_important_stock.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q11_important_stock/q11_important_stock.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q11_important_stock/q11_important_stock.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q11_important_stock/q11_important_stock.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q12_shipping/q12_shipping.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q12_shipping/q12_shipping.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q12_shipping/q12_shipping.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q12_shipping/q12_shipping.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue562/query-issue562.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue562/query-issue562.1.ddl.sqlpp
index 98ee9a2..7ea7980 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue562/query-issue562.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue562/query-issue562.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -60,7 +60,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -72,7 +72,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -83,7 +83,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -91,14 +91,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -111,7 +111,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -120,7 +120,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue601/query-issue601.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue601/query-issue601.1.ddl.sqlpp
index b4d7fb4..758e645 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue601/query-issue601.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue601/query-issue601.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue638/query-issue638.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue638/query-issue638.1.ddl.sqlpp
index 84121b9..9898629 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue638/query-issue638.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue638/query-issue638.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -60,7 +60,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -72,7 +72,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -83,7 +83,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -91,14 +91,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -111,7 +111,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -120,7 +120,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create external  dataset LineItem(LineItemType) using `localfs`((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue785-2/query-issue785-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue785-2/query-issue785-2.1.ddl.sqlpp
index 65152ef..73a2341 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue785-2/query-issue785-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue785-2/query-issue785-2.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue785/query-issue785.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue785/query-issue785.1.ddl.sqlpp
index 65152ef..73a2341 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue785/query-issue785.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue785/query-issue785.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue786/query-issue786.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue786/query-issue786.1.ddl.sqlpp
index 2f927dd..fb751d0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue786/query-issue786.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue786/query-issue786.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue810-2/query-issue810-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue810-2/query-issue810-2.1.ddl.sqlpp
index b2a395f..655b6c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue810-2/query-issue810-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue810-2/query-issue810-2.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue810-3/query-issue810-3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue810-3/query-issue810-3.1.ddl.sqlpp
index b2a395f..655b6c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue810-3/query-issue810-3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue810-3/query-issue810-3.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue810/query-issue810.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue810/query-issue810.1.ddl.sqlpp
index b2a395f..655b6c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue810/query-issue810.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql/query-issue810/query-issue810.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/distinct_by/distinct_by.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/distinct_by/distinct_by.1.ddl.sqlpp
index c6c77fb..3539fa6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/distinct_by/distinct_by.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/distinct_by/distinct_by.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/nest_aggregate/nest_aggregate.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/nest_aggregate/nest_aggregate.1.ddl.sqlpp
index fb985a5..c29a125 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/nest_aggregate/nest_aggregate.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/nest_aggregate/nest_aggregate.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
index fb985a5..c29a125 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
index 0f2b8c8..3412f89 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
index e42ce21..f47341a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
@@ -19,7 +19,7 @@
 
 use tpch;
 
-set hash_merge "true"
+set hash_merge "true";
 
 select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'sum_qty':COLL_SUM((
         select element i.l.l_quantity
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
index a9f2b9b..d4131b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
index 56612a4..472c27e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q04_order_priority/q04_order_priority.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q04_order_priority/q04_order_priority.1.ddl.sqlpp
index 56612a4..472c27e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q04_order_priority/q04_order_priority.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q04_order_priority/q04_order_priority.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q04_order_priority_with_nodegroup/q04_order_priority_with_nodegroup.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q04_order_priority_with_nodegroup/q04_order_priority_with_nodegroup.1.ddl.sqlpp
index dc314f7..5fbc67b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q04_order_priority_with_nodegroup/q04_order_priority_with_nodegroup.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q04_order_priority_with_nodegroup/q04_order_priority_with_nodegroup.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 drop nodegroup group_test if exists;
 create  nodegroup group_test  on
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q04_order_priority_with_nodegroup/q04_order_priority_with_nodegroup.4.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q04_order_priority_with_nodegroup/q04_order_priority_with_nodegroup.4.ddl.sqlpp
index cd8adc2..e2215fc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q04_order_priority_with_nodegroup/q04_order_priority_with_nodegroup.4.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q04_order_priority_with_nodegroup/q04_order_priority_with_nodegroup.4.ddl.sqlpp
@@ -18,4 +18,4 @@
  */
 drop dataverse tpch if exists;
 
-drop nodegroup group_test if exists;
\ No newline at end of file
+drop nodegroup group_test if exists;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
index 4e176f4..d3189b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
index e2ac428..f84d6a6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
index 4e176f4..d3189b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
index 4e176f4..d3189b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
index 4e176f4..d3189b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q10_returned_item/q10_returned_item.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q10_returned_item/q10_returned_item.1.ddl.sqlpp
index 4e176f4..d3189b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q10_returned_item/q10_returned_item.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q10_returned_item/q10_returned_item.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
index 56612a4..472c27e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q11_important_stock/q11_important_stock.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q11_important_stock/q11_important_stock.1.ddl.sqlpp
index 56612a4..472c27e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q11_important_stock/q11_important_stock.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q11_important_stock/q11_important_stock.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q12_shipping/q12_shipping.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q12_shipping/q12_shipping.1.ddl.sqlpp
index 4e176f4..d3189b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q12_shipping/q12_shipping.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q12_shipping/q12_shipping.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q12_shipping/q12_shipping.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q12_shipping/q12_shipping.3.query.sqlpp
index e8097c0..b5390d4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q12_shipping/q12_shipping.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q12_shipping/q12_shipping.3.query.sqlpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-use tpch
+use tpch;
 
 select element {'l_shipmode':l_shipmode,'high_line_count':tpch.coll_sum((
         select element case
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
index 56612a4..472c27e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
index 4e176f4..d3189b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
index 56612a4..472c27e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
index 56612a4..472c27e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
index 56612a4..472c27e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
index 4e176f4..d3189b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
index 56612a4..472c27e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
index 4e176f4..d3189b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
index 4e176f4..d3189b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
index 56612a4..472c27e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
index 4e176f4..d3189b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue562/query-issue562.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue562/query-issue562.1.ddl.sqlpp
index e29de08..75a1427 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue562/query-issue562.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue562/query-issue562.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -60,7 +60,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -72,7 +72,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -83,7 +83,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -91,14 +91,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -111,7 +111,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -120,7 +120,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue601/query-issue601.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue601/query-issue601.1.ddl.sqlpp
index 8ef90ac..cac5f70 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue601/query-issue601.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue601/query-issue601.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785-2/query-issue785-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785-2/query-issue785-2.1.ddl.sqlpp
index c214fc2..42ecced 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785-2/query-issue785-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785-2/query-issue785-2.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785/query-issue785.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785/query-issue785.1.ddl.sqlpp
index c214fc2..42ecced 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785/query-issue785.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue785/query-issue785.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue786/query-issue786.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue786/query-issue786.1.ddl.sqlpp
index 3d09e2a..9dd8f84 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue786/query-issue786.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue786/query-issue786.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-2/query-issue810-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-2/query-issue810-2.1.ddl.sqlpp
index b3e0cc5..22a7bb2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-2/query-issue810-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-2/query-issue810-2.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-3/query-issue810-3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-3/query-issue810-3.1.ddl.sqlpp
index b3e0cc5..22a7bb2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-3/query-issue810-3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810-3/query-issue810-3.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810/query-issue810.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810/query-issue810.1.ddl.sqlpp
index b3e0cc5..22a7bb2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810/query-issue810.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue810/query-issue810.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827-2/query-issue827-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827-2/query-issue827-2.1.ddl.sqlpp
index efec413..5c049cb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827-2/query-issue827-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827-2/query-issue827-2.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827/query-issue827.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827/query-issue827.1.ddl.sqlpp
index efec413..5c049cb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827/query-issue827.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/query-issue827/query-issue827.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/distinct_by/distinct_by.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/distinct_by/distinct_by.1.ddl.sqlpp
index d50dd81..95afadd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/distinct_by/distinct_by.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/distinct_by/distinct_by.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/group_no_agg/group_no_agg.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/group_no_agg/group_no_agg.1.ddl.sqlpp
index 3cbe494..9ee2e7f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/group_no_agg/group_no_agg.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/group_no_agg/group_no_agg.1.ddl.sqlpp
@@ -28,7 +28,7 @@
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Regions_group_no_agg(RegionType) primary key r_regionkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate/nest_aggregate.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate/nest_aggregate.1.ddl.sqlpp
index 089efc3..ac5b5fc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate/nest_aggregate.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate/nest_aggregate.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
index 089efc3..ac5b5fc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/nest_aggregate2/nest_aggregate2.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
index 9d41f77..4e82d90 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
index e42ce21..f47341a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
@@ -19,7 +19,7 @@
 
 use tpch;
 
-set hash_merge "true"
+set hash_merge "true";
 
 select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'sum_qty':COLL_SUM((
         select element i.l.l_quantity
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q04_order_priority/q04_order_priority.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q04_order_priority/q04_order_priority.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q04_order_priority/q04_order_priority.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q04_order_priority/q04_order_priority.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q10_returned_item/q10_returned_item.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q10_returned_item/q10_returned_item.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q10_returned_item/q10_returned_item.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q10_returned_item/q10_returned_item.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q11_important_stock/q11_important_stock.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q11_important_stock/q11_important_stock.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q11_important_stock/q11_important_stock.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q11_important_stock/q11_important_stock.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q12_shipping/q12_shipping.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q12_shipping/q12_shipping.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q12_shipping/q12_shipping.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q12_shipping/q12_shipping.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q18_large_volume_customer/q18_large_volume_customer.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q19_discounted_revenue/q19_discounted_revenue.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q20_potential_part_promotion/q20_potential_part_promotion.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
index 6cbdf11..ef52df8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : bigint,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
index 0db8d36..4ba3bef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -54,7 +54,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -66,7 +66,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -77,7 +77,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -85,14 +85,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -105,7 +105,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -114,7 +114,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue562/query-issue562.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue562/query-issue562.1.ddl.sqlpp
index 98ee9a2..7ea7980 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue562/query-issue562.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue562/query-issue562.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -60,7 +60,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -72,7 +72,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -83,7 +83,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -91,14 +91,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -111,7 +111,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -120,7 +120,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue601/query-issue601.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue601/query-issue601.1.ddl.sqlpp
index b4d7fb4..758e645 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue601/query-issue601.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue601/query-issue601.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue638/query-issue638.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue638/query-issue638.1.ddl.sqlpp
index 84121b9..9898629 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue638/query-issue638.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue638/query-issue638.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -60,7 +60,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -72,7 +72,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -83,7 +83,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -91,14 +91,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create type tpch.PartType as
  closed {
@@ -111,7 +111,7 @@
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type tpch.PartSuppType as
  closed {
@@ -120,7 +120,7 @@
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create external  dataset LineItem(LineItemType) using `localfs`((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`));
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue785-2/query-issue785-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue785-2/query-issue785-2.1.ddl.sqlpp
index 65152ef..73a2341 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue785-2/query-issue785-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue785-2/query-issue785-2.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue785/query-issue785.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue785/query-issue785.1.ddl.sqlpp
index 65152ef..73a2341 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue785/query-issue785.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue785/query-issue785.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : bigint,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : bigint,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : bigint,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue786/query-issue786.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue786/query-issue786.1.ddl.sqlpp
index 2f927dd..fb751d0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue786/query-issue786.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue786/query-issue786.1.ddl.sqlpp
@@ -40,7 +40,7 @@
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@
   n_name : string,
   n_regionkey : integer,
   n_comment : string
-}
+};
 
 create type tpch.RegionType as
  closed {
   r_regionkey : integer,
   r_name : string,
   r_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-2/query-issue810-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-2/query-issue810-2.1.ddl.sqlpp
index b2a395f..655b6c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-2/query-issue810-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-2/query-issue810-2.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-3/query-issue810-3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-3/query-issue810-3.1.ddl.sqlpp
index b2a395f..655b6c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-3/query-issue810-3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810-3/query-issue810-3.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810/query-issue810.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810/query-issue810.1.ddl.sqlpp
index b2a395f..655b6c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810/query-issue810.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue810/query-issue810.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827-2/query-issue827-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827-2/query-issue827-2.1.ddl.sqlpp
index 4a4ec23..e43a8ea 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827-2/query-issue827-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827-2/query-issue827-2.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827/query-issue827.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827/query-issue827.1.ddl.sqlpp
index 4a4ec23..e43a8ea 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827/query-issue827.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch/query-issue827/query-issue827.1.ddl.sqlpp
@@ -47,7 +47,7 @@
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/any-object/any-object.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/any-object/any-object.1.ddl.sqlpp
index 59f9ecd..ca129a7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/any-object/any-object.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/any-object/any-object.1.ddl.sqlpp
@@ -22,4 +22,4 @@
 use test;
 
 create type kv1 as { id: integer, val: AnyObject };
-create type kv2 as { id: integer, val: Metadata.AnyObject };
\ No newline at end of file
+create type kv2 as { id: integer, val: Metadata.AnyObject };
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/default/default.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/default/default.1.ddl.sqlpp
index 63c275b..224395f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/default/default.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/default/default.1.ddl.sqlpp
@@ -20,4 +20,4 @@
 DROP function foo@0 if exists;
 CREATE function foo(){
   1
-}
\ No newline at end of file
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/default/default.3.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/default/default.3.ddl.sqlpp
index b515477..a0bc671 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/default/default.3.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/default/default.3.ddl.sqlpp
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-DROP function foo@0;
\ No newline at end of file
+DROP function foo@0;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/opentype_orderby_01/opentype_orderby_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/opentype_orderby_01/opentype_orderby_01.1.ddl.sqlpp
index d59bdf7..aa34b79 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/opentype_orderby_01/opentype_orderby_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/opentype_orderby_01/opentype_orderby_01.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.1.ddl.sqlpp
index cc7b9f5..cc8c982 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.1.ddl.sqlpp
index 7a3770c..c0184d3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.1.ddl.sqlpp
index 3ea5531..52ac805 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.1.ddl.sqlpp
index 6290eb3..4e76ad2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.1.ddl.sqlpp
index 76f75ea..e6c7ba3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.1.ddl.sqlpp
@@ -33,14 +33,14 @@
   id : bigint,
   empno : bigint,
   name : string
-}
+};
 
 create type test.deptInfoType as
 {
   did : bigint,
   dno : integer,
   dname : string
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.1.ddl.sqlpp
index 3924c36..bb6cdc6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.1.ddl.sqlpp
index a25b4b3..fcb9860 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.1.ddl.sqlpp
index f7e5f55..2f2bf8f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.1.ddl.sqlpp
index 3782fe4..9c677f2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.1.ddl.sqlpp
index 661692c..db81eb2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.1.ddl.sqlpp
index 47a69d6..3c5c5ab 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.1.ddl.sqlpp
index ab5da1b..e9f148b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.1.ddl.sqlpp
index 88087a0..fe5ea94 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.1.ddl.sqlpp
index 97ec95c..bf3bec3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.1.ddl.sqlpp
index b7de6bf..3b86c36 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.1.ddl.sqlpp
index f1a5830..670dcdf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.1.ddl.sqlpp
index 76ef464..72925d3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.1.ddl.sqlpp
index 81bec1c..d0d974a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -47,7 +47,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.1.ddl.sqlpp
index 5f7048f..46cf835 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.1.ddl.sqlpp
index 529060f..3cfd08b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.1.ddl.sqlpp
index 0217500..941892f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.1.ddl.sqlpp
index 5615afa..f591cb7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.1.ddl.sqlpp
index 9a54e5c..f021331 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_04/promotion_opentype_field_vs_constant_04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_04/promotion_opentype_field_vs_constant_04.1.ddl.sqlpp
index 1d13318..cc41b9c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_04/promotion_opentype_field_vs_constant_04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_04/promotion_opentype_field_vs_constant_04.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_05/promotion_opentype_field_vs_constant_05.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_05/promotion_opentype_field_vs_constant_05.1.ddl.sqlpp
index 4e8ac93..a6224d9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_05/promotion_opentype_field_vs_constant_05.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_05/promotion_opentype_field_vs_constant_05.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_06/promotion_opentype_field_vs_constant_06.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_06/promotion_opentype_field_vs_constant_06.1.ddl.sqlpp
index 4862158..48758d1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_06/promotion_opentype_field_vs_constant_06.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_06/promotion_opentype_field_vs_constant_06.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_07/promotion_opentype_field_vs_constant_07.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_07/promotion_opentype_field_vs_constant_07.1.ddl.sqlpp
index e508a11..9da026d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_07/promotion_opentype_field_vs_constant_07.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_07/promotion_opentype_field_vs_constant_07.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_08/promotion_opentype_field_vs_constant_08.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_08/promotion_opentype_field_vs_constant_08.1.ddl.sqlpp
index 354c3ed..09f325d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_08/promotion_opentype_field_vs_constant_08.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_constant_08/promotion_opentype_field_vs_constant_08.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_opentype_field_01/promotion_opentype_field_vs_opentype_field_01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_opentype_field_01/promotion_opentype_field_vs_opentype_field_01.1.ddl.sqlpp
index 1d43718..8cc411c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_opentype_field_01/promotion_opentype_field_vs_opentype_field_01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_opentype_field_01/promotion_opentype_field_vs_opentype_field_01.1.ddl.sqlpp
@@ -36,7 +36,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -46,7 +46,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_opentype_field_02/promotion_opentype_field_vs_opentype_field_02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_opentype_field_02/promotion_opentype_field_vs_opentype_field_02.1.ddl.sqlpp
index f417c73..eb95135 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_opentype_field_02/promotion_opentype_field_vs_opentype_field_02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/promotion_opentype_field_vs_opentype_field_02/promotion_opentype_field_vs_opentype_field_02.1.ddl.sqlpp
@@ -37,7 +37,7 @@
   height : float,
   age : bigint,
   worksince : bigint
-}
+};
 
 create type test.deptInfoType as
 {
@@ -47,7 +47,7 @@
   dsince : bigint,
   bossid : bigint,
   bossidint32 : integer
-}
+};
 
 create  dataset empDataset(empInfoType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/record01/record01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/record01/record01.1.ddl.sqlpp
index a44ac31..7692619 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/record01/record01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/record01/record01.1.ddl.sqlpp
@@ -26,7 +26,7 @@
 create type local.ttype as
 {
   id : integer
-}
+};
 
 create  dataset dset(ttype) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/type_promotion_0/type_promotion_0.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/type_promotion_0/type_promotion_0.1.ddl.sqlpp
index 67506bf..b84244b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/type_promotion_0/type_promotion_0.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/type_promotion_0/type_promotion_0.1.ddl.sqlpp
@@ -35,7 +35,7 @@
   myoptdouble : double?,
   myfloat : float,
   myoptfloat : float?
-}
+};
 
 create  dataset Int64Test(Int64TestType) primary key myint64;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/type_promotion_1/type_promotion_1.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/type_promotion_1/type_promotion_1.1.ddl.sqlpp
index 7d62262..ceff94f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/type_promotion_1/type_promotion_1.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/type_promotion_1/type_promotion_1.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   float_o : [float],
   double_u : {{double}},
   double_o : [double]
-}
+};
 
 create  dataset TestSet(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/type_promotion_open_index_enforced/type_promotion_open_index_enforced.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/type_promotion_open_index_enforced/type_promotion_open_index_enforced.1.ddl.sqlpp
index 00d71c6..6bcfb70 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/type_promotion_open_index_enforced/type_promotion_open_index_enforced.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/type_promotion_open_index_enforced/type_promotion_open_index_enforced.1.ddl.sqlpp
@@ -27,7 +27,7 @@
 {
   id : bigint,
   sec_id : bigint
-}
+};
 
 create  dataset TestSet(TestType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/query-ASTERIXDB-1354-2/query-ASTERIXDB-1354-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/query-ASTERIXDB-1354-2/query-ASTERIXDB-1354-2.1.ddl.sqlpp
index 56b591e..25a20e7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/query-ASTERIXDB-1354-2/query-ASTERIXDB-1354-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/query-ASTERIXDB-1354-2/query-ASTERIXDB-1354-2.1.ddl.sqlpp
@@ -38,7 +38,7 @@
   l_shipinstruct: string,
   l_shipmode: string,
   l_comment: string
-}
+};
 
 create type OrderType as closed {
   o_orderkey: integer,
@@ -50,7 +50,7 @@
   o_clerk: string,
   o_shippriority: integer,
   o_comment: string
-}
+};
 
 create dataset LineItem(LineItemType) primary key l_orderkey, l_linenumber;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/query-ASTERIXDB-1629/query-ASTERIXDB-1629.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/query-ASTERIXDB-1629/query-ASTERIXDB-1629.1.ddl.sqlpp
index ae2e14a..7bf67ca 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/query-ASTERIXDB-1629/query-ASTERIXDB-1629.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/query-ASTERIXDB-1629/query-ASTERIXDB-1629.1.ddl.sqlpp
@@ -38,6 +38,6 @@
   l_shipinstruct: string,
   l_shipmode: string,
   l_comment: string
-}
+};
 
 create dataset LineItem(LineItemType) primary key l_orderkey, l_linenumber;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union/union.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union/union.1.ddl.sqlpp
index 33c064c..4174a77 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union/union.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union/union.1.ddl.sqlpp
@@ -26,12 +26,12 @@
 create type TinySocial.FacebookUserType as
 {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
 {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_heterogeneous_scalar/union_heterogeneous_scalar.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_heterogeneous_scalar/union_heterogeneous_scalar.1.ddl.sqlpp
index 33c064c..4174a77 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_heterogeneous_scalar/union_heterogeneous_scalar.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_heterogeneous_scalar/union_heterogeneous_scalar.1.ddl.sqlpp
@@ -26,12 +26,12 @@
 create type TinySocial.FacebookUserType as
 {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
 {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative/union_negative.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative/union_negative.1.ddl.sqlpp
index 5d7fc70..22bc7fe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative/union_negative.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative/union_negative.1.ddl.sqlpp
@@ -26,7 +26,7 @@
 create type TinySocial.FacebookUserType as
 {
   id : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative_2/union_negative_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative_2/union_negative_2.1.ddl.sqlpp
index 33c064c..4174a77 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative_2/union_negative_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_negative_2/union_negative_2.1.ddl.sqlpp
@@ -26,12 +26,12 @@
 create type TinySocial.FacebookUserType as
 {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
 {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby/union_orderby.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby/union_orderby.1.ddl.sqlpp
index 123e879..1a36c7e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby/union_orderby.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby/union_orderby.1.ddl.sqlpp
@@ -26,12 +26,12 @@
 create type TinySocial.FacebookUserType as
 {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
 {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_2/union_orderby_2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_2/union_orderby_2.1.ddl.sqlpp
index 123e879..1a36c7e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_2/union_orderby_2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_2/union_orderby_2.1.ddl.sqlpp
@@ -26,12 +26,12 @@
 create type TinySocial.FacebookUserType as
 {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
 {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_3/union_orderby_3.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_3/union_orderby_3.1.ddl.sqlpp
index 123e879..1a36c7e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_3/union_orderby_3.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_3/union_orderby_3.1.ddl.sqlpp
@@ -26,12 +26,12 @@
 create type TinySocial.FacebookUserType as
 {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
 {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_4/union_orderby_4.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_4/union_orderby_4.1.ddl.sqlpp
index 123e879..1a36c7e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_4/union_orderby_4.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/union/union_orderby_4/union_orderby_4.1.ddl.sqlpp
@@ -26,12 +26,12 @@
 create type TinySocial.FacebookUserType as
 {
   id : bigint
-}
+};
 
 create type TinySocial.FacebookMessageType as
 {
   `message-id` : bigint
-}
+};
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/filtered-dataset/filtered-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/filtered-dataset/filtered-dataset.1.ddl.sqlpp
index 751ba27..f9349a7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/filtered-dataset/filtered-dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/filtered-dataset/filtered-dataset.1.ddl.sqlpp
@@ -34,7 +34,7 @@
         `sender-location`: point?,
         message: string,
         `send-time`: datetime
-}
+};
 
 create dataset FacebookMessages(FacebookMessageType)
 primary key `message-id`;
@@ -43,4 +43,4 @@
 primary key `message-id` with filter on `send-time`;
 
 create index AutherIdx on FilteredFacebookMessages(`author-id`);
-create index MessageIdx on FilteredFacebookMessages(message);
\ No newline at end of file
+create index MessageIdx on FilteredFacebookMessages(message);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/issue1587-foreignDataType/issue1587-foreignDataType.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/issue1587-foreignDataType/issue1587-foreignDataType.1.ddl.sqlpp
index 1eaeba3..b30a882 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/issue1587-foreignDataType/issue1587-foreignDataType.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/issue1587-foreignDataType/issue1587-foreignDataType.1.ddl.sqlpp
@@ -35,4 +35,4 @@
 
 use b;
 
-create dataset UpsertTo(a.TypeA) primary key id;
\ No newline at end of file
+create dataset UpsertTo(a.TypeA) primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/issue1587-foreignDataType/issue1587-foreignDataType.4.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/issue1587-foreignDataType/issue1587-foreignDataType.4.ddl.sqlpp
index 71eaed1..59425b3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/issue1587-foreignDataType/issue1587-foreignDataType.4.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/issue1587-foreignDataType/issue1587-foreignDataType.4.ddl.sqlpp
@@ -22,4 +22,4 @@
  * Date         : Aug 18th 2016
  */
 drop dataverse b;
-drop dataverse a;
\ No newline at end of file
+drop dataverse a;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/multiple-correlated-secondaries/multiple-correlated-secondaries.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/multiple-correlated-secondaries/multiple-correlated-secondaries.1.ddl.sqlpp
index 7ac198f..872e1bc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/multiple-correlated-secondaries/multiple-correlated-secondaries.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/multiple-correlated-secondaries/multiple-correlated-secondaries.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   poly2: polygon,
   rec: rectangle,
   circle: circle
-}
+};
 
 
 create dataset UpsertTo(MyRecord)
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/multiple-secondaries/multiple-secondaries.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/multiple-secondaries/multiple-secondaries.1.ddl.sqlpp
index f9649c7..e509614 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/multiple-secondaries/multiple-secondaries.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/multiple-secondaries/multiple-secondaries.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   poly2: polygon,
   rec: rectangle,
   circle: circle
-}
+};
 
 
 create dataset UpsertTo(MyRecord)
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/nested-index/nested-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/nested-index/nested-index.1.ddl.sqlpp
index 5d0b5e0..8231ef9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/nested-index/nested-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/nested-index/nested-index.1.ddl.sqlpp
@@ -30,11 +30,11 @@
   o_clerk: string,
   o_shippriority: int64,
   o_comment: string
-}
+};
 
 create type OrderType as closed {
 nested : OrderTypetmp
-}
+};
 
 create dataset UpsertTo(OrderTypetmp)
   primary key o_orderkey;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/nullable-index/nullable-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/nullable-index/nullable-index.1.ddl.sqlpp
index 6451ed4..487d537 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/nullable-index/nullable-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/nullable-index/nullable-index.1.ddl.sqlpp
@@ -24,7 +24,7 @@
   number: int64,
   street: string,
   city: string
-}
+};
 
 create type CustomerType as open {
   cid: int64,
@@ -33,7 +33,7 @@
   address: AddressType?,
   interests: {{string}},
   children: [ { name: string, age: int64? } ]
-}
+};
 
 create dataset Customers(CustomerType) primary key cid;
 create dataset MoreCustomers(CustomerType) primary key cid;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/open-index/open-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/open-index/open-index.1.ddl.sqlpp
index e964d0b..3ac3e3c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/open-index/open-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/open-index/open-index.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   o_clerk: string,
   o_shippriority: int64,
   o_comment: string
-}
+};
 
 create type OrderOpenType as open {
   o_orderkey: int64,
@@ -41,7 +41,7 @@
   o_clerk: string,
   o_shippriority: int64,
   o_comment: string
-}
+};
 
 create dataset Orders(OrderType)
   primary key o_orderkey;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-btree/primary-secondary-btree.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-btree/primary-secondary-btree.1.ddl.sqlpp
index 071dc1f..d1db047 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-btree/primary-secondary-btree.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-btree/primary-secondary-btree.1.ddl.sqlpp
@@ -39,4 +39,4 @@
 
 create dataset UpsertFrom(TestType) primary key id
 using compaction policy `correlated-prefix`
-((`max-mergable-component-size`=`16384`),(`max-tolerance-component-count`=`3`));
\ No newline at end of file
+((`max-mergable-component-size`=`16384`),(`max-tolerance-component-count`=`3`));
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-btree/primary-secondary-btree.3.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-btree/primary-secondary-btree.3.ddl.sqlpp
index 6eea3b8..8d06dfe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-btree/primary-secondary-btree.3.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-btree/primary-secondary-btree.3.ddl.sqlpp
@@ -24,4 +24,4 @@
 
 use test;
 
-create index ageindex on UpsertTo(age);
\ No newline at end of file
+create index ageindex on UpsertTo(age);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-inverted/primary-correlated-secondary-inverted.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-inverted/primary-correlated-secondary-inverted.1.ddl.sqlpp
index 1480b78..f54ab2b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-inverted/primary-correlated-secondary-inverted.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-inverted/primary-correlated-secondary-inverted.1.ddl.sqlpp
@@ -26,7 +26,7 @@
   title: string,
   authors: string,
   misc: string
-}
+};
 
 create dataset UpsertToDBLP(DBLPType)
 primary key id
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-inverted/primary-correlated-secondary-inverted.3.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-inverted/primary-correlated-secondary-inverted.3.ddl.sqlpp
index 61d1674..afe2e4b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-inverted/primary-correlated-secondary-inverted.3.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-inverted/primary-correlated-secondary-inverted.3.ddl.sqlpp
@@ -18,4 +18,4 @@
  */
 use test;
 
-create index keyword_index on UpsertToDBLP(title) type keyword;
\ No newline at end of file
+create index keyword_index on UpsertToDBLP(title) type keyword;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-rtree/primary-correlated-secondary-rtree.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-rtree/primary-correlated-secondary-rtree.1.ddl.sqlpp
index 1c1e480..cc33f84 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-rtree/primary-correlated-secondary-rtree.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-correlated-secondary-rtree/primary-correlated-secondary-rtree.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   poly2: polygon,
   rec: rectangle,
   circle: circle
-}
+};
 
 create dataset UpsertTo(MyRecord)
  primary key id
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-index/primary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-index/primary-index.1.ddl.sqlpp
index c970044..51d59b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-index/primary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-index/primary-index.1.ddl.sqlpp
@@ -34,4 +34,4 @@
 };
 
 create dataset UpsertTo(TestType) primary key id;
-create dataset UpsertFrom(TestType) primary key id;
\ No newline at end of file
+create dataset UpsertFrom(TestType) primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-secondary-btree/primary-secondary-btree.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-secondary-btree/primary-secondary-btree.1.ddl.sqlpp
index b232d8f..0e5d5b2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-secondary-btree/primary-secondary-btree.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-secondary-btree/primary-secondary-btree.1.ddl.sqlpp
@@ -35,4 +35,4 @@
 
 create dataset UpsertTo(TestType) primary key id;
 create index ageindex on UpsertTo(age);
-create dataset UpsertFrom(TestType) primary key id;
\ No newline at end of file
+create dataset UpsertFrom(TestType) primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-secondary-inverted/primary-secondary-inverted.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-secondary-inverted/primary-secondary-inverted.1.ddl.sqlpp
index e8e421a..1aa5740 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-secondary-inverted/primary-secondary-inverted.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-secondary-inverted/primary-secondary-inverted.1.ddl.sqlpp
@@ -26,7 +26,7 @@
   title: string,
   authors: string,
   misc: string
-}
+};
 
 create dataset UpsertToDBLP(DBLPType)
   primary key id;
@@ -34,4 +34,4 @@
 create dataset UpsertFromDBLP(DBLPType)
   primary key id;
 
-create index keyword_index on UpsertToDBLP(title) type keyword;
\ No newline at end of file
+create index keyword_index on UpsertToDBLP(title) type keyword;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-secondary-rtree/primary-secondary-rtree.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-secondary-rtree/primary-secondary-rtree.1.ddl.sqlpp
index 01f6725..999a79a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-secondary-rtree/primary-secondary-rtree.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/primary-secondary-rtree/primary-secondary-rtree.1.ddl.sqlpp
@@ -30,7 +30,7 @@
   poly2: polygon,
   rec: rectangle,
   circle: circle
-}
+};
 
 create dataset UpsertTo(MyRecord)
  primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-with-self-read/upsert-with-self-read.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-with-self-read/upsert-with-self-read.1.ddl.sqlpp
index 23d3b4d..3426145 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-with-self-read/upsert-with-self-read.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/upsert/upsert-with-self-read/upsert-with-self-read.1.ddl.sqlpp
@@ -33,4 +33,4 @@
 salary:double
 };
 
-create dataset UpsertTo(TestType) primary key id;
\ No newline at end of file
+create dataset UpsertTo(TestType) primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-ASTERIXDB-1298/query-ASTERIXDB-1298.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-ASTERIXDB-1298/query-ASTERIXDB-1298.1.ddl.sqlpp
index bb96a11..0af0ada 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-ASTERIXDB-1298/query-ASTERIXDB-1298.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-ASTERIXDB-1298/query-ASTERIXDB-1298.1.ddl.sqlpp
@@ -23,7 +23,7 @@
 use channels;
 
 create type userLocation as closed
-{ userId: int, roomNumber: int }
+{ userId: int, roomNumber: int };
 
 create dataset userLocations(userLocation)
 primary key userId;
@@ -37,7 +37,7 @@
   )
 };
 
-create type subscription as { id:uuid, param0:int }
+create type subscription as { id:uuid, param0:int };
 
 create dataset subscriptions(subscription)
 primary key id autogenerated;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-ASTERIXDB-1652-2/query-ASTERIXDB-1652-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-ASTERIXDB-1652-2/query-ASTERIXDB-1652-2.1.ddl.sqlpp
index cc938ae..edcfb13 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-ASTERIXDB-1652-2/query-ASTERIXDB-1652-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-ASTERIXDB-1652-2/query-ASTERIXDB-1652-2.1.ddl.sqlpp
@@ -24,5 +24,5 @@
 
 create function length(foo){
    1
-}
+};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-ASTERIXDB-1875/query-ASTERIXDB-1298.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-ASTERIXDB-1875/query-ASTERIXDB-1298.1.ddl.sqlpp
index 6821a8a..71ab911 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-ASTERIXDB-1875/query-ASTERIXDB-1298.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-ASTERIXDB-1875/query-ASTERIXDB-1298.1.ddl.sqlpp
@@ -23,4 +23,4 @@
 
 use channels;
 create function cat(str1,str2)
-{ concat(str1,str2) }
\ No newline at end of file
+{ concat(str1,str2) };
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-ASTERIXDB-1876/query-ASTERIXDB-1876.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-ASTERIXDB-1876/query-ASTERIXDB-1876.1.ddl.sqlpp
index 186fd2b..40ac393 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-ASTERIXDB-1876/query-ASTERIXDB-1876.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-ASTERIXDB-1876/query-ASTERIXDB-1876.1.ddl.sqlpp
@@ -24,11 +24,11 @@
 create type UserLocation as closed {
 recordId: integer,
 userName: string
-}
+};
 
 create dataset UserLocations(UserLocation)
 primary key recordId;
 
-create function RecentEmergenciesNearUser(userName) { [1] }
+create function RecentEmergenciesNearUser(userName) { [1] };
 
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue218-2/query-issue218-2.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue218-2/query-issue218-2.1.ddl.sqlpp
index 05fa910..92610dc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue218-2/query-issue218-2.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue218-2/query-issue218-2.1.ddl.sqlpp
@@ -32,4 +32,4 @@
       WHEN pbcRating = 1 THEN salary * 0.25
       ELSE salary * 0.10
    END
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue218/query-issue218.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue218/query-issue218.1.ddl.sqlpp
index d976a60..a8c17fa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue218/query-issue218.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue218/query-issue218.1.ddl.sqlpp
@@ -32,4 +32,4 @@
       WHEN pbcRating = 1 THEN salary * 0.25
       ELSE salary * 0.10
    END
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue244/query-issue244.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue244/query-issue244.1.ddl.sqlpp
index beae038..d08898b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue244/query-issue244.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue244/query-issue244.1.ddl.sqlpp
@@ -32,7 +32,7 @@
 create type TypeA as open {
     id : bigint,
     name : string
-}
+};
 
 create dataset t1(TypeA) primary key id;
 
@@ -40,4 +40,4 @@
 
 create function f1(){
 (from t1 as m select element m)
-};
\ No newline at end of file
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue455/query-issue455.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue455/query-issue455.1.ddl.sqlpp
index 5305386..441684b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue455/query-issue455.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue455/query-issue455.1.ddl.sqlpp
@@ -31,4 +31,4 @@
 create function printName()
 {
 'AsterixDB Shared nothing parallel BDMS'
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue489/query-issue489.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue489/query-issue489.1.ddl.sqlpp
index 6dbee90..1e7a7c6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue489/query-issue489.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/query-issue489/query-issue489.1.ddl.sqlpp
@@ -30,9 +30,9 @@
 create function f1()
 {
 'function with no input'
-}
+};
 
 create function f1(a)
 {
 'function with input'
-}
\ No newline at end of file
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/single-line-definition/single-line-definition.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/single-line-definition/single-line-definition.1.ddl.sqlpp
index ba4a326..3b2b07c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/single-line-definition/single-line-definition.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/single-line-definition/single-line-definition.1.ddl.sqlpp
@@ -28,4 +28,4 @@
 create dataverse test;
 use test;
 
-create function printName() { 'AsterixDB Shared nothing parallel BDMS' };
\ No newline at end of file
+create function printName() { 'AsterixDB Shared nothing parallel BDMS' };
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/single-line-definition/single-line-definition.3.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/single-line-definition/single-line-definition.3.ddl.sqlpp
index 3e20182..dfc165c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/single-line-definition/single-line-definition.3.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/single-line-definition/single-line-definition.3.ddl.sqlpp
@@ -24,4 +24,4 @@
  */
 
 
-drop dataverse test;
\ No newline at end of file
+drop dataverse test;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf01/udf01.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf01/udf01.1.ddl.sqlpp
index 3847c2d..aa9cfc4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf01/udf01.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf01/udf01.1.ddl.sqlpp
@@ -31,5 +31,5 @@
 
 create function test.echo(list){
 list
-}
+};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf02/udf02.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf02/udf02.1.ddl.sqlpp
index a782147..de75ee2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf02/udf02.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf02/udf02.1.ddl.sqlpp
@@ -29,4 +29,4 @@
 
 create function test.getFirst(list){
 list[0]
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf03/udf03.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf03/udf03.1.ddl.sqlpp
index 3a6a19e..ed94ce8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf03/udf03.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf03/udf03.1.ddl.sqlpp
@@ -33,4 +33,4 @@
 
 create function test.echo(list){
 list
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf04/udf04.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf04/udf04.1.ddl.sqlpp
index 398be48..e811992 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf04/udf04.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf04/udf04.1.ddl.sqlpp
@@ -29,4 +29,4 @@
 
 create function test.echo(list){
 list
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf05/udf05.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf05/udf05.1.ddl.sqlpp
index c968bed..98c78339 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf05/udf05.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf05/udf05.1.ddl.sqlpp
@@ -29,4 +29,4 @@
 
 create function test.echo(a){
 a
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf06/udf06.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf06/udf06.1.ddl.sqlpp
index cacfcfe..3d636a0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf06/udf06.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf06/udf06.1.ddl.sqlpp
@@ -30,4 +30,4 @@
 
 create function test.echo(a){
 a
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf07/udf07.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf07/udf07.1.ddl.sqlpp
index df170c2..1d1fe1b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf07/udf07.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf07/udf07.1.ddl.sqlpp
@@ -29,4 +29,4 @@
 
 create function test.echo(a){
 a
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf08/udf08.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf08/udf08.1.ddl.sqlpp
index 5a8662c..342deea 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf08/udf08.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf08/udf08.1.ddl.sqlpp
@@ -29,4 +29,4 @@
 
 create function test.echo(a){
 a
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf09/udf09.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf09/udf09.1.ddl.sqlpp
index f26e02c..8604cf8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf09/udf09.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf09/udf09.1.ddl.sqlpp
@@ -29,10 +29,10 @@
 
 create type test.TestType as open {
 id : bigint
-}
+};
 
 create dataset test.t1(TestType) primary key id;
 
 create function test.readDataset(a) {
 a
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf10/udf10.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf10/udf10.1.ddl.sqlpp
index 197be6e..7142125 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf10/udf10.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf10/udf10.1.ddl.sqlpp
@@ -29,4 +29,4 @@
 
 create function test.echo(uolist){
 uolist
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf11/udf11.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf11/udf11.1.ddl.sqlpp
index a95460e..d2c61cd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf11/udf11.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf11/udf11.1.ddl.sqlpp
@@ -30,4 +30,4 @@
 
 create function test.OList(){
 [1,2,3,4,5,6,7,8,9,10]
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf12/udf12.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf12/udf12.1.ddl.sqlpp
index 78169e2..ff41b8d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf12/udf12.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf12/udf12.1.ddl.sqlpp
@@ -30,4 +30,4 @@
 
 create function test.foo(a,b) {
 a+b
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf13/udf13.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf13/udf13.1.ddl.sqlpp
index 0d5ad73..221adf1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf13/udf13.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf13/udf13.1.ddl.sqlpp
@@ -29,4 +29,4 @@
 
 create function test.foo(a,b) {
 a - b
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf14/udf14.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf14/udf14.1.ddl.sqlpp
index ccf214b..a8fdf4e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf14/udf14.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf14/udf14.1.ddl.sqlpp
@@ -29,4 +29,4 @@
 
 create function test.foo(a,b) {
 a*b
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf15/udf15.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf15/udf15.1.ddl.sqlpp
index 2a0149e..b76cb4f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf15/udf15.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf15/udf15.1.ddl.sqlpp
@@ -33,4 +33,4 @@
 
 create function test.OList2(){
 [[1,2,3,4,5,6,7,8,9,10],['a','b','c','d','e','f','g','h','y']]
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf16/udf16.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf16/udf16.1.ddl.sqlpp
index 85b7fe0..eef6fef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf16/udf16.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf16/udf16.1.ddl.sqlpp
@@ -30,5 +30,5 @@
 
 create function test.fn02(){
 'Welcome to the world of Asterix'
-}
+};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf17/udf17.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf17/udf17.1.ddl.sqlpp
index 10129cc..82098f8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf17/udf17.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf17/udf17.1.ddl.sqlpp
@@ -31,8 +31,8 @@
 
 create function test.parent(){
 test.child()
-}
+};
 
 create function test.child() {
 'This data is from the child function'
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf18/udf18.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf18/udf18.1.ddl.sqlpp
index 0f0286f..c80ce47 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf18/udf18.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf18/udf18.1.ddl.sqlpp
@@ -29,4 +29,4 @@
 
 create function test.fn06(){
 false
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf19/udf19.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf19/udf19.1.ddl.sqlpp
index e1bca9b..870df93 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf19/udf19.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf19/udf19.1.ddl.sqlpp
@@ -30,8 +30,8 @@
 
 create function test.pie(){
 3.14
-}
+};
 
 create function test.area(radius){
 test.pie() * radius * radius
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf20/udf20.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf20/udf20.1.ddl.sqlpp
index e1bca9b..870df93 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf20/udf20.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf20/udf20.1.ddl.sqlpp
@@ -30,8 +30,8 @@
 
 create function test.pie(){
 3.14
-}
+};
 
 create function test.area(radius){
 test.pie() * radius * radius
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf21/udf21.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf21/udf21.1.ddl.sqlpp
index b8e1a9d..2cea06b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf21/udf21.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf21/udf21.1.ddl.sqlpp
@@ -31,4 +31,4 @@
 
 create function test.isOdd(b){
 b%2 != 0
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf22/udf22.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf22/udf22.1.ddl.sqlpp
index 31b73ee..71d705a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf22/udf22.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf22/udf22.1.ddl.sqlpp
@@ -30,4 +30,4 @@
 
 create function test.getFullName(fname,lname){
 `string-concat`([fname,lname])
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf23/udf23.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf23/udf23.1.ddl.sqlpp
index 0d6a61a..2663973 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf23/udf23.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf23/udf23.1.ddl.sqlpp
@@ -29,4 +29,4 @@
 
 create function test.numRows(){
 6
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf24/udf24.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf24/udf24.1.ddl.sqlpp
index 9b6c06a..b1348af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf24/udf24.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf24/udf24.1.ddl.sqlpp
@@ -26,4 +26,4 @@
 create function test.myRangeFn(n)
 {
    range(1,n)
-}
\ No newline at end of file
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf25/udf25.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf25/udf25.1.ddl.sqlpp
index 8a38962..8b3df34 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf25/udf25.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf25/udf25.1.ddl.sqlpp
@@ -35,4 +35,4 @@
         salary * 0.25
    else
         salary * 0.10
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf26/udf26.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf26/udf26.1.ddl.sqlpp
index deb496c..fc23af0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf26/udf26.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf26/udf26.1.ddl.sqlpp
@@ -29,4 +29,4 @@
 
 create function test.needs_f1(x){
  x + f1()
-}
+};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf27/udf27.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf27/udf27.1.ddl.sqlpp
index df9fb78..6b560b5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf27/udf27.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf27/udf27.1.ddl.sqlpp
@@ -32,6 +32,6 @@
 
 create function test.f1(){
 100
-}
+};
 
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf31/udf31.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf31/udf31.1.ddl.sqlpp
index 4e515bd..06a9bce 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf31/udf31.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/user-defined-functions/udf31/udf31.1.ddl.sqlpp
@@ -31,7 +31,7 @@
   `id`: int,
   `intensity`: int,
   `message`: string
-}
+};
 
 create dataset EmergencyReports(EmergencyReport)
 primary key id;
@@ -42,4 +42,4 @@
   order by emergency.id
   limit 1
   select element emergency.message
-}
\ No newline at end of file
+};
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/parser/FunctionParser.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/parser/FunctionParser.java
index d59c5df..2b24ea1 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/parser/FunctionParser.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/parser/FunctionParser.java
@@ -60,7 +60,7 @@
         builder.append("\n");
         builder.append(functionBody);
         builder.append("\n");
-        builder.append("}");
+        builder.append("};");
 
         IParser parser = parserFactory.createParser(new StringReader(new String(builder)));
         List<Statement> statements = parser.parse();
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
index 4c1d174..b76adb8 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
+++ b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
@@ -350,12 +350,14 @@
   Statement stmt = null;
 }
 {
-  ( stmt = SingleStatement() (<SEMICOLON>)*
-    {
-      decls.add(stmt);
-    }
+  (
+    (stmt = SingleStatement()
+      {
+        decls.add(stmt);
+      }
+    )?
+    (<SEMICOLON>)+
   )*
-  (<SEMICOLON>)*
   <EOF>
   {
     return decls;
@@ -382,7 +384,7 @@
     | stmt = ConnectionStatement()
     | stmt = CompactStatement()
     | stmt = ExplainStatement()
-    | stmt = Query(false) <SEMICOLON>
+    | stmt = Query(false)
     | stmt = RefreshExternalDatasetStatement()
     | stmt = RunStatement()
   )
diff --git a/asterixdb/asterix-lang-sqlpp/src/test/java/org/apache/asterix/lang/sqlpp/parser/ParserTest.java b/asterixdb/asterix-lang-sqlpp/src/test/java/org/apache/asterix/lang/sqlpp/parser/ParserTest.java
index dbb72c7..5b7ef16 100644
--- a/asterixdb/asterix-lang-sqlpp/src/test/java/org/apache/asterix/lang/sqlpp/parser/ParserTest.java
+++ b/asterixdb/asterix-lang-sqlpp/src/test/java/org/apache/asterix/lang/sqlpp/parser/ParserTest.java
@@ -25,30 +25,84 @@
 
 public class ParserTest {
 
-    protected void testLineEnding(String query) throws Exception {
+    protected void assertParseError(String query, int expectedErrorLine) throws Exception {
         IParserFactory factory = new SqlppParserFactory();
         IParser parser = factory.createParser(query);
         try {
             parser.parse();
+            throw new Exception("Expected error at line " + expectedErrorLine + " was not thrown");
         } catch (CompilationException e) {
-            if (!e.getMessage().contains("Syntax error: In line 3")) {
+            if (!e.getMessage().contains("Syntax error: In line " + expectedErrorLine)) {
                 throw new Exception("Unexpected error", e);
             }
         }
     }
 
+    protected void testLineEnding(String query, int expectedErrorLine) throws Exception {
+        assertParseError(query, expectedErrorLine);
+    }
+
     @Test
     public void testCR() throws Exception {
-        testLineEnding("select\rvalue\r1");
+        testLineEnding("select\rvalue\r1", 3);
     }
 
     @Test
     public void testCRLF() throws Exception {
-        testLineEnding("select\r\nvalue\r\n1");
+        testLineEnding("select\r\nvalue\r\n1", 3);
     }
 
     @Test
     public void testLF() throws Exception {
-        testLineEnding("select\nvalue\n1");
+        testLineEnding("select\nvalue\n1", 3);
+    }
+
+    @Test
+    public void testMultipleStatements() throws Exception {
+        String query = "use x;\nselect 1;";
+        IParserFactory factory = new SqlppParserFactory();
+        IParser parser = factory.createParser(query);
+        parser.parse();
+        query = "use x;\n use x;;;;\n use x;\n select 1;";
+        parser = factory.createParser(query);
+        parser.parse();
+    }
+
+    @Test
+    public void testUnseparatedStatements() throws Exception {
+        String query = "create dataverse dv select 1";
+        assertParseError(query, 1);
+        query = "use x\n select 1;";
+        assertParseError(query, 2);
+        query = "use x;\n use x;\n use x\n select 1;";
+        assertParseError(query, 4);
+    }
+
+    @Test
+    public void testEmptyStatement() throws Exception {
+        String query = "";
+        IParserFactory factory = new SqlppParserFactory();
+        IParser parser = factory.createParser(query);
+        parser.parse();
+
+        query = ";";
+        parser = factory.createParser(query);
+        parser.parse();
+
+        query = ";;;";
+        parser = factory.createParser(query);
+        parser.parse();
+
+        query = "\n\n";
+        parser = factory.createParser(query);
+        parser.parse();
+
+        query = "; select 1;";
+        parser = factory.createParser(query);
+        parser.parse();
+
+        query = ";;;;; select 1;;;";
+        parser = factory.createParser(query);
+        parser.parse();
     }
 }