Fix system_views_gp.in and fix test query_conflict

Some pg_ views have been modified by cbdb: the gp_segment_id
colmun has been added to them. So they are failed to be transformed
from the pg_ views to gp_ views (see commit
5028222620d410fe3d4c60f732a599e269006968)
So just remove them from system_vies_gp.in. Maybe better to fix
them later.

Author: fanfuxiaoran

src/backend/catalog/system_views_gp.in

@@ -1,7 +1,7 @@
 # This file lists all the PG system views 'pg_%' that we would like to create an
 # MPP-aware view 'gp_%' out of. The generated 'gp_%' view definitions will be placed
 # in system_views_gp.sql, and initialized at the same time as system_views.sql.
-pg_backend_memory_contexts
+#pg_backend_memory_contexts
 pg_config
 pg_cursors
 pg_file_settings
@@ -11,16 +11,16 @@ pg_settings
 pg_stat_activity
 pg_stat_archiver
 pg_stat_bgwriter
-pg_stat_database
+#pg_stat_database
 pg_stat_database_conflicts
 pg_stat_gssapi
 pg_stat_operations
-pg_stat_progress_analyze
-pg_stat_progress_basebackup
-pg_stat_progress_cluster
-pg_stat_progress_copy
-pg_stat_progress_create_index
-pg_stat_progress_vacuum
+#pg_stat_progress_analyze
+#pg_stat_progress_basebackup
+#pg_stat_progress_cluster
+#pg_stat_progress_copy
+#pg_stat_progress_create_index
+#pg_stat_progress_vacuum
 pg_stat_slru
 pg_stat_ssl
 pg_stat_subscription
@@ -29,7 +29,7 @@ pg_stat_sys_tables
 pg_stat_user_functions
 pg_stat_user_indexes
 pg_stat_user_tables
-pg_stat_wal
+#pg_stat_wal
 pg_stat_wal_receiver
 pg_stat_xact_all_tables
 pg_stat_xact_sys_tables
@@ -44,5 +44,5 @@ pg_statio_sys_tables
 pg_statio_user_indexes
 pg_statio_user_sequences
 pg_statio_user_tables
-pg_stats
+#pg_stats ERROR:  column "most_common_vals" has pseudo-type anyarray
 pg_stats_ext

src/test/isolation2/input/hot_standby/query_conflict.source

@@ -126,8 +126,8 @@ select gp_inject_fault('after_open_temp_file', 'reset',dbid) from gp_segment_con
 -1S<:
 -1Sq:
 
--- conflict has been recorded
--1S: select max(confl_tablespace) from gp_stat_database_conflicts where datname = 'isolation2-hot-standby';
+-- conflict has been recorded. The query has multiple slices
+-1S: select max(confl_tablespace) >= 1 from gp_stat_database_conflicts where datname = 'isolation2-hot-standby';
 
 -- cleanup
 !\retcode rm -rf @testtablespace@/hs_tablespace_directory;

src/test/isolation2/output/hot_standby/query_conflict.source

@@ -269,11 +269,11 @@ ERROR:  canceling statement due to conflict with recovery  (seg1 slice3 127.0.1.
 DETAIL:  User was or might have been using tablespace that must be dropped.
 -1Sq: ... <quitting>
 
--- conflict has been recorded
--1S: select max(confl_tablespace) from gp_stat_database_conflicts where datname = 'isolation2-hot-standby';
- max 
------
- 1   
+-- conflict has been recorded. The query has multiple slices
+-1S: select max(confl_tablespace) >= 1 from gp_stat_database_conflicts where datname = 'isolation2-hot-standby';
+ ?column? 
+----------
+ t        
 (1 row)
 
 -- cleanup