http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-1671.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-1671.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-1671.plan
index d26d5a0..fb47041 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-1671.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-1671.plan
@@ -4,10 +4,10 @@
       -- STREAM_PROJECT  |PARTITIONED|
         -- ASSIGN  |PARTITIONED|
           -- STREAM_PROJECT  |PARTITIONED|
-            -- SORT_MERGE_EXCHANGE [$$17(ASC), $$18(ASC) ]  |PARTITIONED|
+            -- SORT_MERGE_EXCHANGE [$$18(ASC), $$19(ASC) ]  |PARTITIONED|
               -- STREAM_LIMIT  |PARTITIONED|
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                  -- STABLE_SORT [topK: 0] [$$17(ASC), $$18(ASC)]  
|PARTITIONED|
+                  -- STABLE_SORT [topK: 0] [$$18(ASC), $$19(ASC)]  
|PARTITIONED|
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                       -- ASSIGN  |PARTITIONED|
                         -- STREAM_PROJECT  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-1806.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-1806.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-1806.plan
index fef4ae3..3f32020 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-1806.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-1806.plan
@@ -3,13 +3,13 @@
     -- STREAM_PROJECT  |PARTITIONED|
       -- ASSIGN  |PARTITIONED|
         -- SORT_MERGE_EXCHANGE [$$l_returnflag(ASC), $$l_linestatus(ASC) ]  
|PARTITIONED|
-          -- SORT_GROUP_BY[$$149, $$150]  |PARTITIONED|
+          -- SORT_GROUP_BY[$$161, $$162]  |PARTITIONED|
                   {
                     -- AGGREGATE  |LOCAL|
                       -- NESTED_TUPLE_SOURCE  |LOCAL|
                   }
-            -- HASH_PARTITION_EXCHANGE [$$149, $$150]  |PARTITIONED|
-              -- SORT_GROUP_BY[$$117, $$118]  |PARTITIONED|
+            -- HASH_PARTITION_EXCHANGE [$$161, $$162]  |PARTITIONED|
+              -- SORT_GROUP_BY[$$129, $$130]  |PARTITIONED|
                       {
                         -- AGGREGATE  |LOCAL|
                           -- NESTED_TUPLE_SOURCE  |LOCAL|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-1806_ps.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-1806_ps.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-1806_ps.plan
index 5585ddd..8e32b8b 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-1806_ps.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-1806_ps.plan
@@ -9,13 +9,13 @@
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                   -- REPLICATE  |PARTITIONED|
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                      -- SORT_GROUP_BY[$$149, $$150]  |PARTITIONED|
+                      -- SORT_GROUP_BY[$$161, $$162]  |PARTITIONED|
                               {
                                 -- AGGREGATE  |LOCAL|
                                   -- NESTED_TUPLE_SOURCE  |LOCAL|
                               }
-                        -- HASH_PARTITION_EXCHANGE [$$149, $$150]  
|PARTITIONED|
-                          -- SORT_GROUP_BY[$$117, $$118]  |PARTITIONED|
+                        -- HASH_PARTITION_EXCHANGE [$$161, $$162]  
|PARTITIONED|
+                          -- SORT_GROUP_BY[$$129, $$130]  |PARTITIONED|
                                   {
                                     -- AGGREGATE  |LOCAL|
                                       -- NESTED_TUPLE_SOURCE  |LOCAL|
@@ -37,13 +37,13 @@
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- REPLICATE  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                -- SORT_GROUP_BY[$$149, $$150]  |PARTITIONED|
+                                -- SORT_GROUP_BY[$$161, $$162]  |PARTITIONED|
                                         {
                                           -- AGGREGATE  |LOCAL|
                                             -- NESTED_TUPLE_SOURCE  |LOCAL|
                                         }
-                                  -- HASH_PARTITION_EXCHANGE [$$149, $$150]  
|PARTITIONED|
-                                    -- SORT_GROUP_BY[$$117, $$118]  
|PARTITIONED|
+                                  -- HASH_PARTITION_EXCHANGE [$$161, $$162]  
|PARTITIONED|
+                                    -- SORT_GROUP_BY[$$129, $$130]  
|PARTITIONED|
                                             {
                                               -- AGGREGATE  |LOCAL|
                                                 -- NESTED_TUPLE_SOURCE  |LOCAL|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2354.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2354.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2354.plan
index b255ab2..0181a84 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2354.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2354.plan
@@ -1,8 +1,8 @@
 -- DISTRIBUTE_RESULT  |PARTITIONED|
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
     -- STREAM_PROJECT  |PARTITIONED|
-      -- SORT_MERGE_EXCHANGE [$$70(ASC), $$71(ASC), $$72(ASC) ]  |PARTITIONED|
-        -- STABLE_SORT [$$70(ASC), $$71(ASC), $$72(ASC)]  |PARTITIONED|
+      -- SORT_MERGE_EXCHANGE [$$74(ASC), $$75(ASC), $$76(ASC) ]  |PARTITIONED|
+        -- STABLE_SORT [$$74(ASC), $$75(ASC), $$76(ASC)]  |PARTITIONED|
           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
             -- UNION_ALL  |PARTITIONED|
               -- RANDOM_PARTITION_EXCHANGE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2354_ps.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2354_ps.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2354_ps.plan
index a110303..a17555e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2354_ps.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2354_ps.plan
@@ -2,8 +2,8 @@
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
     -- STREAM_PROJECT  |PARTITIONED|
       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-        -- STABLE_SORT [$$70(ASC), $$71(ASC), $$72(ASC)]  |PARTITIONED|
-          -- RANGE_PARTITION_EXCHANGE [$$70(ASC), $$71(ASC), $$72(ASC)]  
|PARTITIONED|
+        -- STABLE_SORT [$$74(ASC), $$75(ASC), $$76(ASC)]  |PARTITIONED|
+          -- RANGE_PARTITION_EXCHANGE [$$74(ASC), $$75(ASC), $$76(ASC)]  
|PARTITIONED|
             -- FORWARD  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                 -- REPLICATE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2408.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2408.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2408.plan
index 640a064..fef38d5 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2408.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2408.plan
@@ -3,12 +3,12 @@
     -- STREAM_PROJECT  |PARTITIONED|
       -- ASSIGN  |PARTITIONED|
         -- STREAM_PROJECT  |PARTITIONED|
-          -- SORT_MERGE_EXCHANGE [$$39(ASC) ]  |PARTITIONED|
-            -- STABLE_SORT [$$39(ASC)]  |PARTITIONED|
+          -- SORT_MERGE_EXCHANGE [$$42(ASC) ]  |PARTITIONED|
+            -- STABLE_SORT [$$42(ASC)]  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                 -- STREAM_PROJECT  |PARTITIONED|
                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                    -- PRE_CLUSTERED_GROUP_BY[$$37]  |PARTITIONED|
+                    -- PRE_CLUSTERED_GROUP_BY[$$40]  |PARTITIONED|
                             {
                               -- AGGREGATE  |LOCAL|
                                 -- STREAM_SELECT  |LOCAL|
@@ -17,7 +17,7 @@
                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                         -- STREAM_PROJECT  |PARTITIONED|
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                            -- HYBRID_HASH_JOIN [$$37][$$40]  |PARTITIONED|
+                            -- HYBRID_HASH_JOIN [$$40][$$43]  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                 -- STREAM_PROJECT  |PARTITIONED|
                                   -- ASSIGN  |PARTITIONED|
@@ -25,7 +25,7 @@
                                       -- DATASOURCE_SCAN  |PARTITIONED|
                                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                           -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                              -- HASH_PARTITION_EXCHANGE [$$40]  |PARTITIONED|
+                              -- HASH_PARTITION_EXCHANGE [$$43]  |PARTITIONED|
                                 -- STREAM_PROJECT  |PARTITIONED|
                                   -- ASSIGN  |PARTITIONED|
                                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2408_ps.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2408_ps.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2408_ps.plan
index bd0ff12..b47c7d3 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2408_ps.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-2408_ps.plan
@@ -4,15 +4,15 @@
       -- ASSIGN  |PARTITIONED|
         -- STREAM_PROJECT  |PARTITIONED|
           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-            -- STABLE_SORT [$$39(ASC)]  |PARTITIONED|
-              -- RANGE_PARTITION_EXCHANGE [$$39(ASC)]  |PARTITIONED|
+            -- STABLE_SORT [$$42(ASC)]  |PARTITIONED|
+              -- RANGE_PARTITION_EXCHANGE [$$42(ASC)]  |PARTITIONED|
                 -- FORWARD  |PARTITIONED|
                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                     -- REPLICATE  |PARTITIONED|
                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                         -- STREAM_PROJECT  |PARTITIONED|
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                            -- PRE_CLUSTERED_GROUP_BY[$$37]  |PARTITIONED|
+                            -- PRE_CLUSTERED_GROUP_BY[$$40]  |PARTITIONED|
                                     {
                                       -- AGGREGATE  |LOCAL|
                                         -- STREAM_SELECT  |LOCAL|
@@ -21,7 +21,7 @@
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                 -- STREAM_PROJECT  |PARTITIONED|
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                    -- HYBRID_HASH_JOIN [$$37][$$40]  
|PARTITIONED|
+                                    -- HYBRID_HASH_JOIN [$$40][$$43]  
|PARTITIONED|
                                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                         -- STREAM_PROJECT  |PARTITIONED|
                                           -- ASSIGN  |PARTITIONED|
@@ -29,7 +29,7 @@
                                               -- DATASOURCE_SCAN  |PARTITIONED|
                                                 -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                   -- EMPTY_TUPLE_SOURCE  
|PARTITIONED|
-                                      -- HASH_PARTITION_EXCHANGE [$$40]  
|PARTITIONED|
+                                      -- HASH_PARTITION_EXCHANGE [$$43]  
|PARTITIONED|
                                         -- STREAM_PROJECT  |PARTITIONED|
                                           -- ASSIGN  |PARTITIONED|
                                             -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
@@ -46,7 +46,7 @@
                                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                   -- STREAM_PROJECT  |PARTITIONED|
                                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                      -- PRE_CLUSTERED_GROUP_BY[$$37]  
|PARTITIONED|
+                                      -- PRE_CLUSTERED_GROUP_BY[$$40]  
|PARTITIONED|
                                               {
                                                 -- AGGREGATE  |LOCAL|
                                                   -- STREAM_SELECT  |LOCAL|
@@ -55,7 +55,7 @@
                                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                           -- STREAM_PROJECT  |PARTITIONED|
                                             -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                              -- HYBRID_HASH_JOIN [$$37][$$40] 
 |PARTITIONED|
+                                              -- HYBRID_HASH_JOIN [$$40][$$43] 
 |PARTITIONED|
                                                 -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                   -- STREAM_PROJECT  
|PARTITIONED|
                                                     -- ASSIGN  |PARTITIONED|
@@ -63,7 +63,7 @@
                                                         -- DATASOURCE_SCAN  
|PARTITIONED|
                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                             -- 
EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                                                -- HASH_PARTITION_EXCHANGE 
[$$40]  |PARTITIONED|
+                                                -- HASH_PARTITION_EXCHANGE 
[$$43]  |PARTITIONED|
                                                   -- STREAM_PROJECT  
|PARTITIONED|
                                                     -- ASSIGN  |PARTITIONED|
                                                       -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-2.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-2.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-2.plan
index 1d80ccf..03a2bf2 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-2.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-2.plan
@@ -3,7 +3,7 @@
     -- STREAM_PROJECT  |PARTITIONED|
       -- ASSIGN  |PARTITIONED|
         -- SORT_MERGE_EXCHANGE [$$l_returnflag(ASC), $$l_linestatus(ASC) ]  
|PARTITIONED|
-          -- PRE_CLUSTERED_GROUP_BY[$$104, $$105]  |PARTITIONED|
+          -- PRE_CLUSTERED_GROUP_BY[$$112, $$113]  |PARTITIONED|
                   {
                     -- AGGREGATE  |LOCAL|
                       -- NESTED_TUPLE_SOURCE  |LOCAL|
@@ -13,9 +13,9 @@
                       -- NESTED_TUPLE_SOURCE  |LOCAL|
                   }
             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-              -- STABLE_SORT [$$104(ASC), $$105(ASC)]  |PARTITIONED|
-                -- HASH_PARTITION_EXCHANGE [$$104, $$105]  |PARTITIONED|
-                  -- PRE_CLUSTERED_GROUP_BY[$$90, $$91]  |PARTITIONED|
+              -- STABLE_SORT [$$112(ASC), $$113(ASC)]  |PARTITIONED|
+                -- HASH_PARTITION_EXCHANGE [$$112, $$113]  |PARTITIONED|
+                  -- PRE_CLUSTERED_GROUP_BY[$$98, $$99]  |PARTITIONED|
                           {
                             -- AGGREGATE  |LOCAL|
                               -- STREAM_SELECT  |LOCAL|
@@ -27,7 +27,7 @@
                                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                           }
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                      -- STABLE_SORT [$$90(ASC), $$91(ASC)]  |PARTITIONED|
+                      -- STABLE_SORT [$$98(ASC), $$99(ASC)]  |PARTITIONED|
                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                           -- ASSIGN  |PARTITIONED|
                             -- STREAM_PROJECT  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-2_ps.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-2_ps.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-2_ps.plan
index ed8309c..023a324 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-2_ps.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-2_ps.plan
@@ -9,7 +9,7 @@
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                   -- REPLICATE  |PARTITIONED|
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                      -- PRE_CLUSTERED_GROUP_BY[$$104, $$105]  |PARTITIONED|
+                      -- PRE_CLUSTERED_GROUP_BY[$$112, $$113]  |PARTITIONED|
                               {
                                 -- AGGREGATE  |LOCAL|
                                   -- NESTED_TUPLE_SOURCE  |LOCAL|
@@ -19,9 +19,9 @@
                                   -- NESTED_TUPLE_SOURCE  |LOCAL|
                               }
                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                          -- STABLE_SORT [$$104(ASC), $$105(ASC)]  
|PARTITIONED|
-                            -- HASH_PARTITION_EXCHANGE [$$104, $$105]  
|PARTITIONED|
-                              -- PRE_CLUSTERED_GROUP_BY[$$90, $$91]  
|PARTITIONED|
+                          -- STABLE_SORT [$$112(ASC), $$113(ASC)]  
|PARTITIONED|
+                            -- HASH_PARTITION_EXCHANGE [$$112, $$113]  
|PARTITIONED|
+                              -- PRE_CLUSTERED_GROUP_BY[$$98, $$99]  
|PARTITIONED|
                                       {
                                         -- AGGREGATE  |LOCAL|
                                           -- STREAM_SELECT  |LOCAL|
@@ -33,7 +33,7 @@
                                             -- NESTED_TUPLE_SOURCE  |LOCAL|
                                       }
                                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                  -- STABLE_SORT [$$90(ASC), $$91(ASC)]  
|PARTITIONED|
+                                  -- STABLE_SORT [$$98(ASC), $$99(ASC)]  
|PARTITIONED|
                                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                       -- ASSIGN  |PARTITIONED|
                                         -- STREAM_PROJECT  |PARTITIONED|
@@ -49,7 +49,7 @@
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- REPLICATE  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                -- PRE_CLUSTERED_GROUP_BY[$$104, $$105]  
|PARTITIONED|
+                                -- PRE_CLUSTERED_GROUP_BY[$$112, $$113]  
|PARTITIONED|
                                         {
                                           -- AGGREGATE  |LOCAL|
                                             -- NESTED_TUPLE_SOURCE  |LOCAL|
@@ -59,9 +59,9 @@
                                             -- NESTED_TUPLE_SOURCE  |LOCAL|
                                         }
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                    -- STABLE_SORT [$$104(ASC), $$105(ASC)]  
|PARTITIONED|
-                                      -- HASH_PARTITION_EXCHANGE [$$104, 
$$105]  |PARTITIONED|
-                                        -- PRE_CLUSTERED_GROUP_BY[$$90, $$91]  
|PARTITIONED|
+                                    -- STABLE_SORT [$$112(ASC), $$113(ASC)]  
|PARTITIONED|
+                                      -- HASH_PARTITION_EXCHANGE [$$112, 
$$113]  |PARTITIONED|
+                                        -- PRE_CLUSTERED_GROUP_BY[$$98, $$99]  
|PARTITIONED|
                                                 {
                                                   -- AGGREGATE  |LOCAL|
                                                     -- STREAM_SELECT  |LOCAL|
@@ -73,7 +73,7 @@
                                                       -- NESTED_TUPLE_SOURCE  
|LOCAL|
                                                 }
                                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                            -- STABLE_SORT [$$90(ASC), 
$$91(ASC)]  |PARTITIONED|
+                                            -- STABLE_SORT [$$98(ASC), 
$$99(ASC)]  |PARTITIONED|
                                               -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                 -- ASSIGN  |PARTITIONED|
                                                   -- STREAM_PROJECT  
|PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-3.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-3.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-3.plan
index 56a7aca..e6f7289 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-3.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-3.plan
@@ -3,7 +3,7 @@
     -- STREAM_PROJECT  |PARTITIONED|
       -- ASSIGN  |PARTITIONED|
         -- SORT_MERGE_EXCHANGE [$$l_returnflag(ASC), $$l_linestatus(ASC) ]  
|PARTITIONED|
-          -- PRE_CLUSTERED_GROUP_BY[$$112, $$113]  |PARTITIONED|
+          -- PRE_CLUSTERED_GROUP_BY[$$121, $$122]  |PARTITIONED|
                   {
                     -- AGGREGATE  |LOCAL|
                       -- NESTED_TUPLE_SOURCE  |LOCAL|
@@ -13,9 +13,9 @@
                       -- NESTED_TUPLE_SOURCE  |LOCAL|
                   }
             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-              -- STABLE_SORT [$$112(ASC), $$113(ASC)]  |PARTITIONED|
-                -- HASH_PARTITION_EXCHANGE [$$112, $$113]  |PARTITIONED|
-                  -- PRE_CLUSTERED_GROUP_BY[$$99, $$100]  |PARTITIONED|
+              -- STABLE_SORT [$$121(ASC), $$122(ASC)]  |PARTITIONED|
+                -- HASH_PARTITION_EXCHANGE [$$121, $$122]  |PARTITIONED|
+                  -- PRE_CLUSTERED_GROUP_BY[$$108, $$109]  |PARTITIONED|
                           {
                             -- AGGREGATE  |LOCAL|
                               -- STREAM_SELECT  |LOCAL|
@@ -27,7 +27,7 @@
                                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                           }
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                      -- STABLE_SORT [$$99(ASC), $$100(ASC)]  |PARTITIONED|
+                      -- STABLE_SORT [$$108(ASC), $$109(ASC)]  |PARTITIONED|
                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                           -- ASSIGN  |PARTITIONED|
                             -- STREAM_PROJECT  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-3_ps.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-3_ps.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-3_ps.plan
index 7b7285b..ef2b15a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-3_ps.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810-3_ps.plan
@@ -9,7 +9,7 @@
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                   -- REPLICATE  |PARTITIONED|
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                      -- PRE_CLUSTERED_GROUP_BY[$$112, $$113]  |PARTITIONED|
+                      -- PRE_CLUSTERED_GROUP_BY[$$121, $$122]  |PARTITIONED|
                               {
                                 -- AGGREGATE  |LOCAL|
                                   -- NESTED_TUPLE_SOURCE  |LOCAL|
@@ -19,9 +19,9 @@
                                   -- NESTED_TUPLE_SOURCE  |LOCAL|
                               }
                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                          -- STABLE_SORT [$$112(ASC), $$113(ASC)]  
|PARTITIONED|
-                            -- HASH_PARTITION_EXCHANGE [$$112, $$113]  
|PARTITIONED|
-                              -- PRE_CLUSTERED_GROUP_BY[$$99, $$100]  
|PARTITIONED|
+                          -- STABLE_SORT [$$121(ASC), $$122(ASC)]  
|PARTITIONED|
+                            -- HASH_PARTITION_EXCHANGE [$$121, $$122]  
|PARTITIONED|
+                              -- PRE_CLUSTERED_GROUP_BY[$$108, $$109]  
|PARTITIONED|
                                       {
                                         -- AGGREGATE  |LOCAL|
                                           -- STREAM_SELECT  |LOCAL|
@@ -33,7 +33,7 @@
                                             -- NESTED_TUPLE_SOURCE  |LOCAL|
                                       }
                                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                  -- STABLE_SORT [$$99(ASC), $$100(ASC)]  
|PARTITIONED|
+                                  -- STABLE_SORT [$$108(ASC), $$109(ASC)]  
|PARTITIONED|
                                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                       -- ASSIGN  |PARTITIONED|
                                         -- STREAM_PROJECT  |PARTITIONED|
@@ -49,7 +49,7 @@
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- REPLICATE  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                -- PRE_CLUSTERED_GROUP_BY[$$112, $$113]  
|PARTITIONED|
+                                -- PRE_CLUSTERED_GROUP_BY[$$121, $$122]  
|PARTITIONED|
                                         {
                                           -- AGGREGATE  |LOCAL|
                                             -- NESTED_TUPLE_SOURCE  |LOCAL|
@@ -59,9 +59,9 @@
                                             -- NESTED_TUPLE_SOURCE  |LOCAL|
                                         }
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                    -- STABLE_SORT [$$112(ASC), $$113(ASC)]  
|PARTITIONED|
-                                      -- HASH_PARTITION_EXCHANGE [$$112, 
$$113]  |PARTITIONED|
-                                        -- PRE_CLUSTERED_GROUP_BY[$$99, $$100] 
 |PARTITIONED|
+                                    -- STABLE_SORT [$$121(ASC), $$122(ASC)]  
|PARTITIONED|
+                                      -- HASH_PARTITION_EXCHANGE [$$121, 
$$122]  |PARTITIONED|
+                                        -- PRE_CLUSTERED_GROUP_BY[$$108, 
$$109]  |PARTITIONED|
                                                 {
                                                   -- AGGREGATE  |LOCAL|
                                                     -- STREAM_SELECT  |LOCAL|
@@ -73,7 +73,7 @@
                                                       -- NESTED_TUPLE_SOURCE  
|LOCAL|
                                                 }
                                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                            -- STABLE_SORT [$$99(ASC), 
$$100(ASC)]  |PARTITIONED|
+                                            -- STABLE_SORT [$$108(ASC), 
$$109(ASC)]  |PARTITIONED|
                                               -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                 -- ASSIGN  |PARTITIONED|
                                                   -- STREAM_PROJECT  
|PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810.plan
index 76cd11f..418438a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810.plan
@@ -3,7 +3,7 @@
     -- STREAM_PROJECT  |PARTITIONED|
       -- ASSIGN  |PARTITIONED|
         -- SORT_MERGE_EXCHANGE [$$l_returnflag(ASC), $$l_linestatus(ASC) ]  
|PARTITIONED|
-          -- PRE_CLUSTERED_GROUP_BY[$$120, $$121]  |PARTITIONED|
+          -- PRE_CLUSTERED_GROUP_BY[$$130, $$131]  |PARTITIONED|
                   {
                     -- AGGREGATE  |LOCAL|
                       -- NESTED_TUPLE_SOURCE  |LOCAL|
@@ -13,9 +13,9 @@
                       -- NESTED_TUPLE_SOURCE  |LOCAL|
                   }
             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-              -- STABLE_SORT [$$120(ASC), $$121(ASC)]  |PARTITIONED|
-                -- HASH_PARTITION_EXCHANGE [$$120, $$121]  |PARTITIONED|
-                  -- PRE_CLUSTERED_GROUP_BY[$$108, $$109]  |PARTITIONED|
+              -- STABLE_SORT [$$130(ASC), $$131(ASC)]  |PARTITIONED|
+                -- HASH_PARTITION_EXCHANGE [$$130, $$131]  |PARTITIONED|
+                  -- PRE_CLUSTERED_GROUP_BY[$$118, $$119]  |PARTITIONED|
                           {
                             -- AGGREGATE  |LOCAL|
                               -- STREAM_SELECT  |LOCAL|
@@ -27,7 +27,7 @@
                                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                           }
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                      -- STABLE_SORT [$$108(ASC), $$109(ASC)]  |PARTITIONED|
+                      -- STABLE_SORT [$$118(ASC), $$119(ASC)]  |PARTITIONED|
                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                           -- ASSIGN  |PARTITIONED|
                             -- STREAM_PROJECT  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810_ps.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810_ps.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810_ps.plan
index 8451f5b..38e100a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810_ps.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-ASTERIXDB-810_ps.plan
@@ -9,7 +9,7 @@
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                   -- REPLICATE  |PARTITIONED|
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                      -- PRE_CLUSTERED_GROUP_BY[$$120, $$121]  |PARTITIONED|
+                      -- PRE_CLUSTERED_GROUP_BY[$$130, $$131]  |PARTITIONED|
                               {
                                 -- AGGREGATE  |LOCAL|
                                   -- NESTED_TUPLE_SOURCE  |LOCAL|
@@ -19,9 +19,9 @@
                                   -- NESTED_TUPLE_SOURCE  |LOCAL|
                               }
                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                          -- STABLE_SORT [$$120(ASC), $$121(ASC)]  
|PARTITIONED|
-                            -- HASH_PARTITION_EXCHANGE [$$120, $$121]  
|PARTITIONED|
-                              -- PRE_CLUSTERED_GROUP_BY[$$108, $$109]  
|PARTITIONED|
+                          -- STABLE_SORT [$$130(ASC), $$131(ASC)]  
|PARTITIONED|
+                            -- HASH_PARTITION_EXCHANGE [$$130, $$131]  
|PARTITIONED|
+                              -- PRE_CLUSTERED_GROUP_BY[$$118, $$119]  
|PARTITIONED|
                                       {
                                         -- AGGREGATE  |LOCAL|
                                           -- STREAM_SELECT  |LOCAL|
@@ -33,7 +33,7 @@
                                             -- NESTED_TUPLE_SOURCE  |LOCAL|
                                       }
                                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                  -- STABLE_SORT [$$108(ASC), $$109(ASC)]  
|PARTITIONED|
+                                  -- STABLE_SORT [$$118(ASC), $$119(ASC)]  
|PARTITIONED|
                                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                       -- ASSIGN  |PARTITIONED|
                                         -- STREAM_PROJECT  |PARTITIONED|
@@ -49,7 +49,7 @@
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- REPLICATE  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                -- PRE_CLUSTERED_GROUP_BY[$$120, $$121]  
|PARTITIONED|
+                                -- PRE_CLUSTERED_GROUP_BY[$$130, $$131]  
|PARTITIONED|
                                         {
                                           -- AGGREGATE  |LOCAL|
                                             -- NESTED_TUPLE_SOURCE  |LOCAL|
@@ -59,9 +59,9 @@
                                             -- NESTED_TUPLE_SOURCE  |LOCAL|
                                         }
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                    -- STABLE_SORT [$$120(ASC), $$121(ASC)]  
|PARTITIONED|
-                                      -- HASH_PARTITION_EXCHANGE [$$120, 
$$121]  |PARTITIONED|
-                                        -- PRE_CLUSTERED_GROUP_BY[$$108, 
$$109]  |PARTITIONED|
+                                    -- STABLE_SORT [$$130(ASC), $$131(ASC)]  
|PARTITIONED|
+                                      -- HASH_PARTITION_EXCHANGE [$$130, 
$$131]  |PARTITIONED|
+                                        -- PRE_CLUSTERED_GROUP_BY[$$118, 
$$119]  |PARTITIONED|
                                                 {
                                                   -- AGGREGATE  |LOCAL|
                                                     -- STREAM_SELECT  |LOCAL|
@@ -73,7 +73,7 @@
                                                       -- NESTED_TUPLE_SOURCE  
|LOCAL|
                                                 }
                                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                            -- STABLE_SORT [$$108(ASC), 
$$109(ASC)]  |PARTITIONED|
+                                            -- STABLE_SORT [$$118(ASC), 
$$119(ASC)]  |PARTITIONED|
                                               -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                 -- ASSIGN  |PARTITIONED|
                                                   -- STREAM_PROJECT  
|PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-issue562_ps.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-issue562_ps.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-issue562_ps.plan
index b988a0a..d2bfaf0 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-issue562_ps.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-issue562_ps.plan
@@ -9,12 +9,12 @@
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                   -- REPLICATE  |PARTITIONED|
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                      -- SORT_GROUP_BY[$$142]  |PARTITIONED|
+                      -- SORT_GROUP_BY[$$152]  |PARTITIONED|
                               {
                                 -- AGGREGATE  |LOCAL|
                                   -- NESTED_TUPLE_SOURCE  |LOCAL|
                               }
-                        -- HASH_PARTITION_EXCHANGE [$$142]  |PARTITIONED|
+                        -- HASH_PARTITION_EXCHANGE [$$152]  |PARTITIONED|
                           -- SORT_GROUP_BY[$$phone_substr]  |PARTITIONED|
                                   {
                                     -- AGGREGATE  |LOCAL|
@@ -27,29 +27,29 @@
                                     -- STREAM_SELECT  |PARTITIONED|
                                       -- STREAM_PROJECT  |PARTITIONED|
                                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                          -- SORT_GROUP_BY[$$139]  
|PARTITIONED|
+                                          -- SORT_GROUP_BY[$$149]  
|PARTITIONED|
                                                   {
                                                     -- AGGREGATE  |LOCAL|
                                                       -- NESTED_TUPLE_SOURCE  
|LOCAL|
                                                   }
-                                            -- HASH_PARTITION_EXCHANGE [$$139] 
 |PARTITIONED|
-                                              -- PRE_CLUSTERED_GROUP_BY[$$135] 
 |PARTITIONED|
+                                            -- HASH_PARTITION_EXCHANGE [$$149] 
 |PARTITIONED|
+                                              -- PRE_CLUSTERED_GROUP_BY[$$145] 
 |PARTITIONED|
                                                       {
                                                         -- AGGREGATE  |LOCAL|
                                                           -- STREAM_SELECT  
|LOCAL|
                                                             -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                       }
                                                 -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                  -- STABLE_SORT [$$135(ASC)]  
|PARTITIONED|
+                                                  -- STABLE_SORT [$$145(ASC)]  
|PARTITIONED|
                                                     -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                       -- STREAM_PROJECT  
|PARTITIONED|
                                                         -- ONE_TO_ONE_EXCHANGE 
 |PARTITIONED|
-                                                          -- HYBRID_HASH_JOIN 
[$$122][$$129]  |PARTITIONED|
+                                                          -- HYBRID_HASH_JOIN 
[$$132][$$139]  |PARTITIONED|
                                                             -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                               -- ASSIGN  
|PARTITIONED|
                                                                 -- 
STREAM_PROJECT  |PARTITIONED|
                                                                   -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                    -- 
HYBRID_HASH_JOIN [$$phone_substr][$$124]  |PARTITIONED|
+                                                                    -- 
HYBRID_HASH_JOIN [$$phone_substr][$$134]  |PARTITIONED|
                                                                       -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                         -- 
STREAM_PROJECT  |PARTITIONED|
                                                                           -- 
ASSIGN  |PARTITIONED|
@@ -60,7 +60,7 @@
                                                                       -- 
BROADCAST_EXCHANGE  |PARTITIONED|
                                                                         -- 
UNNEST  |UNPARTITIONED|
                                                                           -- 
EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
-                                                            -- 
HASH_PARTITION_EXCHANGE [$$129]  |PARTITIONED|
+                                                            -- 
HASH_PARTITION_EXCHANGE [$$139]  |PARTITIONED|
                                                               -- ASSIGN  
|PARTITIONED|
                                                                 -- 
STREAM_PROJECT  |PARTITIONED|
                                                                   -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -75,12 +75,12 @@
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- REPLICATE  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                -- SORT_GROUP_BY[$$142]  |PARTITIONED|
+                                -- SORT_GROUP_BY[$$152]  |PARTITIONED|
                                         {
                                           -- AGGREGATE  |LOCAL|
                                             -- NESTED_TUPLE_SOURCE  |LOCAL|
                                         }
-                                  -- HASH_PARTITION_EXCHANGE [$$142]  
|PARTITIONED|
+                                  -- HASH_PARTITION_EXCHANGE [$$152]  
|PARTITIONED|
                                     -- SORT_GROUP_BY[$$phone_substr]  
|PARTITIONED|
                                             {
                                               -- AGGREGATE  |LOCAL|
@@ -93,29 +93,29 @@
                                               -- STREAM_SELECT  |PARTITIONED|
                                                 -- STREAM_PROJECT  
|PARTITIONED|
                                                   -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                    -- SORT_GROUP_BY[$$139]  
|PARTITIONED|
+                                                    -- SORT_GROUP_BY[$$149]  
|PARTITIONED|
                                                             {
                                                               -- AGGREGATE  
|LOCAL|
                                                                 -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                             }
-                                                      -- 
HASH_PARTITION_EXCHANGE [$$139]  |PARTITIONED|
-                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$135]  |PARTITIONED|
+                                                      -- 
HASH_PARTITION_EXCHANGE [$$149]  |PARTITIONED|
+                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$145]  |PARTITIONED|
                                                                 {
                                                                   -- AGGREGATE 
 |LOCAL|
                                                                     -- 
STREAM_SELECT  |LOCAL|
                                                                       -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                                 }
                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                            -- STABLE_SORT 
[$$135(ASC)]  |PARTITIONED|
+                                                            -- STABLE_SORT 
[$$145(ASC)]  |PARTITIONED|
                                                               -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                 -- 
STREAM_PROJECT  |PARTITIONED|
                                                                   -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                    -- 
HYBRID_HASH_JOIN [$$122][$$129]  |PARTITIONED|
+                                                                    -- 
HYBRID_HASH_JOIN [$$132][$$139]  |PARTITIONED|
                                                                       -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
STREAM_PROJECT  |PARTITIONED|
                                                                             -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                              
-- HYBRID_HASH_JOIN [$$phone_substr][$$124]  |PARTITIONED|
+                                                                              
-- HYBRID_HASH_JOIN [$$phone_substr][$$134]  |PARTITIONED|
                                                                                
 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                
   -- STREAM_PROJECT  |PARTITIONED|
                                                                                
     -- ASSIGN  |PARTITIONED|
@@ -126,7 +126,7 @@
                                                                                
 -- BROADCAST_EXCHANGE  |PARTITIONED|
                                                                                
   -- UNNEST  |UNPARTITIONED|
                                                                                
     -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
-                                                                      -- 
HASH_PARTITION_EXCHANGE [$$129]  |PARTITIONED|
+                                                                      -- 
HASH_PARTITION_EXCHANGE [$$139]  |PARTITIONED|
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
STREAM_PROJECT  |PARTITIONED|
                                                                             -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-issue601.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-issue601.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-issue601.plan
index 3651eba..37d5480 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-issue601.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query-issue601.plan
@@ -3,13 +3,13 @@
     -- STREAM_PROJECT  |PARTITIONED|
       -- ASSIGN  |PARTITIONED|
         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-          -- SORT_GROUP_BY[$$42]  |PARTITIONED|
+          -- SORT_GROUP_BY[$$46]  |PARTITIONED|
                   {
                     -- AGGREGATE  |LOCAL|
                       -- NESTED_TUPLE_SOURCE  |LOCAL|
                   }
-            -- HASH_PARTITION_EXCHANGE [$$42]  |PARTITIONED|
-              -- SORT_GROUP_BY[$$39]  |PARTITIONED|
+            -- HASH_PARTITION_EXCHANGE [$$46]  |PARTITIONED|
+              -- SORT_GROUP_BY[$$43]  |PARTITIONED|
                       {
                         -- AGGREGATE  |LOCAL|
                           -- NESTED_TUPLE_SOURCE  |LOCAL|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/query_issue849-2.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query_issue849-2.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query_issue849-2.plan
index 8b7d56e..496ae5a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query_issue849-2.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query_issue849-2.plan
@@ -20,12 +20,12 @@
       -- ASSIGN  |PARTITIONED|
         -- STREAM_PROJECT  |PARTITIONED|
           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-            -- HYBRID_HASH_JOIN [$$38][$$40]  |PARTITIONED|
+            -- HYBRID_HASH_JOIN [$$41][$$43]  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                 -- DATASOURCE_SCAN  |PARTITIONED|
                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                     -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-              -- HASH_PARTITION_EXCHANGE [$$40]  |PARTITIONED|
+              -- HASH_PARTITION_EXCHANGE [$$43]  |PARTITIONED|
                 -- STREAM_PROJECT  |UNPARTITIONED|
                   -- ASSIGN  |UNPARTITIONED|
                     -- UNNEST  |UNPARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/query_issue849.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query_issue849.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query_issue849.plan
index 709d5d5..08fa6a0 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/query_issue849.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/query_issue849.plan
@@ -20,8 +20,8 @@
       -- ASSIGN  |PARTITIONED|
         -- STREAM_PROJECT  |PARTITIONED|
           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-            -- HYBRID_HASH_JOIN [$$39][$$38]  |PARTITIONED|
-              -- HASH_PARTITION_EXCHANGE [$$39]  |PARTITIONED|
+            -- HYBRID_HASH_JOIN [$$42][$$41]  |PARTITIONED|
+              -- HASH_PARTITION_EXCHANGE [$$42]  |PARTITIONED|
                 -- ASSIGN  |UNPARTITIONED|
                   -- UNNEST  |UNPARTITIONED|
                     -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01_ps.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01_ps.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01_ps.plan
index f8b50c6..67313b2 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01_ps.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01_ps.plan
@@ -3,21 +3,21 @@
     -- STREAM_PROJECT  |PARTITIONED|
       -- ASSIGN  |PARTITIONED|
         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-          -- STABLE_SORT [$$55(ASC)]  |PARTITIONED|
-            -- RANGE_PARTITION_EXCHANGE [$$55(ASC)]  |PARTITIONED|
+          -- STABLE_SORT [$$58(ASC)]  |PARTITIONED|
+            -- RANGE_PARTITION_EXCHANGE [$$58(ASC)]  |PARTITIONED|
               -- FORWARD  |PARTITIONED|
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                   -- REPLICATE  |PARTITIONED|
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                      -- PRE_CLUSTERED_GROUP_BY[$$88]  |PARTITIONED|
+                      -- PRE_CLUSTERED_GROUP_BY[$$91]  |PARTITIONED|
                               {
                                 -- AGGREGATE  |LOCAL|
                                   -- STREAM_SELECT  |LOCAL|
                                     -- NESTED_TUPLE_SOURCE  |LOCAL|
                               }
                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                          -- STABLE_SORT [$$88(ASC), $$49(ASC)]  |PARTITIONED|
-                            -- HASH_PARTITION_EXCHANGE [$$88]  |PARTITIONED|
+                          -- STABLE_SORT [$$91(ASC), $$52(ASC)]  |PARTITIONED|
+                            -- HASH_PARTITION_EXCHANGE [$$91]  |PARTITIONED|
                               -- UNION_ALL  |PARTITIONED|
                                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                   -- STREAM_PROJECT  |PARTITIONED|
@@ -74,15 +74,15 @@
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- REPLICATE  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                -- PRE_CLUSTERED_GROUP_BY[$$88]  |PARTITIONED|
+                                -- PRE_CLUSTERED_GROUP_BY[$$91]  |PARTITIONED|
                                         {
                                           -- AGGREGATE  |LOCAL|
                                             -- STREAM_SELECT  |LOCAL|
                                               -- NESTED_TUPLE_SOURCE  |LOCAL|
                                         }
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                    -- STABLE_SORT [$$88(ASC), $$49(ASC)]  
|PARTITIONED|
-                                      -- HASH_PARTITION_EXCHANGE [$$88]  
|PARTITIONED|
+                                    -- STABLE_SORT [$$91(ASC), $$52(ASC)]  
|PARTITIONED|
+                                      -- HASH_PARTITION_EXCHANGE [$$91]  
|PARTITIONED|
                                         -- UNION_ALL  |PARTITIONED|
                                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                             -- STREAM_PROJECT  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.plan
index 80f1234..83f9db7 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.plan
@@ -2,16 +2,16 @@
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
     -- STREAM_PROJECT  |PARTITIONED|
       -- ASSIGN  |PARTITIONED|
-        -- SORT_MERGE_EXCHANGE [$$60(ASC) ]  |PARTITIONED|
-          -- PRE_CLUSTERED_GROUP_BY[$$52]  |PARTITIONED|
+        -- SORT_MERGE_EXCHANGE [$$63(ASC) ]  |PARTITIONED|
+          -- PRE_CLUSTERED_GROUP_BY[$$55]  |PARTITIONED|
                   {
                     -- AGGREGATE  |LOCAL|
                       -- STREAM_SELECT  |LOCAL|
                         -- NESTED_TUPLE_SOURCE  |LOCAL|
                   }
             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-              -- STABLE_SORT [$$52(ASC), $$53(ASC)]  |PARTITIONED|
-                -- HASH_PARTITION_EXCHANGE [$$52]  |PARTITIONED|
+              -- STABLE_SORT [$$55(ASC), $$56(ASC)]  |PARTITIONED|
+                -- HASH_PARTITION_EXCHANGE [$$55]  |PARTITIONED|
                   -- STREAM_PROJECT  |PARTITIONED|
                     -- STREAM_SELECT  |PARTITIONED|
                       -- STREAM_PROJECT  |PARTITIONED|
@@ -20,7 +20,7 @@
                             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                               -- BTREE_SEARCH  |PARTITIONED|
                                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                  -- STABLE_SORT [$$72(ASC)]  |PARTITIONED|
+                                  -- STABLE_SORT [$$75(ASC)]  |PARTITIONED|
                                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                       -- STREAM_PROJECT  |PARTITIONED|
                                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02_ps.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02_ps.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02_ps.plan
index 35e1ec6..e90c368 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02_ps.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02_ps.plan
@@ -3,21 +3,21 @@
     -- STREAM_PROJECT  |PARTITIONED|
       -- ASSIGN  |PARTITIONED|
         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-          -- STABLE_SORT [$$60(ASC)]  |PARTITIONED|
-            -- RANGE_PARTITION_EXCHANGE [$$60(ASC)]  |PARTITIONED|
+          -- STABLE_SORT [$$63(ASC)]  |PARTITIONED|
+            -- RANGE_PARTITION_EXCHANGE [$$63(ASC)]  |PARTITIONED|
               -- FORWARD  |PARTITIONED|
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                   -- REPLICATE  |PARTITIONED|
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                      -- PRE_CLUSTERED_GROUP_BY[$$52]  |PARTITIONED|
+                      -- PRE_CLUSTERED_GROUP_BY[$$55]  |PARTITIONED|
                               {
                                 -- AGGREGATE  |LOCAL|
                                   -- STREAM_SELECT  |LOCAL|
                                     -- NESTED_TUPLE_SOURCE  |LOCAL|
                               }
                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                          -- STABLE_SORT [$$52(ASC), $$53(ASC)]  |PARTITIONED|
-                            -- HASH_PARTITION_EXCHANGE [$$52]  |PARTITIONED|
+                          -- STABLE_SORT [$$55(ASC), $$56(ASC)]  |PARTITIONED|
+                            -- HASH_PARTITION_EXCHANGE [$$55]  |PARTITIONED|
                               -- STREAM_PROJECT  |PARTITIONED|
                                 -- STREAM_SELECT  |PARTITIONED|
                                   -- STREAM_PROJECT  |PARTITIONED|
@@ -26,7 +26,7 @@
                                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                           -- BTREE_SEARCH  |PARTITIONED|
                                             -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                              -- STABLE_SORT [$$72(ASC)]  
|PARTITIONED|
+                                              -- STABLE_SORT [$$75(ASC)]  
|PARTITIONED|
                                                 -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                   -- STREAM_PROJECT  
|PARTITIONED|
                                                     -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
@@ -49,15 +49,15 @@
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- REPLICATE  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                -- PRE_CLUSTERED_GROUP_BY[$$52]  |PARTITIONED|
+                                -- PRE_CLUSTERED_GROUP_BY[$$55]  |PARTITIONED|
                                         {
                                           -- AGGREGATE  |LOCAL|
                                             -- STREAM_SELECT  |LOCAL|
                                               -- NESTED_TUPLE_SOURCE  |LOCAL|
                                         }
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                    -- STABLE_SORT [$$52(ASC), $$53(ASC)]  
|PARTITIONED|
-                                      -- HASH_PARTITION_EXCHANGE [$$52]  
|PARTITIONED|
+                                    -- STABLE_SORT [$$55(ASC), $$56(ASC)]  
|PARTITIONED|
+                                      -- HASH_PARTITION_EXCHANGE [$$55]  
|PARTITIONED|
                                         -- STREAM_PROJECT  |PARTITIONED|
                                           -- STREAM_SELECT  |PARTITIONED|
                                             -- STREAM_PROJECT  |PARTITIONED|
@@ -66,7 +66,7 @@
                                                   -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                     -- BTREE_SEARCH  
|PARTITIONED|
                                                       -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                        -- STABLE_SORT 
[$$72(ASC)]  |PARTITIONED|
+                                                        -- STABLE_SORT 
[$$75(ASC)]  |PARTITIONED|
                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                             -- STREAM_PROJECT  
|PARTITIONED|
                                                               -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/spatial-intersect-point_02.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/spatial-intersect-point_02.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/spatial-intersect-point_02.plan
index 3229470..e84357c 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/spatial-intersect-point_02.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/spatial-intersect-point_02.plan
@@ -8,7 +8,7 @@
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                 -- BTREE_SEARCH  |PARTITIONED|
                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                    -- STABLE_SORT [$$36(ASC)]  |PARTITIONED|
+                    -- STABLE_SORT [$$38(ASC)]  |PARTITIONED|
                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                         -- STREAM_PROJECT  |PARTITIONED|
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/spatial-intersect-point_03.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/spatial-intersect-point_03.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/spatial-intersect-point_03.plan
index 3229470..e84357c 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/spatial-intersect-point_03.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index-join/spatial-intersect-point_03.plan
@@ -8,7 +8,7 @@
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                 -- BTREE_SEARCH  |PARTITIONED|
                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                    -- STABLE_SORT [$$36(ASC)]  |PARTITIONED|
+                    -- STABLE_SORT [$$38(ASC)]  |PARTITIONED|
                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                         -- STREAM_PROJECT  |PARTITIONED|
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index/rtree-sidx-idxonly-01-disable-idxonly.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index/rtree-sidx-idxonly-01-disable-idxonly.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index/rtree-sidx-idxonly-01-disable-idxonly.plan
index 231c0f7..60f968f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index/rtree-sidx-idxonly-01-disable-idxonly.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/rtree-index/rtree-sidx-idxonly-01-disable-idxonly.plan
@@ -10,7 +10,7 @@
                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                     -- BTREE_SEARCH  |PARTITIONED|
                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                        -- STABLE_SORT [$$56(ASC)]  |PARTITIONED|
+                        -- STABLE_SORT [$$60(ASC)]  |PARTITIONED|
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- STREAM_PROJECT  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/skip-index/skip-ngram-index_ps.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/skip-index/skip-ngram-index_ps.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/skip-index/skip-ngram-index_ps.plan
index 86c5aac..a5a752f 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/skip-index/skip-ngram-index_ps.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/skip-index/skip-ngram-index_ps.plan
@@ -2,8 +2,8 @@
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
     -- STREAM_PROJECT  |PARTITIONED|
       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-        -- STABLE_SORT [$$13(ASC)]  |PARTITIONED|
-          -- RANGE_PARTITION_EXCHANGE [$$13(ASC)]  |PARTITIONED|
+        -- STABLE_SORT [$$14(ASC)]  |PARTITIONED|
+          -- RANGE_PARTITION_EXCHANGE [$$14(ASC)]  |PARTITIONED|
             -- FORWARD  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                 -- REPLICATE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/skip-index/skip-secondary-btree-index-2.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/skip-index/skip-secondary-btree-index-2.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/skip-index/skip-secondary-btree-index-2.plan
index 0d9a257..4b4412e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/skip-index/skip-secondary-btree-index-2.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/skip-index/skip-secondary-btree-index-2.plan
@@ -7,7 +7,7 @@
             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
               -- BTREE_SEARCH  |PARTITIONED|
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                  -- STABLE_SORT [$$19(ASC)]  |PARTITIONED|
+                  -- STABLE_SORT [$$20(ASC)]  |PARTITIONED|
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                       -- STREAM_PROJECT  |PARTITIONED|
                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/split-materialization.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/split-materialization.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/split-materialization.plan
index e707957..ae9bb70 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/split-materialization.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/split-materialization.plan
@@ -2,8 +2,8 @@
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
     -- STREAM_PROJECT  |PARTITIONED|
       -- ASSIGN  |PARTITIONED|
-        -- SORT_MERGE_EXCHANGE [$$79(ASC), $$80(ASC) ]  |PARTITIONED|
-          -- STABLE_SORT [$$79(ASC), $$80(ASC)]  |PARTITIONED|
+        -- SORT_MERGE_EXCHANGE [$$85(ASC), $$86(ASC) ]  |PARTITIONED|
+          -- STABLE_SORT [$$85(ASC), $$86(ASC)]  |PARTITIONED|
             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
               -- NESTED_LOOP  |PARTITIONED|
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/split-materialization_ps.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/split-materialization_ps.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/split-materialization_ps.plan
index 8361112..a021d33 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/split-materialization_ps.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/split-materialization_ps.plan
@@ -3,8 +3,8 @@
     -- STREAM_PROJECT  |PARTITIONED|
       -- ASSIGN  |PARTITIONED|
         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-          -- STABLE_SORT [$$79(ASC), $$80(ASC)]  |PARTITIONED|
-            -- RANGE_PARTITION_EXCHANGE [$$79(ASC), $$80(ASC)]  |PARTITIONED|
+          -- STABLE_SORT [$$85(ASC), $$86(ASC)]  |PARTITIONED|
+            -- RANGE_PARTITION_EXCHANGE [$$85(ASC), $$86(ASC)]  |PARTITIONED|
               -- FORWARD  |PARTITIONED|
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                   -- REPLICATE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/statement-params/statement-params-01.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/statement-params/statement-params-01.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/statement-params/statement-params-01.plan
index cd5c81e..c00661e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/statement-params/statement-params-01.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/statement-params/statement-params-01.plan
@@ -7,7 +7,7 @@
             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
               -- BTREE_SEARCH  |PARTITIONED|
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                  -- STABLE_SORT [$$21(ASC)]  |PARTITIONED|
+                  -- STABLE_SORT [$$22(ASC)]  |PARTITIONED|
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                       -- STREAM_PROJECT  |PARTITIONED|
                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/statement-params/statement-params-02.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/statement-params/statement-params-02.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/statement-params/statement-params-02.plan
index cd5c81e..c00661e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/statement-params/statement-params-02.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/statement-params/statement-params-02.plan
@@ -7,7 +7,7 @@
             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
               -- BTREE_SEARCH  |PARTITIONED|
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                  -- STABLE_SORT [$$21(ASC)]  |PARTITIONED|
+                  -- STABLE_SORT [$$22(ASC)]  |PARTITIONED|
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                       -- STREAM_PROJECT  |PARTITIONED|
                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/statement-params/statement-params-03.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/statement-params/statement-params-03.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/statement-params/statement-params-03.plan
index cd5c81e..c00661e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/statement-params/statement-params-03.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/statement-params/statement-params-03.plan
@@ -7,7 +7,7 @@
             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
               -- BTREE_SEARCH  |PARTITIONED|
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                  -- STABLE_SORT [$$21(ASC)]  |PARTITIONED|
+                  -- STABLE_SORT [$$22(ASC)]  |PARTITIONED|
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                       -- STREAM_PROJECT  |PARTITIONED|
                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/subquery/exists.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/subquery/exists.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/subquery/exists.plan
index a010ace..5e52c52 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/subquery/exists.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/subquery/exists.plan
@@ -3,13 +3,13 @@
     -- STREAM_PROJECT  |PARTITIONED|
       -- ASSIGN  |PARTITIONED|
         -- SORT_MERGE_EXCHANGE [$$cntrycode(ASC) ]  |PARTITIONED|
-          -- SORT_GROUP_BY[$$164]  |PARTITIONED|
+          -- SORT_GROUP_BY[$$176]  |PARTITIONED|
                   {
                     -- AGGREGATE  |LOCAL|
                       -- NESTED_TUPLE_SOURCE  |LOCAL|
                   }
-            -- HASH_PARTITION_EXCHANGE [$$164]  |PARTITIONED|
-              -- SORT_GROUP_BY[$$141]  |PARTITIONED|
+            -- HASH_PARTITION_EXCHANGE [$$176]  |PARTITIONED|
+              -- SORT_GROUP_BY[$$153]  |PARTITIONED|
                       {
                         -- AGGREGATE  |LOCAL|
                           -- NESTED_TUPLE_SOURCE  |LOCAL|
@@ -21,25 +21,25 @@
                         -- STREAM_SELECT  |PARTITIONED|
                           -- STREAM_PROJECT  |PARTITIONED|
                             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                              -- SORT_GROUP_BY[$$161]  |PARTITIONED|
+                              -- SORT_GROUP_BY[$$173]  |PARTITIONED|
                                       {
                                         -- AGGREGATE  |LOCAL|
                                           -- NESTED_TUPLE_SOURCE  |LOCAL|
                                       }
-                                -- HASH_PARTITION_EXCHANGE [$$161]  
|PARTITIONED|
-                                  -- PRE_CLUSTERED_GROUP_BY[$$155]  
|PARTITIONED|
+                                -- HASH_PARTITION_EXCHANGE [$$173]  
|PARTITIONED|
+                                  -- PRE_CLUSTERED_GROUP_BY[$$167]  
|PARTITIONED|
                                           {
                                             -- AGGREGATE  |LOCAL|
                                               -- STREAM_SELECT  |LOCAL|
                                                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                                           }
                                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                      -- STABLE_SORT [$$155(ASC)]  
|PARTITIONED|
+                                      -- STABLE_SORT [$$167(ASC)]  
|PARTITIONED|
                                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                           -- STREAM_PROJECT  |PARTITIONED|
                                             -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                              -- HYBRID_HASH_JOIN 
[$$150][$$147]  |PARTITIONED|
-                                                -- HASH_PARTITION_EXCHANGE 
[$$150]  |PARTITIONED|
+                                              -- HYBRID_HASH_JOIN 
[$$162][$$159]  |PARTITIONED|
+                                                -- HASH_PARTITION_EXCHANGE 
[$$162]  |PARTITIONED|
                                                   -- ASSIGN  |PARTITIONED|
                                                     -- STREAM_PROJECT  
|PARTITIONED|
                                                       -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
@@ -66,7 +66,7 @@
                                                                                
 -- DATASOURCE_SCAN  |PARTITIONED|
                                                                                
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                
     -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                                                -- HASH_PARTITION_EXCHANGE 
[$$147]  |PARTITIONED|
+                                                -- HASH_PARTITION_EXCHANGE 
[$$159]  |PARTITIONED|
                                                   -- ASSIGN  |PARTITIONED|
                                                     -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                       -- DATASOURCE_SCAN  
|PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/subquery/exists_ps.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/subquery/exists_ps.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/subquery/exists_ps.plan
index 4c9eff3..0a126ab 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/subquery/exists_ps.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/subquery/exists_ps.plan
@@ -9,13 +9,13 @@
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                   -- REPLICATE  |PARTITIONED|
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                      -- SORT_GROUP_BY[$$164]  |PARTITIONED|
+                      -- SORT_GROUP_BY[$$176]  |PARTITIONED|
                               {
                                 -- AGGREGATE  |LOCAL|
                                   -- NESTED_TUPLE_SOURCE  |LOCAL|
                               }
-                        -- HASH_PARTITION_EXCHANGE [$$164]  |PARTITIONED|
-                          -- SORT_GROUP_BY[$$141]  |PARTITIONED|
+                        -- HASH_PARTITION_EXCHANGE [$$176]  |PARTITIONED|
+                          -- SORT_GROUP_BY[$$153]  |PARTITIONED|
                                   {
                                     -- AGGREGATE  |LOCAL|
                                       -- NESTED_TUPLE_SOURCE  |LOCAL|
@@ -27,25 +27,25 @@
                                     -- STREAM_SELECT  |PARTITIONED|
                                       -- STREAM_PROJECT  |PARTITIONED|
                                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                          -- SORT_GROUP_BY[$$161]  
|PARTITIONED|
+                                          -- SORT_GROUP_BY[$$173]  
|PARTITIONED|
                                                   {
                                                     -- AGGREGATE  |LOCAL|
                                                       -- NESTED_TUPLE_SOURCE  
|LOCAL|
                                                   }
-                                            -- HASH_PARTITION_EXCHANGE [$$161] 
 |PARTITIONED|
-                                              -- PRE_CLUSTERED_GROUP_BY[$$155] 
 |PARTITIONED|
+                                            -- HASH_PARTITION_EXCHANGE [$$173] 
 |PARTITIONED|
+                                              -- PRE_CLUSTERED_GROUP_BY[$$167] 
 |PARTITIONED|
                                                       {
                                                         -- AGGREGATE  |LOCAL|
                                                           -- STREAM_SELECT  
|LOCAL|
                                                             -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                       }
                                                 -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                  -- STABLE_SORT [$$155(ASC)]  
|PARTITIONED|
+                                                  -- STABLE_SORT [$$167(ASC)]  
|PARTITIONED|
                                                     -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                       -- STREAM_PROJECT  
|PARTITIONED|
                                                         -- ONE_TO_ONE_EXCHANGE 
 |PARTITIONED|
-                                                          -- HYBRID_HASH_JOIN 
[$$150][$$147]  |PARTITIONED|
-                                                            -- 
HASH_PARTITION_EXCHANGE [$$150]  |PARTITIONED|
+                                                          -- HYBRID_HASH_JOIN 
[$$162][$$159]  |PARTITIONED|
+                                                            -- 
HASH_PARTITION_EXCHANGE [$$162]  |PARTITIONED|
                                                               -- ASSIGN  
|PARTITIONED|
                                                                 -- 
STREAM_PROJECT  |PARTITIONED|
                                                                   -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -72,7 +72,7 @@
                                                                                
             -- DATASOURCE_SCAN  |PARTITIONED|
                                                                                
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                
                 -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                                                            -- 
HASH_PARTITION_EXCHANGE [$$147]  |PARTITIONED|
+                                                            -- 
HASH_PARTITION_EXCHANGE [$$159]  |PARTITIONED|
                                                               -- ASSIGN  
|PARTITIONED|
                                                                 -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                   -- 
DATASOURCE_SCAN  |PARTITIONED|
@@ -86,13 +86,13 @@
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- REPLICATE  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                -- SORT_GROUP_BY[$$164]  |PARTITIONED|
+                                -- SORT_GROUP_BY[$$176]  |PARTITIONED|
                                         {
                                           -- AGGREGATE  |LOCAL|
                                             -- NESTED_TUPLE_SOURCE  |LOCAL|
                                         }
-                                  -- HASH_PARTITION_EXCHANGE [$$164]  
|PARTITIONED|
-                                    -- SORT_GROUP_BY[$$141]  |PARTITIONED|
+                                  -- HASH_PARTITION_EXCHANGE [$$176]  
|PARTITIONED|
+                                    -- SORT_GROUP_BY[$$153]  |PARTITIONED|
                                             {
                                               -- AGGREGATE  |LOCAL|
                                                 -- NESTED_TUPLE_SOURCE  |LOCAL|
@@ -104,25 +104,25 @@
                                               -- STREAM_SELECT  |PARTITIONED|
                                                 -- STREAM_PROJECT  
|PARTITIONED|
                                                   -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                    -- SORT_GROUP_BY[$$161]  
|PARTITIONED|
+                                                    -- SORT_GROUP_BY[$$173]  
|PARTITIONED|
                                                             {
                                                               -- AGGREGATE  
|LOCAL|
                                                                 -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                             }
-                                                      -- 
HASH_PARTITION_EXCHANGE [$$161]  |PARTITIONED|
-                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$155]  |PARTITIONED|
+                                                      -- 
HASH_PARTITION_EXCHANGE [$$173]  |PARTITIONED|
+                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$167]  |PARTITIONED|
                                                                 {
                                                                   -- AGGREGATE 
 |LOCAL|
                                                                     -- 
STREAM_SELECT  |LOCAL|
                                                                       -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                                 }
                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                            -- STABLE_SORT 
[$$155(ASC)]  |PARTITIONED|
+                                                            -- STABLE_SORT 
[$$167(ASC)]  |PARTITIONED|
                                                               -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                 -- 
STREAM_PROJECT  |PARTITIONED|
                                                                   -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                    -- 
HYBRID_HASH_JOIN [$$150][$$147]  |PARTITIONED|
-                                                                      -- 
HASH_PARTITION_EXCHANGE [$$150]  |PARTITIONED|
+                                                                    -- 
HYBRID_HASH_JOIN [$$162][$$159]  |PARTITIONED|
+                                                                      -- 
HASH_PARTITION_EXCHANGE [$$162]  |PARTITIONED|
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
STREAM_PROJECT  |PARTITIONED|
                                                                             -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -149,7 +149,7 @@
                                                                                
                       -- DATASOURCE_SCAN  |PARTITIONED|
                                                                                
                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                
                           -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                                                                      -- 
HASH_PARTITION_EXCHANGE [$$147]  |PARTITIONED|
+                                                                      -- 
HASH_PARTITION_EXCHANGE [$$159]  |PARTITIONED|
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                             -- 
DATASOURCE_SCAN  |PARTITIONED|

Reply via email to