Xikui Wang has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/2679

Change subject: Coordinated Change for Align VarCounter in query rewritting
......................................................................

Coordinated Change for Align VarCounter in query rewritting

Change-Id: I20701e5119a65e06d33e379bc3520dff1e2d6c2e
---
M 
asterix-bad/src/test/resources/optimizerts/results/channel/channel-advanced-index-only.plan
M 
asterix-bad/src/test/resources/optimizerts/results/channel/channel-advanced.plan
M asterix-bad/src/test/resources/optimizerts/results/channel/channel-create.plan
M 
asterix-bad/src/test/resources/optimizerts/results/channel/channel-subscribe.plan
M 
asterix-bad/src/test/resources/optimizerts/results/channel/channel-unsubscribe.plan
5 files changed, 64 insertions(+), 64 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb-bad 
refs/changes/79/2679/1

diff --git 
a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-advanced-index-only.plan
 
b/asterix-bad/src/test/resources/optimizerts/results/channel/channel-advanced-index-only.plan
index dd68a36..39c2743 100644
--- 
a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-advanced-index-only.plan
+++ 
b/asterix-bad/src/test/resources/optimizerts/results/channel/channel-advanced-index-only.plan
@@ -1,17 +1,17 @@
 -- NOTIFY_BROKERS  |PARTITIONED|
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-    -- PRE_CLUSTERED_GROUP_BY[$$133, $$channelExecutionTime]  |PARTITIONED|
+    -- PRE_CLUSTERED_GROUP_BY[$$140, $$channelExecutionTime]  |PARTITIONED|
             {
               -- AGGREGATE  |LOCAL|
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
             }
       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-        -- STABLE_SORT [$$133(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
-          -- HASH_PARTITION_EXCHANGE [$$133, $$channelExecutionTime]  
|PARTITIONED|
+        -- STABLE_SORT [$$140(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
+          -- HASH_PARTITION_EXCHANGE [$$140, $$channelExecutionTime]  
|PARTITIONED|
             -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                -- STABLE_SORT [$$108(ASC)]  |PARTITIONED|
-                  -- HASH_PARTITION_EXCHANGE [$$108]  |PARTITIONED|
+                -- STABLE_SORT [$$115(ASC)]  |PARTITIONED|
+                  -- HASH_PARTITION_EXCHANGE [$$115]  |PARTITIONED|
                     -- STREAM_PROJECT  |PARTITIONED|
                       -- COMMIT  |PARTITIONED|
                         -- STREAM_PROJECT  |PARTITIONED|
@@ -21,7 +21,7 @@
                                 -- STREAM_PROJECT  |PARTITIONED|
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                     -- INSERT_DELETE  |PARTITIONED|
-                                      -- HASH_PARTITION_EXCHANGE [$$104]  
|PARTITIONED|
+                                      -- HASH_PARTITION_EXCHANGE [$$111]  
|PARTITIONED|
                                         -- ASSIGN  |PARTITIONED|
                                           -- STREAM_PROJECT  |PARTITIONED|
                                             -- ASSIGN  |PARTITIONED|
@@ -33,12 +33,12 @@
                                                         -- STREAM_SELECT  
|PARTITIONED|
                                                           -- STREAM_PROJECT  
|PARTITIONED|
                                                             -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                              -- 
HYBRID_HASH_JOIN [$$118][$$117]  |PARTITIONED|
-                                                                -- 
HASH_PARTITION_EXCHANGE [$$118]  |PARTITIONED|
+                                                              -- 
HYBRID_HASH_JOIN [$$125][$$124]  |PARTITIONED|
+                                                                -- 
HASH_PARTITION_EXCHANGE [$$125]  |PARTITIONED|
                                                                   -- 
STREAM_PROJECT  |PARTITIONED|
                                                                     -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                      -- 
HYBRID_HASH_JOIN [$$116, $$114][$$109, $$110]  |PARTITIONED|
-                                                                        -- 
HASH_PARTITION_EXCHANGE [$$116, $$114]  |PARTITIONED|
+                                                                      -- 
HYBRID_HASH_JOIN [$$123, $$121][$$116, $$117]  |PARTITIONED|
+                                                                        -- 
HASH_PARTITION_EXCHANGE [$$123, $$121]  |PARTITIONED|
                                                                           -- 
STREAM_PROJECT  |PARTITIONED|
                                                                             -- 
ASSIGN  |PARTITIONED|
                                                                               
-- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -46,24 +46,24 @@
                                                                                
   -- BROADCAST_EXCHANGE  |PARTITIONED|
                                                                                
     -- ASSIGN  |UNPARTITIONED|
                                                                                
       -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
-                                                                        -- 
HASH_PARTITION_EXCHANGE [$$109, $$110]  |PARTITIONED|
+                                                                        -- 
HASH_PARTITION_EXCHANGE [$$116, $$117]  |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 [$$117]  |PARTITIONED|
+                                                                -- 
HASH_PARTITION_EXCHANGE [$$124]  |PARTITIONED|
                                                                   -- 
STREAM_PROJECT  |PARTITIONED|
                                                                     -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                      -- 
HYBRID_HASH_JOIN [$$111][$$127]  |PARTITIONED|
+                                                                      -- 
HYBRID_HASH_JOIN [$$118][$$134]  |PARTITIONED|
                                                                         -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                           -- 
STREAM_SELECT  |PARTITIONED|
                                                                             -- 
ASSIGN  |PARTITIONED|
                                                                               
-- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                
 -- BTREE_SEARCH  |PARTITIONED|
                                                                                
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
     -- STABLE_SORT [$$137(ASC)]  |PARTITIONED|
+                                                                               
     -- STABLE_SORT [$$144(ASC)]  |PARTITIONED|
                                                                                
       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                
         -- STREAM_PROJECT  |PARTITIONED|
                                                                                
           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -71,7 +71,7 @@
                                                                                
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                
                 -- ASSIGN  |PARTITIONED|
                                                                                
                   -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                                                                        -- 
HASH_PARTITION_EXCHANGE [$$127]  |PARTITIONED|
+                                                                        -- 
HASH_PARTITION_EXCHANGE [$$134]  |PARTITIONED|
                                                                           -- 
NESTED_LOOP  |PARTITIONED|
                                                                             -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                               
-- UNION_ALL  |PARTITIONED|
@@ -127,4 +127,4 @@
                                                                                
               -- BTREE_SEARCH  |PARTITIONED|
                                                                                
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                
                   -- ASSIGN  |PARTITIONED|
-                                                                               
                     -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
\ No newline at end of file
+                                                                               
                     -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git 
a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-advanced.plan
 
b/asterix-bad/src/test/resources/optimizerts/results/channel/channel-advanced.plan
index d9e613d..0356edb 100644
--- 
a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-advanced.plan
+++ 
b/asterix-bad/src/test/resources/optimizerts/results/channel/channel-advanced.plan
@@ -1,17 +1,17 @@
 -- NOTIFY_BROKERS  |PARTITIONED|
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-    -- PRE_CLUSTERED_GROUP_BY[$$133, $$channelExecutionTime]  |PARTITIONED|
+    -- PRE_CLUSTERED_GROUP_BY[$$140, $$channelExecutionTime]  |PARTITIONED|
             {
               -- AGGREGATE  |LOCAL|
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
             }
       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-        -- STABLE_SORT [$$133(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
-          -- HASH_PARTITION_EXCHANGE [$$133, $$channelExecutionTime]  
|PARTITIONED|
+        -- STABLE_SORT [$$140(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
+          -- HASH_PARTITION_EXCHANGE [$$140, $$channelExecutionTime]  
|PARTITIONED|
             -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                -- STABLE_SORT [$$108(ASC)]  |PARTITIONED|
-                  -- HASH_PARTITION_EXCHANGE [$$108]  |PARTITIONED|
+                -- STABLE_SORT [$$115(ASC)]  |PARTITIONED|
+                  -- HASH_PARTITION_EXCHANGE [$$115]  |PARTITIONED|
                     -- STREAM_PROJECT  |PARTITIONED|
                       -- COMMIT  |PARTITIONED|
                         -- STREAM_PROJECT  |PARTITIONED|
@@ -21,7 +21,7 @@
                                 -- STREAM_PROJECT  |PARTITIONED|
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                     -- INSERT_DELETE  |PARTITIONED|
-                                      -- HASH_PARTITION_EXCHANGE [$$104]  
|PARTITIONED|
+                                      -- HASH_PARTITION_EXCHANGE [$$111]  
|PARTITIONED|
                                         -- ASSIGN  |PARTITIONED|
                                           -- STREAM_PROJECT  |PARTITIONED|
                                             -- ASSIGN  |PARTITIONED|
@@ -33,12 +33,12 @@
                                                         -- STREAM_SELECT  
|PARTITIONED|
                                                           -- STREAM_PROJECT  
|PARTITIONED|
                                                             -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                              -- 
HYBRID_HASH_JOIN [$$118][$$117]  |PARTITIONED|
-                                                                -- 
HASH_PARTITION_EXCHANGE [$$118]  |PARTITIONED|
+                                                              -- 
HYBRID_HASH_JOIN [$$125][$$124]  |PARTITIONED|
+                                                                -- 
HASH_PARTITION_EXCHANGE [$$125]  |PARTITIONED|
                                                                   -- 
STREAM_PROJECT  |PARTITIONED|
                                                                     -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                      -- 
HYBRID_HASH_JOIN [$$116, $$114][$$109, $$110]  |PARTITIONED|
-                                                                        -- 
HASH_PARTITION_EXCHANGE [$$116, $$114]  |PARTITIONED|
+                                                                      -- 
HYBRID_HASH_JOIN [$$123, $$121][$$116, $$117]  |PARTITIONED|
+                                                                        -- 
HASH_PARTITION_EXCHANGE [$$123, $$121]  |PARTITIONED|
                                                                           -- 
STREAM_PROJECT  |PARTITIONED|
                                                                             -- 
ASSIGN  |PARTITIONED|
                                                                               
-- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -46,24 +46,24 @@
                                                                                
   -- BROADCAST_EXCHANGE  |PARTITIONED|
                                                                                
     -- ASSIGN  |UNPARTITIONED|
                                                                                
       -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
-                                                                        -- 
HASH_PARTITION_EXCHANGE [$$109, $$110]  |PARTITIONED|
+                                                                        -- 
HASH_PARTITION_EXCHANGE [$$116, $$117]  |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 [$$117]  |PARTITIONED|
+                                                                -- 
HASH_PARTITION_EXCHANGE [$$124]  |PARTITIONED|
                                                                   -- 
STREAM_PROJECT  |PARTITIONED|
                                                                     -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                      -- 
HYBRID_HASH_JOIN [$$111][$$127]  |PARTITIONED|
+                                                                      -- 
HYBRID_HASH_JOIN [$$118][$$134]  |PARTITIONED|
                                                                         -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                           -- 
STREAM_SELECT  |PARTITIONED|
                                                                             -- 
ASSIGN  |PARTITIONED|
                                                                               
-- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                
 -- BTREE_SEARCH  |PARTITIONED|
                                                                                
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
     -- STABLE_SORT [$$137(ASC)]  |PARTITIONED|
+                                                                               
     -- STABLE_SORT [$$144(ASC)]  |PARTITIONED|
                                                                                
       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                
         -- STREAM_PROJECT  |PARTITIONED|
                                                                                
           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -71,7 +71,7 @@
                                                                                
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                
                 -- ASSIGN  |PARTITIONED|
                                                                                
                   -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
-                                                                        -- 
HASH_PARTITION_EXCHANGE [$$127]  |PARTITIONED|
+                                                                        -- 
HASH_PARTITION_EXCHANGE [$$134]  |PARTITIONED|
                                                                           -- 
NESTED_LOOP  |PARTITIONED|
                                                                             -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                               
-- STREAM_PROJECT  |PARTITIONED|
@@ -79,7 +79,7 @@
                                                                                
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                
     -- BTREE_SEARCH  |PARTITIONED|
                                                                                
       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
         -- STABLE_SORT [$$141(ASC)]  |PARTITIONED|
+                                                                               
         -- STABLE_SORT [$$148(ASC)]  |PARTITIONED|
                                                                                
           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                
             -- STREAM_PROJECT  |PARTITIONED|
                                                                                
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -94,11 +94,11 @@
                                                                                
     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                
       -- BTREE_SEARCH  |PARTITIONED|
                                                                                
         -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                               
           -- STABLE_SORT [$$144(ASC)]  |PARTITIONED|
+                                                                               
           -- STABLE_SORT [$$151(ASC)]  |PARTITIONED|
                                                                                
             -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                
               -- STREAM_PROJECT  |PARTITIONED|
                                                                                
                 -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                
                   -- BTREE_SEARCH  |PARTITIONED|
                                                                                
                     -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                                
                       -- ASSIGN  |PARTITIONED|
-                                                                               
                         -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
\ No newline at end of file
+                                                                               
                         -- EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git 
a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-create.plan
 
b/asterix-bad/src/test/resources/optimizerts/results/channel/channel-create.plan
index 374e30e..523b4a6 100644
--- 
a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-create.plan
+++ 
b/asterix-bad/src/test/resources/optimizerts/results/channel/channel-create.plan
@@ -1,17 +1,17 @@
 -- NOTIFY_BROKERS  |PARTITIONED|
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-    -- PRE_CLUSTERED_GROUP_BY[$$86, $$channelExecutionTime]  |PARTITIONED|
+    -- PRE_CLUSTERED_GROUP_BY[$$93, $$channelExecutionTime]  |PARTITIONED|
             {
               -- AGGREGATE  |LOCAL|
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
             }
       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-        -- STABLE_SORT [$$86(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
-          -- HASH_PARTITION_EXCHANGE [$$86, $$channelExecutionTime]  
|PARTITIONED|
+        -- STABLE_SORT [$$93(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
+          -- HASH_PARTITION_EXCHANGE [$$93, $$channelExecutionTime]  
|PARTITIONED|
             -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                -- STABLE_SORT [$$71(ASC)]  |PARTITIONED|
-                  -- HASH_PARTITION_EXCHANGE [$$71]  |PARTITIONED|
+                -- STABLE_SORT [$$78(ASC)]  |PARTITIONED|
+                  -- HASH_PARTITION_EXCHANGE [$$78]  |PARTITIONED|
                     -- STREAM_PROJECT  |PARTITIONED|
                       -- COMMIT  |PARTITIONED|
                         -- STREAM_PROJECT  |PARTITIONED|
@@ -21,7 +21,7 @@
                                 -- STREAM_PROJECT  |PARTITIONED|
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                     -- INSERT_DELETE  |PARTITIONED|
-                                      -- HASH_PARTITION_EXCHANGE [$$66]  
|PARTITIONED|
+                                      -- HASH_PARTITION_EXCHANGE [$$73]  
|PARTITIONED|
                                         -- ASSIGN  |PARTITIONED|
                                           -- STREAM_PROJECT  |PARTITIONED|
                                             -- ASSIGN  |PARTITIONED|
@@ -35,8 +35,8 @@
                                                             -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                               -- 
STREAM_PROJECT  |PARTITIONED|
                                                                 -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                  -- 
HYBRID_HASH_JOIN [$$78, $$76][$$72, $$73]  |PARTITIONED|
-                                                                    -- 
HASH_PARTITION_EXCHANGE [$$78, $$76]  |PARTITIONED|
+                                                                  -- 
HYBRID_HASH_JOIN [$$85, $$83][$$79, $$80]  |PARTITIONED|
+                                                                    -- 
HASH_PARTITION_EXCHANGE [$$85, $$83]  |PARTITIONED|
                                                                       -- 
STREAM_PROJECT  |PARTITIONED|
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -44,7 +44,7 @@
                                                                               
-- BROADCAST_EXCHANGE  |PARTITIONED|
                                                                                
 -- ASSIGN  |UNPARTITIONED|
                                                                                
   -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
-                                                                    -- 
HASH_PARTITION_EXCHANGE [$$72, $$73]  |PARTITIONED|
+                                                                    -- 
HASH_PARTITION_EXCHANGE [$$79, $$80]  |PARTITIONED|
                                                                       -- 
STREAM_PROJECT  |PARTITIONED|
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -58,4 +58,4 @@
                                                                     -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                                       -- 
DATASOURCE_SCAN  |PARTITIONED|
                                                                         -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                          -- 
EMPTY_TUPLE_SOURCE  |PARTITIONED|
\ No newline at end of file
+                                                                          -- 
EMPTY_TUPLE_SOURCE  |PARTITIONED|
diff --git 
a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-subscribe.plan
 
b/asterix-bad/src/test/resources/optimizerts/results/channel/channel-subscribe.plan
index 8c2ba14..ffa1792 100644
--- 
a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-subscribe.plan
+++ 
b/asterix-bad/src/test/resources/optimizerts/results/channel/channel-subscribe.plan
@@ -1,17 +1,17 @@
 -- NOTIFY_BROKERS  |PARTITIONED|
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-    -- PRE_CLUSTERED_GROUP_BY[$$86, $$channelExecutionTime]  |PARTITIONED|
+    -- PRE_CLUSTERED_GROUP_BY[$$93, $$channelExecutionTime]  |PARTITIONED|
             {
               -- AGGREGATE  |LOCAL|
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
             }
       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-        -- STABLE_SORT [$$86(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
-          -- HASH_PARTITION_EXCHANGE [$$86, $$channelExecutionTime]  
|PARTITIONED|
+        -- STABLE_SORT [$$93(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
+          -- HASH_PARTITION_EXCHANGE [$$93, $$channelExecutionTime]  
|PARTITIONED|
             -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                -- STABLE_SORT [$$71(ASC)]  |PARTITIONED|
-                  -- HASH_PARTITION_EXCHANGE [$$71]  |PARTITIONED|
+                -- STABLE_SORT [$$78(ASC)]  |PARTITIONED|
+                  -- HASH_PARTITION_EXCHANGE [$$78]  |PARTITIONED|
                     -- STREAM_PROJECT  |PARTITIONED|
                       -- COMMIT  |PARTITIONED|
                         -- STREAM_PROJECT  |PARTITIONED|
@@ -21,7 +21,7 @@
                                 -- STREAM_PROJECT  |PARTITIONED|
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                     -- INSERT_DELETE  |PARTITIONED|
-                                      -- HASH_PARTITION_EXCHANGE [$$66]  
|PARTITIONED|
+                                      -- HASH_PARTITION_EXCHANGE [$$73]  
|PARTITIONED|
                                         -- ASSIGN  |PARTITIONED|
                                           -- STREAM_PROJECT  |PARTITIONED|
                                             -- ASSIGN  |PARTITIONED|
@@ -35,8 +35,8 @@
                                                             -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                               -- 
STREAM_PROJECT  |PARTITIONED|
                                                                 -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                  -- 
HYBRID_HASH_JOIN [$$78, $$76][$$72, $$73]  |PARTITIONED|
-                                                                    -- 
HASH_PARTITION_EXCHANGE [$$78, $$76]  |PARTITIONED|
+                                                                  -- 
HYBRID_HASH_JOIN [$$85, $$83][$$79, $$80]  |PARTITIONED|
+                                                                    -- 
HASH_PARTITION_EXCHANGE [$$85, $$83]  |PARTITIONED|
                                                                       -- 
STREAM_PROJECT  |PARTITIONED|
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -44,7 +44,7 @@
                                                                               
-- BROADCAST_EXCHANGE  |PARTITIONED|
                                                                                
 -- ASSIGN  |UNPARTITIONED|
                                                                                
   -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
-                                                                    -- 
HASH_PARTITION_EXCHANGE [$$72, $$73]  |PARTITIONED|
+                                                                    -- 
HASH_PARTITION_EXCHANGE [$$79, $$80]  |PARTITIONED|
                                                                       -- 
STREAM_PROJECT  |PARTITIONED|
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -66,11 +66,11 @@
         -- STREAM_PROJECT  |PARTITIONED|
           -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
             -- INSERT_DELETE  |PARTITIONED|
-              -- HASH_PARTITION_EXCHANGE [$$4]  |PARTITIONED|
+              -- HASH_PARTITION_EXCHANGE [$$12]  |PARTITIONED|
                 -- ASSIGN  |UNPARTITIONED|
                   -- STREAM_PROJECT  |UNPARTITIONED|
                     -- ASSIGN  |UNPARTITIONED|
                       -- STREAM_PROJECT  |UNPARTITIONED|
                         -- ASSIGN  |UNPARTITIONED|
                           -- ASSIGN  |UNPARTITIONED|
-                            -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
\ No newline at end of file
+                            -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
diff --git 
a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-unsubscribe.plan
 
b/asterix-bad/src/test/resources/optimizerts/results/channel/channel-unsubscribe.plan
index 84c707b..f718e5c 100644
--- 
a/asterix-bad/src/test/resources/optimizerts/results/channel/channel-unsubscribe.plan
+++ 
b/asterix-bad/src/test/resources/optimizerts/results/channel/channel-unsubscribe.plan
@@ -1,17 +1,17 @@
 -- NOTIFY_BROKERS  |PARTITIONED|
   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-    -- PRE_CLUSTERED_GROUP_BY[$$86, $$channelExecutionTime]  |PARTITIONED|
+    -- PRE_CLUSTERED_GROUP_BY[$$93, $$channelExecutionTime]  |PARTITIONED|
             {
               -- AGGREGATE  |LOCAL|
                 -- NESTED_TUPLE_SOURCE  |LOCAL|
             }
       -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-        -- STABLE_SORT [$$86(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
-          -- HASH_PARTITION_EXCHANGE [$$86, $$channelExecutionTime]  
|PARTITIONED|
+        -- STABLE_SORT [$$93(ASC), $$channelExecutionTime(ASC)]  |PARTITIONED|
+          -- HASH_PARTITION_EXCHANGE [$$93, $$channelExecutionTime]  
|PARTITIONED|
             -- PRE_SORTED_DISTINCT_BY  |PARTITIONED|
               -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                -- STABLE_SORT [$$71(ASC)]  |PARTITIONED|
-                  -- HASH_PARTITION_EXCHANGE [$$71]  |PARTITIONED|
+                -- STABLE_SORT [$$78(ASC)]  |PARTITIONED|
+                  -- HASH_PARTITION_EXCHANGE [$$78]  |PARTITIONED|
                     -- STREAM_PROJECT  |PARTITIONED|
                       -- COMMIT  |PARTITIONED|
                         -- STREAM_PROJECT  |PARTITIONED|
@@ -21,7 +21,7 @@
                                 -- STREAM_PROJECT  |PARTITIONED|
                                   -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                     -- INSERT_DELETE  |PARTITIONED|
-                                      -- HASH_PARTITION_EXCHANGE [$$66]  
|PARTITIONED|
+                                      -- HASH_PARTITION_EXCHANGE [$$73]  
|PARTITIONED|
                                         -- ASSIGN  |PARTITIONED|
                                           -- STREAM_PROJECT  |PARTITIONED|
                                             -- ASSIGN  |PARTITIONED|
@@ -35,8 +35,8 @@
                                                             -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
                                                               -- 
STREAM_PROJECT  |PARTITIONED|
                                                                 -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
-                                                                  -- 
HYBRID_HASH_JOIN [$$78, $$76][$$72, $$73]  |PARTITIONED|
-                                                                    -- 
HASH_PARTITION_EXCHANGE [$$78, $$76]  |PARTITIONED|
+                                                                  -- 
HYBRID_HASH_JOIN [$$85, $$83][$$79, $$80]  |PARTITIONED|
+                                                                    -- 
HASH_PARTITION_EXCHANGE [$$85, $$83]  |PARTITIONED|
                                                                       -- 
STREAM_PROJECT  |PARTITIONED|
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|
@@ -44,7 +44,7 @@
                                                                               
-- BROADCAST_EXCHANGE  |PARTITIONED|
                                                                                
 -- ASSIGN  |UNPARTITIONED|
                                                                                
   -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
-                                                                    -- 
HASH_PARTITION_EXCHANGE [$$72, $$73]  |PARTITIONED|
+                                                                    -- 
HASH_PARTITION_EXCHANGE [$$79, $$80]  |PARTITIONED|
                                                                       -- 
STREAM_PROJECT  |PARTITIONED|
                                                                         -- 
ASSIGN  |PARTITIONED|
                                                                           -- 
ONE_TO_ONE_EXCHANGE  |PARTITIONED|

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2679
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I20701e5119a65e06d33e379bc3520dff1e2d6c2e
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang <[email protected]>

Reply via email to