http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-edit-distance_04.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-edit-distance_04.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-edit-distance_04.plan
index e05463e..c64fc28 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-edit-distance_04.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-edit-distance_04.plan
@@ -4,12 +4,12 @@
       -- ASSIGN  |PARTITIONED|
         -- STREAM_PROJECT  |PARTITIONED|
           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-            -- HYBRID_HASH_JOIN [$$48][$$37]  |PARTITIONED|
+            -- HYBRID_HASH_JOIN [$$51][$$40]  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                 -- DATASOURCE_SCAN  |PARTITIONED|
                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                     -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-              -- HASH_PARTITION_EXCHANGE [$$37]  |PARTITIONED|
+              -- HASH_PARTITION_EXCHANGE [$$40]  |PARTITIONED|
                 -- UNION_ALL  |PARTITIONED|
                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                     -- STREAM_PROJECT  |PARTITIONED|
@@ -20,7 +20,7 @@
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                 -- BTREE_SEARCH  |PARTITIONED|
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                    -- STABLE_SORT [$$53(ASC)]  |PARTITIONED|
+                                    -- STABLE_SORT [$$56(ASC)]  |PARTITIONED|
                                       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                         -- 
LENGTH_PARTITIONED_INVERTED_INDEX_SEARCH  |PARTITIONED|
                                           -- BROADCAST_EXCHANGE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-edit-distance_01.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-edit-distance_01.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-edit-distance_01.plan
index 8a8090e..c75c998 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-edit-distance_01.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-edit-distance_01.plan
@@ -4,12 +4,12 @@
       -- ASSIGN  |PARTITIONED|
         -- STREAM_PROJECT  |PARTITIONED|
           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-            -- HYBRID_HASH_JOIN [$$36][$$28]  |PARTITIONED|
+            -- HYBRID_HASH_JOIN [$$38][$$30]  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                 -- DATASOURCE_SCAN  |PARTITIONED|
                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                     -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-              -- HASH_PARTITION_EXCHANGE [$$28]  |PARTITIONED|
+              -- HASH_PARTITION_EXCHANGE [$$30]  |PARTITIONED|
                 -- UNION_ALL  |PARTITIONED|
                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                     -- STREAM_PROJECT  |PARTITIONED|
@@ -18,7 +18,7 @@
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- BTREE_SEARCH  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                -- STABLE_SORT [$$41(ASC)]  |PARTITIONED|
+                                -- STABLE_SORT [$$43(ASC)]  |PARTITIONED|
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                     -- 
LENGTH_PARTITIONED_INVERTED_INDEX_SEARCH  |PARTITIONED|
                                       -- BROADCAST_EXCHANGE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-edit-distance_03.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-edit-distance_03.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-edit-distance_03.plan
index 8a8090e..c75c998 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-edit-distance_03.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-edit-distance_03.plan
@@ -4,12 +4,12 @@
       -- ASSIGN  |PARTITIONED|
         -- STREAM_PROJECT  |PARTITIONED|
           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-            -- HYBRID_HASH_JOIN [$$36][$$28]  |PARTITIONED|
+            -- HYBRID_HASH_JOIN [$$38][$$30]  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                 -- DATASOURCE_SCAN  |PARTITIONED|
                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                     -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-              -- HASH_PARTITION_EXCHANGE [$$28]  |PARTITIONED|
+              -- HASH_PARTITION_EXCHANGE [$$30]  |PARTITIONED|
                 -- UNION_ALL  |PARTITIONED|
                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                     -- STREAM_PROJECT  |PARTITIONED|
@@ -18,7 +18,7 @@
                           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                             -- BTREE_SEARCH  |PARTITIONED|
                               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                -- STABLE_SORT [$$41(ASC)]  |PARTITIONED|
+                                -- STABLE_SORT [$$43(ASC)]  |PARTITIONED|
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                     -- 
LENGTH_PARTITIONED_INVERTED_INDEX_SEARCH  |PARTITIONED|
                                       -- BROADCAST_EXCHANGE  |PARTITIONED|

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f2c18aa9/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-jaccard_02.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-jaccard_02.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-jaccard_02.plan
index 3ddaca2..cbbce46 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-jaccard_02.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-jaccard_02.plan
@@ -6,7 +6,7 @@
           -- STREAM_SELECT  |PARTITIONED|
             -- STREAM_PROJECT  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                -- HYBRID_HASH_JOIN [$$30][$$idLeft_0]  |PARTITIONED|
+                -- HYBRID_HASH_JOIN [$$32][$$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 [$$31][$$idRight_0]  |PARTITIONED|
+                        -- HYBRID_HASH_JOIN [$$33][$$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[$$110, $$108]  |PARTITIONED|
+                            -- EXTERNAL_GROUP_BY[$$112, $$110]  |PARTITIONED|
                                     {
                                       -- AGGREGATE  |LOCAL|
                                         -- NESTED_TUPLE_SOURCE  |LOCAL|
                                     }
-                              -- HASH_PARTITION_EXCHANGE [$$110, $$108]  
|PARTITIONED|
+                              -- HASH_PARTITION_EXCHANGE [$$112, $$110]  
|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[$$45]  |PARTITIONED|
+                                                -- 
PRE_CLUSTERED_GROUP_BY[$$47]  |PARTITIONED|
                                                         {
                                                           -- AGGREGATE  |LOCAL|
                                                             -- STREAM_SELECT  
|LOCAL|
                                                               -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                         }
                                                   -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                    -- STABLE_SORT [$$45(ASC), 
$$i(ASC)]  |PARTITIONED|
+                                                    -- STABLE_SORT [$$47(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 [$$115(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
-                                                                               
   -- STABLE_SORT [$$115(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
+                                                                               
 -- SORT_MERGE_EXCHANGE [$$117(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
+                                                                               
   -- STABLE_SORT [$$117(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
                                                                                
     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
       -- EXTERNAL_GROUP_BY[$$122]  |PARTITIONED|
+                                                                               
       -- EXTERNAL_GROUP_BY[$$124]  |PARTITIONED|
                                                                                
               {
                                                                                
                 -- AGGREGATE  |LOCAL|
                                                                                
                   -- NESTED_TUPLE_SOURCE  |LOCAL|
                                                                                
               }
-                                                                               
         -- HASH_PARTITION_EXCHANGE [$$122]  |PARTITIONED|
+                                                                               
         -- HASH_PARTITION_EXCHANGE [$$124]  |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[$$41]  |PARTITIONED|
+                                                    -- 
PRE_CLUSTERED_GROUP_BY[$$43]  |PARTITIONED|
                                                             {
                                                               -- AGGREGATE  
|LOCAL|
                                                                 -- 
STREAM_SELECT  |LOCAL|
                                                                   -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                             }
                                                       -- ONE_TO_ONE_EXCHANGE  
|PARTITIONED|
-                                                        -- STABLE_SORT 
[$$41(ASC), $$i(ASC)]  |PARTITIONED|
+                                                        -- STABLE_SORT 
[$$43(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 [$$115(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
-                                                                               
 -- STABLE_SORT [$$115(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
+                                                                              
-- SORT_MERGE_EXCHANGE [$$117(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
+                                                                               
 -- STABLE_SORT [$$117(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
                                                                                
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
     -- EXTERNAL_GROUP_BY[$$122]  |PARTITIONED|
+                                                                               
     -- EXTERNAL_GROUP_BY[$$124]  |PARTITIONED|
                                                                                
             {
                                                                                
               -- AGGREGATE  |LOCAL|
                                                                                
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                                                                                
             }
-                                                                               
       -- HASH_PARTITION_EXCHANGE [$$122]  |PARTITIONED|
+                                                                               
       -- HASH_PARTITION_EXCHANGE [$$124]  |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/ngram-fuzzyeq-jaccard_03.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-jaccard_03.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-jaccard_03.plan
index 157c781..79e824e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-jaccard_03.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-fuzzyeq-jaccard_03.plan
@@ -6,7 +6,7 @@
           -- STREAM_SELECT  |PARTITIONED|
             -- STREAM_PROJECT  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                -- HYBRID_HASH_JOIN [$$30][$$idLeft_0]  |PARTITIONED|
+                -- HYBRID_HASH_JOIN [$$32][$$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 [$$31][$$idRight_0]  |PARTITIONED|
+                        -- HYBRID_HASH_JOIN [$$33][$$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[$$110, $$108]  |PARTITIONED|
+                            -- EXTERNAL_GROUP_BY[$$112, $$110]  |PARTITIONED|
                                     {
                                       -- AGGREGATE  |LOCAL|
                                         -- NESTED_TUPLE_SOURCE  |LOCAL|
                                     }
-                              -- HASH_PARTITION_EXCHANGE [$$110, $$108]  
|PARTITIONED|
+                              -- HASH_PARTITION_EXCHANGE [$$112, $$110]  
|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[$$41]  |PARTITIONED|
+                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$43]  |PARTITIONED|
                                                                 {
                                                                   -- AGGREGATE 
 |LOCAL|
                                                                     -- 
STREAM_SELECT  |LOCAL|
                                                                       -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                                 }
                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                            -- STABLE_SORT 
[$$41(ASC), $$i(ASC)]  |PARTITIONED|
+                                                            -- STABLE_SORT 
[$$43(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 [$$115(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
-                                                                               
 -- STABLE_SORT [$$115(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
+                                                                              
-- SORT_MERGE_EXCHANGE [$$117(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
+                                                                               
 -- STABLE_SORT [$$117(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
                                                                                
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
     -- EXTERNAL_GROUP_BY[$$122]  |PARTITIONED|
+                                                                               
     -- EXTERNAL_GROUP_BY[$$124]  |PARTITIONED|
                                                                                
             {
                                                                                
               -- AGGREGATE  |LOCAL|
                                                                                
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                                                                                
             }
-                                                                               
       -- HASH_PARTITION_EXCHANGE [$$122]  |PARTITIONED|
+                                                                               
       -- HASH_PARTITION_EXCHANGE [$$124]  |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[$$41]  |PARTITIONED|
+                                                        -- 
PRE_CLUSTERED_GROUP_BY[$$43]  |PARTITIONED|
                                                                 {
                                                                   -- AGGREGATE 
 |LOCAL|
                                                                     -- 
STREAM_SELECT  |LOCAL|
                                                                       -- 
NESTED_TUPLE_SOURCE  |LOCAL|
                                                                 }
                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                            -- STABLE_SORT 
[$$41(ASC), $$i(ASC)]  |PARTITIONED|
+                                                            -- STABLE_SORT 
[$$43(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 [$$115(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
-                                                                               
 -- STABLE_SORT [$$115(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
+                                                                              
-- SORT_MERGE_EXCHANGE [$$117(ASC), $$tokenGroupped(ASC) ]  |PARTITIONED|
+                                                                               
 -- STABLE_SORT [$$117(ASC), $$tokenGroupped(ASC)]  |PARTITIONED|
                                                                                
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
     -- EXTERNAL_GROUP_BY[$$122]  |PARTITIONED|
+                                                                               
     -- EXTERNAL_GROUP_BY[$$124]  |PARTITIONED|
                                                                                
             {
                                                                                
               -- AGGREGATE  |LOCAL|
                                                                                
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
                                                                                
             }
-                                                                               
       -- HASH_PARTITION_EXCHANGE [$$122]  |PARTITIONED|
+                                                                               
       -- HASH_PARTITION_EXCHANGE [$$124]  |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/ngram-jaccard-check_02.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-jaccard-check_02.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-jaccard-check_02.plan
index 1813a27..1daa1cf 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-jaccard-check_02.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-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/ngram-jaccard-check_03.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-jaccard-check_03.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-jaccard-check_03.plan
index 5820ec3..01e070e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-jaccard-check_03.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-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/ngram-jaccard-check_04.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-jaccard-check_04.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-jaccard-check_04.plan
index b6052ea..22ad072 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-jaccard-check_04.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-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/ngram-jaccard_02.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-jaccard_02.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-jaccard_02.plan
index 1813a27..1daa1cf 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-jaccard_02.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-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/ngram-jaccard_03.plan
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-jaccard_03.plan
 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-jaccard_03.plan
index 5820ec3..01e070e 100644
--- 
a/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-jaccard_03.plan
+++ 
b/asterixdb/asterix-app/src/test/resources/optimizerts/results/inverted-index-join/ngram-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|

Reply via email to