From d8a7b3a5b6e3789e9ba21923e07258b16699dae1 Mon Sep 17 00:00:00 2001 From: gentle_hu Date: Tue, 24 Dec 2024 20:07:58 +0800 Subject: [PATCH] upgrade bugfix --- src/common/backend/catalog/builtin_funcs.ini | 4 ++-- src/common/backend/utils/init/globals.cpp | 2 +- .../rollback_catalog_maindb_93_032.sql | 17 ++++++++++++++++ .../rollback_catalog_otherdb_93_032.sql | 17 ++++++++++++++++ .../upgrade-post_catalog_maindb_93_032.sql | 20 +++++++++++++++++++ .../upgrade-post_catalog_otherdb_93_032.sql | 20 +++++++++++++++++++ 6 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_93_032.sql create mode 100644 src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_93_032.sql create mode 100644 src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_93_032.sql create mode 100644 src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_93_032.sql diff --git a/src/common/backend/catalog/builtin_funcs.ini b/src/common/backend/catalog/builtin_funcs.ini index 7c2a8e7665..438b35b41a 100644 --- a/src/common/backend/catalog/builtin_funcs.ini +++ b/src/common/backend/catalog/builtin_funcs.ini @@ -2525,7 +2525,7 @@ ), AddFuncGroup( "ondemand_recovery_status", 1, - AddBuiltinFunc(_0(6991), _1("ondemand_recovery_status"), _2(0), _3(false), _4(false), _5(get_ondemand_recovery_status), _6(2249), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(0), _11(0), _12(0), _13(0), _14(false), _15(false), _16(false), _17(false), _18('i'), _19(0), _20(0), _21(12, TEXTOID, TEXTOID, OIDOID, OIDOID, OIDOID, OIDOID, BOOLOID, TEXTOID, TEXTOID, TEXTOID, OIDOID, OIDOID), _22(12, 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o'), _23(12, "primary_checkpoint_redo_lsn", "realtime_build_replayed_lsn", "hashmap_used_blocks", "hashmap_total_blocks", "trxn_queue_blocks", "seg_queue_blocks", "in_ondemand_recovery", "ondemand_recovery_status", "realtime_build_status", "recovery_pause_status", "record_item_num", "record_item_mbytes"), _24(NULL), _25("get_ondemand_recovery_status"), _26(NULL), _27(NULL), _28(NULL), _29(0), _30(false), _31(NULL), _32(false), _33(NULL), _34('f'), _35(NULL), _36(0), _37(false), _38(NULL), _39(NULL), _40(0)) + AddBuiltinFunc(_0(6991), _1("ondemand_recovery_status"), _2(0), _3(false), _4(true), _5(get_ondemand_recovery_status), _6(2249), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(10), _11(10), _12(0), _13(0), _14(false), _15(false), _16(false), _17(false), _18('s'), _19(0), _20(0), _21(12, TEXTOID, TEXTOID, OIDOID, OIDOID, OIDOID, OIDOID, BOOLOID, TEXTOID, TEXTOID, TEXTOID, OIDOID, OIDOID), _22(12, 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o'), _23(12, "primary_checkpoint_redo_lsn", "realtime_build_replayed_lsn", "hashmap_used_blocks", "hashmap_total_blocks", "trxn_queue_blocks", "seg_queue_blocks", "in_ondemand_recovery", "ondemand_recovery_status", "realtime_build_status", "recovery_pause_status", "record_item_num", "record_item_mbytes"), _24(NULL), _25("get_ondemand_recovery_status"), _26(NULL), _27(NULL), _28(NULL), _29(0), _30(false), _31(NULL), _32(false), _33(NULL), _34('f'), _35(NULL), _36(0), _37(false), _38(NULL), _39(NULL), _40(0)) ), AddFuncGroup( "realtime_build_log_ctrl_status", 1, @@ -2533,7 +2533,7 @@ ), AddFuncGroup( "dss_io_stat", 1, - AddBuiltinFunc(_0(6990), _1("dss_io_stat"), _2(1), _3(true), _4(false), _5(dss_io_stat), _6(2249), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(0), _12(0), _13(0), _14(false), _15(false), _16(false), _17(false), _18('i'), _19(0), _20(1, INT4OID), _21(4, INT4OID, INT8OID, INT8OID, INT4OID), _22(4, 'i', 'o', 'o', 'o'), _23(4, "duration", "read_kilobyte_per_sec", "write_kilobyte_per_sec", "io_times"), _24(NULL), _25("dss_io_stat"), _26(NULL), _27(NULL), _28(NULL), _29(0), _30(false), _31(NULL), _32(false), _33(NULL), _34('f'), _35(NULL), _36(0), _37(false), _38(NULL), _39(NULL), _40(0)) + AddBuiltinFunc(_0(6990), _1("dss_io_stat"), _2(1), _3(true), _4(false), _5(dss_io_stat), _6(2249), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(0), _12(0), _13(0), _14(false), _15(false), _16(false), _17(false), _18('i'), _19(0), _20(1, INT4OID), _21(4, INT4OID, INT8OID, INT8OID, INT4OID), _22(4, 'i', 'o', 'o', 'o'), _23(4, "duration", "read_kilobyte_per_sec", "write_kilobyte_per_sec", "io_times"), _24(NULL), _25("dss_io_stat"), _26(NULL), _27(NULL), _28(NULL), _29(0), _30(false), _31(false), _32(false), _33(NULL), _34('f'), _35(NULL), _36(0), _37(false), _38(NULL), _39(NULL), _40(0)) ), AddFuncGroup( "dsynonym_init", 1, diff --git a/src/common/backend/utils/init/globals.cpp b/src/common/backend/utils/init/globals.cpp index b6286d4c6f..56661fb960 100644 --- a/src/common/backend/utils/init/globals.cpp +++ b/src/common/backend/utils/init/globals.cpp @@ -76,7 +76,7 @@ bool will_shutdown = false; * NEXT | 93000 | ? | ? * ********************************************/ -const uint32 GRAND_VERSION_NUM = 93031; +const uint32 GRAND_VERSION_NUM = 93032; /******************************************** * 2.VERSION NUM FOR EACH FEATURE diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_93_032.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_93_032.sql new file mode 100644 index 0000000000..889e8e25f9 --- /dev/null +++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_93_032.sql @@ -0,0 +1,17 @@ +DROP FUNCTION IF EXISTS pg_catalog.ondemand_recovery_status() CASCADE; +SET LOCAL inplace_upgrade_next_system_object_oids=IUO_PROC, 6991; +CREATE FUNCTION pg_catalog.ondemand_recovery_status( + out primary_checkpoint_redo_lsn text, + out realtime_build_replayed_lsn text, + out hashmap_used_blocks oid, + out hashmap_total_blocks oid, + out trxn_queue_blocks oid, + out seg_queue_blocks oid, + out in_ondemand_recovery boolean, + out ondemand_recovery_status text, + out realtime_build_status text, + out recovery_pause_status text, + out record_item_num oid, + out record_item_mbytes oid +) +RETURNS SETOF record LANGUAGE INTERNAL as 'ondemand_recovery_status' stable; diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_93_032.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_93_032.sql new file mode 100644 index 0000000000..889e8e25f9 --- /dev/null +++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_93_032.sql @@ -0,0 +1,17 @@ +DROP FUNCTION IF EXISTS pg_catalog.ondemand_recovery_status() CASCADE; +SET LOCAL inplace_upgrade_next_system_object_oids=IUO_PROC, 6991; +CREATE FUNCTION pg_catalog.ondemand_recovery_status( + out primary_checkpoint_redo_lsn text, + out realtime_build_replayed_lsn text, + out hashmap_used_blocks oid, + out hashmap_total_blocks oid, + out trxn_queue_blocks oid, + out seg_queue_blocks oid, + out in_ondemand_recovery boolean, + out ondemand_recovery_status text, + out realtime_build_status text, + out recovery_pause_status text, + out record_item_num oid, + out record_item_mbytes oid +) +RETURNS SETOF record LANGUAGE INTERNAL as 'ondemand_recovery_status' stable; diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_93_032.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_93_032.sql new file mode 100644 index 0000000000..7fc1733a42 --- /dev/null +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_93_032.sql @@ -0,0 +1,20 @@ +DROP FUNCTION IF EXISTS pg_catalog.ondemand_recovery_status() CASCADE; +SET LOCAL inplace_upgrade_next_system_object_oids=IUO_PROC, 6991; +CREATE OR REPLACE FUNCTION pg_catalog.ondemand_recovery_status( + OUT primary_checkpoint_redo_lsn text, + OUT realtime_build_replayed_lsn text, + OUT hashmap_used_blocks oid, + OUT hashmap_total_blocks oid, + OUT trxn_queue_blocks oid, + OUT seg_queue_blocks oid, + OUT in_ondemand_recovery boolean, + OUT ondemand_recovery_status text, + OUT realtime_build_status text, + OUT recovery_pause_status text, + OUT record_item_num oid, + OUT record_item_mbytes oid +) RETURNS SETOF record + LANGUAGE internal + STABLE NOT FENCED NOT SHIPPABLE COST 10 ROWS 10 +AS $function$get_ondemand_recovery_status$function$; + diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_93_032.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_93_032.sql new file mode 100644 index 0000000000..7fc1733a42 --- /dev/null +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_93_032.sql @@ -0,0 +1,20 @@ +DROP FUNCTION IF EXISTS pg_catalog.ondemand_recovery_status() CASCADE; +SET LOCAL inplace_upgrade_next_system_object_oids=IUO_PROC, 6991; +CREATE OR REPLACE FUNCTION pg_catalog.ondemand_recovery_status( + OUT primary_checkpoint_redo_lsn text, + OUT realtime_build_replayed_lsn text, + OUT hashmap_used_blocks oid, + OUT hashmap_total_blocks oid, + OUT trxn_queue_blocks oid, + OUT seg_queue_blocks oid, + OUT in_ondemand_recovery boolean, + OUT ondemand_recovery_status text, + OUT realtime_build_status text, + OUT recovery_pause_status text, + OUT record_item_num oid, + OUT record_item_mbytes oid +) RETURNS SETOF record + LANGUAGE internal + STABLE NOT FENCED NOT SHIPPABLE COST 10 ROWS 10 +AS $function$get_ondemand_recovery_status$function$; + -- Gitee