http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.sqlpp
----------------------------------------------------------------------
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 @@ create type test.DBLPType as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -43,7 +43,7 @@ create type test.CSXType as
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@ create  dataset CSX(CSXType) primary key id;
 
 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`;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.sqlpp
----------------------------------------------------------------------
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 @@ create type test.DBLPType as
   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`;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.sqlpp
----------------------------------------------------------------------
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 @@ create type test.DBLPType as
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -42,7 +42,7 @@ create type test.CSXType as
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@ create  index keyword_index_DBLP  on DBLP (title:string?) 
type keyword enforced;
 
 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`;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.sqlpp
----------------------------------------------------------------------
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 @@ create type test.TwitterUserType as
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -49,7 +49,7 @@ create type test.TweetMessageType as
   `referred-topics` : {{string}},
   countA : integer,
   countB : integer
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
@@ -61,7 +61,7 @@ create  index msgCountBIx  on TweetMessages (countB) type 
btree;
 
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.sqlpp
----------------------------------------------------------------------
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 @@ create type test.DBLPType as
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -43,7 +43,7 @@ create type test.CSXType as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@ create  dataset CSX(CSXType) 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_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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.sqlpp
----------------------------------------------------------------------
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 @@ create type test.DBLPType as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -43,7 +43,7 @@ create type test.CSXType as
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@ create  dataset CSX(CSXType) primary key id;
 
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.sqlpp
----------------------------------------------------------------------
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 @@ create type test.DBLPType as
   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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.sqlpp
----------------------------------------------------------------------
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 @@ create type test.DBLPType as
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -42,7 +42,7 @@ create type test.CSXType as
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@ create  index keyword_index_DBLP  on DBLP (title:string?) 
type keyword enforced;
 
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.sqlpp
----------------------------------------------------------------------
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 @@ create type test.DBLPType as
   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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.sqlpp
----------------------------------------------------------------------
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 @@ create type test.DBLPType as
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
  closed {
@@ -43,7 +43,7 @@ create type test.CSXType as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@ create  dataset CSX(CSXType) 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_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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.sqlpp
----------------------------------------------------------------------
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 @@ create type test.DBLPType as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -43,7 +43,7 @@ create type test.CSXType as
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -51,7 +51,7 @@ create  dataset CSX(CSXType) primary key id;
 
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.sqlpp
----------------------------------------------------------------------
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 @@ create type test.DBLPType as
   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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.sqlpp
----------------------------------------------------------------------
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 @@ create type test.DBLPType as
   dblpid : string,
   authors : string,
   misc : string
-}
+};
 
 create type test.CSXType as
 {
@@ -42,7 +42,7 @@ create type test.CSXType as
   csxid : string,
   authors : string,
   misc : string
-}
+};
 
 create  dataset DBLP(DBLPType) primary key id;
 
@@ -52,7 +52,7 @@ create  index keyword_index_DBLP  on DBLP (title:string?) 
type keyword enforced;
 
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.sqlpp
----------------------------------------------------------------------
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 @@ create type test.DBLPType as
   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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
----------------------------------------------------------------------
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 @@ create type test.TwitterUserType as
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -48,7 +48,7 @@ create type test.TweetMessageType as
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
@@ -60,7 +60,7 @@ create  index msgCountBIx  on TweetMessages (countB) type 
btree;
 
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
----------------------------------------------------------------------
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 @@ create type test.TwitterUserType as
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -48,7 +48,7 @@ create type test.TweetMessageType as
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
@@ -60,7 +60,7 @@ create  index msgCountBIx  on TweetMessages (countB) type 
btree;
 
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.sqlpp
----------------------------------------------------------------------
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 @@ create type test.MyRecord as
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyRecordOpen as
 {
@@ -50,7 +50,7 @@ create type test.MyRecordOpen as
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create  dataset MyData1(MyRecordOpen) primary key id;
 
@@ -58,7 +58,7 @@ create  dataset MyData2(MyRecord) primary key id;
 
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.sqlpp
----------------------------------------------------------------------
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 @@ create type test.MyRecord as
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create type test.MyRecordOpen as
 {
@@ -50,7 +50,7 @@ create type test.MyRecordOpen as
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create  dataset MyData1(MyRecord) primary key id;
 
@@ -58,7 +58,7 @@ create  dataset MyData2(MyRecordOpen) primary key id;
 
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.sqlpp
----------------------------------------------------------------------
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 @@ create type test.MyRecord as
   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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.sqlpp
----------------------------------------------------------------------
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 @@ create type test.MyRecord as
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create  dataset MyData1(MyRecord) primary key id;
 
@@ -48,7 +48,7 @@ create  index rtree_index  on MyData1 (point:point?) type 
rtree enforced;
 
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.sqlpp
----------------------------------------------------------------------
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 @@ create type test.MyRecord as
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create  dataset MyData1(MyRecord) primary key id;
 
@@ -46,7 +46,7 @@ create  dataset MyData2(MyRecord) primary key id;
 
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orderby-desc-using-gby.sqlpp
----------------------------------------------------------------------
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 @@ create type `gby-using-orderby-desc`.AddressType as
   number : integer,
   street : string,
   city : string
-}
+};
 
 create type `gby-using-orderby-desc`.CustomerType as
  closed {
@@ -41,7 +41,7 @@ create type `gby-using-orderby-desc`.CustomerType as
       total : float
   }
 
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -49,7 +49,7 @@ create  nodegroup group1 if not exists  on
 ;
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp
----------------------------------------------------------------------
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 @@ create type `orders-aggreg`.OrderType as
   orderpriority : string,
   clerk : string,
   total : float
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -39,7 +39,7 @@ create  nodegroup group1 if not exists  on
 ;
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-composite-index-search.sqlpp
----------------------------------------------------------------------
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 @@ create type index_search.OrderType as
   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'))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_01.sqlpp
----------------------------------------------------------------------
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 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -46,7 +46,7 @@ load  dataset Orders using localfs 
((`path`=`asterix_nc1://data/tpch0.001/orders
 
 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))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_02.sqlpp
----------------------------------------------------------------------
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 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -46,7 +46,7 @@ load  dataset Orders using localfs 
((`path`=`asterix_nc1://data/tpch0.001/orders
 
 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))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_01.sqlpp
----------------------------------------------------------------------
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 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -46,7 +46,7 @@ load  dataset Orders using localfs 
((`path`=`asterix_nc1://data/tpch0.001/orders
 
 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))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_02.sqlpp
----------------------------------------------------------------------
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 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -46,7 +46,7 @@ load  dataset Orders using localfs 
((`path`=`asterix_nc1://data/tpch0.001/orders
 
 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))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-open.sqlpp
----------------------------------------------------------------------
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 @@ create type index_search.OrderType as
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -44,7 +44,7 @@ create  dataset Orders(OrderType) primary key o_orderkey on 
group1;
 
 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)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search.sqlpp
----------------------------------------------------------------------
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 @@ create type index_search.OrderType as
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -44,7 +44,7 @@ create  dataset Orders(OrderType) primary key o_orderkey on 
group1;
 
 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)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search-open.sqlpp
----------------------------------------------------------------------
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 @@ create type prim_index_search.OrderType as
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -42,7 +42,7 @@ create  nodegroup group1 if not exists  on
 ;
 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)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search.sqlpp
----------------------------------------------------------------------
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 @@ create type prim_index_search.OrderType as
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -42,7 +42,7 @@ create  nodegroup group1 if not exists  on
 ;
 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)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/pull_select_above_eq_join.sqlpp
----------------------------------------------------------------------
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 @@ create type `pull-select-above-eq-join`.UserType as
   name : string,
   city : string,
   lottery_numbers : {{integer}}
-}
+};
 
 create type `pull-select-above-eq-join`.VisitorType as
 {
@@ -37,7 +37,7 @@ create type `pull-select-above-eq-join`.VisitorType as
   name : string,
   city : string,
   lottery_numbers : {{integer}}
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -47,7 +47,7 @@ create  dataset Users(UserType) primary key uid on group1;
 
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push-project-through-group.sqlpp
----------------------------------------------------------------------
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 @@ create type fuzzyjoin_080.DBLPType as
   title : string,
   authors : string,
   misc : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -38,7 +38,7 @@ create  nodegroup group1 if not exists  on
 ;
 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 (

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push_limit.sqlpp
----------------------------------------------------------------------
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 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -42,7 +42,7 @@ create  nodegroup group1 if not exists  on
 ;
 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)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q01_pricing_summary_report_nt.sqlpp
----------------------------------------------------------------------
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 @@ create type tpch.LineItemType as
   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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp
----------------------------------------------------------------------
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 @@ create type q3_shipping_priority.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type q3_shipping_priority.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type q3_shipping_priority.OrderType as
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type q3_shipping_priority.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type q3_shipping_priority.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -78,7 +78,7 @@ create  dataset Orders(OrderType) primary key o_orderkey on 
group1;
 
 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,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp
----------------------------------------------------------------------
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 @@ create type q5_local_supplier.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type q5_local_supplier.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type q5_local_supplier.OrderType as
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type q5_local_supplier.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type q5_local_supplier.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type q5_local_supplier.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type q5_local_supplier.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type q5_local_supplier.NationType as
  closed {
@@ -85,14 +85,14 @@ create type q5_local_supplier.NationType as
   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 Nations(NationType) primary key n_nationkey 
on group1;
 
 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,
       (

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q08_group_by.sqlpp
----------------------------------------------------------------------
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 @@ create type q08_group_by.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type q08_group_by.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type q08_group_by.OrderType as
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type q08_group_by.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type q08_group_by.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type q08_group_by.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type q08_group_by.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type q08_group_by.NationType as
  closed {
@@ -85,14 +85,14 @@ create type q08_group_by.NationType as
   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 @@ create type q08_group_by.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q09_group_by.sqlpp
----------------------------------------------------------------------
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 @@ create type q09_group_by.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type q09_group_by.OrderType as
  closed {
@@ -54,7 +54,7 @@ create type q09_group_by.OrderType as
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type q09_group_by.CustomerType as
  closed {
@@ -66,7 +66,7 @@ create type q09_group_by.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type q09_group_by.SupplierType as
  closed {
@@ -77,7 +77,7 @@ create type q09_group_by.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type q09_group_by.NationType as
  closed {
@@ -85,14 +85,14 @@ create type q09_group_by.NationType as
   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 @@ create type q09_group_by.PartType as
   p_container : string,
   p_retailprice : double,
   p_comment : string
-}
+};
 
 create type q09_group_by.PartSuppType as
  closed {
@@ -114,7 +114,7 @@ create type q09_group_by.PartSuppType as
   ps_availqty : integer,
   ps_supplycost : double,
   ps_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q1.sqlpp
----------------------------------------------------------------------
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 @@ create type events.AddressType as
   city : string,
   zip : string,
   latlong : point
-}
+};
 
 create type events.UserType as
 {
@@ -43,7 +43,7 @@ create type events.UserType as
           member_since : date
       }
 }}
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -51,7 +51,7 @@ create  nodegroup group1 if not exists  on
 ;
 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')

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q2.sqlpp
----------------------------------------------------------------------
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 @@ create type events.AddressType as
   street : string,
   city : string,
   zip : string
-}
+};
 
 create type events.EventType as
  closed {
@@ -48,7 +48,7 @@ create type events.EventType as
   price : double?,
   start_time : datetime,
   end_time : datetime
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -56,7 +56,7 @@ create  nodegroup group1 if not exists  on
 ;
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue562.sqlpp
----------------------------------------------------------------------
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 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create type tpch.OrderType as
  closed {
@@ -60,7 +60,7 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -72,7 +72,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create  dataset Orders(OrderType) primary key o_orderkey;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue601.sqlpp
----------------------------------------------------------------------
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 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue697.sqlpp
----------------------------------------------------------------------
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 @@ create type test.TestType as
  closed {
   key1 : integer,
   `value` : integer
-}
+};
 
 create  dataset test(TestType) primary key key1;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue785.sqlpp
----------------------------------------------------------------------
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 @@ create type tpch.OrderType as
   o_clerk : string,
   o_shippriority : integer,
   o_comment : string
-}
+};
 
 create type tpch.CustomerType as
  closed {
@@ -52,7 +52,7 @@ create type tpch.CustomerType as
   c_acctbal : double,
   c_mktsegment : string,
   c_comment : string
-}
+};
 
 create type tpch.SupplierType as
  closed {
@@ -63,7 +63,7 @@ create type tpch.SupplierType as
   s_phone : string,
   s_acctbal : double,
   s_comment : string
-}
+};
 
 create type tpch.NationType as
  closed {
@@ -71,14 +71,14 @@ create type tpch.NationType as
   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;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810-2.sqlpp
----------------------------------------------------------------------
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 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue810.sqlpp
----------------------------------------------------------------------
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 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query-issue827-2.sqlpp
----------------------------------------------------------------------
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 @@ create type tpch.LineItemType as
   l_shipinstruct : string,
   l_shipmode : string,
   l_comment : string
-}
+};
 
 create  dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849-2.sqlpp
----------------------------------------------------------------------
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 @@ use test;
 create type test.sType as
  closed {
   b : integer
-}
+};
 
 create  dataset s(sType) primary key b;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/query_issue849.sqlpp
----------------------------------------------------------------------
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 @@ use test;
 create type test.sType as
  closed {
   b : integer
-}
+};
 
 create  dataset s(sType) primary key b;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.sqlpp
----------------------------------------------------------------------
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 @@ create type TinySocial.TwitterUserType as
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create  dataset TwitterUsers(TwitterUserType) primary key `screen-name`;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-numeric.sqlpp
----------------------------------------------------------------------
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 @@ create type TinySocial.TwitterUserType as
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create  dataset TwitterUsers(TwitterUserType) primary key `screen-name`;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string-desc.sqlpp
----------------------------------------------------------------------
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 @@ create type TinySocial.TwitterUserType as
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create  dataset TwitterUsers(TwitterUserType) primary key `screen-name`;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/range-connector/sort-hint-on-closed-string.sqlpp
----------------------------------------------------------------------
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 @@ create type TinySocial.TwitterUserType as
   statuses_count : bigint,
   name : string,
   followers_count : bigint
-}
+};
 
 create  dataset TwitterUsers(TwitterUserType) primary key `screen-name`;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/record_access.sqlpp
----------------------------------------------------------------------
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 @@ create  dataverse test;
 use test;
 
 
-write output to asterix_nc1:"/tmp/rec_access.adm"
+write output to asterix_nc1:"/tmp/rec_access.adm";
 {'a':2}.a;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/issue730.sqlpp
----------------------------------------------------------------------
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 @@ create type test.TwitterUserType as
   statuses_count : integer,
   name : string,
   followers_count : integer
-}
+};
 
 create type test.TweetMessageType as
 {
@@ -47,13 +47,13 @@ create type test.TweetMessageType as
   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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.sqlpp
----------------------------------------------------------------------
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 @@ create type test.TwitterUserType as
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
  closed {
@@ -49,7 +49,7 @@ create type test.TweetMessageType as
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
@@ -61,7 +61,7 @@ create  index msgCountBIx  on TweetMessages (countB) type 
btree;
 
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.sqlpp
----------------------------------------------------------------------
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 @@ create type test.TwitterUserType as
   `statuses-count` : integer,
   name : string,
   `followers-count` : integer
-}
+};
 
 create type test.TweetMessageType as
  closed {
@@ -49,7 +49,7 @@ create type test.TweetMessageType as
   `message-text` : string,
   countA : integer,
   countB : integer
-}
+};
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
 
@@ -61,7 +61,7 @@ create  index msgCountBIx  on TweetMessages (countB) type 
btree;
 
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/query-issue838.sqlpp
----------------------------------------------------------------------
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 @@ create type twitter.TweetMessageType as
   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  dataset TweetMessages(TweetMessageType) primary key 
tweetid;
 
 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,
       (

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_01.sqlpp
----------------------------------------------------------------------
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 @@ create type test.MyRecord as
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create  dataset MyData1(MyRecord) primary key id;
 
@@ -47,7 +47,7 @@ create  dataset MyData2(MyRecord) primary key id;
 
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_02.sqlpp
----------------------------------------------------------------------
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 @@ create type test.MyRecord as
   poly1 : polygon,
   poly2 : polygon,
   rec : rectangle
-}
+};
 
 create  dataset MyData1(MyRecord) primary key id;
 
@@ -47,7 +47,7 @@ create  dataset MyData2(MyRecord) primary key id;
 
 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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-index-join/spatial-intersect-point_03.sqlpp
----------------------------------------------------------------------
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 @@ create type test.MyRecord as
   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

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index-open.sqlpp
----------------------------------------------------------------------
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 @@ create type test.MyRecord as
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -46,7 +46,7 @@ load  dataset MyData using localfs 
((`path`=`asterix_nc1://data/spatial/spatialD
 
 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]))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index.sqlpp
----------------------------------------------------------------------
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 @@ create type test.MyRecord as
   poly2 : polygon,
   rec : rectangle,
   circle : circle
-}
+};
 
 create  nodegroup group1 if not exists  on
     asterix_nc1,
@@ -46,7 +46,7 @@ load  dataset MyData using localfs 
((`path`=`asterix_nc1://data/spatial/spatialD
 
 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]))

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dc77522b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-all.sqlpp
----------------------------------------------------------------------
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 @@ create type tpch.LineItemType as
   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,

Reply via email to