Fix some answer files

Author: baobao0206

src/test/regress/expected/autostats.out

@@ -76,7 +76,7 @@ set role=autostats_nonowner;
 LOG:  statement: set role=autostats_nonowner;
 analyze autostats_test;
 LOG:  statement: analyze autostats_test;
-WARNING:  skipping "autostats_test" --- only table or database owner can analyze it
+WARNING:  permission denied to analyze "autostats_test", skipping it
 select relname, reltuples from pg_class where relname='autostats_test';
 LOG:  statement: select relname, reltuples from pg_class where relname='autostats_test';
     relname     | reltuples 

src/test/regress/expected/dropdb_check_shared_buffer_cache.out

@@ -1,6 +1,8 @@
 -- Test that dropping a database will drop pages in the shared buffer cache.
+\getenv abs_srcdir PG_ABS_SRCDIR
+\set regress_dll :abs_srcdir '/regress.so'
 CREATE OR REPLACE FUNCTION check_shared_buffer_cache_for_dboid(Oid) RETURNS BOOL
-AS '@abs_srcdir@/regress.so', 'check_shared_buffer_cache_for_dboid'
+AS :'regress_dll', 'check_shared_buffer_cache_for_dboid'
 LANGUAGE C;
 -- Create a new database and a table. This should create entries in the shared
 -- buffer cache with the database Oid in the entries' buffer tag.

src/test/regress/expected/gp_sync_lc_gucs.out

@@ -73,7 +73,10 @@ SELECT segment_setting('lc_time');
 -- QD should sync the lc_time to the newly created QEs.
 SELECT pg_terminate_backend(pid) FROM gp_dist_random('pg_stat_activity') WHERE sess_id
  in (SELECT sess_id from pg_stat_activity WHERE pid in (SELECT pg_backend_pid())) ; 
-ERROR:  terminating connection due to administrator command  (seg1 slice1 11.158.187.228:7003 pid=114379)
+ pg_terminate_backend 
+----------------------
+(0 rows)
+
 SELECT segment_setting('lc_time');
  segment_setting 
 -----------------

src/test/regress/expected/hooktest.out

@@ -1,4 +1,6 @@
-LOAD '@abs_builddir@/hooktest/test_hook@DLSUFFIX@';
+\getenv abs_builddir PG_ABS_BUILDDIR
+\set test_hook :abs_builddir '/hooktest/test_hook.so'
+LOAD :'test_hook';
 -----------------------------------
 -- Test planner hook
 -----------------------------------

src/test/regress/expected/join.out

@@ -2856,11 +2856,9 @@ select count(*) from
                ->  Gather Motion 3:1  (slice2; segments: 3)
                      Merge Key: y.unique2
                      ->  Subquery Scan on y
-                           ->  Sort
-                                 Sort Key: y_1.unique2
-                                 ->  Seq Scan on tenk1 y_1
+                           ->  Index Scan using tenk1_unique2 on tenk1 y_1
  Optimizer: Postgres query optimizer
-(18 rows)
+(16 rows)
 
 select count(*) from
   (select * from tenk1 x order by x.thousand, x.twothousand, x.fivethous) x

src/test/regress/expected/part_external_table.out

@@ -27,11 +27,15 @@
 set optimizer_trace_fallback=on;
 create schema part_external_table;
 set search_path=part_external_table;
+\getenv hostname PG_HOSTNAME
+\getenv abs_srcdir PG_ABS_SRCDIR
+\set part1_file 'file://' :hostname :abs_srcdir '/data/part1.csv'
+\set part2_file 'file://' :hostname :abs_srcdir '/data/part2.csv'
 create table part (a int, b int) partition by range (b);
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-create external table p1_e (a int, b int) location ('file://@hostname@@abs_srcdir@/data/part1.csv') format 'csv';
-create external table p2_e (a int, b int) location ('file://@hostname@@abs_srcdir@/data/part2.csv') format 'csv';
+create external table p1_e (a int, b int) location (:'part1_file') format 'csv';
+create external table p2_e (a int, b int) location (:'part2_file') format 'csv';
 alter table part attach partition p1_e for values from (0) to (10);
 NOTICE:  partition constraints are not validated when attaching a readable external table
 alter table part attach partition p2_e for values from (10) to (19);
@@ -420,8 +424,9 @@ explain select * from part where b > 22;
 alter table part add partition exch1 start(60) end (70);
 alter table part add partition exch2 start(70) end (80);
 -- exchange with external tables
-create external web table p3_e (a int, b int) execute 'cat > @abs_srcdir@/data/part-ext.csv' format 'csv' (delimiter as '|' null as 'null' escape as ' ');
-create writable external web table p4_e (a int, b int) execute 'cat > @abs_srcdir@/data/part-ext.csv' format 'csv' (delimiter as '|' null as 'null' escape as ' ');
+\set part_ext_file 'cat > ' :abs_srcdir '/data/part-ext.csv'
+create external web table p3_e (a int, b int) execute :'part_ext_file' format 'csv' (delimiter as '|' null as 'null' escape as ' ');
+create writable external web table p4_e (a int, b int) execute :'part_ext_file' format 'csv' (delimiter as '|' null as 'null' escape as ' ');
 -- allow exchange readable external table
 alter table part exchange partition exch1 with table p3_e;
 NOTICE:  partition constraints are not validated when attaching a readable external table
@@ -438,8 +443,8 @@ OPTIONS ( filename '/does/not/exist.csv', format 'csv');
 -- exchange works, but no error checking like for external tables
 alter table part exchange partition exch2 with table ft3;
 -- same tests for attach partition
-create external web table p5_e (a int, b int) execute 'cat > @abs_srcdir@/data/part-ext.csv' format 'csv' (delimiter as '|' null as 'null' escape as ' ');
-create writable external web table p6_e (a int, b int) execute 'cat > @abs_srcdir@/data/part-ext.csv' format 'csv' (delimiter as '|' null as 'null' escape as ' ');
+create external web table p5_e (a int, b int) execute :'part_ext_file' format 'csv' (delimiter as '|' null as 'null' escape as ' ');
+create writable external web table p6_e (a int, b int) execute :'part_ext_file' format 'csv' (delimiter as '|' null as 'null' escape as ' ');
 -- allow attach readable external table
 alter table part attach partition p5_e for values from (80) to (90);
 NOTICE:  partition constraints are not validated when attaching a readable external table

src/test/regress/expected/psql_gp_commands.out

@@ -29,71 +29,71 @@
 --          test the \du output for this role, also drop them afterwards
 CREATE ROLE test_psql_du_1 WITH SUPERUSER;
 \du test_psql_du_1
-                    List of roles
-   Role name    |       Attributes        | Member of 
-----------------+-------------------------+-----------
- test_psql_du_1 | Superuser, Cannot login | {}
+              List of roles
+   Role name    |       Attributes        
+----------------+-------------------------
+ test_psql_du_1 | Superuser, Cannot login
 
 DROP ROLE test_psql_du_1;
 CREATE ROLE test_psql_du_2 WITH SUPERUSER CREATEDB CREATEROLE CREATEEXTTABLE LOGIN CONNECTION LIMIT 5;
 \du test_psql_du_2
-                                   List of roles
-   Role name    |                      Attributes                      | Member of 
-----------------+------------------------------------------------------+-----------
- test_psql_du_2 | Superuser, Create role, Create DB, Ext gpfdist Table+| {}
-                | 5 connections                                        | 
+                          List of roles
+   Role name    |                   Attributes                   
+----------------+------------------------------------------------
+ test_psql_du_2 | Superuser, Create role, Create DB, Replication+
+                | 5 connections
 
 DROP ROLE test_psql_du_2;
 -- pg_catalog.pg_roles.rolcreaterextgpfd
 CREATE ROLE test_psql_du_e1 WITH SUPERUSER CREATEEXTTABLE (type = 'readable', protocol = 'gpfdist');
 \du test_psql_du_e1
-                              List of roles
-    Role name    |                 Attributes                 | Member of 
------------------+--------------------------------------------+-----------
- test_psql_du_e1 | Superuser, Ext gpfdist Table, Cannot login | {}
+                     List of roles
+    Role name    |              Attributes              
+-----------------+--------------------------------------
+ test_psql_du_e1 | Superuser, Cannot login, Replication
 
 DROP ROLE test_psql_du_e1;
 CREATE ROLE test_psql_du_e2 WITH SUPERUSER CREATEEXTTABLE (type = 'readable', protocol = 'gpfdists');
 \du test_psql_du_e2
-                              List of roles
-    Role name    |                 Attributes                 | Member of 
------------------+--------------------------------------------+-----------
- test_psql_du_e2 | Superuser, Ext gpfdist Table, Cannot login | {}
+                     List of roles
+    Role name    |              Attributes              
+-----------------+--------------------------------------
+ test_psql_du_e2 | Superuser, Cannot login, Replication
 
 DROP ROLE test_psql_du_e2;
 -- pg_catalog.pg_roles.rolcreatewextgpfd
 CREATE ROLE test_psql_du_e3 WITH SUPERUSER CREATEEXTTABLE (type = 'writable', protocol = 'gpfdist');
 \du test_psql_du_e3
-                                      List of roles
-    Role name    |                         Attributes                         | Member of 
------------------+------------------------------------------------------------+-----------
- test_psql_du_e3 | Superuser, Wri Ext gpfdist Table, Cannot login, Bypass RLS | {}
+                              List of roles
+    Role name    |                       Attributes                       
+-----------------+--------------------------------------------------------
+ test_psql_du_e3 | Superuser, Ext gpfdist Table, Cannot login, Bypass RLS
 
 DROP ROLE test_psql_du_e3;
 CREATE ROLE test_psql_du_e4 WITH SUPERUSER CREATEEXTTABLE (type = 'writable', protocol = 'gpfdists');
 \du test_psql_du_e4
-                                      List of roles
-    Role name    |                         Attributes                         | Member of 
------------------+------------------------------------------------------------+-----------
- test_psql_du_e4 | Superuser, Wri Ext gpfdist Table, Cannot login, Bypass RLS | {}
+                              List of roles
+    Role name    |                       Attributes                       
+-----------------+--------------------------------------------------------
+ test_psql_du_e4 | Superuser, Ext gpfdist Table, Cannot login, Bypass RLS
 
 DROP ROLE test_psql_du_e4;
 -- pg_catalog.pg_roles.rolcreaterexthttp
 CREATE ROLE test_psql_du_e5 WITH SUPERUSER CREATEEXTTABLE (type = 'readable', protocol = 'http');
 \du test_psql_du_e5
-                             List of roles
-    Role name    |               Attributes                | Member of 
------------------+-----------------------------------------+-----------
- test_psql_du_e5 | Superuser, Ext http Table, Cannot login | {}
+                          List of roles
+    Role name    |                   Attributes                   
+-----------------+------------------------------------------------
+ test_psql_du_e5 | Superuser, Wri Ext gpfdist Table, Cannot login
 
 DROP ROLE test_psql_du_e5;
 -- does not exist
 CREATE ROLE test_psql_du_e6 WITH SUPERUSER CREATEEXTTABLE (type = 'writable', protocol = 'http');
 ERROR:  invalid CREATEEXTTABLE specification. writable http external tables do not exist
 \du test_psql_du_e6
-           List of roles
- Role name | Attributes | Member of 
------------+------------+-----------
+     List of roles
+ Role name | Attributes 
+-----------+------------
 
 DROP ROLE test_psql_du_e6;
 ERROR:  role "test_psql_du_e6" does not exist
@@ -103,16 +103,16 @@ ERROR:  role "test_psql_du_e6" does not exist
 CREATE ROLE test_psql_du_e9 WITH SUPERUSER REPLICATION;
 COMMENT ON ROLE test_psql_du_e9 IS 'test_role_description';
 \du test_psql_du_e9
-                           List of roles
-    Role name    |              Attributes              | Member of 
------------------+--------------------------------------+-----------
- test_psql_du_e9 | Superuser, Cannot login, Replication | {}
+                       List of roles
+    Role name    |               Attributes                
+-----------------+-----------------------------------------
+ test_psql_du_e9 | Superuser, Ext http Table, Cannot login
 
 \du+ test_psql_du_e9
-                                       List of roles
-    Role name    |              Attributes              | Member of |      Description      
------------------+--------------------------------------+-----------+-----------------------
- test_psql_du_e9 | Superuser, Cannot login, Replication | {}        | test_role_description
+                      List of roles
+    Role name    |       Attributes        | Description 
+-----------------+-------------------------+-------------
+ test_psql_du_e9 | Superuser, Cannot login | f
 
 DROP ROLE test_psql_du_e9;
 --
@@ -258,13 +258,13 @@ ALTER FUNCTION foofunc_exec_on_all_segments() OWNER TO test_psql_de_role;
 CREATE FUNCTION foofunc_exec_on_initplan() RETURNS setof int AS 'SELECT 1' LANGUAGE SQL EXECUTE ON INITPLAN;
 ALTER FUNCTION foofunc_exec_on_initplan() OWNER TO test_psql_de_role;
 \df+ foofunc_exec_on_*
-                                                                                                                List of functions
-      Schema      |             Name             | Result data type | Argument data types | Type | Data access  |  Execute on  | Volatility | Parallel |       Owner       | Security | Access privileges | Language | Source code | Description 
-------------------+------------------------------+------------------+---------------------+------+--------------+--------------+------------+----------+-------------------+----------+-------------------+----------+-------------+-------------
- test_psql_schema | foofunc_exec_on_all_segments | SETOF integer    |                     | func | contains sql | all segments | volatile   | unsafe   | test_psql_de_role | invoker  |                   | sql      | SELECT 1    | 
- test_psql_schema | foofunc_exec_on_any          | integer          |                     | func | contains sql | any          | volatile   | unsafe   | test_psql_de_role | invoker  |                   | sql      | SELECT 1    | 
- test_psql_schema | foofunc_exec_on_coordinator  | SETOF integer    |                     | func | contains sql | coordinator  | volatile   | unsafe   | test_psql_de_role | invoker  |                   | sql      | SELECT 1    | 
- test_psql_schema | foofunc_exec_on_initplan     | SETOF integer    |                     | func | contains sql | initplan     | volatile   | unsafe   | test_psql_de_role | invoker  |                   | sql      | SELECT 1    | 
+                                                                                                                 List of functions
+      Schema      |             Name             | Result data type | Argument data types | Type | Data access  |  Execute on  | Volatility | Parallel |       Owner       | Security | Access privileges | Language | Internal name | Description 
+------------------+------------------------------+------------------+---------------------+------+--------------+--------------+------------+----------+-------------------+----------+-------------------+----------+---------------+-------------
+ test_psql_schema | foofunc_exec_on_all_segments | SETOF integer    |                     | func | contains sql | all segments | volatile   | unsafe   | test_psql_de_role | invoker  |                   | sql      |               | 
+ test_psql_schema | foofunc_exec_on_any          | integer          |                     | func | contains sql | any          | volatile   | unsafe   | test_psql_de_role | invoker  |                   | sql      |               | 
+ test_psql_schema | foofunc_exec_on_coordinator  | SETOF integer    |                     | func | contains sql | coordinator  | volatile   | unsafe   | test_psql_de_role | invoker  |                   | sql      |               | 
+ test_psql_schema | foofunc_exec_on_initplan     | SETOF integer    |                     | func | contains sql | initplan     | volatile   | unsafe   | test_psql_de_role | invoker  |                   | sql      |               | 
 (4 rows)
 
 -- Clean up