FIX icw test from Foreign Scans

Author: jiaqizho

src/test/regress/expected/update_gp_optimizer.out

@@ -888,23 +888,26 @@ insert into from_table select i*1.5,i*2,i*3,'xx'||i,'yy'||i, i+1 from generate_s
 explain (costs off)
 update into_table set d=from_table.d, e=from_table.e, f=from_table.f from from_table
 where into_table.a=from_table.a and into_table.b=from_table.b and into_table.c=from_table.c;
-                                                                   QUERY PLAN                                                                   
-------------------------------------------------------------------------------------------------------------------------------------------------
+                                                       QUERY PLAN                                                       
+------------------------------------------------------------------------------------------------------------------------
  Update on into_table
-   ->  Result
-         ->  Redistribute Motion 3:3  (slice1; segments: 3)
-               Hash Key: into_table_1.a, into_table_1.b, into_table_1.c
-               ->  Split
-                     ->  Hash Join
-                           Hash Cond: ((into_table_1.a = from_table.a) AND (into_table_1.b = from_table.b) AND (into_table_1.c = from_table.c))
-                           ->  Redistribute Motion 3:3  (slice2; segments: 3)
-                                 Hash Key: into_table_1.a
-                                 ->  Dynamic Seq Scan on into_table into_table_1
-                                       Number of partitions to scan: 4 (out of 4)
-                           ->  Hash
-                                 ->  Seq Scan on from_table
- Optimizer: Pivotal Optimizer (GPORCA)
-(14 rows)
+   Update on into_table_1_prt_1 into_table_1
+   Update on into_table_1_prt_2 into_table_2
+   Update on into_table_1_prt_3 into_table_3
+   Update on into_table_1_prt_4 into_table_4
+   ->  Hash Join
+         Hash Cond: ((into_table.a = from_table.a) AND (into_table.b = from_table.b) AND (into_table.c = from_table.c))
+         ->  Append
+               ->  Seq Scan on into_table_1_prt_1 into_table_1
+               ->  Seq Scan on into_table_1_prt_2 into_table_2
+               ->  Seq Scan on into_table_1_prt_3 into_table_3
+               ->  Seq Scan on into_table_1_prt_4 into_table_4
+         ->  Hash
+               ->  Redistribute Motion 3:3  (slice1; segments: 3)
+                     Hash Key: from_table.a, from_table.b, from_table.c
+                     ->  Seq Scan on from_table
+ Optimizer: Postgres query optimizer
+(17 rows)
 
 update into_table set d=from_table.d, e=from_table.e, f=from_table.f from from_table
 where into_table.a=from_table.a and into_table.b=from_table.b and into_table.c=from_table.c;

src/test/regress/output/external_table_optimizer.source

@@ -4978,13 +4978,13 @@ SELECT policytype, distkey FROM gp_distribution_policy WHERE localoid = 'part_ex
 
 DROP TABLE part_root;
 -- check logerrors value of pg_exttable
-CREATE EXTERNAL TABLE ext_false (c INT) 
+CREATE EXTERNAL TABLE ext_false (c INT)
 location ('file://@hostname@@abs_srcdir@/data/ext_fasle.tbl' )
 FORMAT 'text' (delimiter '|');
-CREATE EXTERNAL TABLE ext_true (c INT) 
+CREATE EXTERNAL TABLE ext_true (c INT)
 location ('file://@hostname@@abs_srcdir@/data/ext_true.tbl' )
 FORMAT 'text' (delimiter '|') LOG ERRORS SEGMENT REJECT LIMIT 100;
-CREATE EXTERNAL TABLE ext_persistently (c INT) 
+CREATE EXTERNAL TABLE ext_persistently (c INT)
 location ('file://@hostname@@abs_srcdir@/data/ext_persistently.tbl' )
 FORMAT 'text' (delimiter '|') LOG ERRORS PERSISTENTLY SEGMENT REJECT LIMIT 100;
 SELECT logerrors from pg_exttable a, pg_class b where a.reloid = b.oid and b.relname = 'ext_false';