From fd2711f8bc1b88dc46ca04b4aa0b7b852c4891dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E6=96=87=E5=81=A5?= Date: Mon, 12 Aug 2024 16:51:01 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug=20#I9P3QO=20#5=20=E4=BF=AE=E5=A4=8Dgs?= =?UTF-8?q?=5Fxlog=5Fkeepers=E5=87=BD=E6=95=B0=E5=9C=A8=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=89=8D=E5=90=8E=E5=9C=A8pg=5Fproc=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/backend/catalog/builtin_funcs.ini | 2 +- src/common/backend/utils/init/globals.cpp | 2 +- .../rollback-post_catalog_maindb_92_950.sql | 7 +++++++ .../rollback-post_catalog_otherdb_92_950.sql | 7 +++++++ .../upgrade-post_catalog_maindb_92_950.sql | 7 +++++++ .../upgrade-post_catalog_otherdb_92_950.sql | 7 +++++++ 6 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_950.sql create mode 100644 src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_950.sql create mode 100644 src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_950.sql create mode 100644 src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_950.sql diff --git a/src/common/backend/catalog/builtin_funcs.ini b/src/common/backend/catalog/builtin_funcs.ini index f8c0ec6aa..cc944c2dc 100644 --- a/src/common/backend/catalog/builtin_funcs.ini +++ b/src/common/backend/catalog/builtin_funcs.ini @@ -3693,7 +3693,7 @@ ), AddFuncGroup( "gs_xlog_keepers", 1, - AddBuiltinFunc(_0(9040), _1("gs_xlog_keepers"), _2(0), _3(true), _4(false), _5(gs_xlog_keepers), _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('s'), _19(0), _20(0), _21(3, 25, 25, 25), _22(3, 'o', 'o', 'o'), _23(3, "keeptype", "keepsegment", "describe"), _24(NULL), _25("gs_xlog_keepers"), _26(NULL), _27(NULL), _28(NULL), _29(0), _30(false), _31(NULL), _32(false), _33(NULL), _34('f')) + AddBuiltinFunc(_0(9040), _1("gs_xlog_keepers"), _2(0), _3(true), _4(true), _5(gs_xlog_keepers), _6(2249), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(1000), _12(0), _13(0), _14(false), _15(false), _16(false), _17(false), _18('v'), _19(0), _20(0), _21(3, 25, 25, 25), _22(3, 'o', 'o', 'o'), _23(3, "keeptype", "keepsegment", "describe"), _24(NULL), _25("gs_xlog_keepers"), _26(NULL), _27(NULL), _28(NULL), _29(0), _30(false), _31(false), _32(false), _33(NULL), _34('f')) ), AddFuncGroup( "gs_get_next_xid_csn", 1, diff --git a/src/common/backend/utils/init/globals.cpp b/src/common/backend/utils/init/globals.cpp index 71b73d9e4..ccb12587f 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; * ********************************************/ -const uint32 GRAND_VERSION_NUM = 92949; +const uint32 GRAND_VERSION_NUM = 92950; /******************************************** * 2.VERSION NUM FOR EACH FEATURE 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-post_catalog_maindb_92_950.sql new file mode 100644 index 000000000..587afbd3e --- /dev/null +++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_950.sql @@ -0,0 +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); +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 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-post_catalog_otherdb_92_950.sql new file mode 100644 index 000000000..587afbd3e --- /dev/null +++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_950.sql @@ -0,0 +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); +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 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-post_catalog_maindb_92_950.sql new file mode 100644 index 000000000..6771a737b --- /dev/null +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_950.sql @@ -0,0 +1,7 @@ +DROP FUNCTION IF EXISTS pg_catalog.gs_xlog_keepers() CASCADE; +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 ROWS 1000 NOT SHIPPABLE as 'gs_xlog_keepers'; 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-post_catalog_otherdb_92_950.sql new file mode 100644 index 000000000..6771a737b --- /dev/null +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_950.sql @@ -0,0 +1,7 @@ +DROP FUNCTION IF EXISTS pg_catalog.gs_xlog_keepers() CASCADE; +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 ROWS 1000 NOT SHIPPABLE as 'gs_xlog_keepers';