http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check-after-btree-access.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check-after-btree-access.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check-after-btree-access.plan
index dcc8cd6..80d465e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check-after-btree-access.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check-after-btree-access.plan
@@ -5,7 +5,7 @@
         -- STREAM_SELECT  |PARTITIONED|
           -- STREAM_PROJECT  |PARTITIONED|
             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-              -- HYBRID_HASH_JOIN [$$47][$$idLeft_0]  |PARTITIONED|
+              -- HYBRID_HASH_JOIN [$$50][$$idLeft_0]  |PARTITIONED|
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                   -- STREAM_PROJECT  |PARTITIONED|
                     -- ASSIGN  |PARTITIONED|
@@ -21,7 +21,7 @@
                 -- HASH_PARTITION_EXCHANGE [$$idLeft_0]  |PARTITIONED|
                   -- STREAM_PROJECT  |PARTITIONED|
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                      -- HYBRID_HASH_JOIN [$$48][$$idRight_0]  |PARTITIONED|
+                      -- HYBRID_HASH_JOIN [$$51][$$idRight_0]  |PARTITIONED|
                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                           -- STREAM_PROJECT  |PARTITIONED|
                             -- ASSIGN  |PARTITIONED|
@@ -30,12 +30,12 @@
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                     -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
                         -- HASH_PARTITION_EXCHANGE [$$idRight_0]  |PARTITIONED|
-                          -- EXTERNAL_GROUP_BY[$$127, $$125]  |PARTITIONED|
+                          -- EXTERNAL_GROUP_BY[$$130, $$128]  |PARTITIONED|
                                   {
                                     -- AGGREGATE  |LOCAL|
                                       -- NESTED_TUPLE_SOURCE  |LOCAL|
                                   }
-                            -- HASH_PARTITION_EXCHANGE [$$127, $$125]  
|PARTITIONED|
+                            -- HASH_PARTITION_EXCHANGE [$$130, $$128]  
|PARTITIONED|
                               -- STREAM_PROJECT  |PARTITIONED|
                                 -- STREAM_SELECT  |PARTITIONED|
                                   -- STREAM_PROJECT  |PARTITIONED|
@@ -44,14 +44,14 @@
                                         -- HASH_PARTITION_EXCHANGE 
[$$prefixTokenRight]  |PARTITIONED|
                                           -- UNNEST  |PARTITIONED|
                                             -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                              -- PRE_CLUSTERED_GROUP_BY[$$62]  
|PARTITIONED|
+                                              -- PRE_CLUSTERED_GROUP_BY[$$65]  
|PARTITIONED|
                                                       {
                                                         -- AGGREGATE  |LOCAL|
                                                           -- STREAM_SELECT  
|LOCAL|
                                                             -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                       }
                                                 -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                  -- STABLE_SORT [$$62(ASC), 
$$i(ASC)]  |PARTITIONED|
+                                                  -- STABLE_SORT [$$65(ASC), 
$$i(ASC)]  |PARTITIONED|
                                                     -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                       -- STREAM_PROJECT  
|PARTITIONED|
                                                         -- ONE_TO_ONE_EXCHANGE 
 |PARTITIONED|
@@ -73,15 +73,15 @@
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
RUNNING_AGGREGATE  |PARTITIONED|
                                                                             -- 
STREAM_PROJECT  |PARTITIONED|
-                                                                              
-- SORT_MERGE_EXCHANGE [$$132(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
-                                                                               
 -- STABLE_SORT [$$132(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
+                                                                              
-- SORT_MERGE_EXCHANGE [$$135(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
+                                                                               
 -- STABLE_SORT [$$135(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
                                                                                
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
     -- EXTERNAL_GROUP_BY[$$139]  |PARTITIONED|
+                                                                               
     -- EXTERNAL_GROUP_BY[$$142]  |PARTITIONED|
                                                                                
             {
                                                                                
               -- AGGREGATE  |LOCAL|
                                                                                
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                                                                                
             }
-                                                                               
       -- HASH_PARTITION_EXCHANGE [$$139]  |PARTITIONED|
+                                                                               
       -- HASH_PARTITION_EXCHANGE [$$142]  |PARTITIONED|
                                                                                
         -- EXTERNAL_GROUP_BY[$$token]  |PARTITIONED|
                                                                                
                 {
                                                                                
                   -- AGGREGATE  |LOCAL|
@@ -102,14 +102,14 @@
                                             -- UNNEST  |PARTITIONED|
                                               -- ASSIGN  |PARTITIONED|
                                                 -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                  -- 
PRE_CLUSTERED_GROUP_BY[$$57]  |PARTITIONED|
+                                                  -- 
PRE_CLUSTERED_GROUP_BY[$$60]  |PARTITIONED|
                                                           {
                                                             -- AGGREGATE  
|LOCAL|
                                                               -- STREAM_SELECT 
 |LOCAL|
                                                                 -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                           }
                                                     -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                      -- STABLE_SORT 
[$$57(ASC), $$i(ASC)]  |PARTITIONED|
+                                                      -- STABLE_SORT 
[$$60(ASC), $$i(ASC)]  |PARTITIONED|
                                                         -- ONE_TO_ONE_EXCHANGE 
 |PARTITIONED|
                                                           -- STREAM_PROJECT  
|PARTITIONED|
                                                             -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -131,15 +131,15 @@
                                                                       -- 
ASSIGN  |PARTITIONED|
                                                                         -- 
RUNNING_AGGREGATE  |PARTITIONED|
                                                                           -- 
STREAM_PROJECT  |PARTITIONED|
-                                                                            -- 
SORT_MERGE_EXCHANGE [$$132(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
-                                                                              
-- STABLE_SORT [$$132(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
+                                                                            -- 
SORT_MERGE_EXCHANGE [$$135(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
+                                                                              
-- STABLE_SORT [$$135(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
                                                                                
 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
   -- EXTERNAL_GROUP_BY[$$139]  |PARTITIONED|
+                                                                               
   -- EXTERNAL_GROUP_BY[$$142]  |PARTITIONED|
                                                                                
           {
                                                                                
             -- AGGREGATE  |LOCAL|
                                                                                
               -- NESTED_TUPLE_SOURCE  |LOCAL|
                                                                                
           }
-                                                                               
     -- HASH_PARTITION_EXCHANGE [$$139]  |PARTITIONED|
+                                                                               
     -- HASH_PARTITION_EXCHANGE [$$142]  |PARTITIONED|
                                                                                
       -- EXTERNAL_GROUP_BY[$$token]  |PARTITIONED|
                                                                                
               {
                                                                                
                 -- AGGREGATE  |LOCAL|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check_02.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check_02.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check_02.plan
index 1813a27..1daa1cf 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check_02.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check_02.plan
@@ -6,7 +6,7 @@
           -- STREAM_SELECT  |PARTITIONED|
             -- STREAM_PROJECT  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                -- HYBRID_HASH_JOIN [$$31][$$idLeft_0]  |PARTITIONED|
+                -- HYBRID_HASH_JOIN [$$33][$$idLeft_0]  |PARTITIONED|
                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                     -- DATASOURCE_SCAN  |PARTITIONED|
                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -14,18 +14,18 @@
                   -- HASH_PARTITION_EXCHANGE [$$idLeft_0]  |PARTITIONED|
                     -- STREAM_PROJECT  |PARTITIONED|
                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                        -- HYBRID_HASH_JOIN [$$32][$$idRight_0]  |PARTITIONED|
+                        -- HYBRID_HASH_JOIN [$$34][$$idRight_0]  |PARTITIONED|
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- DATASOURCE_SCAN  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                 -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
                           -- HASH_PARTITION_EXCHANGE [$$idRight_0]  
|PARTITIONED|
-                            -- EXTERNAL_GROUP_BY[$$111, $$109]  |PARTITIONED|
+                            -- EXTERNAL_GROUP_BY[$$113, $$111]  |PARTITIONED|
                                     {
                                       -- AGGREGATE  |LOCAL|
                                         -- NESTED_TUPLE_SOURCE  |LOCAL|
                                     }
-                              -- HASH_PARTITION_EXCHANGE [$$111, $$109]  
|PARTITIONED|
+                              -- HASH_PARTITION_EXCHANGE [$$113, $$111]  
|PARTITIONED|
                                 -- STREAM_PROJECT  |PARTITIONED|
                                   -- STREAM_SELECT  |PARTITIONED|
                                     -- STREAM_PROJECT  |PARTITIONED|
@@ -34,14 +34,14 @@
                                           -- HASH_PARTITION_EXCHANGE 
[$$prefixTokenRight]  |PARTITIONED|
                                             -- UNNEST  |PARTITIONED|
                                               -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                -- 
PRE_CLUSTERED_GROUP_BY[$$46]  |PARTITIONED|
+                                                -- 
PRE_CLUSTERED_GROUP_BY[$$48]  |PARTITIONED|
                                                         {
                                                           -- AGGREGATE  |LOCAL|
                                                             -- STREAM_SELECT  
|LOCAL|
                                                               -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                         }
                                                   -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                    -- STABLE_SORT [$$46(ASC), 
$$i(ASC)]  |PARTITIONED|
+                                                    -- STABLE_SORT [$$48(ASC), 
$$i(ASC)]  |PARTITIONED|
                                                       -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                         -- STREAM_PROJECT  
|PARTITIONED|
                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -63,15 +63,15 @@
                                                                           -- 
ASSIGN  |PARTITIONED|
                                                                             -- 
RUNNING_AGGREGATE  |PARTITIONED|
                                                                               
-- STREAM_PROJECT  |PARTITIONED|
-                                                                               
 -- SORT_MERGE_EXCHANGE [$$116(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
-                                                                               
   -- STABLE_SORT [$$116(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
+                                                                               
 -- SORT_MERGE_EXCHANGE [$$118(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
+                                                                               
   -- STABLE_SORT [$$118(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
                                                                                
     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
       -- EXTERNAL_GROUP_BY[$$123]  |PARTITIONED|
+                                                                               
       -- EXTERNAL_GROUP_BY[$$125]  |PARTITIONED|
                                                                                
               {
                                                                                
                 -- AGGREGATE  |LOCAL|
                                                                                
                   -- NESTED_TUPLE_SOURCE  |LOCAL|
                                                                                
               }
-                                                                               
         -- HASH_PARTITION_EXCHANGE [$$123]  |PARTITIONED|
+                                                                               
         -- HASH_PARTITION_EXCHANGE [$$125]  |PARTITIONED|
                                                                                
           -- EXTERNAL_GROUP_BY[$$token]  |PARTITIONED|
                                                                                
                   {
                                                                                
                     -- AGGREGATE  |LOCAL|
@@ -92,14 +92,14 @@
                                               -- UNNEST  |PARTITIONED|
                                                 -- ASSIGN  |PARTITIONED|
                                                   -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                    -- 
PRE_CLUSTERED_GROUP_BY[$$42]  |PARTITIONED|
+                                                    -- 
PRE_CLUSTERED_GROUP_BY[$$44]  |PARTITIONED|
                                                             {
                                                               -- AGGREGATE  
|LOCAL|
                                                                 -- 
STREAM_SELECT  |LOCAL|
                                                                   -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                             }
                                                       -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                        -- STABLE_SORT 
[$$42(ASC), $$i(ASC)]  |PARTITIONED|
+                                                        -- STABLE_SORT 
[$$44(ASC), $$i(ASC)]  |PARTITIONED|
                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                             -- STREAM_PROJECT  
|PARTITIONED|
                                                               -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -118,15 +118,15 @@
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
RUNNING_AGGREGATE  |PARTITIONED|
                                                                             -- 
STREAM_PROJECT  |PARTITIONED|
-                                                                              
-- SORT_MERGE_EXCHANGE [$$116(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
-                                                                               
 -- STABLE_SORT [$$116(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
+                                                                              
-- SORT_MERGE_EXCHANGE [$$118(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
+                                                                               
 -- STABLE_SORT [$$118(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
                                                                                
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
     -- EXTERNAL_GROUP_BY[$$123]  |PARTITIONED|
+                                                                               
     -- EXTERNAL_GROUP_BY[$$125]  |PARTITIONED|
                                                                                
             {
                                                                                
               -- AGGREGATE  |LOCAL|
                                                                                
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                                                                                
             }
-                                                                               
       -- HASH_PARTITION_EXCHANGE [$$123]  |PARTITIONED|
+                                                                               
       -- HASH_PARTITION_EXCHANGE [$$125]  |PARTITIONED|
                                                                                
         -- EXTERNAL_GROUP_BY[$$token]  |PARTITIONED|
                                                                                
                 {
                                                                                
                   -- AGGREGATE  |LOCAL|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check_03.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check_03.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check_03.plan
index 5820ec3..01e070e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check_03.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check_03.plan
@@ -6,7 +6,7 @@
           -- STREAM_SELECT  |PARTITIONED|
             -- STREAM_PROJECT  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                -- HYBRID_HASH_JOIN [$$31][$$idLeft_0]  |PARTITIONED|
+                -- HYBRID_HASH_JOIN [$$33][$$idLeft_0]  |PARTITIONED|
                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                     -- DATASOURCE_SCAN  |PARTITIONED|
                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -14,18 +14,18 @@
                   -- HASH_PARTITION_EXCHANGE [$$idLeft_0]  |PARTITIONED|
                     -- STREAM_PROJECT  |PARTITIONED|
                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                        -- HYBRID_HASH_JOIN [$$32][$$idRight_0]  |PARTITIONED|
+                        -- HYBRID_HASH_JOIN [$$34][$$idRight_0]  |PARTITIONED|
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- DATASOURCE_SCAN  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                 -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
                           -- HASH_PARTITION_EXCHANGE [$$idRight_0]  
|PARTITIONED|
-                            -- EXTERNAL_GROUP_BY[$$111, $$109]  |PARTITIONED|
+                            -- EXTERNAL_GROUP_BY[$$113, $$111]  |PARTITIONED|
                                     {
                                       -- AGGREGATE  |LOCAL|
                                         -- NESTED_TUPLE_SOURCE  |LOCAL|
                                     }
-                              -- HASH_PARTITION_EXCHANGE [$$111, $$109]  
|PARTITIONED|
+                              -- HASH_PARTITION_EXCHANGE [$$113, $$111]  
|PARTITIONED|
                                 -- STREAM_PROJECT  |PARTITIONED|
                                   -- STREAM_SELECT  |PARTITIONED|
                                     -- STREAM_PROJECT  |PARTITIONED|
@@ -38,14 +38,14 @@
                                                   -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                     -- REPLICATE  |PARTITIONED|
                                                       -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$42]  |PARTITIONED|
+                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$44]  |PARTITIONED|
                                                                 {
                                                                   -- AGGREGATE 
 |LOCAL|
                                                                     -- 
STREAM_SELECT  |LOCAL|
                                                                       -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                                 }
                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                            -- STABLE_SORT 
[$$42(ASC), $$i(ASC)]  |PARTITIONED|
+                                                            -- STABLE_SORT 
[$$44(ASC), $$i(ASC)]  |PARTITIONED|
                                                               -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                 -- 
STREAM_PROJECT  |PARTITIONED|
                                                                   -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -62,15 +62,15 @@
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
RUNNING_AGGREGATE  |PARTITIONED|
                                                                             -- 
STREAM_PROJECT  |PARTITIONED|
-                                                                              
-- SORT_MERGE_EXCHANGE [$$116(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
-                                                                               
 -- STABLE_SORT [$$116(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
+                                                                              
-- SORT_MERGE_EXCHANGE [$$118(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
+                                                                               
 -- STABLE_SORT [$$118(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
                                                                                
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
     -- EXTERNAL_GROUP_BY[$$123]  |PARTITIONED|
+                                                                               
     -- EXTERNAL_GROUP_BY[$$125]  |PARTITIONED|
                                                                                
             {
                                                                                
               -- AGGREGATE  |LOCAL|
                                                                                
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                                                                                
             }
-                                                                               
       -- HASH_PARTITION_EXCHANGE [$$123]  |PARTITIONED|
+                                                                               
       -- HASH_PARTITION_EXCHANGE [$$125]  |PARTITIONED|
                                                                                
         -- EXTERNAL_GROUP_BY[$$token]  |PARTITIONED|
                                                                                
                 {
                                                                                
                   -- AGGREGATE  |LOCAL|
@@ -93,14 +93,14 @@
                                                   -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                     -- REPLICATE  |PARTITIONED|
                                                       -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$42]  |PARTITIONED|
+                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$44]  |PARTITIONED|
                                                                 {
                                                                   -- AGGREGATE 
 |LOCAL|
                                                                     -- 
STREAM_SELECT  |LOCAL|
                                                                       -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                                 }
                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                            -- STABLE_SORT 
[$$42(ASC), $$i(ASC)]  |PARTITIONED|
+                                                            -- STABLE_SORT 
[$$44(ASC), $$i(ASC)]  |PARTITIONED|
                                                               -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                 -- 
STREAM_PROJECT  |PARTITIONED|
                                                                   -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -117,15 +117,15 @@
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
RUNNING_AGGREGATE  |PARTITIONED|
                                                                             -- 
STREAM_PROJECT  |PARTITIONED|
-                                                                              
-- SORT_MERGE_EXCHANGE [$$116(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
-                                                                               
 -- STABLE_SORT [$$116(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
+                                                                              
-- SORT_MERGE_EXCHANGE [$$118(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
+                                                                               
 -- STABLE_SORT [$$118(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
                                                                                
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
     -- EXTERNAL_GROUP_BY[$$123]  |PARTITIONED|
+                                                                               
     -- EXTERNAL_GROUP_BY[$$125]  |PARTITIONED|
                                                                                
             {
                                                                                
               -- AGGREGATE  |LOCAL|
                                                                                
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                                                                                
             }
-                                                                               
       -- HASH_PARTITION_EXCHANGE [$$123]  |PARTITIONED|
+                                                                               
       -- HASH_PARTITION_EXCHANGE [$$125]  |PARTITIONED|
                                                                                
         -- EXTERNAL_GROUP_BY[$$token]  |PARTITIONED|
                                                                                
                 {
                                                                                
                   -- AGGREGATE  |LOCAL|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check_04.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check_04.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check_04.plan
index b6052ea..22ad072 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check_04.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard-check_04.plan
@@ -6,7 +6,7 @@
           -- STREAM_SELECT  |PARTITIONED|
             -- STREAM_PROJECT  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                -- HYBRID_HASH_JOIN [$$40][$$idLeft_0]  |PARTITIONED|
+                -- HYBRID_HASH_JOIN [$$43][$$idLeft_0]  |PARTITIONED|
                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                     -- DATASOURCE_SCAN  |PARTITIONED|
                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -14,7 +14,7 @@
                   -- HASH_PARTITION_EXCHANGE [$$idLeft_0]  |PARTITIONED|
                     -- STREAM_PROJECT  |PARTITIONED|
                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                        -- HYBRID_HASH_JOIN [$$41][$$idRight_0]  |PARTITIONED|
+                        -- HYBRID_HASH_JOIN [$$44][$$idRight_0]  |PARTITIONED|
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- ASSIGN  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -22,12 +22,12 @@
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                     -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
                           -- HASH_PARTITION_EXCHANGE [$$idRight_0]  
|PARTITIONED|
-                            -- EXTERNAL_GROUP_BY[$$122, $$120]  |PARTITIONED|
+                            -- EXTERNAL_GROUP_BY[$$125, $$123]  |PARTITIONED|
                                     {
                                       -- AGGREGATE  |LOCAL|
                                         -- NESTED_TUPLE_SOURCE  |LOCAL|
                                     }
-                              -- HASH_PARTITION_EXCHANGE [$$122, $$120]  
|PARTITIONED|
+                              -- HASH_PARTITION_EXCHANGE [$$125, $$123]  
|PARTITIONED|
                                 -- STREAM_PROJECT  |PARTITIONED|
                                   -- STREAM_SELECT  |PARTITIONED|
                                     -- STREAM_PROJECT  |PARTITIONED|
@@ -40,14 +40,14 @@
                                                   -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                     -- REPLICATE  |PARTITIONED|
                                                       -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$53]  |PARTITIONED|
+                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$56]  |PARTITIONED|
                                                                 {
                                                                   -- AGGREGATE 
 |LOCAL|
                                                                     -- 
STREAM_SELECT  |LOCAL|
                                                                       -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                                 }
                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                            -- STABLE_SORT 
[$$53(ASC), $$i(ASC)]  |PARTITIONED|
+                                                            -- STABLE_SORT 
[$$56(ASC), $$i(ASC)]  |PARTITIONED|
                                                               -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                 -- 
STREAM_PROJECT  |PARTITIONED|
                                                                   -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -64,15 +64,15 @@
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
RUNNING_AGGREGATE  |PARTITIONED|
                                                                             -- 
STREAM_PROJECT  |PARTITIONED|
-                                                                              
-- SORT_MERGE_EXCHANGE [$$127(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
-                                                                               
 -- STABLE_SORT [$$127(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
+                                                                              
-- SORT_MERGE_EXCHANGE [$$130(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
+                                                                               
 -- STABLE_SORT [$$130(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
                                                                                
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
     -- EXTERNAL_GROUP_BY[$$134]  |PARTITIONED|
+                                                                               
     -- EXTERNAL_GROUP_BY[$$137]  |PARTITIONED|
                                                                                
             {
                                                                                
               -- AGGREGATE  |LOCAL|
                                                                                
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                                                                                
             }
-                                                                               
       -- HASH_PARTITION_EXCHANGE [$$134]  |PARTITIONED|
+                                                                               
       -- HASH_PARTITION_EXCHANGE [$$137]  |PARTITIONED|
                                                                                
         -- EXTERNAL_GROUP_BY[$$token]  |PARTITIONED|
                                                                                
                 {
                                                                                
                   -- AGGREGATE  |LOCAL|
@@ -95,14 +95,14 @@
                                                   -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                     -- REPLICATE  |PARTITIONED|
                                                       -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$53]  |PARTITIONED|
+                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$56]  |PARTITIONED|
                                                                 {
                                                                   -- AGGREGATE 
 |LOCAL|
                                                                     -- 
STREAM_SELECT  |LOCAL|
                                                                       -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                                 }
                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                            -- STABLE_SORT 
[$$53(ASC), $$i(ASC)]  |PARTITIONED|
+                                                            -- STABLE_SORT 
[$$56(ASC), $$i(ASC)]  |PARTITIONED|
                                                               -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                 -- 
STREAM_PROJECT  |PARTITIONED|
                                                                   -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -119,15 +119,15 @@
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
RUNNING_AGGREGATE  |PARTITIONED|
                                                                             -- 
STREAM_PROJECT  |PARTITIONED|
-                                                                              
-- SORT_MERGE_EXCHANGE [$$127(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
-                                                                               
 -- STABLE_SORT [$$127(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
+                                                                              
-- SORT_MERGE_EXCHANGE [$$130(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
+                                                                               
 -- STABLE_SORT [$$130(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
                                                                                
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
     -- EXTERNAL_GROUP_BY[$$134]  |PARTITIONED|
+                                                                               
     -- EXTERNAL_GROUP_BY[$$137]  |PARTITIONED|
                                                                                
             {
                                                                                
               -- AGGREGATE  |LOCAL|
                                                                                
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                                                                                
             }
-                                                                               
       -- HASH_PARTITION_EXCHANGE [$$134]  |PARTITIONED|
+                                                                               
       -- HASH_PARTITION_EXCHANGE [$$137]  |PARTITIONED|
                                                                                
         -- EXTERNAL_GROUP_BY[$$token]  |PARTITIONED|
                                                                                
                 {
                                                                                
                   -- AGGREGATE  |LOCAL|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard_02.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard_02.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard_02.plan
index 1813a27..1daa1cf 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard_02.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard_02.plan
@@ -6,7 +6,7 @@
           -- STREAM_SELECT  |PARTITIONED|
             -- STREAM_PROJECT  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                -- HYBRID_HASH_JOIN [$$31][$$idLeft_0]  |PARTITIONED|
+                -- HYBRID_HASH_JOIN [$$33][$$idLeft_0]  |PARTITIONED|
                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                     -- DATASOURCE_SCAN  |PARTITIONED|
                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -14,18 +14,18 @@
                   -- HASH_PARTITION_EXCHANGE [$$idLeft_0]  |PARTITIONED|
                     -- STREAM_PROJECT  |PARTITIONED|
                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                        -- HYBRID_HASH_JOIN [$$32][$$idRight_0]  |PARTITIONED|
+                        -- HYBRID_HASH_JOIN [$$34][$$idRight_0]  |PARTITIONED|
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- DATASOURCE_SCAN  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                 -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
                           -- HASH_PARTITION_EXCHANGE [$$idRight_0]  
|PARTITIONED|
-                            -- EXTERNAL_GROUP_BY[$$111, $$109]  |PARTITIONED|
+                            -- EXTERNAL_GROUP_BY[$$113, $$111]  |PARTITIONED|
                                     {
                                       -- AGGREGATE  |LOCAL|
                                         -- NESTED_TUPLE_SOURCE  |LOCAL|
                                     }
-                              -- HASH_PARTITION_EXCHANGE [$$111, $$109]  
|PARTITIONED|
+                              -- HASH_PARTITION_EXCHANGE [$$113, $$111]  
|PARTITIONED|
                                 -- STREAM_PROJECT  |PARTITIONED|
                                   -- STREAM_SELECT  |PARTITIONED|
                                     -- STREAM_PROJECT  |PARTITIONED|
@@ -34,14 +34,14 @@
                                           -- HASH_PARTITION_EXCHANGE 
[$$prefixTokenRight]  |PARTITIONED|
                                             -- UNNEST  |PARTITIONED|
                                               -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                -- 
PRE_CLUSTERED_GROUP_BY[$$46]  |PARTITIONED|
+                                                -- 
PRE_CLUSTERED_GROUP_BY[$$48]  |PARTITIONED|
                                                         {
                                                           -- AGGREGATE  |LOCAL|
                                                             -- STREAM_SELECT  
|LOCAL|
                                                               -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                         }
                                                   -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                    -- STABLE_SORT [$$46(ASC), 
$$i(ASC)]  |PARTITIONED|
+                                                    -- STABLE_SORT [$$48(ASC), 
$$i(ASC)]  |PARTITIONED|
                                                       -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                         -- STREAM_PROJECT  
|PARTITIONED|
                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -63,15 +63,15 @@
                                                                           -- 
ASSIGN  |PARTITIONED|
                                                                             -- 
RUNNING_AGGREGATE  |PARTITIONED|
                                                                               
-- STREAM_PROJECT  |PARTITIONED|
-                                                                               
 -- SORT_MERGE_EXCHANGE [$$116(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
-                                                                               
   -- STABLE_SORT [$$116(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
+                                                                               
 -- SORT_MERGE_EXCHANGE [$$118(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
+                                                                               
   -- STABLE_SORT [$$118(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
                                                                                
     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
       -- EXTERNAL_GROUP_BY[$$123]  |PARTITIONED|
+                                                                               
       -- EXTERNAL_GROUP_BY[$$125]  |PARTITIONED|
                                                                                
               {
                                                                                
                 -- AGGREGATE  |LOCAL|
                                                                                
                   -- NESTED_TUPLE_SOURCE  |LOCAL|
                                                                                
               }
-                                                                               
         -- HASH_PARTITION_EXCHANGE [$$123]  |PARTITIONED|
+                                                                               
         -- HASH_PARTITION_EXCHANGE [$$125]  |PARTITIONED|
                                                                                
           -- EXTERNAL_GROUP_BY[$$token]  |PARTITIONED|
                                                                                
                   {
                                                                                
                     -- AGGREGATE  |LOCAL|
@@ -92,14 +92,14 @@
                                               -- UNNEST  |PARTITIONED|
                                                 -- ASSIGN  |PARTITIONED|
                                                   -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                    -- 
PRE_CLUSTERED_GROUP_BY[$$42]  |PARTITIONED|
+                                                    -- 
PRE_CLUSTERED_GROUP_BY[$$44]  |PARTITIONED|
                                                             {
                                                               -- AGGREGATE  
|LOCAL|
                                                                 -- 
STREAM_SELECT  |LOCAL|
                                                                   -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                             }
                                                       -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                        -- STABLE_SORT 
[$$42(ASC), $$i(ASC)]  |PARTITIONED|
+                                                        -- STABLE_SORT 
[$$44(ASC), $$i(ASC)]  |PARTITIONED|
                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                             -- STREAM_PROJECT  
|PARTITIONED|
                                                               -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -118,15 +118,15 @@
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
RUNNING_AGGREGATE  |PARTITIONED|
                                                                             -- 
STREAM_PROJECT  |PARTITIONED|
-                                                                              
-- SORT_MERGE_EXCHANGE [$$116(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
-                                                                               
 -- STABLE_SORT [$$116(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
+                                                                              
-- SORT_MERGE_EXCHANGE [$$118(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
+                                                                               
 -- STABLE_SORT [$$118(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
                                                                                
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
     -- EXTERNAL_GROUP_BY[$$123]  |PARTITIONED|
+                                                                               
     -- EXTERNAL_GROUP_BY[$$125]  |PARTITIONED|
                                                                                
             {
                                                                                
               -- AGGREGATE  |LOCAL|
                                                                                
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                                                                                
             }
-                                                                               
       -- HASH_PARTITION_EXCHANGE [$$123]  |PARTITIONED|
+                                                                               
       -- HASH_PARTITION_EXCHANGE [$$125]  |PARTITIONED|
                                                                                
         -- EXTERNAL_GROUP_BY[$$token]  |PARTITIONED|
                                                                                
                 {
                                                                                
                   -- AGGREGATE  |LOCAL|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard_03.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard_03.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard_03.plan
index 5820ec3..01e070e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard_03.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard_03.plan
@@ -6,7 +6,7 @@
           -- STREAM_SELECT  |PARTITIONED|
             -- STREAM_PROJECT  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                -- HYBRID_HASH_JOIN [$$31][$$idLeft_0]  |PARTITIONED|
+                -- HYBRID_HASH_JOIN [$$33][$$idLeft_0]  |PARTITIONED|
                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                     -- DATASOURCE_SCAN  |PARTITIONED|
                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -14,18 +14,18 @@
                   -- HASH_PARTITION_EXCHANGE [$$idLeft_0]  |PARTITIONED|
                     -- STREAM_PROJECT  |PARTITIONED|
                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                        -- HYBRID_HASH_JOIN [$$32][$$idRight_0]  |PARTITIONED|
+                        -- HYBRID_HASH_JOIN [$$34][$$idRight_0]  |PARTITIONED|
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- DATASOURCE_SCAN  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                 -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
                           -- HASH_PARTITION_EXCHANGE [$$idRight_0]  
|PARTITIONED|
-                            -- EXTERNAL_GROUP_BY[$$111, $$109]  |PARTITIONED|
+                            -- EXTERNAL_GROUP_BY[$$113, $$111]  |PARTITIONED|
                                     {
                                       -- AGGREGATE  |LOCAL|
                                         -- NESTED_TUPLE_SOURCE  |LOCAL|
                                     }
-                              -- HASH_PARTITION_EXCHANGE [$$111, $$109]  
|PARTITIONED|
+                              -- HASH_PARTITION_EXCHANGE [$$113, $$111]  
|PARTITIONED|
                                 -- STREAM_PROJECT  |PARTITIONED|
                                   -- STREAM_SELECT  |PARTITIONED|
                                     -- STREAM_PROJECT  |PARTITIONED|
@@ -38,14 +38,14 @@
                                                   -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                     -- REPLICATE  |PARTITIONED|
                                                       -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$42]  |PARTITIONED|
+                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$44]  |PARTITIONED|
                                                                 {
                                                                   -- AGGREGATE 
 |LOCAL|
                                                                     -- 
STREAM_SELECT  |LOCAL|
                                                                       -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                                 }
                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                            -- STABLE_SORT 
[$$42(ASC), $$i(ASC)]  |PARTITIONED|
+                                                            -- STABLE_SORT 
[$$44(ASC), $$i(ASC)]  |PARTITIONED|
                                                               -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                 -- 
STREAM_PROJECT  |PARTITIONED|
                                                                   -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -62,15 +62,15 @@
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
RUNNING_AGGREGATE  |PARTITIONED|
                                                                             -- 
STREAM_PROJECT  |PARTITIONED|
-                                                                              
-- SORT_MERGE_EXCHANGE [$$116(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
-                                                                               
 -- STABLE_SORT [$$116(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
+                                                                              
-- SORT_MERGE_EXCHANGE [$$118(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
+                                                                               
 -- STABLE_SORT [$$118(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
                                                                                
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
     -- EXTERNAL_GROUP_BY[$$123]  |PARTITIONED|
+                                                                               
     -- EXTERNAL_GROUP_BY[$$125]  |PARTITIONED|
                                                                                
             {
                                                                                
               -- AGGREGATE  |LOCAL|
                                                                                
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                                                                                
             }
-                                                                               
       -- HASH_PARTITION_EXCHANGE [$$123]  |PARTITIONED|
+                                                                               
       -- HASH_PARTITION_EXCHANGE [$$125]  |PARTITIONED|
                                                                                
         -- EXTERNAL_GROUP_BY[$$token]  |PARTITIONED|
                                                                                
                 {
                                                                                
                   -- AGGREGATE  |LOCAL|
@@ -93,14 +93,14 @@
                                                   -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                     -- REPLICATE  |PARTITIONED|
                                                       -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$42]  |PARTITIONED|
+                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$44]  |PARTITIONED|
                                                                 {
                                                                   -- AGGREGATE 
 |LOCAL|
                                                                     -- 
STREAM_SELECT  |LOCAL|
                                                                       -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                                 }
                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                            -- STABLE_SORT 
[$$42(ASC), $$i(ASC)]  |PARTITIONED|
+                                                            -- STABLE_SORT 
[$$44(ASC), $$i(ASC)]  |PARTITIONED|
                                                               -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                 -- 
STREAM_PROJECT  |PARTITIONED|
                                                                   -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -117,15 +117,15 @@
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
RUNNING_AGGREGATE  |PARTITIONED|
                                                                             -- 
STREAM_PROJECT  |PARTITIONED|
-                                                                              
-- SORT_MERGE_EXCHANGE [$$116(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
-                                                                               
 -- STABLE_SORT [$$116(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
+                                                                              
-- SORT_MERGE_EXCHANGE [$$118(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
+                                                                               
 -- STABLE_SORT [$$118(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
                                                                                
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
     -- EXTERNAL_GROUP_BY[$$123]  |PARTITIONED|
+                                                                               
     -- EXTERNAL_GROUP_BY[$$125]  |PARTITIONED|
                                                                                
             {
                                                                                
               -- AGGREGATE  |LOCAL|
                                                                                
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                                                                                
             }
-                                                                               
       -- HASH_PARTITION_EXCHANGE [$$123]  |PARTITIONED|
+                                                                               
       -- HASH_PARTITION_EXCHANGE [$$125]  |PARTITIONED|
                                                                                
         -- EXTERNAL_GROUP_BY[$$token]  |PARTITIONED|
                                                                                
                 {
                                                                                
                   -- AGGREGATE  |LOCAL|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard_04.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard_04.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard_04.plan
index 4e06205..d3acd29 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard_04.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/word-jaccard_04.plan
@@ -6,7 +6,7 @@
           -- STREAM_SELECT  |PARTITIONED|
             -- STREAM_PROJECT  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                -- HYBRID_HASH_JOIN [$$39][$$idLeft_0]  |PARTITIONED|
+                -- HYBRID_HASH_JOIN [$$42][$$idLeft_0]  |PARTITIONED|
                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                     -- DATASOURCE_SCAN  |PARTITIONED|
                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -14,7 +14,7 @@
                   -- HASH_PARTITION_EXCHANGE [$$idLeft_0]  |PARTITIONED|
                     -- STREAM_PROJECT  |PARTITIONED|
                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                        -- HYBRID_HASH_JOIN [$$40][$$idRight_0]  |PARTITIONED|
+                        -- HYBRID_HASH_JOIN [$$43][$$idRight_0]  |PARTITIONED|
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- ASSIGN  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -22,12 +22,12 @@
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                     -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
                           -- HASH_PARTITION_EXCHANGE [$$idRight_0]  
|PARTITIONED|
-                            -- EXTERNAL_GROUP_BY[$$122, $$120]  |PARTITIONED|
+                            -- EXTERNAL_GROUP_BY[$$125, $$123]  |PARTITIONED|
                                     {
                                       -- AGGREGATE  |LOCAL|
                                         -- NESTED_TUPLE_SOURCE  |LOCAL|
                                     }
-                              -- HASH_PARTITION_EXCHANGE [$$122, $$120]  
|PARTITIONED|
+                              -- HASH_PARTITION_EXCHANGE [$$125, $$123]  
|PARTITIONED|
                                 -- STREAM_PROJECT  |PARTITIONED|
                                   -- STREAM_SELECT  |PARTITIONED|
                                     -- STREAM_PROJECT  |PARTITIONED|
@@ -40,14 +40,14 @@
                                                   -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                     -- REPLICATE  |PARTITIONED|
                                                       -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$53]  |PARTITIONED|
+                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$56]  |PARTITIONED|
                                                                 {
                                                                   -- AGGREGATE 
 |LOCAL|
                                                                     -- 
STREAM_SELECT  |LOCAL|
                                                                       -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                                 }
                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                            -- STABLE_SORT 
[$$53(ASC), $$i(ASC)]  |PARTITIONED|
+                                                            -- STABLE_SORT 
[$$56(ASC), $$i(ASC)]  |PARTITIONED|
                                                               -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                 -- 
STREAM_PROJECT  |PARTITIONED|
                                                                   -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -64,15 +64,15 @@
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
RUNNING_AGGREGATE  |PARTITIONED|
                                                                             -- 
STREAM_PROJECT  |PARTITIONED|
-                                                                              
-- SORT_MERGE_EXCHANGE [$$127(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
-                                                                               
 -- STABLE_SORT [$$127(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
+                                                                              
-- SORT_MERGE_EXCHANGE [$$130(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
+                                                                               
 -- STABLE_SORT [$$130(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
                                                                                
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
     -- EXTERNAL_GROUP_BY[$$134]  |PARTITIONED|
+                                                                               
     -- EXTERNAL_GROUP_BY[$$137]  |PARTITIONED|
                                                                                
             {
                                                                                
               -- AGGREGATE  |LOCAL|
                                                                                
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                                                                                
             }
-                                                                               
       -- HASH_PARTITION_EXCHANGE [$$134]  |PARTITIONED|
+                                                                               
       -- HASH_PARTITION_EXCHANGE [$$137]  |PARTITIONED|
                                                                                
         -- EXTERNAL_GROUP_BY[$$token]  |PARTITIONED|
                                                                                
                 {
                                                                                
                   -- AGGREGATE  |LOCAL|
@@ -95,14 +95,14 @@
                                                   -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                     -- REPLICATE  |PARTITIONED|
                                                       -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$53]  |PARTITIONED|
+                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$56]  |PARTITIONED|
                                                                 {
                                                                   -- AGGREGATE 
 |LOCAL|
                                                                     -- 
STREAM_SELECT  |LOCAL|
                                                                       -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                                 }
                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                            -- STABLE_SORT 
[$$53(ASC), $$i(ASC)]  |PARTITIONED|
+                                                            -- STABLE_SORT 
[$$56(ASC), $$i(ASC)]  |PARTITIONED|
                                                               -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                 -- 
STREAM_PROJECT  |PARTITIONED|
                                                                   -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -119,15 +119,15 @@
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
RUNNING_AGGREGATE  |PARTITIONED|
                                                                             -- 
STREAM_PROJECT  |PARTITIONED|
-                                                                              
-- SORT_MERGE_EXCHANGE [$$127(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
-                                                                               
 -- STABLE_SORT [$$127(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
+                                                                              
-- SORT_MERGE_EXCHANGE [$$130(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
+                                                                               
 -- STABLE_SORT [$$130(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
                                                                                
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
     -- EXTERNAL_GROUP_BY[$$134]  |PARTITIONED|
+                                                                               
     -- EXTERNAL_GROUP_BY[$$137]  |PARTITIONED|
                                                                                
             {
                                                                                
               -- AGGREGATE  |LOCAL|
                                                                                
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                                                                                
             }
-                                                                               
       -- HASH_PARTITION_EXCHANGE [$$134]  |PARTITIONED|
+                                                                               
       -- HASH_PARTITION_EXCHANGE [$$137]  |PARTITIONED|
                                                                                
         -- EXTERNAL_GROUP_BY[$$token]  |PARTITIONED|
                                                                                
                 {
                                                                                
                   -- AGGREGATE  |LOCAL|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/join-super-key_01.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/join-super-key_01.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/join-super-key_01.plan
index d6e272b..cc7cf7d 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/join-super-key_01.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/join-super-key_01.plan
@@ -4,8 +4,8 @@
       -- ASSIGN  |PARTITIONED|
         -- STREAM_PROJECT  |PARTITIONED|
           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-            -- HYBRID_HASH_JOIN [$$33, $$38, $$40][$$35, $$39, $$36]  
|PARTITIONED|
-              -- HASH_PARTITION_EXCHANGE [$$33, $$40]  |PARTITIONED|
+            -- HYBRID_HASH_JOIN [$$35, $$40, $$42][$$37, $$41, $$38]  
|PARTITIONED|
+              -- HASH_PARTITION_EXCHANGE [$$35, $$42]  |PARTITIONED|
                 -- STREAM_PROJECT  |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/join-super-key_02.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/join-super-key_02.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/join-super-key_02.plan
index 49e2b90..6d6455a 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/join-super-key_02.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/join-super-key_02.plan
@@ -4,7 +4,7 @@
       -- ASSIGN  |PARTITIONED|
         -- STREAM_PROJECT  |PARTITIONED|
           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-            -- HYBRID_HASH_JOIN [$$33, $$39, $$34][$$35, $$38, $$40]  
|PARTITIONED|
+            -- HYBRID_HASH_JOIN [$$35, $$41, $$36][$$37, $$40, $$42]  
|PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                 -- STREAM_PROJECT  |PARTITIONED|
                   -- ASSIGN  |PARTITIONED|
@@ -12,7 +12,7 @@
                       -- DATASOURCE_SCAN  |PARTITIONED|
                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                           -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-              -- HASH_PARTITION_EXCHANGE [$$35, $$40]  |PARTITIONED|
+              -- HASH_PARTITION_EXCHANGE [$$37, $$42]  |PARTITIONED|
                 -- STREAM_PROJECT  |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/joins/nested_query_with_bcast.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/joins/nested_query_with_bcast.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/joins/nested_query_with_bcast.plan
index 58af75f..cb1184e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/joins/nested_query_with_bcast.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/joins/nested_query_with_bcast.plan
@@ -2,7 +2,7 @@
   -- STREAM_PROJECT  |PARTITIONED|
     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
       -- INSERT_DELETE  |PARTITIONED|
-        -- HASH_PARTITION_EXCHANGE [$$31]  |PARTITIONED|
+        -- HASH_PARTITION_EXCHANGE [$$33]  |PARTITIONED|
           -- ASSIGN  |PARTITIONED|
             -- STREAM_PROJECT  |PARTITIONED|
               -- ASSIGN  |PARTITIONED|
@@ -12,19 +12,19 @@
                       -- ASSIGN  |PARTITIONED|
                         -- STREAM_PROJECT  |PARTITIONED|
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                            -- PRE_CLUSTERED_GROUP_BY[$$34]  |PARTITIONED|
+                            -- PRE_CLUSTERED_GROUP_BY[$$36]  |PARTITIONED|
                                     {
                                       -- AGGREGATE  |LOCAL|
                                         -- STREAM_SELECT  |LOCAL|
                                           -- NESTED_TUPLE_SOURCE  |LOCAL|
                                     }
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                -- STABLE_SORT [$$34(ASC)]  |PARTITIONED|
-                                  -- HASH_PARTITION_EXCHANGE [$$34]  
|PARTITIONED|
+                                -- STABLE_SORT [$$36(ASC)]  |PARTITIONED|
+                                  -- HASH_PARTITION_EXCHANGE [$$36]  
|PARTITIONED|
                                     -- STREAM_PROJECT  |PARTITIONED|
                                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                        -- HYBRID_HASH_JOIN [$$37][$$35]  
|PARTITIONED|
-                                          -- HASH_PARTITION_EXCHANGE [$$37]  
|PARTITIONED|
+                                        -- HYBRID_HASH_JOIN [$$39][$$37]  
|PARTITIONED|
+                                          -- HASH_PARTITION_EXCHANGE [$$39]  
|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/loj-core.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/loj-core.plan 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/loj-core.plan
index 2cab787..8dac302 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results/loj-core.plan
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/loj-core.plan
@@ -2,20 +2,20 @@
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
     -- STREAM_PROJECT  |PARTITIONED|
       -- ASSIGN  |PARTITIONED|
-        -- SORT_MERGE_EXCHANGE [$$36(ASC) ]  |PARTITIONED|
-          -- STABLE_SORT [$$36(ASC)]  |PARTITIONED|
+        -- SORT_MERGE_EXCHANGE [$$39(ASC) ]  |PARTITIONED|
+          -- STABLE_SORT [$$39(ASC)]  |PARTITIONED|
             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
               -- STREAM_PROJECT  |PARTITIONED|
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                  -- HYBRID_HASH_JOIN [$$38][$$39]  |PARTITIONED|
-                    -- HASH_PARTITION_EXCHANGE [$$38]  |PARTITIONED|
+                  -- HYBRID_HASH_JOIN [$$41][$$42]  |PARTITIONED|
+                    -- HASH_PARTITION_EXCHANGE [$$41]  |PARTITIONED|
                       -- STREAM_PROJECT  |PARTITIONED|
                         -- ASSIGN  |PARTITIONED|
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- DATASOURCE_SCAN  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                 -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                    -- HASH_PARTITION_EXCHANGE [$$39]  |PARTITIONED|
+                    -- HASH_PARTITION_EXCHANGE [$$42]  |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/loj-core_ps.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/loj-core_ps.plan 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/loj-core_ps.plan
index 73103df..cd94777 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/loj-core_ps.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/loj-core_ps.plan
@@ -3,23 +3,23 @@
     -- STREAM_PROJECT  |PARTITIONED|
       -- ASSIGN  |PARTITIONED|
         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-          -- STABLE_SORT [$$36(ASC)]  |PARTITIONED|
-            -- RANGE_PARTITION_EXCHANGE [$$36(ASC)]  |PARTITIONED|
+          -- STABLE_SORT [$$39(ASC)]  |PARTITIONED|
+            -- RANGE_PARTITION_EXCHANGE [$$39(ASC)]  |PARTITIONED|
               -- FORWARD  |PARTITIONED|
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                   -- REPLICATE  |PARTITIONED|
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                       -- STREAM_PROJECT  |PARTITIONED|
                         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                          -- HYBRID_HASH_JOIN [$$38][$$39]  |PARTITIONED|
-                            -- HASH_PARTITION_EXCHANGE [$$38]  |PARTITIONED|
+                          -- HYBRID_HASH_JOIN [$$41][$$42]  |PARTITIONED|
+                            -- HASH_PARTITION_EXCHANGE [$$41]  |PARTITIONED|
                               -- STREAM_PROJECT  |PARTITIONED|
                                 -- ASSIGN  |PARTITIONED|
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                     -- DATASOURCE_SCAN  |PARTITIONED|
                                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                         -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                            -- HASH_PARTITION_EXCHANGE [$$39]  |PARTITIONED|
+                            -- HASH_PARTITION_EXCHANGE [$$42]  |PARTITIONED|
                               -- ASSIGN  |PARTITIONED|
                                 -- STREAM_PROJECT  |PARTITIONED|
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -36,15 +36,15 @@
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                 -- STREAM_PROJECT  |PARTITIONED|
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                    -- HYBRID_HASH_JOIN [$$38][$$39]  
|PARTITIONED|
-                                      -- HASH_PARTITION_EXCHANGE [$$38]  
|PARTITIONED|
+                                    -- HYBRID_HASH_JOIN [$$41][$$42]  
|PARTITIONED|
+                                      -- HASH_PARTITION_EXCHANGE [$$41]  
|PARTITIONED|
                                         -- STREAM_PROJECT  |PARTITIONED|
                                           -- ASSIGN  |PARTITIONED|
                                             -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                               -- DATASOURCE_SCAN  |PARTITIONED|
                                                 -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
                                                   -- EMPTY_TUPLE_SOURCE  
|PARTITIONED|
-                                      -- HASH_PARTITION_EXCHANGE [$$39]  
|PARTITIONED|
+                                      -- HASH_PARTITION_EXCHANGE [$$42]  
|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/loj-sugar.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/loj-sugar.plan 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/loj-sugar.plan
index a547407..f15c610 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/loj-sugar.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/loj-sugar.plan
@@ -2,20 +2,20 @@
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
     -- STREAM_PROJECT  |PARTITIONED|
       -- ASSIGN  |PARTITIONED|
-        -- SORT_MERGE_EXCHANGE [$$29(ASC) ]  |PARTITIONED|
-          -- STABLE_SORT [$$29(ASC)]  |PARTITIONED|
+        -- SORT_MERGE_EXCHANGE [$$31(ASC) ]  |PARTITIONED|
+          -- STABLE_SORT [$$31(ASC)]  |PARTITIONED|
             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
               -- STREAM_PROJECT  |PARTITIONED|
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                  -- HYBRID_HASH_JOIN [$$31][$$32]  |PARTITIONED|
-                    -- HASH_PARTITION_EXCHANGE [$$31]  |PARTITIONED|
+                  -- HYBRID_HASH_JOIN [$$33][$$34]  |PARTITIONED|
+                    -- HASH_PARTITION_EXCHANGE [$$33]  |PARTITIONED|
                       -- STREAM_PROJECT  |PARTITIONED|
                         -- ASSIGN  |PARTITIONED|
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- DATASOURCE_SCAN  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                 -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                    -- HASH_PARTITION_EXCHANGE [$$32]  |PARTITIONED|
+                    -- HASH_PARTITION_EXCHANGE [$$34]  |PARTITIONED|
                       -- ASSIGN  |PARTITIONED|
                         -- STREAM_PROJECT  |PARTITIONED|
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|

Reply via email to