Accept expected output differences for EXPLAIN

After the merge with 10.3, we see reduction in the redundant columns in the
targetlists for certain nodes. While we are yet to fully understand the
underlying change that's causing this, the changes loook quite benign and in
fact correct. So accept the changes.

diff --git a/src/test/regress/expected/xc_FQS.out b/src/test/regress/expected/xc_FQS.out
index 6fe945878190435f147dae321cb9148bab532705..25ca6715c57656f26ee4c7d6efbd60d5841c0b3e 100644 (file)
--- a/src/test/regress/expected/xc_FQS.out
+++ b/src/test/regress/expected/xc_FQS.out
@@ -419,7 +419,7 @@ explain (verbose on, nodes off, costs off) update tab1_rr set val2 = 1000 where
                            QUERY PLAN                           
 ----------------------------------------------------------------
  Remote Fast Query Execution
-   Output: 1000, tab1_rr.xc_node_id, tab1_rr.ctid
+   Output: 1000
    Remote query: UPDATE tab1_rr SET val2 = 1000 WHERE (val = 7)
    ->  Update on public.tab1_rr
          ->  Seq Scan on public.tab1_rr
@@ -439,14 +439,13 @@ explain (verbose on, costs off) delete from tab1_rr where val = 7;
                      QUERY PLAN                      
 -----------------------------------------------------
  Remote Fast Query Execution
-   Output: tab1_rr.xc_node_id, tab1_rr.ctid
    Node/s: datanode_1, datanode_2
    Remote query: DELETE FROM tab1_rr WHERE (val = 7)
    ->  Delete on public.tab1_rr
          ->  Seq Scan on public.tab1_rr
                Output: ctid
                Filter: (tab1_rr.val = 7)
-(8 rows)
+(7 rows)
 
 select * from tab1_rr where val = 7;
  val | val2 
@@ -835,7 +834,7 @@ explain (verbose on, nodes off, costs off) update tab1_hash set val2 = 1000 wher
                             QUERY PLAN                            
 ------------------------------------------------------------------
  Remote Fast Query Execution
-   Output: 1000, tab1_hash.xc_node_id, tab1_hash.ctid
+   Output: 1000
    Remote query: UPDATE tab1_hash SET val2 = 1000 WHERE (val = 7)
    ->  Update on public.tab1_hash
          ->  Seq Scan on public.tab1_hash
@@ -855,14 +854,13 @@ explain (verbose on, costs off) delete from tab1_hash where val = 7;
                       QUERY PLAN                       
 -------------------------------------------------------
  Remote Fast Query Execution
-   Output: tab1_hash.xc_node_id, tab1_hash.ctid
    Node/s: datanode_2
    Remote query: DELETE FROM tab1_hash WHERE (val = 7)
    ->  Delete on public.tab1_hash
          ->  Seq Scan on public.tab1_hash
                Output: ctid
                Filter: (tab1_hash.val = 7)
-(8 rows)
+(7 rows)
 
 select * from tab1_hash where val = 7;
  val | val2 
@@ -1251,7 +1249,7 @@ explain (verbose on, nodes off, costs off) update tab1_modulo set val2 = 1000 wh
                              QUERY PLAN                             
 --------------------------------------------------------------------
  Remote Fast Query Execution
-   Output: 1000, tab1_modulo.xc_node_id, tab1_modulo.ctid
+   Output: 1000
    Remote query: UPDATE tab1_modulo SET val2 = 1000 WHERE (val = 7)
    ->  Update on public.tab1_modulo
          ->  Seq Scan on public.tab1_modulo
@@ -1271,14 +1269,13 @@ explain (verbose on, costs off) delete from tab1_modulo where val = 7;
                        QUERY PLAN                        
 ---------------------------------------------------------
  Remote Fast Query Execution
-   Output: tab1_modulo.xc_node_id, tab1_modulo.ctid
    Node/s: datanode_2
    Remote query: DELETE FROM tab1_modulo WHERE (val = 7)
    ->  Delete on public.tab1_modulo
          ->  Seq Scan on public.tab1_modulo
                Output: ctid
                Filter: (tab1_modulo.val = 7)
-(8 rows)
+(7 rows)
 
 select * from tab1_modulo where val = 7;
  val | val2 
@@ -1558,7 +1555,7 @@ explain (verbose on, nodes off, costs off) update tab1_replicated set val2 = 100
                                QUERY PLAN                               
 ------------------------------------------------------------------------
  Remote Fast Query Execution
-   Output: 1000, tab1_replicated.ctid
+   Output: 1000
    Remote query: UPDATE tab1_replicated SET val2 = 1000 WHERE (val = 7)
    ->  Update on public.tab1_replicated
          ->  Seq Scan on public.tab1_replicated
@@ -1577,14 +1574,13 @@ explain (verbose on, costs off) delete from tab1_replicated where val = 7;
                          QUERY PLAN                          
 -------------------------------------------------------------
  Remote Fast Query Execution
-   Output: tab1_replicated.ctid
    Node/s: datanode_1, datanode_2
    Remote query: DELETE FROM tab1_replicated WHERE (val = 7)
    ->  Delete on public.tab1_replicated
          ->  Seq Scan on public.tab1_replicated
                Output: ctid
                Filter: (tab1_replicated.val = 7)
-(8 rows)
+(7 rows)
 
 select * from tab1_replicated where val = 7;
  val | val2 

diff --git a/src/test/regress/expected/xl_plan_pushdown.out b/src/test/regress/expected/xl_plan_pushdown.out
index 2abb66f7949451f1f88527085bd82bfbd2cf668e..d066f77d0462561e63e93467368688cacb6454e0 100755 (executable)
--- a/src/test/regress/expected/xl_plan_pushdown.out
+++ b/src/test/regress/expected/xl_plan_pushdown.out
@@ -54,7 +54,7 @@ EXPLAIN VERBOSE UPDATE xl_pp SET b=2 where a=200;
                                 QUERY PLAN                                 
 ---------------------------------------------------------------------------
  Remote Fast Query Execution  (cost=0.00..0.00 rows=0 width=0)
-   Output: 2, xl_pp.xc_node_id, xl_pp.ctid
+   Output: 2
    Node/s: datanode_1
    Remote query: UPDATE xl_pp SET b = 2 WHERE (a = 200)
    ->  Update on public.xl_pp  (cost=0.00..35.50 rows=10 width=18)
@@ -67,7 +67,7 @@ EXPLAIN VERBOSE UPDATE xl_pp SET b=2 where a=200::bigint;
                                 QUERY PLAN                                 
 ---------------------------------------------------------------------------
  Remote Fast Query Execution  (cost=0.00..0.00 rows=0 width=0)
-   Output: 2, xl_pp.xc_node_id, xl_pp.ctid
+   Output: 2
    Node/s: datanode_1
    Remote query: UPDATE xl_pp SET b = 2 WHERE (a = (200)::bigint)
    ->  Update on public.xl_pp  (cost=0.00..35.50 rows=10 width=18)
@@ -80,14 +80,13 @@ EXPLAIN VERBOSE DELETE FROM xl_pp where a=200;
                                 QUERY PLAN                                
 --------------------------------------------------------------------------
  Remote Fast Query Execution  (cost=0.00..0.00 rows=0 width=0)
-   Output: xl_pp.xc_node_id, xl_pp.ctid
    Node/s: datanode_1
    Remote query: DELETE FROM xl_pp WHERE (a = 200)
    ->  Delete on public.xl_pp  (cost=0.00..35.50 rows=10 width=6)
          ->  Seq Scan on public.xl_pp  (cost=0.00..35.50 rows=10 width=6)
                Output: ctid
                Filter: (xl_pp.a = 200)
-(8 rows)
+(7 rows)
 
 SELECT * from xl_pp where a=200;
  a | b 
@@ -103,27 +102,25 @@ EXPLAIN VERBOSE DELETE FROM xl_pp where a=200;
                                 QUERY PLAN                                
 --------------------------------------------------------------------------
  Remote Fast Query Execution  (cost=0.00..0.00 rows=0 width=0)
-   Output: xl_pp.xc_node_id, xl_pp.ctid
    Node/s: datanode_1
    Remote query: DELETE FROM xl_pp WHERE (a = 200)
    ->  Delete on public.xl_pp  (cost=0.00..35.50 rows=10 width=6)
          ->  Seq Scan on public.xl_pp  (cost=0.00..35.50 rows=10 width=6)
                Output: ctid
                Filter: (xl_pp.a = 200)
-(8 rows)
+(7 rows)
 
 EXPLAIN VERBOSE DELETE FROM xl_pp where a=200::bigint;
                                 QUERY PLAN                                
 --------------------------------------------------------------------------
  Remote Fast Query Execution  (cost=0.00..0.00 rows=0 width=0)
-   Output: xl_pp.xc_node_id, xl_pp.ctid
    Node/s: datanode_1
    Remote query: DELETE FROM xl_pp WHERE (a = (200)::bigint)
    ->  Delete on public.xl_pp  (cost=0.00..35.50 rows=10 width=6)
          ->  Seq Scan on public.xl_pp  (cost=0.00..35.50 rows=10 width=6)
                Output: ctid
                Filter: (xl_pp.a = '200'::bigint)
-(8 rows)
+(7 rows)
 
 --Testing with MODULO distribution
 CREATE TABLE xl_ppm (a INT2, b int) DISTRIBUTE BY MODULO(a);
@@ -168,7 +165,7 @@ EXPLAIN VERBOSE UPDATE xl_ppm SET b=2 where a=200;
                                  QUERY PLAN                                 
 ----------------------------------------------------------------------------
  Remote Fast Query Execution  (cost=0.00..0.00 rows=0 width=0)
-   Output: 2, xl_ppm.xc_node_id, xl_ppm.ctid
+   Output: 2
    Node/s: datanode_1
    Remote query: UPDATE xl_ppm SET b = 2 WHERE (a = 200)
    ->  Update on public.xl_ppm  (cost=0.00..40.00 rows=12 width=12)
@@ -181,7 +178,7 @@ EXPLAIN VERBOSE UPDATE xl_ppm SET b=2 where a=200::INT2;
                                  QUERY PLAN                                 
 ----------------------------------------------------------------------------
  Remote Fast Query Execution  (cost=0.00..0.00 rows=0 width=0)
-   Output: 2, xl_ppm.xc_node_id, xl_ppm.ctid
+   Output: 2
    Node/s: datanode_1
    Remote query: UPDATE xl_ppm SET b = 2 WHERE (a = (200)::smallint)
    ->  Update on public.xl_ppm  (cost=0.00..40.00 rows=12 width=12)
@@ -194,14 +191,13 @@ EXPLAIN VERBOSE DELETE FROM xl_ppm where a=200;
                                 QUERY PLAN                                 
 ---------------------------------------------------------------------------
  Remote Fast Query Execution  (cost=0.00..0.00 rows=0 width=0)
-   Output: xl_ppm.xc_node_id, xl_ppm.ctid
    Node/s: datanode_1
    Remote query: DELETE FROM xl_ppm WHERE (a = 200)
    ->  Delete on public.xl_ppm  (cost=0.00..40.00 rows=12 width=6)
          ->  Seq Scan on public.xl_ppm  (cost=0.00..40.00 rows=12 width=6)
                Output: ctid
                Filter: (xl_ppm.a = 200)
-(8 rows)
+(7 rows)
 
 SELECT * from xl_ppm where a=200;
  a | b 
@@ -217,27 +213,25 @@ EXPLAIN VERBOSE DELETE FROM xl_ppm where a=200;
                                 QUERY PLAN                                 
 ---------------------------------------------------------------------------
  Remote Fast Query Execution  (cost=0.00..0.00 rows=0 width=0)
-   Output: xl_ppm.xc_node_id, xl_ppm.ctid
    Node/s: datanode_1
    Remote query: DELETE FROM xl_ppm WHERE (a = 200)
    ->  Delete on public.xl_ppm  (cost=0.00..40.00 rows=12 width=6)
          ->  Seq Scan on public.xl_ppm  (cost=0.00..40.00 rows=12 width=6)
                Output: ctid
                Filter: (xl_ppm.a = 200)
-(8 rows)
+(7 rows)
 
 EXPLAIN VERBOSE DELETE FROM xl_ppm where a=200::INT2;
                                 QUERY PLAN                                 
 ---------------------------------------------------------------------------
  Remote Fast Query Execution  (cost=0.00..0.00 rows=0 width=0)
-   Output: xl_ppm.xc_node_id, xl_ppm.ctid
    Node/s: datanode_1
    Remote query: DELETE FROM xl_ppm WHERE (a = (200)::smallint)
    ->  Delete on public.xl_ppm  (cost=0.00..40.00 rows=12 width=6)
          ->  Seq Scan on public.xl_ppm  (cost=0.00..40.00 rows=12 width=6)
                Output: ctid
                Filter: (xl_ppm.a = '200'::smallint)
-(8 rows)
+(7 rows)
 
 DROP TABLE xl_pp;
 DROP TABLE xl_ppm;