Fix some answer files

Author: baobao0206

src/test/regress/expected/cbdb_parallel.out

@@ -2,7 +2,7 @@
 -- CBDB PARALLEL
 -- Test CBDB style parallel plan.
 -- GUCs shoule be set with local, do not disturb other parallel plans.
--- Should not use force_parallel_mode as it will ignore plan and check results only.
+-- Should not use debug_parallel_query as it will ignore plan and check results only.
 -- We want to check plan in this file!
 -- If there is need to do that, set it local inside a transaction.
 -- Set optimizer off in this file, ORCA parallel is not supported.
@@ -31,7 +31,7 @@
 --  12  CdbLocusType_HashedWorkers
 --
 --
-set force_parallel_mode = 0;
+set debug_parallel_query=off;
 set optimizer = off;
 create schema test_parallel;
 set search_path to test_parallel;
@@ -628,7 +628,7 @@ set local enable_parallel = on;
 create index on t1(c2);
 insert into t1 select i, i from generate_series(1, 10000000) i;
 analyze t1;
-set local force_parallel_mode = 1;
+set local debug_parallel_query=regress;
 set local enable_seqscan = off;
 explain(locus, costs off) select c2 from t1;
                       QUERY PLAN                      
@@ -2710,7 +2710,7 @@ abort;
 begin;
 set local optimizer=off;
 set local enable_parallel=on;
-set local force_parallel_mode =1 ;
+set local debug_parallel_query=regress;
 set local min_parallel_table_scan_size = 0;
 create table semi_t1 (c1 integer) with(parallel_workers=2) distributed randomly;
 create table semi_t2 (c2 integer) with(parallel_workers=2) distributed randomly;
@@ -3073,5 +3073,5 @@ abort;
 drop schema test_parallel cascade;
 -- end_ignore
 reset gp_appendonly_insert_files;
-reset force_parallel_mode;
+reset debug_parallel_query;
 reset optimizer;

src/test/regress/expected/qp_gist_indexes2.out

@@ -24,8 +24,10 @@ language plpython3u;
 CREATE TABLE GistTable1 ( id INTEGER, owner VARCHAR, description VARCHAR, property BOX, poli POLYGON, bullseye CIRCLE, v VARCHAR, t TEXT, f FLOAT, p POINT, c CIRCLE, filler VARCHAR DEFAULT 'This is here just to take up space so that we use more pages of data and sequential scans take a lot more time.  Stones tinheads and mixers coming; we did it all on our own; this summer I hear the crunching; 11 dead in Ohio. Got right down to it; we were cutting us down; could have had fun but, no; left them face down dead on the ground.  How can you listen when you know?'
  )
  DISTRIBUTED BY (id);
+\getenv abs_srcdir PG_ABS_SRCDIR
+\set PropertyInfo_file :abs_srcdir '/data/PropertyInfo.txt'
 COPY GistTable1 FROM
-'@abs_srcdir@/data/PropertyInfo.txt'
+:'PropertyInfo_file'
  CSV
  ;
 ANALYZE GistTable1;
@@ -729,7 +731,7 @@ CREATE TABLE GistTable1 ( id INTEGER, owner VARCHAR, description VARCHAR, proper
  WITH (APPENDONLY=True, COMPRESSTYPE=ZLIB, COMPRESSLEVEL=1)
  DISTRIBUTED BY (id);
 COPY GistTable1 FROM
-'@abs_srcdir@/data/PropertyInfo.txt'
+:'PropertyInfo_file'
  CSV
  ;
 -- ----------------------------------------------------------------------
@@ -1351,7 +1353,7 @@ CREATE TABLE GistTable1 ( id INTEGER, owner VARCHAR, description VARCHAR, proper
  WITH (APPENDONLY=True)
  DISTRIBUTED BY (id);
 COPY GistTable1 FROM
-'@abs_srcdir@/data/PropertyInfo.txt'
+:'PropertyInfo_file'
  CSV
  ;
 -- ----------------------------------------------------------------------
@@ -1973,7 +1975,7 @@ CREATE TABLE GistTable1 ( id INTEGER, owner VARCHAR, description VARCHAR, proper
  WITH (APPENDONLY=True, ORIENTATION='column', COMPRESSTYPE=ZLIB, COMPRESSLEVEL=1)
  DISTRIBUTED BY (id);
 COPY GistTable1 FROM
-'@abs_srcdir@/data/PropertyInfo.txt'
+:'PropertyInfo_file'
  CSV
  ;
 -- ----------------------------------------------------------------------
@@ -2595,7 +2597,7 @@ CREATE TABLE GistTable1 ( id INTEGER, owner VARCHAR, description VARCHAR, proper
  WITH (APPENDONLY=True, ORIENTATION='column')
  DISTRIBUTED BY (id);
 COPY GistTable1 FROM
-'@abs_srcdir@/data/PropertyInfo.txt'
+:'PropertyInfo_file'
  CSV
  ;
 -- ----------------------------------------------------------------------

src/test/regress/expected/qp_regexp.out

@@ -19,7 +19,9 @@ state char(2),
 phone_num bigint
 )
 distributed by (lname);
-\copy public.phone_book from '@abs_srcdir@/data/phone_book.txt' delimiter as '|'
+\getenv abs_srcdir PG_ABS_SRCDIR
+\set phone_book_file :abs_srcdir '/data/phone_book.txt'
+copy public.phone_book from :'phone_book_file' delimiter as '|';
 drop table if exists phone_book_substr;
 NOTICE:  table "phone_book_substr" does not exist, skipping
 create table phone_book_substr

src/test/regress/expected/session_reset.out

@@ -1,6 +1,8 @@
 set log_min_messages to ERROR;
+\getenv abs_builddir PG_ABS_BUILDDIR
+\set regress_dll :abs_builddir '/regress.so'
 CREATE OR REPLACE FUNCTION gp_execute_on_server(content int, query text) returns text
-language C as '@abs_builddir@/regress@DLSUFFIX@', 'gp_execute_on_server';
+language C as :'regress_dll', 'gp_execute_on_server';
 -- terminate backend process for this session on segment with content ID = 0
 select gp_execute_on_server(0, 'select pg_terminate_backend(pg_backend_pid())');
 ERROR:  terminating connection due to administrator command  (seg0 10.152.10.149:25432 pid=32665)

src/test/regress/sql/qp_regexp.sql

@@ -27,7 +27,7 @@ distributed by (lname);
 
 \getenv abs_srcdir PG_ABS_SRCDIR
 \set phone_book_file :abs_srcdir '/data/phone_book.txt'
-copy public.phone_book from :'phone_book_file' delimiter as '|'
+copy public.phone_book from :'phone_book_file' delimiter as '|';
 
 drop table if exists phone_book_substr;
 

src/test/regress/sql/session_reset.sql

@@ -1,6 +1,6 @@
 
 set log_min_messages to ERROR;
-\getenv abs_builddir ABS_BUILDDIR
+\getenv abs_builddir PG_ABS_BUILDDIR
 \set regress_dll :abs_builddir '/regress.so'
 CREATE OR REPLACE FUNCTION gp_execute_on_server(content int, query text) returns text
 language C as :'regress_dll', 'gp_execute_on_server';