Fix some answer files

Author: baobao0206

src/test/regress/expected/createdb.out

@@ -211,7 +211,7 @@ HINT:  Inject an infinite 'skip' into the 'fts_probe' fault to disable FTS probi
 
 -- should fail
 create database db4 STRATEGY = file_copy;
-ERROR:  fault triggered, fault name:'end_prepare_two_phase' fault type:'panic'  (seg0 127.0.1.1:7002 pid=3772777)
+ERROR:  fault triggered, fault name:'end_prepare_two_phase' fault type:'panic'  (seg0 127.0.1.1:7002 pid=1804307)
 select force_mirrors_to_catch_up();
  force_mirrors_to_catch_up 
 ---------------------------

src/test/regress/expected/explain.out

@@ -759,7 +759,6 @@ select jsonb_pretty(
          "Settings": {                                      +
              "jit": "off",                                  +
              "Optimizer": "Postgres query optimizer",       +
-             "optimizer": "off",                            +
              "enable_parallel": "off",                      +
              "parallel_setup_cost": "0",                    +
              "parallel_tuple_cost": "0",                    +

src/test/regress/expected/freeze_aux_tables.out

@@ -167,10 +167,10 @@ select segid = -1 as is_master, relname, classify_age(age) from aux_rel_ages('te
 group by segid = -1, relname, classify_age(age);
  is_master |          relname           | classify_age 
 -----------+----------------------------+--------------
- t         | test_table_heap_with_toast | very young
- f         | test_table_heap_with_toast | young
- f         | pg_toast_<oid>             | young
  t         | pg_toast_<oid>             | very young
+ f         | test_table_heap_with_toast | zero
+ f         | pg_toast_<oid>             | zero
+ t         | test_table_heap_with_toast | very young
 (4 rows)
 
 select segid = -1 as is_master, relname, classify_age(age) from aux_rel_ages('test_table_ao')

src/test/regress/expected/gp_tablespace_with_faults.out

@@ -31,7 +31,7 @@ create or replace function remove_tablespace_location_directory(tablespace_locat
 		tablespace_symlink
 			for tablespace_symlink
 			in sum(tablespace_symlinks, [])
-			if os.readlink(tablespace_symlink).startswith(tablespace_location_dir)]
+			if os.path.islink(tablespace_symlink) and os.readlink(tablespace_symlink).startswith(tablespace_location_dir)]
 
 	for tablespace_symlink_to_remove in tablespace_symlinks_to_remove:
 		os.unlink(tablespace_symlink_to_remove);

src/test/regress/expected/gpsd.out

@@ -1428,7 +1428,7 @@ SELECT :io_sum_local_after_evictions > :io_sum_local_before_evictions,
        :io_sum_local_after_extends > :io_sum_local_before_extends;
  ?column? | ?column? | ?column? | ?column? 
 ----------+----------+----------+----------
- f        | f        | t        | t
+ t        | f        | t        | t
 (1 row)
 
 -- Change the tablespaces so that the temporary table is rewritten to other

src/test/regress/expected/stats.out

@@ -344,36 +344,40 @@ CREATE VIEW vac_option_tab_counts AS
   ORDER BY rel;
 VACUUM (PROCESS_TOAST TRUE) vac_option_tab;
 SELECT * FROM vac_option_tab_counts;
- rel  | vacuum_count 
-------+--------------
- main |            1
-(1 row)
+  rel  | vacuum_count 
+-------+--------------
+ main  |            1
+ toast |            1
+(2 rows)
 
 VACUUM (PROCESS_TOAST FALSE) vac_option_tab;
 SELECT * FROM vac_option_tab_counts;
- rel  | vacuum_count 
-------+--------------
- main |            2
-(1 row)
+  rel  | vacuum_count 
+-------+--------------
+ main  |            2
+ toast |            1
+(2 rows)
 
 VACUUM (PROCESS_TOAST FALSE, FULL) vac_option_tab; -- error
 ERROR:  PROCESS_TOAST required with VACUUM FULL
 -- PROCESS_MAIN option
 -- Only the toast table is processed.
 VACUUM (PROCESS_MAIN FALSE) vac_option_tab;
 SELECT * FROM vac_option_tab_counts;
- rel  | vacuum_count 
-------+--------------
- main |            2
-(1 row)
+  rel  | vacuum_count 
+-------+--------------
+ main  |            2
+ toast |            2
+(2 rows)
 
 -- Nothing is processed.
 VACUUM (PROCESS_MAIN FALSE, PROCESS_TOAST FALSE) vac_option_tab;
 SELECT * FROM vac_option_tab_counts;
- rel  | vacuum_count 
-------+--------------
- main |            2
-(1 row)
+  rel  | vacuum_count 
+-------+--------------
+ main  |            2
+ toast |            2
+(2 rows)
 
 -- Check if the filenodes nodes have been updated as wanted after FULL.
 SELECT relfilenode AS main_filenode FROM pg_class

src/test/regress/expected/vacuum.out

@@ -63,6 +63,9 @@ FROM pg_tablespace WHERE spcname = 'testspace';
 -- Ensure mirrors have applied filesystem changes
 SELECT force_mirrors_to_catch_up();
 
+\! ls $PG_ABS_SRCDIR/testtablespace
+
+
 -- Test moving AO/AOCO tables from one tablespace to another.
 CREATE TABLE ao_ts_table (id int4, t text) with (appendonly=true, orientation=row) distributed by (id);
 CREATE TABLE aoco_ts_table (id int4, t text) with (appendonly=true, orientation=column) distributed by (id);
@@ -227,8 +230,9 @@ DROP TABLESPACE testspace_existing_version_dir;
 -- Ensure mirrors have applied filesystem changes
 SELECT force_mirrors_to_catch_up();
 
--- Test alter tablespace: PG does not seem to test these.
+\! ls $PG_ABS_SRCDIR/testtablespace_existing_version_dir/*
 
+-- Test alter tablespace: PG does not seem to test these.    
 -- test SET & OWNER
 ALTER TABLESPACE testspace_otherloc SET (random_page_cost=20.0);
 SELECT spcoptions FROM pg_tablespace WHERE spcname = 'testspace_otherloc';
@@ -257,6 +261,7 @@ DROP TABLESPACE testspace_otherloc;
 
 CREATE TABLESPACE testspace_dir_empty LOCATION :'testtablespace';
 CREATE TABLE t_dir_empty(a int);
+\! rm -rf $PG_ABS_SRCDIR/testtablespace
 DROP TABLE IF EXISTS t_dir_empty;
 DROP TABLESPACE testspace_dir_empty;
 

src/test/regress/sql/gp_tablespace.sql

@@ -32,7 +32,7 @@ create or replace function remove_tablespace_location_directory(tablespace_locat
 		tablespace_symlink
 			for tablespace_symlink
 			in sum(tablespace_symlinks, [])
-			if os.readlink(tablespace_symlink).startswith(tablespace_location_dir)]
+			if os.path.islink(tablespace_symlink) and os.readlink(tablespace_symlink).startswith(tablespace_location_dir)]
 
 	for tablespace_symlink_to_remove in tablespace_symlinks_to_remove:
 		os.unlink(tablespace_symlink_to_remove);