You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by bu...@apache.org on 2016/06/07 20:28:12 UTC

[29/38] incubator-asterixdb git commit: Use backticks instead of double quotes for delimited identifiers in SQL++.

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/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 3ba09c1..78d4dc6 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
@@ -18,7 +18,7 @@
  */
 /*
  * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary rtree index in index subtree.
- * Issue        : 730, 741                 
+ * Issue        : 730, 741
  * Expected Res : Success
  * Date         : 8th May 2014
  */
@@ -31,45 +31,45 @@ use test;
 
 create type test.TwitterUserType as
  closed {
-  "screen-name" : string,
+  `screen-name` : string,
   lang : string,
-  "friends-count" : int32,
-  "statuses-count" : int32,
+  `friends-count` : int32,
+  `statuses-count` : int32,
   name : string,
-  "followers-count" : int32
+  `followers-count` : int32
 }
 
 create type test.TweetMessageType as
  closed {
   tweetid : int64,
   user : TwitterUserType,
-  "sender-location" : point,
-  "send-time" : datetime,
-  "referred-topics" : {{string}},
-  "message-text" : string,
+  `sender-location` : point,
+  `send-time` : datetime,
+  `referred-topics` : {{string}},
+  `message-text` : string,
   countA : int32,
   countB : int32
 }
 
 create  table TweetMessages(TweetMessageType) primary key tweetid;
 
-create  index twmSndLocIx  on TweetMessages ("sender-location") type rtree;
+create  index twmSndLocIx  on TweetMessages (`sender-location`) type rtree;
 
 create  index msgCountAIx  on TweetMessages (countA) type btree;
 
 create  index msgCountBIx  on TweetMessages (countB) type btree;
 
-create  index msgTextIx  on TweetMessages ("message-text") type keyword;
+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"
-select element {'tweetid1':t1.tweetid,'loc1':t1."sender-location",'nearby-message':(
-        select element {'tweetid2':t2.tweetid,'loc2':t2."sender-location"}
+select element {'tweetid1':t1.tweetid,'loc1':t1.`sender-location`,'nearby-message':(
+        select element {'tweetid2':t2.tweetid,'loc2':t2.`sender-location`}
         from  TweetMessages as t2
-        where (test."spatial-intersect"(t2."sender-location",n) and (t1.tweetid != t2.tweetid))
+        where (test.`spatial-intersect`(t2.`sender-location`,n) and (t1.tweetid != t2.tweetid))
         order by t2.tweetid
     )}
 from  TweetMessages as t1
-with  n as test."create-circle"(t1."sender-location",0.5)
+with  n as test.`create-circle`(t1.`sender-location`,0.5)
 where (t1.tweetid < test.int64('10'))
 order by t1.tweetid
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/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 fd04441..3f94633 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
@@ -32,32 +32,32 @@ use twitter;
 create type twitter.TweetMessageType as
  closed {
   tweetid : int64,
-  "sender-location" : point,
+  `sender-location` : point,
   text : string
 }
 
 create type twitter.TweetHistorySubscription as
 {
-  "subscription-id" : int32,
+  `subscription-id` : int32,
   location : point
 }
 
-create  table TweetHistorySubscriptions(TweetHistorySubscription) primary key "subscription-id";
+create  table TweetHistorySubscriptions(TweetHistorySubscription) primary key `subscription-id`;
 
 create  index testa  on TweetHistorySubscriptions (location) type rtree;
 
 create  table TweetMessages(TweetMessageType) primary key tweetid;
 
-create  index locationIdx  on TweetMessages ("sender-location") type rtree;
+create  index locationIdx  on TweetMessages (`sender-location`) type rtree;
 
 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}
+select element {'subscription-id':sub.`subscription-id`,'changeSet':1,'execution-time':twitter.`current-datetime`(),'message-text':text}
 from  TweetHistorySubscriptions as sub,
       (
     select element tweet
     from  TweetMessages as tweet
-    with  circle as twitter."create-circle"(location,30.0)
-    where twitter."spatial-intersect"(tweet."sender-location",circle)
+    with  circle as twitter.`create-circle`(location,30.0)
+    where twitter.`spatial-intersect`(tweet.`sender-location`,circle)
 ) as text
 with  location as sub.location
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/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 73f4024..f73e341 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
@@ -18,7 +18,7 @@
  */
 /*
  * Description    : Joins two datasets on the intersection of their point attributes.
- *                  The dataset 'MyData1' has an RTree index, and we expect the 
+ *                  The dataset 'MyData1' has an RTree index, and we expect the
  *                  join to be transformed into an indexed nested-loop join.
  * Success        : Yes
  */
@@ -51,5 +51,5 @@ 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
-where test."spatial-intersect"(a.point,b.point)
+where test.`spatial-intersect`(a.point,b.point)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/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 437f61f..ecce098 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
@@ -18,7 +18,7 @@
  */
 /*
  * Description    : Joins two datasets on the intersection of their point attributes.
- *                  The dataset 'MyData2' has an RTree index, and we expect the 
+ *                  The dataset 'MyData2' has an RTree index, and we expect the
  *                  join to be transformed into an indexed nested-loop join.
  * Success        : Yes
  */
@@ -51,5 +51,5 @@ write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_02.
 select element {'a':a,'b':b}
 from  MyData1 as a,
       MyData2 as b
-where test."spatial-intersect"(a.point,b.point)
+where test.`spatial-intersect`(a.point,b.point)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/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 449cf9d..57758b8 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
@@ -18,7 +18,7 @@
  */
 /*
  * Description    : Self-joins a dataset on the intersection of its point attribute.
- *                  The dataset has an RTree index, and we expect the 
+ *                  The dataset has an RTree index, and we expect the
  *                  join to be transformed into an indexed nested-loop join.
  * Success        : Yes
  */
@@ -49,5 +49,5 @@ write output to asterix_nc1:"rttest/rtree-index-join_spatial-intersect-point_03.
 select element {'a':a,'b':b}
 from  MyData as a,
       MyData as b
-where test."spatial-intersect"(a.point,b.point)
+where test.`spatial-intersect`(a.point,b.point)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/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 4205f3d..2977271 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
@@ -36,18 +36,18 @@ create type test.MyRecord as
   circle : circle
 }
 
-create  nodegroup group1 if not exists  on 
+create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;
 create  table MyData(MyRecord) primary key id on group1;
 
-load  table MyData using localfs (("path"="asterix_nc1://data/spatial/spatialData.json"),("format"="adm")) pre-sorted;
+load  table MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),("format"="adm")) pre-sorted;
 
 create  index rtree_index_point  on MyData (point) type rtree;
 
 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]))
+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/incubator-asterixdb/blob/6d57e49f/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 d9f15e1..239fd72 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
@@ -36,18 +36,18 @@ create type test.MyRecord as
   circle : circle
 }
 
-create  nodegroup group1 if not exists  on 
+create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;
 create  table MyData(MyRecord) primary key id on group1;
 
-load  table MyData using localfs (("path"="asterix_nc1://data/spatial/spatialData.json"),("format"="adm")) pre-sorted;
+load  table MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),("format"="adm")) pre-sorted;
 
 create  index rtree_index_point  on MyData (point) type rtree;
 
 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]))
+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/incubator-asterixdb/blob/6d57e49f/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 2d68bf0..4f5793d 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
@@ -50,7 +50,7 @@ create type tpch.LineIDType as
   l_suppkey : int32
 }
 
-create  nodegroup group1 if not exists  on 
+create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-rtree-secondary-index.sqlpp
----------------------------------------------------------------------
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 eb78120..2cc5c3b 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
@@ -36,13 +36,13 @@ create type test.MyRecord as
   circle : circle
 }
 
-create  nodegroup group1 if not exists  on 
+create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;
 create  table MyData(MyRecord) primary key id on group1;
 
-load  table MyData using localfs (("path"="asterix_nc1://data/spatial/spatialData.json"),("format"="adm")) pre-sorted;
+load  table MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),("format"="adm")) pre-sorted;
 
 create  index rtree_index_point  on MyData (point) type rtree;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete.sqlpp
----------------------------------------------------------------------
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 1aea151..f68e261 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
@@ -50,7 +50,7 @@ create type tpch.LineIDType as
   l_suppkey : int32
 }
 
-create  nodegroup group1 if not exists  on 
+create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-insert-secondary-index.sqlpp
----------------------------------------------------------------------
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 0e948d6..c74b9b4 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
@@ -50,7 +50,7 @@ create type tpch.LineIDType as
   l_suppkey : int32
 }
 
-create  nodegroup group1 if not exists  on 
+create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-insert.sqlpp
----------------------------------------------------------------------
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 df5ccb9..f5d09b0 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
@@ -50,7 +50,7 @@ create type tpch.LineIDType as
   l_suppkey : int32
 }
 
-create  nodegroup group1 if not exists  on 
+create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.sqlpp
----------------------------------------------------------------------
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 60db226..ce0d64b 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold
  *                  into edit-distance-check if possible.
  *                  Tests that the optimizer drills through the let clause.
  *                  Replacement should happen because of a "<=" condition on the edit distance.
@@ -44,6 +44,6 @@ create  table DBLP(DBLPType) primary key id;
 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')
+with  ed as test.`edit-distance`(o.authors,'Michael J. Carey')
 where (ed <= 2)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.sqlpp
----------------------------------------------------------------------
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 8853755..4c7a2cc 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
@@ -17,9 +17,9 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold
  *                  into edit-distance-check if possible.
- *                  Tests that the optimizer drills through the let clause. 
+ *                  Tests that the optimizer drills through the let clause.
  *                  Replacement should happen because of a reverse "<=" condition on the edit distance.
  * Success        : Yes
  */
@@ -44,6 +44,6 @@ create  table DBLP(DBLPType) primary key id;
 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')
+with  ed as test.`edit-distance`(o.authors,'Michael J. Carey')
 where (2 >= ed)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.sqlpp
----------------------------------------------------------------------
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 408caa7..a341e36 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold
  *                  into edit-distance-check if possible.
  *                  Tests that the optimizer drills through the let clause.
  *                  Replacement should happen because of a "<" condition on the edit distance.
@@ -44,6 +44,6 @@ create  table DBLP(DBLPType) primary key id;
 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')
+with  ed as test.`edit-distance`(o.authors,'Michael J. Carey')
 where (ed < 3)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.sqlpp
----------------------------------------------------------------------
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 c0b5e27..ad20ba4 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold
  *                  into edit-distance-check if possible.
  *                  Tests that the optimizer drills through the let clause.
  *                  Replacement should happen because of a reverse "<" condition on the edit distance.
@@ -44,6 +44,6 @@ create  table DBLP(DBLPType) primary key id;
 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')
+with  ed as test.`edit-distance`(o.authors,'Michael J. Carey')
 where (3 > ed)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.sqlpp
----------------------------------------------------------------------
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 7c9a651..e934999 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold
  *                  into edit-distance-check if possible.
  *                  Tests that the optimizer drills through the let clause.
  *                  Replacement should *not* happen because of a ">=" condition on the edit distance.
@@ -44,6 +44,6 @@ create  table DBLP(DBLPType) primary key id;
 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')
+with  ed as test.`edit-distance`(o.authors,'Michael J. Carey')
 where (ed >= 2)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.sqlpp
----------------------------------------------------------------------
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 2f46b13..b3dbea3 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold
  *                  into edit-distance-check if possible.
  *                  Tests that the optimizer drills through the let clause.
  *                   Replacement should *not* happen because of a reverse ">=" condition on the edit distance.
@@ -44,6 +44,6 @@ create  table DBLP(DBLPType) primary key id;
 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')
+with  ed as test.`edit-distance`(o.authors,'Michael J. Carey')
 where (2 <= ed)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.sqlpp
----------------------------------------------------------------------
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 93f9874..e12a62d 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold
  *                  into edit-distance-check if possible.
  *                  Tests that the optimizer drills through the let clause.
  *                  Replacement should *not* happen because of a ">" condition on the edit distance.
@@ -44,6 +44,6 @@ create  table DBLP(DBLPType) primary key id;
 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')
+with  ed as test.`edit-distance`(o.authors,'Michael J. Carey')
 where (ed > 2)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.sqlpp
----------------------------------------------------------------------
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 aa36034..9517de6 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold
  *                  into edit-distance-check if possible.
  *                  Tests that the optimizer drills through the let clause.
  *                  Replacement should *not* happen because of a reverse ">" condition on the edit distance.
@@ -44,6 +44,6 @@ create  table DBLP(DBLPType) primary key id;
 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')
+with  ed as test.`edit-distance`(o.authors,'Michael J. Carey')
 where (2 < ed)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_01.sqlpp
----------------------------------------------------------------------
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 872bc96..bc5e877 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold
  *                  into edit-distance-check if possible.
  *                  Replacement should happen because of a "<=" condition on the edit distance.
  * Success        : Yes
@@ -43,5 +43,5 @@ create  table DBLP(DBLPType) primary key id;
 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)
+where (test.`edit-distance`(o.authors,'Michael J. Carey') <= 2)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_02.sqlpp
----------------------------------------------------------------------
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 2934e62..74906ce 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold
  *                  into edit-distance-check if possible.
  *                  Replacement should happen because of a reverse "<=" condition on the edit distance.
  * Success        : Yes
@@ -43,5 +43,5 @@ create  table DBLP(DBLPType) primary key id;
 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'))
+where (2 >= test.`edit-distance`(o.authors,'Michael J. Carey'))
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_03.sqlpp
----------------------------------------------------------------------
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 772254e..80556e0 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold
  *                  into edit-distance-check if possible.
  *                  Replacement should happen because of a "<" condition on the edit distance.
  * Success        : Yes
@@ -43,5 +43,5 @@ create  table DBLP(DBLPType) primary key id;
 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)
+where (test.`edit-distance`(o.authors,'Michael J. Carey') < 3)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_04.sqlpp
----------------------------------------------------------------------
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 08ca282..fd34b6c 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold
  *                  into edit-distance-check if possible.
  *                  Replacement should happen because of a reverse "<" condition on the edit distance.
  * Success        : Yes
@@ -43,5 +43,5 @@ create  table DBLP(DBLPType) primary key id;
 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'))
+where (3 > test.`edit-distance`(o.authors,'Michael J. Carey'))
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_05.sqlpp
----------------------------------------------------------------------
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 18032a9..3359d5f 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold
  *                  into edit-distance-check if possible.
  *                  Replacement should *not* happen because of a ">=" condition on the edit distance.
  * Success        : Yes
@@ -43,5 +43,5 @@ create  table DBLP(DBLPType) primary key id;
 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)
+where (test.`edit-distance`(o.authors,'Michael J. Carey') >= 2)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_06.sqlpp
----------------------------------------------------------------------
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 3703f58..ec17343 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold
  *                  into edit-distance-check if possible.
  *                  Replacement should *not* happen because of a reverse ">=" condition on the edit distance.
  * Success        : Yes
@@ -43,5 +43,5 @@ create  table DBLP(DBLPType) primary key id;
 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'))
+where (2 <= test.`edit-distance`(o.authors,'Michael J. Carey'))
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_07.sqlpp
----------------------------------------------------------------------
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 610252f..69455d6 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold
  *                  into edit-distance-check if possible.
  *                  Replacement should *not* happen because of a ">" condition on the edit distance.
  * Success        : Yes
@@ -43,5 +43,5 @@ create  table DBLP(DBLPType) primary key id;
 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)
+where (test.`edit-distance`(o.authors,'Michael J. Carey') > 2)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/edit-distance-to-edit-distance-check_08.sqlpp
----------------------------------------------------------------------
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 b21959c..b8a9d2c 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the edit-distance function with a threshold
  *                  into edit-distance-check if possible.
  *                  Replacement should *not* happen because of a reverse ">" condition on the edit distance.
  * Success        : Yes
@@ -43,5 +43,5 @@ create  table DBLP(DBLPType) primary key id;
 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'))
+where (2 < test.`edit-distance`(o.authors,'Michael J. Carey'))
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/fuzzyeq-to-edit-distance-check.sqlpp
----------------------------------------------------------------------
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 8ee9dd4..a8b576b 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the FuzzyEqRule rewrites ~= using edit distance 
+ * Description    : Tests that the FuzzyEqRule rewrites ~= using edit distance
  *                  into edit-distance-check.
  * Success        : Yes
  */
@@ -40,9 +40,9 @@ create type test.DBLPType as
 create  table DBLP(DBLPType) primary key id;
 
 write output to asterix_nc1:"rttest/similarity_fuzzyeq-to-edit-distance-check.adm"
-set "simfunction" "edit-distance";
+set `simfunction` `edit-distance`;
 
-set "simthreshold" "1";
+set `simthreshold` `1`;
 
 select element o
 from  DBLP as o

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/fuzzyeq-to-jaccard-check.sqlpp
----------------------------------------------------------------------
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 d294b6e..893b252 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the FuzzyEqRule rewrites ~= using Jaccard 
+ * Description    : Tests that the FuzzyEqRule rewrites ~= using Jaccard
  *                  into edit-distance-check.
  * Success        : Yes
  */
@@ -40,11 +40,11 @@ create type test.DBLPType as
 create  table DBLP(DBLPType) primary key id;
 
 write output to asterix_nc1:"rttest/similarity_fuzzyeq-to-jaccard-check.adm"
-set "simfunction" "jaccard";
+set `simfunction` `jaccard`;
 
-set "simthreshold" "0.8f";
+set `simthreshold` `0.8f`;
 
 select element paper
 from  DBLP as paper
-where (test."word-tokens"(paper.title) ~= test."word-tokens"('Transactions for Cooperative Environments'))
+where (test.`word-tokens`(paper.title) ~= test.`word-tokens`('Transactions for Cooperative Environments'))
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_01.sqlpp
----------------------------------------------------------------------
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 b654632..968e341 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold
  *                  into similarity-jaccard-check-check if possible.
  *                  Tests that the optimizer drills through the let clause.
  *                  Replacement should happen because of a ">=" condition on the similarity.
@@ -44,6 +44,6 @@ create  table DBLP(DBLPType) primary key id;
 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'))
+with  jacc as test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments'))
 where (jacc >= 0.800000f)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_02.sqlpp
----------------------------------------------------------------------
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 b87361c..50458d2 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold
  *                  into similarity-jaccard-check-check if possible.
  *                  Tests that the optimizer drills through the let clause.
  *                  Replacement should happen because of a reverse ">=" condition on the similarity.
@@ -44,6 +44,6 @@ create  table DBLP(DBLPType) primary key id;
 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'))
+with  jacc as test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments'))
 where (0.800000f <= jacc)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_03.sqlpp
----------------------------------------------------------------------
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 bfd1b27..b15d669 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold
  *                  into similarity-jaccard-check-check if possible.
  *                  Tests that the optimizer drills through the let clause.
  *                  Replacement should happen because of a ">" condition on the similarity.
@@ -44,6 +44,6 @@ create  table DBLP(DBLPType) primary key id;
 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'))
+with  jacc as test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments'))
 where (jacc > 0.800000f)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_04.sqlpp
----------------------------------------------------------------------
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 7f88d18..41e2a02 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold
  *                  into similarity-jaccard-check-check if possible.
  *                  Tests that the optimizer drills through the let clause.
  *                  Replacement should happen because of a reverse ">" condition on the similarity.
@@ -44,6 +44,6 @@ create  table DBLP(DBLPType) primary key id;
 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'))
+with  jacc as test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments'))
 where (0.800000f < jacc)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_05.sqlpp
----------------------------------------------------------------------
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 5f586aa..0641de1 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold
  *                  into similarity-jaccard-check-check if possible.
  *                  Tests that the optimizer drills through the let clause.
  *                  Replacement should *not* happen because of a "<=" condition on the similarity.
@@ -44,6 +44,6 @@ create  table DBLP(DBLPType) primary key id;
 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'))
+with  jacc as test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments'))
 where (jacc <= 0.800000f)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_06.sqlpp
----------------------------------------------------------------------
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 923e91b..7430d43 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold
  *                  into similarity-jaccard-check-check if possible.
  *                  Tests that the optimizer drills through the let clause.
  *                  Replacement should *not* happen because of a reverse "<=" condition on the similarity.
@@ -44,6 +44,6 @@ create  table DBLP(DBLPType) primary key id;
 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'))
+with  jacc as test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments'))
 where (0.800000f >= jacc)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_07.sqlpp
----------------------------------------------------------------------
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 e41206c..2112ef8 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold
  *                  into similarity-jaccard-check-check if possible.
  *                  Tests that the optimizer drills through the let clause.
  *                  Replacement should *not* happen because of a "<" condition on the similarity.
@@ -44,6 +44,6 @@ create  table DBLP(DBLPType) primary key id;
 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'))
+with  jacc as test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments'))
 where (jacc < 0.800000f)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-let-to-jaccard-check_08.sqlpp
----------------------------------------------------------------------
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 c908acc..fa014d6 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold
  *                  into similarity-jaccard-check-check if possible.
  *                  Tests that the optimizer drills through the let clause.
  *                  Replacement should *not* happen because of a reverse "<" condition on the similarity.
@@ -44,6 +44,6 @@ create  table DBLP(DBLPType) primary key id;
 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'))
+with  jacc as test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments'))
 where (0.800000f > jacc)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_01.sqlpp
----------------------------------------------------------------------
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 8d1b600..0db58b0 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold
  *                  into similarity-jaccard-check-check if possible.
  *                  Replacement should happen because of a ">=" condition on the similarity.
  * Success        : Yes
@@ -43,5 +43,5 @@ create  table DBLP(DBLPType) primary key id;
 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)
+where (test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments')) >= 0.800000f)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_02.sqlpp
----------------------------------------------------------------------
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 7d8aa68..4c9152a 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold
  *                  into similarity-jaccard-check-check if possible.
  *                  Replacement should happen because of a reverse ">=" condition on the similarity.
  * Success        : Yes
@@ -43,5 +43,5 @@ create  table DBLP(DBLPType) primary key id;
 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')))
+where (0.800000f <= test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments')))
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_03.sqlpp
----------------------------------------------------------------------
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 7fa8f9c..1f25520 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold
  *                  into similarity-jaccard-check-check if possible.
  *                  Replacement should happen because of a ">" condition on the similarity.
  * Success        : Yes
@@ -43,5 +43,5 @@ create  table DBLP(DBLPType) primary key id;
 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)
+where (test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments')) > 0.800000f)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_04.sqlpp
----------------------------------------------------------------------
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 32dd476..5c3e4a7 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold
  *                  into similarity-jaccard-check-check if possible.
  *                  Replacement should happen because of a reverse ">" condition on the similarity.
  * Success        : Yes
@@ -43,5 +43,5 @@ create  table DBLP(DBLPType) primary key id;
 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')))
+where (0.800000f < test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments')))
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_05.sqlpp
----------------------------------------------------------------------
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 ea1d247..0a27d34 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold
  *                  into similarity-jaccard-check-check if possible.
  *                  Replacement should *not* happen because of a "<=" condition on the similarity.
  * Success        : Yes
@@ -43,5 +43,5 @@ create  table DBLP(DBLPType) primary key id;
 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)
+where (test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments')) <= 0.800000f)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_06.sqlpp
----------------------------------------------------------------------
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 1a0abcb..1e75104 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold
  *                  into similarity-jaccard-check-check if possible.
  *                  Replacement should *not* happen because of a reverse "<=" condition on the similarity.
  * Success        : Yes
@@ -43,5 +43,5 @@ create  table DBLP(DBLPType) primary key id;
 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')))
+where (0.800000f >= test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments')))
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_07.sqlpp
----------------------------------------------------------------------
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 614f17d..8c3dae0 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold
  *                  into similarity-jaccard-check-check if possible.
  *                  Replacement should *not* happen because of a "<" condition on the similarity.
  * Success        : Yes
@@ -43,5 +43,5 @@ create  table DBLP(DBLPType) primary key id;
 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)
+where (test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments')) < 0.800000f)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/similarity/jaccard-to-jaccard-check_08.sqlpp
----------------------------------------------------------------------
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 1af461f..8523fe9 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 /*
- * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold 
+ * Description    : Tests that the SimilarityCheckRule rewrites the similarity-jaccard function with a threshold
  *                  into similarity-jaccard-check-check if possible.
  *                  Replacement should *not* happen because of a reverse "<" condition on the similarity.
  * Success        : Yes
@@ -43,5 +43,5 @@ create  table DBLP(DBLPType) primary key id;
 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')))
+where (0.800000f > test.`similarity-jaccard`(test.`word-tokens`(paper.title),test.`word-tokens`('Transactions for Cooperative Environments')))
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/dont-skip-primary-index.sqlpp
----------------------------------------------------------------------
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 bf2f529..9085484 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
@@ -18,7 +18,7 @@
  */
 /*
  *  Description     : The hint to skip secondary indexes don't apply to the primary index
- *                  : This test is intended to verify that the primary index is still used instead of a scan 
+ *                  : This test is intended to verify that the primary index is still used instead of a scan
  *  Expected Result : Success
  *  Date            : 21th December 2013
  */

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-rtree-index-search-in-delete.sqlpp
----------------------------------------------------------------------
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 a91f5b8..c431b42 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
@@ -46,4 +46,4 @@ create  table MyData(MyRecord) primary key id;
 create  index rtree_index_point  on MyData (point) type rtree;
 
 delete m from MyData
- where  /*+ skip-index */ test."spatial-intersect"(m.point,test."create-polygon"([0.0,1.0,0.0,4.0,12.0,4.0,12.0,1.0]));
+ where  /*+ skip-index */ test.`spatial-intersect`(m.point,test.`create-polygon`([0.0,1.0,0.0,4.0,12.0,4.0,12.0,1.0]));

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-rtree-secondary-index.sqlpp
----------------------------------------------------------------------
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 eccf667..32650b3 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
@@ -41,18 +41,18 @@ create type test.MyRecord as
   circle : circle
 }
 
-create  nodegroup group1 if not exists  on 
+create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;
 create  table MyData(MyRecord) primary key id on group1;
 
-load  table MyData using localfs (("path"="asterix_nc1://data/spatial/spatialData.json"),("format"="adm")) pre-sorted;
+load  table MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),("format"="adm")) pre-sorted;
 
 create  index rtree_index_point  on MyData (point) type rtree;
 
 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]))
+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]))
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-word-index-search-in-delete.sqlpp
----------------------------------------------------------------------
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 36a9716..44702cc 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
@@ -42,4 +42,4 @@ create  table DBLP(DBLPType) primary key id;
 create  index keyword_index  on DBLP (title) type keyword;
 
 delete o from DBLP
- where ( /*+ skip-index */ test."similarity-jaccard"(test."word-tokens"(o.title),test."word-tokens"('Transactions for Cooperative Environments')) >= 0.500000f);
+ where ( /*+ skip-index */ test.`similarity-jaccard`(test.`word-tokens`(o.title),test.`word-tokens`('Transactions for Cooperative Environments')) >= 0.500000f);

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-word-index.sqlpp
----------------------------------------------------------------------
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 6808b88..9d272d0 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
@@ -44,6 +44,6 @@ create  index keyword_index  on DBLP (title) type keyword;
 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'))
+with  jacc as  /*+ skip-index */ test.`similarity-jaccard`(test.`word-tokens`(o.title),test.`word-tokens`('Transactions for Cooperative Environments'))
 where (jacc >= 0.500000f)
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/sort-cust.sqlpp
----------------------------------------------------------------------
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 6ae32c4..db81ca2 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
@@ -43,7 +43,7 @@ create type custlimit.CustomerType as
 
 }
 
-create  nodegroup group1 if not exists  on 
+create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/split-materialization-above-join.sqlpp
----------------------------------------------------------------------
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 94bcbf1..b04c6e4 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
@@ -34,7 +34,7 @@ create type fuzzyjoin.DBLPType as
 
 create  table DBLP(DBLPType) primary key id;
 
-set "import-private-functions" "true";
+set `import-private-functions` `true`;
 
 select element {'left':paperLeft,'right':paperRight,'sim':ridpair.sim}
 from  DBLP as paperLeft,
@@ -42,38 +42,38 @@ from  DBLP as paperLeft,
       (
     select element {'idLeft':idLeft,'idRight':idRight,'sim':sim[0]}
     from  DBLP as paperLeft,
-          fuzzyjoin."subset-collection"(tokensLeft,0,fuzzyjoin."prefix-len-jaccard"(lenLeft,0.500000f)) as prefixTokenLeft,
+          fuzzyjoin.`subset-collection`(tokensLeft,0,fuzzyjoin.`prefix-len-jaccard`(lenLeft,0.500000f)) as prefixTokenLeft,
           DBLP as paperRight,
-          fuzzyjoin."subset-collection"(tokensRight,0,fuzzyjoin."prefix-len-jaccard"(lenRight,0.500000f)) as prefixTokenRight
-    with  lenLeft as fuzzyjoin.len(fuzzyjoin."counthashed-word-tokens"(paperLeft.title)),
+          fuzzyjoin.`subset-collection`(tokensRight,0,fuzzyjoin.`prefix-len-jaccard`(lenRight,0.500000f)) as prefixTokenRight
+    with  lenLeft as fuzzyjoin.len(fuzzyjoin.`counthashed-word-tokens`(paperLeft.title)),
           tokensLeft as (
           select element i
-          from  fuzzyjoin."counthashed-word-tokens"(paperLeft.title) as tokenUnranked,
+          from  fuzzyjoin.`counthashed-word-tokens`(paperLeft.title) as tokenUnranked,
                 (
               select element tokenGroupped
               from  DBLP as paper,
-                    fuzzyjoin."counthashed-word-tokens"(paper.title) as token
+                    fuzzyjoin.`counthashed-word-tokens`(paper.title) as token
               group by token as tokenGroupped
               order by count(paper),tokenGroupped
           ) as tokenRanked at i
           where (tokenUnranked = tokenRanked)
           order by i
       ),
-          lenRight as fuzzyjoin.len(fuzzyjoin."counthashed-word-tokens"(paperRight.title)),
+          lenRight as fuzzyjoin.len(fuzzyjoin.`counthashed-word-tokens`(paperRight.title)),
           tokensRight as (
           select element i
-          from  fuzzyjoin."counthashed-word-tokens"(paperRight.title) as tokenUnranked,
+          from  fuzzyjoin.`counthashed-word-tokens`(paperRight.title) as tokenUnranked,
                 (
               select element tokenGroupped
               from  DBLP as paper,
-                    fuzzyjoin."counthashed-word-tokens"(paper.title) as token
+                    fuzzyjoin.`counthashed-word-tokens`(paper.title) as token
               group by token as tokenGroupped
               order by count(paper),tokenGroupped
           ) as tokenRanked at i
           where (tokenUnranked = tokenRanked)
           order by i
       ),
-          sim as fuzzyjoin."similarity-jaccard-prefix"(lenLeft,tokensLeft,lenRight,tokensRight,prefixTokenLeft,0.500000f)
+          sim as fuzzyjoin.`similarity-jaccard-prefix`(lenLeft,tokensLeft,lenRight,tokensRight,prefixTokenLeft,0.500000f)
     where ((prefixTokenLeft = prefixTokenRight) and ((sim >= 0.500000f) and (paperLeft.id < paperRight.id)))
     group by paperLeft.id as idLeft,paperRight.id as idRight
 ) as ridpair

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/split-materialization.sqlpp
----------------------------------------------------------------------
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 0cd244c..93eb9f2 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
@@ -25,9 +25,9 @@ use TinySocial;
 
 create type TinySocial.EmploymentType as
 {
-  "organization-name" : string,
-  "start-date" : date,
-  "end-date" : date?
+  `organization-name` : string,
+  `start-date` : date,
+  `end-date` : date?
 }
 
 create type TinySocial.FacebookUserType as
@@ -35,8 +35,8 @@ create type TinySocial.FacebookUserType as
   id : int32,
   alias : string,
   name : string,
-  "user-since" : datetime,
-  "friend-ids" : {{int32}},
+  `user-since` : datetime,
+  `friend-ids` : {{int32}},
   employment : [EmploymentType]
 }
 
@@ -45,12 +45,12 @@ create  table FacebookUsers(FacebookUserType) primary key id;
 with  lonelyusers as (
       select element d
       from  FacebookUsers as d
-      where (TinySocial.coll_count(d."friend-ids") < 2)
+      where (TinySocial.coll_count(d.`friend-ids`) < 2)
   ),
       lonelyusers2 as (
       select element d
       from  FacebookUsers as d
-      where (TinySocial.coll_count(d."friend-ids") < 2)
+      where (TinySocial.coll_count(d.`friend-ids`) < 2)
   )
 select element {'user1':{'id':l1.id,'name':l1.name},'user2':{'id':l2.id,'name':l2.name}}
 from  lonelyusers as l1,

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/6d57e49f/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/unnest_list_in_subplan.sqlpp
----------------------------------------------------------------------
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 f4dca82..9163bda 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
@@ -38,7 +38,7 @@ create type fuzzyjoin.TOKENSRANKEDADMType as
   rank : int32
 }
 
-create  nodegroup group1 if not exists  on 
+create  nodegroup group1 if not exists  on
     asterix_nc1,
     asterix_nc2
 ;
@@ -50,7 +50,7 @@ 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,
-      tokensUnrankedDBLP as fuzzyjoin."counthashed-word-tokens"(paperDBLP.title),
+      tokensUnrankedDBLP as fuzzyjoin.`counthashed-word-tokens`(paperDBLP.title),
       tokensDBLP as (
       select element tokenRanked.rank
       from  tokensUnrankedDBLP as tokenUnranked,