From 9ae0cfd7dc11afebf904f2f9588dd91b681a17f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=85=E7=A8=8B?= <517719039@qq.com> Date: Thu, 29 Aug 2024 22:10:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgs=5Fstat=5Fundo=EF=BC=8Cgs?= =?UTF-8?q?=5Fxlog=5Fkeepers=E7=B3=BB=E7=BB=9F=E5=87=BD=E6=95=B0=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rollback-post_catalog_maindb_92_935.sql | 7 ------- .../rollback_catalog_maindb_92_935.sql | 8 ++++++++ ...0.sql => rollback_catalog_maindb_92_950.sql} | 4 ++-- .../rollback-post_catalog_otherdb_92_935.sql | 7 ------- .../rollback_catalog_otherdb_92_935.sql | 8 ++++++++ ....sql => rollback_catalog_otherdb_92_950.sql} | 4 ++-- .../upgrade-post_catalog_maindb_92_935.sql | 16 ---------------- .../upgrade_catalog_maindb_92_935.sql | 17 +++++++++++++++++ ...50.sql => upgrade_catalog_maindb_92_950.sql} | 0 .../upgrade-post_catalog_otherdb_92_935.sql | 16 ---------------- .../upgrade_catalog_otherdb_92_935.sql | 17 +++++++++++++++++ ...0.sql => upgrade_catalog_otherdb_92_950.sql} | 0 12 files changed, 54 insertions(+), 50 deletions(-) delete mode 100644 src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_935.sql rename src/include/catalog/upgrade_sql/rollback_catalog_maindb/{rollback-post_catalog_maindb_92_950.sql => rollback_catalog_maindb_92_950.sql} (63%) delete mode 100644 src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_935.sql rename src/include/catalog/upgrade_sql/rollback_catalog_otherdb/{rollback-post_catalog_otherdb_92_950.sql => rollback_catalog_otherdb_92_950.sql} (63%) delete mode 100644 src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_935.sql rename src/include/catalog/upgrade_sql/upgrade_catalog_maindb/{upgrade-post_catalog_maindb_92_950.sql => upgrade_catalog_maindb_92_950.sql} (100%) delete mode 100644 src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_935.sql rename src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/{upgrade-post_catalog_otherdb_92_950.sql => upgrade_catalog_otherdb_92_950.sql} (100%) diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_935.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_935.sql deleted file mode 100644 index 159ef88a4..000000000 --- a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_935.sql +++ /dev/null @@ -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'; \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_935.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_935.sql index b102902d8..5ab58ef59 100644 --- a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_935.sql +++ b/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'; diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_950.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_950.sql similarity index 63% rename from src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_950.sql rename to src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_950.sql index 587afbd3e..1fa8165ed 100644 --- a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_950.sql +++ b/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'; \ No newline at end of file +RETURNS SETOF record LANGUAGE INTERNAL VOLATILE STRICT as 'gs_xlog_keepers'; diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_935.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_935.sql deleted file mode 100644 index 159ef88a4..000000000 --- a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_935.sql +++ /dev/null @@ -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'; \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_935.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_935.sql index b102902d8..5ab58ef59 100644 --- a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_935.sql +++ b/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'; diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_950.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_950.sql similarity index 63% rename from src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_950.sql rename to src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_950.sql index 587afbd3e..1fa8165ed 100644 --- a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_950.sql +++ b/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'; \ No newline at end of file +RETURNS SETOF record LANGUAGE INTERNAL VOLATILE STRICT as 'gs_xlog_keepers'; diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_935.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_935.sql deleted file mode 100644 index 08fa0111b..000000000 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_935.sql +++ /dev/null @@ -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'; \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_935.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_935.sql index e67475671..f98c1eba3 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_935.sql +++ b/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'; diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_950.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_950.sql similarity index 100% rename from src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_950.sql rename to src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_950.sql diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_935.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_935.sql deleted file mode 100644 index 08fa0111b..000000000 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_935.sql +++ /dev/null @@ -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'; \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_935.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_935.sql index e67475671..f98c1eba3 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_935.sql +++ b/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'; diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_950.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_950.sql similarity index 100% rename from src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_950.sql rename to src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_950.sql