!6165 【master】修复1.1.0 升级6.0.0报错

Merge pull request !6165 from 梅程/6.0.0_update_master

src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_935.sql

@@ -1,7 +0,0 @@
-/*------ add sys fuction gs_stat_undo ------*/
-DROP FUNCTION IF EXISTS pg_catalog.gs_stat_undo();
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4434;
-CREATE FUNCTION pg_catalog.gs_stat_undo(OUT curr_used_zone_count int4, OUT top_used_zones text, OUT curr_used_undo_size int4,
-OUT undo_threshold int4, OUT oldest_xid_in_undo oid, OUT oldest_xmin oid, OUT total_undo_chain_len oid, OUT max_undo_chain_len oid,
-OUT create_undo_file_count int4, OUT discard_undo_file_count int4)
-RETURNS record LANGUAGE INTERNAL as 'gs_stat_undo';

src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_935.sql

@@ -9,3 +9,11 @@ DROP FUNCTION IF EXISTS pg_catalog.gs_undo_translot_dump_xid(xid, boolean, OUT z
 SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4438;
 CREATE OR REPLACE FUNCTION pg_catalog.gs_undo_translot_dump_xid(xid, boolean, OUT zone_id oid, OUT slot_xid text, OUT start_undoptr text, OUT end_undoptr text, OUT lsn text, OUT gs_undo_translot oid)
 RETURNS SETOF record LANGUAGE INTERNAL as 'gs_undo_translot_dump_xid';
+
+/*------ add sys fuction gs_stat_undo ------*/
+DROP FUNCTION IF EXISTS pg_catalog.gs_stat_undo();
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4434;
+CREATE FUNCTION pg_catalog.gs_stat_undo(OUT curr_used_zone_count int4, OUT top_used_zones text, OUT curr_used_undo_size int4,
+OUT undo_threshold int4, OUT oldest_xid_in_undo oid, OUT oldest_xmin oid, OUT total_undo_chain_len oid, OUT max_undo_chain_len oid,
+OUT create_undo_file_count int4, OUT discard_undo_file_count int4)
+RETURNS record LANGUAGE INTERNAL as 'gs_stat_undo';

src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_950.sql

@@ -1,7 +1,7 @@
-DROP FUNCTION IF EXISTS pg_catalog.gs_xlog_keepers(out keeptype pg_catalog.text, out keepsegment pg_catalog.text, out describe pg_catalog.text);
+DROP FUNCTION IF EXISTS pg_catalog.gs_xlog_keepers();
 SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC,9040;
 CREATE OR REPLACE FUNCTION pg_catalog.gs_xlog_keepers
 (out keeptype pg_catalog.text,
 out keepsegment pg_catalog.text,
 out describe pg_catalog.text)
-RETURNS SETOF record LANGUAGE INTERNAL VOLATILE STRICT as 'gs_xlog_keepers';
+RETURNS SETOF record LANGUAGE INTERNAL VOLATILE STRICT as 'gs_xlog_keepers';

src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_935.sql

@@ -1,7 +0,0 @@
-/*------ add sys fuction gs_stat_undo ------*/
-DROP FUNCTION IF EXISTS pg_catalog.gs_stat_undo();
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4434;
-CREATE FUNCTION pg_catalog.gs_stat_undo(OUT curr_used_zone_count int4, OUT top_used_zones text, OUT curr_used_undo_size int4,
-OUT undo_threshold int4, OUT oldest_xid_in_undo oid, OUT oldest_xmin oid, OUT total_undo_chain_len oid, OUT max_undo_chain_len oid,
-OUT create_undo_file_count int4, OUT discard_undo_file_count int4)
-RETURNS record LANGUAGE INTERNAL as 'gs_stat_undo';

src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_935.sql

@@ -9,3 +9,11 @@ DROP FUNCTION IF EXISTS pg_catalog.gs_undo_translot_dump_xid(xid, boolean, OUT z
 SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4438;
 CREATE OR REPLACE FUNCTION pg_catalog.gs_undo_translot_dump_xid(xid, boolean, OUT zone_id oid, OUT slot_xid text, OUT start_undoptr text, OUT end_undoptr text, OUT lsn text, OUT gs_undo_translot oid)
 RETURNS SETOF record LANGUAGE INTERNAL as 'gs_undo_translot_dump_xid';
+
+/*------ add sys fuction gs_stat_undo ------*/
+DROP FUNCTION IF EXISTS pg_catalog.gs_stat_undo();
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4434;
+CREATE FUNCTION pg_catalog.gs_stat_undo(OUT curr_used_zone_count int4, OUT top_used_zones text, OUT curr_used_undo_size int4,
+OUT undo_threshold int4, OUT oldest_xid_in_undo oid, OUT oldest_xmin oid, OUT total_undo_chain_len oid, OUT max_undo_chain_len oid,
+OUT create_undo_file_count int4, OUT discard_undo_file_count int4)
+RETURNS record LANGUAGE INTERNAL as 'gs_stat_undo';

src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_950.sql

@@ -1,7 +1,7 @@
-DROP FUNCTION IF EXISTS pg_catalog.gs_xlog_keepers(out keeptype pg_catalog.text, out keepsegment pg_catalog.text, out describe pg_catalog.text);
+DROP FUNCTION IF EXISTS pg_catalog.gs_xlog_keepers();
 SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC,9040;
 CREATE OR REPLACE FUNCTION pg_catalog.gs_xlog_keepers
 (out keeptype pg_catalog.text,
 out keepsegment pg_catalog.text,
 out describe pg_catalog.text)
-RETURNS SETOF record LANGUAGE INTERNAL VOLATILE STRICT as 'gs_xlog_keepers';
+RETURNS SETOF record LANGUAGE INTERNAL VOLATILE STRICT as 'gs_xlog_keepers';

src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_935.sql

@@ -1,16 +0,0 @@
-/*------ add sys fuction gs_stat_undo ------*/
-DROP FUNCTION IF EXISTS pg_catalog.gs_stat_undo();
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4434;
-CREATE FUNCTION pg_catalog.gs_stat_undo(
-    OUT curr_used_zone_count int4, 
-    OUT top_used_zones text, 
-    OUT curr_used_undo_size int4,
-    OUT undo_threshold int4, 
-    OUT global_recycle_xid xid, 
-    OUT oldest_xmin xid, 
-    OUT total_undo_chain_len int8, 
-    OUT max_undo_chain_len int8,
-    OUT create_undo_file_count int4, 
-    OUT discard_undo_file_count int4)
-RETURNS SETOF record 
-LANGUAGE INTERNAL STABLE NOT SHIPPABLE ROWS 1 as 'gs_stat_undo';

src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_935.sql

@@ -13,3 +13,20 @@ DROP FUNCTION IF EXISTS pg_catalog.gs_undo_translot_dump_xid(xid, boolean, OUT z
 SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4438;
 CREATE OR REPLACE FUNCTION pg_catalog.gs_undo_translot_dump_xid(xid, boolean, OUT zone_id oid, OUT slot_xid text, OUT start_undoptr text, OUT end_undoptr text, OUT slot_ptr text, OUT gs_undo_translot oid)
 RETURNS SETOF record LANGUAGE INTERNAL as 'gs_undo_translot_dump_xid';
+
+/*------ add sys fuction gs_stat_undo ------*/
+DROP FUNCTION IF EXISTS pg_catalog.gs_stat_undo();
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4434;
+CREATE FUNCTION pg_catalog.gs_stat_undo(
+    OUT curr_used_zone_count int4, 
+    OUT top_used_zones text, 
+    OUT curr_used_undo_size int4,
+    OUT undo_threshold int4, 
+    OUT global_recycle_xid xid, 
+    OUT oldest_xmin xid, 
+    OUT total_undo_chain_len int8, 
+    OUT max_undo_chain_len int8,
+    OUT create_undo_file_count int4, 
+    OUT discard_undo_file_count int4)
+RETURNS SETOF record 
+LANGUAGE INTERNAL STABLE NOT SHIPPABLE ROWS 1 as 'gs_stat_undo';

src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_935.sql

@@ -1,16 +0,0 @@
-/*------ add sys fuction gs_stat_undo ------*/
-DROP FUNCTION IF EXISTS pg_catalog.gs_stat_undo();
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4434;
-CREATE FUNCTION pg_catalog.gs_stat_undo(
-    OUT curr_used_zone_count int4, 
-    OUT top_used_zones text, 
-    OUT curr_used_undo_size int4,
-    OUT undo_threshold int4, 
-    OUT global_recycle_xid xid, 
-    OUT oldest_xmin xid, 
-    OUT total_undo_chain_len int8, 
-    OUT max_undo_chain_len int8,
-    OUT create_undo_file_count int4, 
-    OUT discard_undo_file_count int4)
-RETURNS SETOF record 
-LANGUAGE INTERNAL STABLE NOT SHIPPABLE ROWS 1 as 'gs_stat_undo';

src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_935.sql

@@ -13,3 +13,20 @@ DROP FUNCTION IF EXISTS pg_catalog.gs_undo_translot_dump_xid(xid, boolean, OUT z
 SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4438;
 CREATE OR REPLACE FUNCTION pg_catalog.gs_undo_translot_dump_xid(xid, boolean, OUT zone_id oid, OUT slot_xid text, OUT start_undoptr text, OUT end_undoptr text, OUT slot_ptr text, OUT gs_undo_translot oid)
 RETURNS SETOF record LANGUAGE INTERNAL as 'gs_undo_translot_dump_xid';
+
+/*------ add sys fuction gs_stat_undo ------*/
+DROP FUNCTION IF EXISTS pg_catalog.gs_stat_undo();
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4434;
+CREATE FUNCTION pg_catalog.gs_stat_undo(
+    OUT curr_used_zone_count int4, 
+    OUT top_used_zones text, 
+    OUT curr_used_undo_size int4,
+    OUT undo_threshold int4, 
+    OUT global_recycle_xid xid, 
+    OUT oldest_xmin xid, 
+    OUT total_undo_chain_len int8, 
+    OUT max_undo_chain_len int8,
+    OUT create_undo_file_count int4, 
+    OUT discard_undo_file_count int4)
+RETURNS SETOF record 
+LANGUAGE INTERNAL STABLE NOT SHIPPABLE ROWS 1 as 'gs_stat_undo';