fix hw_pbe and explain_pbe of fastcheck

src/test/regress/expected/explain_pbe.out

@@ -22,11 +22,10 @@ explain (costs off, verbose on) execute s (1,1);
 explain (costs off, verbose on) execute i (6,6,6);
          QUERY PLAN         
 ----------------------------
- [Bypass]
  Insert on public.t1_xc_fqs
    ->  Result
          Output: 6, 6, 6
-(4 rows)
+(3 rows)
 
 explain (costs off, verbose on) execute u (2,2);
                           QUERY PLAN                           
@@ -189,11 +188,10 @@ explain (costs off, verbose on) execute s (1);
 explain (costs off, verbose on) execute i (6);
          QUERY PLAN         
 ----------------------------
- [Bypass]
  Insert on public.t1_xc_fqs
    ->  Result
          Output: 6, 2, 3
-(4 rows)
+(3 rows)
 
 explain (costs off, verbose on) execute u (2);
                           QUERY PLAN                           
@@ -2558,11 +2556,10 @@ explain (costs off, verbose on) execute s (1);
 explain (costs off, verbose on) execute i (6);
          QUERY PLAN         
 ----------------------------
- [Bypass]
  Insert on public.t1_xc_fqs
    ->  Result
          Output: 6, 2, 3
-(4 rows)
+(3 rows)
 
 explain (costs off, verbose on) execute u (2);
                           QUERY PLAN                           

src/test/regress/expected/hw_pbe.out

@@ -21,11 +21,10 @@ explain (costs off, verbose on) execute s (1,1);
 explain (costs off, verbose on) execute i (6,6,6);
          QUERY PLAN         
 ----------------------------
- [Bypass]
  Insert on public.t1_xc_fqs
    ->  Result
          Output: 6, 6, 6
-(4 rows)
+(3 rows)
 
 explain (costs off, verbose on) execute u (2,2);
                           QUERY PLAN                           
@@ -188,11 +187,10 @@ explain (costs off, verbose on) execute s (1);
 explain (costs off, verbose on) execute i (6);
          QUERY PLAN         
 ----------------------------
- [Bypass]
  Insert on public.t1_xc_fqs
    ->  Result
          Output: 6, 2, 3
-(4 rows)
+(3 rows)
 
 explain (costs off, verbose on) execute u (2);
                           QUERY PLAN                           
@@ -2557,11 +2555,10 @@ explain (costs off, verbose on) execute s (1);
 explain (costs off, verbose on) execute i (6);
          QUERY PLAN         
 ----------------------------
- [Bypass]
  Insert on public.t1_xc_fqs
    ->  Result
          Output: 6, 2, 3
-(4 rows)
+(3 rows)
 
 explain (costs off, verbose on) execute u (2);
                           QUERY PLAN                           
@@ -4093,8 +4090,8 @@ set enable_pbe_optimization to true;
 create table TESTTABLE_t1 (id int, num int);
 insert into TESTTABLE_t1 values (1,1),(20,20);
 explain analyze create table TESTTABLE_t2 as select * from TESTTABLE_t1;
-                                                      QUERY PLAN                                                       
+                                                   QUERY PLAN                                                   
------------------------------------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------------------
 --?Insert on testtable_t2  (cost=0.00..31.49 rows=2149 width=8) (actual time=.* rows=2 loops=1)
 --?  ->  Seq Scan on testtable_t1  (cost=0.00..31.49 rows=2149 width=8) (actual time=.* rows=2 loops=1)
 --? Total runtime: .* ms

src/test/regress/expected/xc_remote.out

@@ -561,7 +561,7 @@ insert into xcrem_employee select * from xcrem_temptable;
          Hash Cond: (e.workdept = xcrem_employee.workdept)
          Join Filter: ((e.edlevel)::numeric > (avg(xcrem_employee.edlevel)))
          ->  Seq Scan on public.xcrem_employee e
-               Output: e.ctid, e.edlevel, e.workdept
+               Output: e.ctid, e.workdept, e.edlevel
          ->  Hash
                Output: (avg(xcrem_employee.edlevel)), xcrem_employee.workdept
                ->  HashAggregate
@@ -600,7 +600,7 @@ insert into xcrem_employee select * from xcrem_temptable;
          Hash Cond: ("substring"((e.workdept)::text, 1, 1) = ("substring"((xcrem_employee.workdept)::text, 1, 1)))
          Join Filter: (e.salary > (avg(xcrem_employee.salary)))
          ->  Seq Scan on public.xcrem_employee e
-               Output: e.ctid, e.salary, e.workdept
+               Output: e.ctid, e.workdept, e.salary
          ->  Hash
                Output: (avg(xcrem_employee.salary)), ("substring"((xcrem_employee.workdept)::text, 1, 1))
                ->  HashAggregate

src/test/regress/parallel_schedule0

@@ -1,3 +1,4 @@
+
 # ----------
 # src/test/regress/parallel_schedule
 #
@@ -455,7 +456,7 @@ test: xc_misc
 test: xc_groupby xc_distkey xc_having
 #test: hw_rewrite_lazyagg hw_light
 test: xc_temp xc_FQS 
-#test: xc_remote hw_pbe
+test: xc_remote hw_pbe
 test: xc_FQS_join xc_copy 
 #test: xc_alter_table
 test: xc_constraints xc_limit xc_sort
@@ -639,7 +640,7 @@ test: hw_audit_detailinfo
 
 test: performance_enhance
 test: explain_fqs
-#test: explain_pbe
+test: explain_pbe
 # temp__3 create_table copy vec_prepare_001 vec_prepare_002 vec_prepare_003 int4 int8 are duplicated
 test: temp__3