Accept expected output diffs pertaining to Remote Subplan addition

All these test caes were failing because of Remote Subplan nodes in the explain
output.

diff --git a/src/test/regress/expected/aggregates.out b/src/test/regress/expected/aggregates.out
index 176a58d0bb96beabaed9ade575c247b05b84a2a4..e3cc2a02988e42c732269f9eb677a6f6dc9c1662 100644 (file)
--- a/src/test/regress/expected/aggregates.out
+++ b/src/test/regress/expected/aggregates.out
@@ -2130,14 +2130,15 @@ SET enable_indexonlyscan = off;
 -- sum(int8) covers int8_avg_combine
 EXPLAIN (COSTS OFF)
   SELECT variance(unique1::int4), sum(unique1::int8) FROM tenk1;
-                  QUERY PLAN                  
-----------------------------------------------
+                        QUERY PLAN                         
+-----------------------------------------------------------
  Finalize Aggregate
-   ->  Gather
-         Workers Planned: 4
-         ->  Partial Aggregate
-               ->  Parallel Seq Scan on tenk1
-(5 rows)
+   ->  Remote Subquery Scan on all (datanode_1,datanode_2)
+         ->  Gather
+               Workers Planned: 4
+               ->  Partial Aggregate
+                     ->  Parallel Seq Scan on tenk1
+(6 rows)
 
 SELECT variance(unique1::int4), sum(unique1::int8) FROM tenk1;
        variance       |   sum    

diff --git a/src/test/regress/expected/join.out b/src/test/regress/expected/join.out
index 0f24b50a5aa7bc6f8ac1cbefbd1d8696368bdcb2..70e099e29890fd7683b63c4211a3b89c297a5bd9 100644 (file)
--- a/src/test/regress/expected/join.out
+++ b/src/test/regress/expected/join.out
@@ -2735,25 +2735,30 @@ create temp table tidv (idv mycomptype);
 create index on tidv (idv);
 explain (costs off)
 select a.idv, b.idv from tidv a, tidv b where a.idv = b.idv;
-                        QUERY PLAN                        
-----------------------------------------------------------
+                           QUERY PLAN                            
+-----------------------------------------------------------------
  Merge Join
    Merge Cond: (a.idv = b.idv)
-   ->  Index Only Scan using tidv_idv_idx on tidv a
+   ->  Remote Subquery Scan on all (datanode_1,datanode_2)
+         ->  Index Only Scan using tidv_idv_idx on tidv a
    ->  Materialize
-         ->  Index Only Scan using tidv_idv_idx on tidv b
-(5 rows)
+         ->  Remote Subquery Scan on all (datanode_1,datanode_2)
+               ->  Index Only Scan using tidv_idv_idx on tidv b
+(7 rows)
 
 set enable_mergejoin = 0;
 explain (costs off)
 select a.idv, b.idv from tidv a, tidv b where a.idv = b.idv;
-                     QUERY PLAN                     
-----------------------------------------------------
+                           QUERY PLAN                            
+-----------------------------------------------------------------
  Nested Loop
-   ->  Seq Scan on tidv a
-   ->  Index Only Scan using tidv_idv_idx on tidv b
-         Index Cond: (idv = a.idv)
-(4 rows)
+   ->  Remote Subquery Scan on all (datanode_1,datanode_2)
+         ->  Seq Scan on tidv a
+   ->  Materialize
+         ->  Remote Subquery Scan on all (datanode_1,datanode_2)
+               ->  Index Only Scan using tidv_idv_idx on tidv b
+                     Index Cond: (idv = a.idv)
+(7 rows)
 
 rollback;
 --

diff --git a/src/test/regress/expected/select_parallel.out b/src/test/regress/expected/select_parallel.out
index 1f78cc992127c409346d07679a594722bb95bf1a..50e7ab17b66efefb473716865de58328746353d9 100644 (file)
--- a/src/test/regress/expected/select_parallel.out
+++ b/src/test/regress/expected/select_parallel.out
@@ -410,19 +410,20 @@ select count(*) from tenk1 group by twenty;
 -- test handling of SRFs in targetlist (bug in 10.0)
 explain (costs off)
    select count(*), generate_series(1,2) from tenk1 group by twenty;
-                        QUERY PLAN                        
-----------------------------------------------------------
+                           QUERY PLAN                            
+-----------------------------------------------------------------
  ProjectSet
    ->  Finalize GroupAggregate
          Group Key: twenty
-         ->  Gather Merge
-               Workers Planned: 4
-               ->  Partial GroupAggregate
-                     Group Key: twenty
-                     ->  Sort
-                           Sort Key: twenty
-                           ->  Parallel Seq Scan on tenk1
-(10 rows)
+         ->  Remote Subquery Scan on all (datanode_1,datanode_2)
+               ->  Gather Merge
+                     Workers Planned: 4
+                     ->  Partial GroupAggregate
+                           Group Key: twenty
+                           ->  Sort
+                                 Sort Key: twenty
+                                 ->  Parallel Seq Scan on tenk1
+(11 rows)
 
 select count(*), generate_series(1,2) from tenk1 group by twenty;
  count | generate_series 

diff --git a/src/test/regress/expected/tsrf.out b/src/test/regress/expected/tsrf.out
index 044931c5cf3c9ad1b557b20e327226e5153ce0f2..13caba5448b8ce7904c0a5de940dd1a155d4be45 100644 (file)
--- a/src/test/regress/expected/tsrf.out
+++ b/src/test/regress/expected/tsrf.out
@@ -424,13 +424,15 @@ reset enable_hashagg;
 -- case with degenerate ORDER BY
 explain (verbose, costs off)
 select 'foo' as f, generate_series(1,2) as g from few order by 1;
-                  QUERY PLAN                  
-----------------------------------------------
- ProjectSet
+                     QUERY PLAN                      
+-----------------------------------------------------
+ Remote Subquery Scan on all (datanode_1,datanode_2)
    Output: 'foo'::text, generate_series(1, 2)
-   ->  Seq Scan on public.few
-         Output: id, dataa, datab
-(4 rows)
+   ->  ProjectSet
+         Output: 'foo'::text, generate_series(1, 2)
+         ->  Seq Scan on public.few
+               Output: id, dataa, datab
+(6 rows)
 
 select 'foo' as f, generate_series(1,2) as g from few order by 1;
   f  | g 

diff --git a/src/test/regress/expected/updatable_views.out b/src/test/regress/expected/updatable_views.out
index dab52976a63459ff45d0dd45dc29e7c4db42a3cf..a2a91a80f25c5d9919625d59acbea74b213ac542 100644 (file)
--- a/src/test/regress/expected/updatable_views.out
+++ b/src/test/regress/expected/updatable_views.out
@@ -2443,14 +2443,15 @@ select * from uv_iocu_tab;
 explain (costs off)
 insert into uv_iocu_view (a, b) values ('xyxyxy', 3)
    on conflict (a) do update set b = excluded.b where excluded.c > 0;
-                                    QUERY PLAN                                     
------------------------------------------------------------------------------------
- Insert on uv_iocu_tab
-   Conflict Resolution: UPDATE
-   Conflict Arbiter Indexes: uv_iocu_tab_a_key
-   Conflict Filter: ((excluded.b + '1'::double precision) > '0'::double precision)
-   ->  Result
-(5 rows)
+                                       QUERY PLAN                                        
+-----------------------------------------------------------------------------------------
+ Remote Subquery Scan on all (datanode_2)
+   ->  Insert on uv_iocu_tab
+         Conflict Resolution: UPDATE
+         Conflict Arbiter Indexes: uv_iocu_tab_a_key
+         Conflict Filter: ((excluded.b + '1'::double precision) > '0'::double precision)
+         ->  Result
+(6 rows)
 
 insert into uv_iocu_view (a, b) values ('xyxyxy', 3)
    on conflict (a) do update set b = excluded.b where excluded.c > 0;
@@ -2473,14 +2474,15 @@ insert into uv_iocu_view (aa,bb) values (1,'y')
    where excluded.aa > 0
    and excluded.bb != ''
    and excluded.cc is not null;
-                                               QUERY PLAN                                                
----------------------------------------------------------------------------------------------------------
- Insert on uv_iocu_tab
-   Conflict Resolution: UPDATE
-   Conflict Arbiter Indexes: uv_iocu_tab_a_key
-   Conflict Filter: ((excluded.a > 0) AND (excluded.b <> ''::text) AND ((excluded.*)::text IS NOT NULL))
-   ->  Result
-(5 rows)
+                                                  QUERY PLAN                                                   
+---------------------------------------------------------------------------------------------------------------
+ Remote Subquery Scan on all (datanode_1)
+   ->  Insert on uv_iocu_tab
+         Conflict Resolution: UPDATE
+         Conflict Arbiter Indexes: uv_iocu_tab_a_key
+         Conflict Filter: ((excluded.a > 0) AND (excluded.b <> ''::text) AND ((excluded.*)::text IS NOT NULL))
+         ->  Result
+(6 rows)
 
 insert into uv_iocu_view (aa,bb) values (1,'y')
    on conflict (aa) do update set bb = 'Rejected: '||excluded.*