database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!5691 [master][5.0.2问题同步]修复gs_xlog_keepers在5.0.0升级5.0.2时，系统表中数据存在不同的问题。

Browse Source 
Merge pull request !5691 from 何文健/master
This commit is contained in:
opengauss_bot
2024-08-15 12:07:36 +00:00
committed by Gitee
parent e53432eda6 fd2711f8bc
commit 5cbcbc8a08
6 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/backend/catalog/builtin_funcs.ini
View File

@ -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,

2
src/common/backend/utils/init/globals.cpp
View File

@ -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

7
src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_950.sql Normal file
View File

@ -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';

7
src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_950.sql Normal file
View File

@ -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';

7
src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_950.sql Normal file
View File

@ -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';

7
src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_950.sql Normal file
View File

@ -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';