diff --git a/src/common/backend/catalog/builtin_funcs.ini b/src/common/backend/catalog/builtin_funcs.ini index 5913e39b70571b84ef8390ffdfaa446f1e81b6b0..f146b950ff4d2a288eb6457fc4faca08e329aed0 100644 --- a/src/common/backend/catalog/builtin_funcs.ini +++ b/src/common/backend/catalog/builtin_funcs.ini @@ -4017,7 +4017,7 @@ ), AddFuncGroup( "gs_undo_dump_xid", 1, - AddBuiltinFunc(_0(4540), _1("gs_undo_dump_xid"), _2(1), _3(false), _4(true), _5(gs_undo_dump_xid), _6(2249), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(1), _12(0), _13(0), _14(false), _15(false), _16(false), _17(false), _18('s'), _19(0), _20(1, 28), _21(22, 28, 26, 26, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25), _22(22, 'i', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o'), _23(22, "undoptr", "undoptr", "xactid", "cid", "reloid", "relfilenode", "utype", "blkprev", "blockno", "uoffset", "prevurp", "payloadlen", "oldxactid", "partitionoid", "tablespace", "alreadyread_bytes", "prev_undorec_len", "td_id", "reserved", "flag", "flag2", "t_hoff"), _24(NULL), _25("gs_undo_dump_xid"), _26(NULL), _27(NULL), _28(NULL), _29(0), _30(false), _31(false), _32(false), _33(NULL), _34('f'), _35(NULL), _36(0), _37(false)) + AddBuiltinFunc(_0(4540), _1("gs_undo_dump_xid"), _2(1), _3(false), _4(true), _5(gs_undo_dump_xid), _6(2249), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(1), _12(0), _13(0), _14(false), _15(false), _16(false), _17(false), _18('s'), _19(0), _20(1, 28), _21(22, 23, 26, 26, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25), _22(22, 'i', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o'), _23(22, "undoptr", "undoptr", "xactid", "cid", "reloid", "relfilenode", "utype", "blkprev", "blockno", "uoffset", "prevurp", "payloadlen", "oldxactid", "partitionoid", "tablespace", "alreadyread_bytes", "prev_undorec_len", "td_id", "reserved", "flag", "flag2", "t_hoff"), _24(NULL), _25("gs_undo_dump_xid"), _26(NULL), _27(NULL), _28(NULL), _29(0), _30(false), _31(false), _32(false), _33(NULL), _34('f'), _35(NULL), _36(0), _37(false)) ), AddFuncGroup( "gs_undo_meta", 1, diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_812.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_812.sql index 2261c0163fc58d43f8ce482674a64dc9f975d2e8..8c1cdd1c081cf26398a0324c3922ec43d6dd7a45 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_812.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_812.sql @@ -837,12 +837,12 @@ CREATE OPERATOR pg_catalog.>=( ); COMMENT ON OPERATOR pg_catalog.>=(anyset, int8) IS 'greater than or equal'; -UPDATE pg_operator SET oprcom = 6462 WHERE oid = 6441; -UPDATE pg_operator SET oprcom = 6463 WHERE oid = 6442; -UPDATE pg_operator SET oprcom = 6465 WHERE oid = 6443; -UPDATE pg_operator SET oprcom = 6464 WHERE oid = 6444; -UPDATE pg_operator SET oprcom = 6467 WHERE oid = 6445; -UPDATE pg_operator SET oprcom = 6466 WHERE oid = 6446; +UPDATE pg_operator SET oprcom = 6441 WHERE oid = 6441; +UPDATE pg_operator SET oprcom = 6442 WHERE oid = 6442; +UPDATE pg_operator SET oprcom = 6444 WHERE oid = 6443; +UPDATE pg_operator SET oprcom = 6443 WHERE oid = 6444; +UPDATE pg_operator SET oprcom = 6446 WHERE oid = 6445; +UPDATE pg_operator SET oprcom = 6445 WHERE oid = 6446; UPDATE pg_operator SET oprnegate = 6442 WHERE oid = 6441; UPDATE pg_operator SET oprnegate = 6441 WHERE oid = 6442; UPDATE pg_operator SET oprnegate = 6446 WHERE oid = 6443; @@ -886,12 +886,12 @@ CREATE OPERATOR pg_catalog.>=( ); COMMENT ON OPERATOR pg_catalog.>=(anyset, int2) IS 'greater than or equal'; -UPDATE pg_operator SET oprcom = 6468 WHERE oid = 6447; -UPDATE pg_operator SET oprcom = 6469 WHERE oid = 6448; -UPDATE pg_operator SET oprcom = 6471 WHERE oid = 6449; -UPDATE pg_operator SET oprcom = 6470 WHERE oid = 6450; -UPDATE pg_operator SET oprcom = 6473 WHERE oid = 6451; -UPDATE pg_operator SET oprcom = 6472 WHERE oid = 6452; +UPDATE pg_operator SET oprcom = 6447 WHERE oid = 6447; +UPDATE pg_operator SET oprcom = 6448 WHERE oid = 6448; +UPDATE pg_operator SET oprcom = 6450 WHERE oid = 6449; +UPDATE pg_operator SET oprcom = 6449 WHERE oid = 6450; +UPDATE pg_operator SET oprcom = 6452 WHERE oid = 6451; +UPDATE pg_operator SET oprcom = 6451 WHERE oid = 6452; UPDATE pg_operator SET oprnegate = 6448 WHERE oid = 6447; UPDATE pg_operator SET oprnegate = 6447 WHERE oid = 6448; UPDATE pg_operator SET oprnegate = 6452 WHERE oid = 6449; @@ -935,12 +935,12 @@ CREATE OPERATOR pg_catalog.>=( ); COMMENT ON OPERATOR pg_catalog.>=(anyset, int4) IS 'greater than or equal'; -UPDATE pg_operator SET oprcom = 6474 WHERE oid = 6453; -UPDATE pg_operator SET oprcom = 6475 WHERE oid = 6454; -UPDATE pg_operator SET oprcom = 6477 WHERE oid = 6455; -UPDATE pg_operator SET oprcom = 6476 WHERE oid = 6456; -UPDATE pg_operator SET oprcom = 6479 WHERE oid = 6457; -UPDATE pg_operator SET oprcom = 6478 WHERE oid = 6458; +UPDATE pg_operator SET oprcom = 6453 WHERE oid = 6453; +UPDATE pg_operator SET oprcom = 6454 WHERE oid = 6454; +UPDATE pg_operator SET oprcom = 6456 WHERE oid = 6455; +UPDATE pg_operator SET oprcom = 6455 WHERE oid = 6456; +UPDATE pg_operator SET oprcom = 6458 WHERE oid = 6457; +UPDATE pg_operator SET oprcom = 6457 WHERE oid = 6458; UPDATE pg_operator SET oprnegate = 6454 WHERE oid = 6453; UPDATE pg_operator SET oprnegate = 6453 WHERE oid = 6454; UPDATE pg_operator SET oprnegate = 6458 WHERE oid = 6455; @@ -984,12 +984,12 @@ CREATE OPERATOR pg_catalog.>=( ); COMMENT ON OPERATOR pg_catalog.>=(int8, anyset) IS 'greater than or equal'; -UPDATE pg_operator SET oprcom = 6441 WHERE oid = 6462; -UPDATE pg_operator SET oprcom = 6442 WHERE oid = 6463; -UPDATE pg_operator SET oprcom = 6444 WHERE oid = 6464; -UPDATE pg_operator SET oprcom = 6443 WHERE oid = 6465; -UPDATE pg_operator SET oprcom = 6446 WHERE oid = 6466; -UPDATE pg_operator SET oprcom = 6445 WHERE oid = 6467; +UPDATE pg_operator SET oprcom = 6462 WHERE oid = 6462; +UPDATE pg_operator SET oprcom = 6463 WHERE oid = 6463; +UPDATE pg_operator SET oprcom = 6465 WHERE oid = 6464; +UPDATE pg_operator SET oprcom = 6464 WHERE oid = 6465; +UPDATE pg_operator SET oprcom = 6467 WHERE oid = 6466; +UPDATE pg_operator SET oprcom = 6466 WHERE oid = 6467; UPDATE pg_operator SET oprnegate = 6463 WHERE oid = 6462; UPDATE pg_operator SET oprnegate = 6462 WHERE oid = 6463; UPDATE pg_operator SET oprnegate = 6467 WHERE oid = 6464; @@ -1033,12 +1033,12 @@ CREATE OPERATOR pg_catalog.>=( ); COMMENT ON OPERATOR pg_catalog.>=(int2, anyset) IS 'greater than or equal'; -UPDATE pg_operator SET oprcom = 6447 WHERE oid = 6468; -UPDATE pg_operator SET oprcom = 6448 WHERE oid = 6469; -UPDATE pg_operator SET oprcom = 6450 WHERE oid = 6470; -UPDATE pg_operator SET oprcom = 6449 WHERE oid = 6471; -UPDATE pg_operator SET oprcom = 6452 WHERE oid = 6472; -UPDATE pg_operator SET oprcom = 6451 WHERE oid = 6473; +UPDATE pg_operator SET oprcom = 6468 WHERE oid = 6468; +UPDATE pg_operator SET oprcom = 6469 WHERE oid = 6469; +UPDATE pg_operator SET oprcom = 6471 WHERE oid = 6470; +UPDATE pg_operator SET oprcom = 6470 WHERE oid = 6471; +UPDATE pg_operator SET oprcom = 6473 WHERE oid = 6472; +UPDATE pg_operator SET oprcom = 6472 WHERE oid = 6473; UPDATE pg_operator SET oprnegate = 6469 WHERE oid = 6468; UPDATE pg_operator SET oprnegate = 6468 WHERE oid = 6469; UPDATE pg_operator SET oprnegate = 6473 WHERE oid = 6470; @@ -1082,12 +1082,12 @@ CREATE OPERATOR pg_catalog.>=( ); COMMENT ON OPERATOR pg_catalog.>=(int4, anyset) IS 'greater than or equal'; -UPDATE pg_operator SET oprcom = 6453 WHERE oid = 6474; -UPDATE pg_operator SET oprcom = 6454 WHERE oid = 6475; -UPDATE pg_operator SET oprcom = 6456 WHERE oid = 6476; -UPDATE pg_operator SET oprcom = 6455 WHERE oid = 6477; -UPDATE pg_operator SET oprcom = 6458 WHERE oid = 6478; -UPDATE pg_operator SET oprcom = 6457 WHERE oid = 6479; +UPDATE pg_operator SET oprcom = 6474 WHERE oid = 6474; +UPDATE pg_operator SET oprcom = 6475 WHERE oid = 6475; +UPDATE pg_operator SET oprcom = 6477 WHERE oid = 6476; +UPDATE pg_operator SET oprcom = 6476 WHERE oid = 6477; +UPDATE pg_operator SET oprcom = 6479 WHERE oid = 6478; +UPDATE pg_operator SET oprcom = 6478 WHERE oid = 6479; UPDATE pg_operator SET oprnegate = 6475 WHERE oid = 6474; UPDATE pg_operator SET oprnegate = 6474 WHERE oid = 6475; UPDATE pg_operator SET oprnegate = 6479 WHERE oid = 6476; @@ -1131,12 +1131,12 @@ CREATE OPERATOR pg_catalog.>=( ); COMMENT ON OPERATOR pg_catalog.>=(anyset, text) IS 'greater than or equal'; -UPDATE pg_operator SET oprcom = 6559 WHERE oid = 6553; -UPDATE pg_operator SET oprcom = 6560 WHERE oid = 6554; -UPDATE pg_operator SET oprcom = 6562 WHERE oid = 6555; -UPDATE pg_operator SET oprcom = 6561 WHERE oid = 6556; -UPDATE pg_operator SET oprcom = 6564 WHERE oid = 6557; -UPDATE pg_operator SET oprcom = 6563 WHERE oid = 6558; +UPDATE pg_operator SET oprcom = 6553 WHERE oid = 6553; +UPDATE pg_operator SET oprcom = 6554 WHERE oid = 6554; +UPDATE pg_operator SET oprcom = 6556 WHERE oid = 6555; +UPDATE pg_operator SET oprcom = 6555 WHERE oid = 6556; +UPDATE pg_operator SET oprcom = 6558 WHERE oid = 6557; +UPDATE pg_operator SET oprcom = 6557 WHERE oid = 6558; UPDATE pg_operator SET oprnegate = 6554 WHERE oid = 6553; UPDATE pg_operator SET oprnegate = 6553 WHERE oid = 6554; UPDATE pg_operator SET oprnegate = 6558 WHERE oid = 6555; @@ -1180,12 +1180,12 @@ CREATE OPERATOR pg_catalog.>=( ); COMMENT ON OPERATOR pg_catalog.>=(text, anyset) IS 'greater than or equal'; -UPDATE pg_operator SET oprcom = 6553 WHERE oid = 6559; -UPDATE pg_operator SET oprcom = 6554 WHERE oid = 6560; -UPDATE pg_operator SET oprcom = 6556 WHERE oid = 6561; -UPDATE pg_operator SET oprcom = 6555 WHERE oid = 6562; -UPDATE pg_operator SET oprcom = 6558 WHERE oid = 6563; -UPDATE pg_operator SET oprcom = 6557 WHERE oid = 6564; +UPDATE pg_operator SET oprcom = 6559 WHERE oid = 6559; +UPDATE pg_operator SET oprcom = 6560 WHERE oid = 6560; +UPDATE pg_operator SET oprcom = 6562 WHERE oid = 6561; +UPDATE pg_operator SET oprcom = 6561 WHERE oid = 6562; +UPDATE pg_operator SET oprcom = 6564 WHERE oid = 6563; +UPDATE pg_operator SET oprcom = 6563 WHERE oid = 6564; UPDATE pg_operator SET oprnegate = 6560 WHERE oid = 6559; UPDATE pg_operator SET oprnegate = 6559 WHERE oid = 6560; UPDATE pg_operator SET oprnegate = 6564 WHERE oid = 6561; diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_835.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_835.sql index a7c8fbb4b282f2319fe47a051ce36a0f1f2f086a..0d5d514b1ebc7a67909f3eb401d961bf385ae9e7 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_835.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_835.sql @@ -7,5 +7,4 @@ SET LOCAL inplace_upgrade_next_system_object_oids = IUO_GENERAL, 6565; CREATE OPERATOR pg_catalog.-( RIGHTARG = bool, PROCEDURE = boolum -); -COMMENT ON OPERATOR pg_catalog.-(none, bool) IS 'negate'; \ No newline at end of file +); \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_965.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_965.sql index 9bc9138fa1d2cc31889b213897d7f574529d521d..b1bacbb0e9d43f4c983454953b151ea7ce55f2a8 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_965.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_965.sql @@ -347,10 +347,3 @@ comment on function PG_CATALOG.regexp_replace(text, text, text, integer, integer comment on function PG_CATALOG.regexp_substr(text, text, integer) is 'extract text matching regular expression'; comment on function PG_CATALOG.regexp_substr(text, text, integer, integer) is 'extract text matching regular expression'; comment on function PG_CATALOG.regexp_substr(text, text, integer, integer, text) is 'extract text matching regular expression'; - -DO $upgrade$ -BEGIN -IF working_version_num() < 92780 then -DROP INDEX IF EXISTS pg_partition_tblspc_relfilenode_index CASCADE; -END IF; -END $upgrade$; \ No newline at end of file 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 index 7c71c306b5aaa3e8ee7160063b07de2389c58216..4368949964d010455f587aaf125304a5537594f0 100644 --- 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 @@ -12,42 +12,4 @@ CREATE FUNCTION pg_catalog.json_object() RETURNS json LANGUAGE INTERNAL IMMUTABLE STRICT NOT FENCED NOT SHIPPABLE -as 'json_object'; - -DECLARE -ans boolean; -BEGIN - select case when count(*)=1 then true else false end as ans from (select nspname from pg_namespace where nspname='dbe_perf' limit 1) into ans; - if ans = true then ------------------------------------------------------------------------------------------------------------------------------------------------------ - DROP VIEW IF EXISTS DBE_PERF.local_active_session cascade; - DROP FUNCTION IF EXISTS pg_catalog.get_local_active_session(OUT sampleid bigint, OUT sample_time timestamp with time zone, OUT need_flush_sample boolean, OUT databaseid oid, OUT thread_id bigint, OUT sessionid bigint, OUT start_time timestamp with time zone, OUT event text, OUT lwtid integer, OUT psessionid bigint, OUT tlevel integer, OUT smpid integer, OUT userid oid, OUT application_name text, OUT client_addr inet, OUT client_hostname text, OUT client_port integer, OUT query_id bigint, OUT unique_query_id bigint, OUT user_id oid, OUT cn_id integer, OUT unique_query text, OUT locktag text, OUT lockmode text, OUT block_sessionid bigint, OUT wait_status text, OUT global_sessionid text) cascade; - - SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5721; - CREATE OR REPLACE FUNCTION pg_catalog.get_local_active_session - (OUT sampleid bigint, OUT sample_time timestamp with time zone, OUT need_flush_sample boolean, OUT databaseid oid, OUT thread_id bigint, OUT sessionid bigint, OUT start_time timestamp with time zone, OUT event text, OUT lwtid integer, OUT psessionid bigint, OUT tlevel integer, OUT smpid integer, OUT userid oid, OUT application_name text, OUT client_addr inet, OUT client_hostname text, OUT client_port integer, OUT query_id bigint, OUT unique_query_id bigint, OUT user_id oid, OUT cn_id integer, OUT unique_query text, OUT locktag text, OUT lockmode text, OUT block_sessionid bigint, OUT wait_status text, OUT global_sessionid text, OUT xact_start_time timestamp with time zone, OUT query_start_time timestamp with time zone, OUT state text) - RETURNS setof record LANGUAGE INTERNAL STABLE NOT FENCED NOT SHIPPABLE ROWS 100 as 'get_local_active_session'; - CREATE OR REPLACE VIEW DBE_PERF.local_active_session AS - WITH RECURSIVE - las(sampleid, sample_time, need_flush_sample, databaseid, thread_id, sessionid, start_time, event, lwtid, psessionid, - tlevel, smpid, userid, application_name, client_addr, client_hostname, client_port, query_id, unique_query_id, - user_id, cn_id, unique_query, locktag, lockmode, block_sessionid, wait_status, global_sessionid, xact_start_time, query_start_time, state) - AS (select t.* from get_local_active_session() as t), - tt(sampleid, sample_time, need_flush_sample, databaseid, thread_id, sessionid, start_time, event, lwtid, psessionid, - tlevel, smpid, userid, application_name, client_addr, client_hostname, client_port, query_id, unique_query_id, - user_id, cn_id, unique_query, locktag, lockmode, block_sessionid, wait_status, global_sessionid, xact_start_time, query_start_time, state, final_block_sessionid, level, head) - AS(SELECT las.*, las.block_sessionid AS final_block_sessionid, 1 AS level, array_append('{}', las.sessionid) AS head FROM las - UNION ALL - SELECT tt.sampleid, tt.sample_time, tt.need_flush_sample, tt.databaseid, tt.thread_id, tt.sessionid, tt.start_time, tt.event, tt.lwtid, tt.psessionid, - tt.tlevel, tt.smpid, tt.userid, tt.application_name, tt.client_addr, tt.client_hostname, tt.client_port, tt.query_id, tt.unique_query_id, - tt.user_id, tt.cn_id, tt.unique_query, tt.locktag, tt.lockmode, tt.block_sessionid, tt.wait_status, tt.global_sessionid, tt.xact_start_time, tt.query_start_time, tt.state, las.block_sessionid AS final_block_sessionid, tt.level + 1 AS level, array_append(tt.head, las.sessionid) AS head - FROM tt INNER JOIN las ON tt.final_block_sessionid = las.sessionid - WHERE las.sampleid = tt.sampleid AND (las.block_sessionid IS NOT NULL OR las.block_sessionid != 0) - AND las.sessionid != all(head) AND las.sessionid != las.block_sessionid) - SELECT sampleid, sample_time, need_flush_sample, databaseid, thread_id, sessionid, start_time, event, lwtid, psessionid, - tlevel, smpid, userid, application_name, client_addr, client_hostname, client_port, query_id, unique_query_id, - user_id, cn_id, unique_query, locktag, lockmode, block_sessionid, final_block_sessionid, wait_status, global_sessionid, xact_start_time, query_start_time, state FROM tt - WHERE level = (SELECT MAX(level) FROM tt t1 WHERE t1.sampleid = tt.sampleid AND t1.sessionid = tt.sessionid); - end if; -END; -/ \ No newline at end of file +as 'json_object'; \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_93_038.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_93_038.sql index 146a7980ed8970bb89e2a3b960f826c9bcbab00a..20c9528c38508d5ff255515ea43cd671ab7ce780 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_93_038.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_93_038.sql @@ -5,73 +5,4 @@ unknown, unknown ) RETURNS text LANGUAGE INTERNAL STABLE SHIPPABLE STRICT as 'unknown_to_char2'; -COMMENT ON FUNCTION pg_catalog.to_char(unknown, unknown) is 'unknown,unknown to char for compatibility'; - --- DROP: gs_get_parallel_decode_status() -DROP FUNCTION IF EXISTS pg_catalog.gs_get_parallel_decode_status(OUT slot_name text, OUT parallel_decode_num int4, OUT read_change_queue_length text, OUT decode_change_queue_length text) CASCADE; --- CREATE: gs_get_parallel_decode_status -SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 9377; -CREATE OR REPLACE FUNCTION pg_catalog.gs_get_parallel_decode_status(OUT slot_name text, OUT parallel_decode_num int4, OUT read_change_queue_length text, OUT decode_change_queue_length text, OUT reader_lsn text, OUT working_txn_cnt int8, OUT working_txn_memory int8) - RETURNS SETOF RECORD - LANGUAGE internal - STABLE NOT FENCED NOT SHIPPABLE -AS $function$gs_get_parallel_decode_status$function$; - -DROP FUNCTION IF EXISTS pg_catalog.gs_get_history_memory_detail() cascade; -SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5257; -CREATE OR REPLACE FUNCTION pg_catalog.gs_get_history_memory_detail( -memlog_filename cstring, -OUT memory_info text) RETURNS SETOF TEXT LANGUAGE INTERNAL IMMUTABLE NOT FENCED NOT SHIPPABLE ROWS 100 as 'gs_get_history_memory_detail'; - -DROP FUNCTION IF EXISTS gs_is_dw_io_blocked() CASCADE; -SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4772; -CREATE OR REPLACE FUNCTION pg_catalog.gs_is_dw_io_blocked(OUT boolean) - RETURNS SETOF boolean - LANGUAGE internal - STABLE STRICT NOT FENCED NOT SHIPPABLE ROWS 1000 -AS $function$gs_is_dw_io_blocked$function$; - -/*------ add sys fuction gs_undo_meta_dump_zone ------*/ -DROP FUNCTION IF EXISTS pg_catalog.gs_undo_meta_dump_zone(int4, boolean, OUT zone_id oid, OUT persist_type oid, OUT insert text, OUT discard text, OUT forcediscard text, OUT lsn text) CASCADE; -SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4433; -CREATE OR REPLACE FUNCTION pg_catalog.gs_undo_meta_dump_zone(zone_id int4, read_memory boolean, OUT zone_id oid, OUT persist_type oid, OUT insert text, OUT discard text, OUT forcediscard text, OUT lsn text) -RETURNS SETOF record LANGUAGE INTERNAL STABLE NOT FENCED NOT SHIPPABLE ROWS 1 as 'gs_undo_meta_dump_zone'; - -/*------ add sys fuction gs_undo_meta_dump_spaces ------*/ -DROP FUNCTION IF EXISTS pg_catalog.gs_undo_meta_dump_spaces(int4, boolean, OUT zone_id oid, OUT undorecord_space_tail text, OUT undorecord_space_head text, OUT undorecord_space_lsn text, OUT undoslot_space_tail text, OUT undoslot_space_head text, OUT undoreslot_space_lsn text) CASCADE; -SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4432; -CREATE OR REPLACE FUNCTION pg_catalog.gs_undo_meta_dump_spaces(zone_id int4, read_memory boolean, OUT zone_id oid, OUT undorecord_space_tail text, OUT undorecord_space_head text, OUT undorecord_space_lsn text, OUT undoslot_space_tail text, OUT undoslot_space_head text, OUT undoreslot_space_lsn text) -RETURNS SETOF record LANGUAGE INTERNAL STABLE NOT FENCED NOT SHIPPABLE ROWS 1 as 'gs_undo_meta_dump_spaces'; - -/*------ add sys fuction gs_undo_meta_dump_slot ------*/ -DROP FUNCTION IF EXISTS pg_catalog.gs_undo_meta_dump_slot(int4, boolean, OUT zone_id oid, OUT allocate text, OUT recycle text, OUT frozen_xid text, OUT global_frozen_xid text, OUT recycle_xid text, OUT global_recycle_xid text) CASCADE; -SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4437; -CREATE OR REPLACE FUNCTION pg_catalog.gs_undo_meta_dump_slot(zone_id int4, read_memory boolean, OUT zone_id oid, OUT allocate text, OUT recycle text, OUT frozen_xid text, OUT global_frozen_xid text, OUT recycle_xid text, OUT global_recycle_xid text) -RETURNS SETOF record LANGUAGE INTERNAL STABLE NOT FENCED NOT SHIPPABLE ROWS 1 as 'gs_undo_meta_dump_slot'; - -/*------ add sys fuction gs_undo_dump_record ------*/ -DROP FUNCTION IF EXISTS pg_catalog.gs_undo_dump_record(bigint, OUT undoptr oid, OUT xactid oid, OUT cid text, -OUT reloid text, OUT relfilenode text, OUT utype text, OUT blkprev text, OUT blockno text, OUT uoffset text, -OUT prevurp text, OUT payloadlen text, OUT oldxactid text, OUT partitionoid text, OUT tablespace text, OUT alreadyread_bytes text, OUT prev_undorec_len text, OUT td_id text, OUT reserved text, OUT flag text, OUT flag2 text, OUT t_hoff text) CASCADE; -SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4539; -CREATE FUNCTION pg_catalog.gs_undo_dump_record(undoptr bigint, OUT undoptr oid, OUT xactid oid, OUT cid text, -OUT reloid text, OUT relfilenode text, OUT utype text, OUT blkprev text, OUT blockno text, OUT uoffset text, -OUT prevurp text, OUT payloadlen text, OUT oldxactid text, OUT partitionoid text, OUT tablespace text, OUT alreadyread_bytes text, OUT prev_undorec_len text, OUT td_id text, OUT reserved text, OUT flag text, OUT flag2 text, OUT t_hoff text) -RETURNS SETOF record LANGUAGE INTERNAL STABLE NOT FENCED NOT SHIPPABLE ROWS 1 as 'gs_undo_dump_record'; - -/*------ add sys fuction gs_undo_dump_xid ------*/ -DROP FUNCTION IF EXISTS pg_catalog.gs_undo_dump_xid(xid, OUT undoptr oid, OUT xactid oid, OUT cid text, -OUT reloid text, OUT relfilenode text, OUT utype text, OUT blkprev text, OUT blockno text, OUT uoffset text, -OUT prevurp text, OUT payloadlen text, OUT oldxactid text, OUT partitionoid text, OUT tablespace text, OUT alreadyread_bytes text, OUT prev_undorec_len text, OUT td_id text, OUT reserved text, OUT flag text, OUT flag2 text, OUT t_hoff text) CASCADE; -SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4540; -CREATE FUNCTION pg_catalog.gs_undo_dump_xid(undoptr xid, OUT undoptr oid, OUT xactid oid, OUT cid text, -OUT reloid text, OUT relfilenode text, OUT utype text, OUT blkprev text, OUT blockno text, OUT uoffset text, -OUT prevurp text, OUT payloadlen text, OUT oldxactid text, OUT partitionoid text, OUT tablespace text, OUT alreadyread_bytes text, OUT prev_undorec_len text, OUT td_id text, OUT reserved text, OUT flag text, OUT flag2 text, OUT t_hoff text) -RETURNS SETOF record LANGUAGE INTERNAL STABLE NOT FENCED NOT SHIPPABLE ROWS 1 as 'gs_undo_dump_xid'; - -DROP FUNCTION IF EXISTS pg_catalog.array_count(anyarray, integer) CASCADE; -DROP FUNCTION IF EXISTS pg_catalog.gs_repair_urq(oid, OUT result text) CASCADE; -DROP FUNCTION IF EXISTS pg_catalog.gs_verify_undo_meta(text, int8, int8, boolean, OUT zone_id oid, OUT detail text) CASCADE; -DROP FUNCTION IF EXISTS pg_catalog.gs_verify_undo_record(text, int8, int8, boolean, OUT zone_id oid, OUT detail text) CASCADE; -DROP FUNCTION IF EXISTS pg_catalog.gs_verify_undo_translot(text, int8, int8, boolean, OUT zone_id int8, OUT detail text) CASCADE; -DROP FUNCTION IF EXISTS pg_catalog.gs_verify_urq(oid, text, int8, text, OUT error_code text, OUT detail text) CASCADE; \ No newline at end of file +COMMENT ON FUNCTION pg_catalog.to_char(unknown, unknown) is 'unknown,unknown to char for compatibility'; \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_812.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_812.sql index 2261c0163fc58d43f8ce482674a64dc9f975d2e8..8c1cdd1c081cf26398a0324c3922ec43d6dd7a45 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_812.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_812.sql @@ -837,12 +837,12 @@ CREATE OPERATOR pg_catalog.>=( ); COMMENT ON OPERATOR pg_catalog.>=(anyset, int8) IS 'greater than or equal'; -UPDATE pg_operator SET oprcom = 6462 WHERE oid = 6441; -UPDATE pg_operator SET oprcom = 6463 WHERE oid = 6442; -UPDATE pg_operator SET oprcom = 6465 WHERE oid = 6443; -UPDATE pg_operator SET oprcom = 6464 WHERE oid = 6444; -UPDATE pg_operator SET oprcom = 6467 WHERE oid = 6445; -UPDATE pg_operator SET oprcom = 6466 WHERE oid = 6446; +UPDATE pg_operator SET oprcom = 6441 WHERE oid = 6441; +UPDATE pg_operator SET oprcom = 6442 WHERE oid = 6442; +UPDATE pg_operator SET oprcom = 6444 WHERE oid = 6443; +UPDATE pg_operator SET oprcom = 6443 WHERE oid = 6444; +UPDATE pg_operator SET oprcom = 6446 WHERE oid = 6445; +UPDATE pg_operator SET oprcom = 6445 WHERE oid = 6446; UPDATE pg_operator SET oprnegate = 6442 WHERE oid = 6441; UPDATE pg_operator SET oprnegate = 6441 WHERE oid = 6442; UPDATE pg_operator SET oprnegate = 6446 WHERE oid = 6443; @@ -886,12 +886,12 @@ CREATE OPERATOR pg_catalog.>=( ); COMMENT ON OPERATOR pg_catalog.>=(anyset, int2) IS 'greater than or equal'; -UPDATE pg_operator SET oprcom = 6468 WHERE oid = 6447; -UPDATE pg_operator SET oprcom = 6469 WHERE oid = 6448; -UPDATE pg_operator SET oprcom = 6471 WHERE oid = 6449; -UPDATE pg_operator SET oprcom = 6470 WHERE oid = 6450; -UPDATE pg_operator SET oprcom = 6473 WHERE oid = 6451; -UPDATE pg_operator SET oprcom = 6472 WHERE oid = 6452; +UPDATE pg_operator SET oprcom = 6447 WHERE oid = 6447; +UPDATE pg_operator SET oprcom = 6448 WHERE oid = 6448; +UPDATE pg_operator SET oprcom = 6450 WHERE oid = 6449; +UPDATE pg_operator SET oprcom = 6449 WHERE oid = 6450; +UPDATE pg_operator SET oprcom = 6452 WHERE oid = 6451; +UPDATE pg_operator SET oprcom = 6451 WHERE oid = 6452; UPDATE pg_operator SET oprnegate = 6448 WHERE oid = 6447; UPDATE pg_operator SET oprnegate = 6447 WHERE oid = 6448; UPDATE pg_operator SET oprnegate = 6452 WHERE oid = 6449; @@ -935,12 +935,12 @@ CREATE OPERATOR pg_catalog.>=( ); COMMENT ON OPERATOR pg_catalog.>=(anyset, int4) IS 'greater than or equal'; -UPDATE pg_operator SET oprcom = 6474 WHERE oid = 6453; -UPDATE pg_operator SET oprcom = 6475 WHERE oid = 6454; -UPDATE pg_operator SET oprcom = 6477 WHERE oid = 6455; -UPDATE pg_operator SET oprcom = 6476 WHERE oid = 6456; -UPDATE pg_operator SET oprcom = 6479 WHERE oid = 6457; -UPDATE pg_operator SET oprcom = 6478 WHERE oid = 6458; +UPDATE pg_operator SET oprcom = 6453 WHERE oid = 6453; +UPDATE pg_operator SET oprcom = 6454 WHERE oid = 6454; +UPDATE pg_operator SET oprcom = 6456 WHERE oid = 6455; +UPDATE pg_operator SET oprcom = 6455 WHERE oid = 6456; +UPDATE pg_operator SET oprcom = 6458 WHERE oid = 6457; +UPDATE pg_operator SET oprcom = 6457 WHERE oid = 6458; UPDATE pg_operator SET oprnegate = 6454 WHERE oid = 6453; UPDATE pg_operator SET oprnegate = 6453 WHERE oid = 6454; UPDATE pg_operator SET oprnegate = 6458 WHERE oid = 6455; @@ -984,12 +984,12 @@ CREATE OPERATOR pg_catalog.>=( ); COMMENT ON OPERATOR pg_catalog.>=(int8, anyset) IS 'greater than or equal'; -UPDATE pg_operator SET oprcom = 6441 WHERE oid = 6462; -UPDATE pg_operator SET oprcom = 6442 WHERE oid = 6463; -UPDATE pg_operator SET oprcom = 6444 WHERE oid = 6464; -UPDATE pg_operator SET oprcom = 6443 WHERE oid = 6465; -UPDATE pg_operator SET oprcom = 6446 WHERE oid = 6466; -UPDATE pg_operator SET oprcom = 6445 WHERE oid = 6467; +UPDATE pg_operator SET oprcom = 6462 WHERE oid = 6462; +UPDATE pg_operator SET oprcom = 6463 WHERE oid = 6463; +UPDATE pg_operator SET oprcom = 6465 WHERE oid = 6464; +UPDATE pg_operator SET oprcom = 6464 WHERE oid = 6465; +UPDATE pg_operator SET oprcom = 6467 WHERE oid = 6466; +UPDATE pg_operator SET oprcom = 6466 WHERE oid = 6467; UPDATE pg_operator SET oprnegate = 6463 WHERE oid = 6462; UPDATE pg_operator SET oprnegate = 6462 WHERE oid = 6463; UPDATE pg_operator SET oprnegate = 6467 WHERE oid = 6464; @@ -1033,12 +1033,12 @@ CREATE OPERATOR pg_catalog.>=( ); COMMENT ON OPERATOR pg_catalog.>=(int2, anyset) IS 'greater than or equal'; -UPDATE pg_operator SET oprcom = 6447 WHERE oid = 6468; -UPDATE pg_operator SET oprcom = 6448 WHERE oid = 6469; -UPDATE pg_operator SET oprcom = 6450 WHERE oid = 6470; -UPDATE pg_operator SET oprcom = 6449 WHERE oid = 6471; -UPDATE pg_operator SET oprcom = 6452 WHERE oid = 6472; -UPDATE pg_operator SET oprcom = 6451 WHERE oid = 6473; +UPDATE pg_operator SET oprcom = 6468 WHERE oid = 6468; +UPDATE pg_operator SET oprcom = 6469 WHERE oid = 6469; +UPDATE pg_operator SET oprcom = 6471 WHERE oid = 6470; +UPDATE pg_operator SET oprcom = 6470 WHERE oid = 6471; +UPDATE pg_operator SET oprcom = 6473 WHERE oid = 6472; +UPDATE pg_operator SET oprcom = 6472 WHERE oid = 6473; UPDATE pg_operator SET oprnegate = 6469 WHERE oid = 6468; UPDATE pg_operator SET oprnegate = 6468 WHERE oid = 6469; UPDATE pg_operator SET oprnegate = 6473 WHERE oid = 6470; @@ -1082,12 +1082,12 @@ CREATE OPERATOR pg_catalog.>=( ); COMMENT ON OPERATOR pg_catalog.>=(int4, anyset) IS 'greater than or equal'; -UPDATE pg_operator SET oprcom = 6453 WHERE oid = 6474; -UPDATE pg_operator SET oprcom = 6454 WHERE oid = 6475; -UPDATE pg_operator SET oprcom = 6456 WHERE oid = 6476; -UPDATE pg_operator SET oprcom = 6455 WHERE oid = 6477; -UPDATE pg_operator SET oprcom = 6458 WHERE oid = 6478; -UPDATE pg_operator SET oprcom = 6457 WHERE oid = 6479; +UPDATE pg_operator SET oprcom = 6474 WHERE oid = 6474; +UPDATE pg_operator SET oprcom = 6475 WHERE oid = 6475; +UPDATE pg_operator SET oprcom = 6477 WHERE oid = 6476; +UPDATE pg_operator SET oprcom = 6476 WHERE oid = 6477; +UPDATE pg_operator SET oprcom = 6479 WHERE oid = 6478; +UPDATE pg_operator SET oprcom = 6478 WHERE oid = 6479; UPDATE pg_operator SET oprnegate = 6475 WHERE oid = 6474; UPDATE pg_operator SET oprnegate = 6474 WHERE oid = 6475; UPDATE pg_operator SET oprnegate = 6479 WHERE oid = 6476; @@ -1131,12 +1131,12 @@ CREATE OPERATOR pg_catalog.>=( ); COMMENT ON OPERATOR pg_catalog.>=(anyset, text) IS 'greater than or equal'; -UPDATE pg_operator SET oprcom = 6559 WHERE oid = 6553; -UPDATE pg_operator SET oprcom = 6560 WHERE oid = 6554; -UPDATE pg_operator SET oprcom = 6562 WHERE oid = 6555; -UPDATE pg_operator SET oprcom = 6561 WHERE oid = 6556; -UPDATE pg_operator SET oprcom = 6564 WHERE oid = 6557; -UPDATE pg_operator SET oprcom = 6563 WHERE oid = 6558; +UPDATE pg_operator SET oprcom = 6553 WHERE oid = 6553; +UPDATE pg_operator SET oprcom = 6554 WHERE oid = 6554; +UPDATE pg_operator SET oprcom = 6556 WHERE oid = 6555; +UPDATE pg_operator SET oprcom = 6555 WHERE oid = 6556; +UPDATE pg_operator SET oprcom = 6558 WHERE oid = 6557; +UPDATE pg_operator SET oprcom = 6557 WHERE oid = 6558; UPDATE pg_operator SET oprnegate = 6554 WHERE oid = 6553; UPDATE pg_operator SET oprnegate = 6553 WHERE oid = 6554; UPDATE pg_operator SET oprnegate = 6558 WHERE oid = 6555; @@ -1180,12 +1180,12 @@ CREATE OPERATOR pg_catalog.>=( ); COMMENT ON OPERATOR pg_catalog.>=(text, anyset) IS 'greater than or equal'; -UPDATE pg_operator SET oprcom = 6553 WHERE oid = 6559; -UPDATE pg_operator SET oprcom = 6554 WHERE oid = 6560; -UPDATE pg_operator SET oprcom = 6556 WHERE oid = 6561; -UPDATE pg_operator SET oprcom = 6555 WHERE oid = 6562; -UPDATE pg_operator SET oprcom = 6558 WHERE oid = 6563; -UPDATE pg_operator SET oprcom = 6557 WHERE oid = 6564; +UPDATE pg_operator SET oprcom = 6559 WHERE oid = 6559; +UPDATE pg_operator SET oprcom = 6560 WHERE oid = 6560; +UPDATE pg_operator SET oprcom = 6562 WHERE oid = 6561; +UPDATE pg_operator SET oprcom = 6561 WHERE oid = 6562; +UPDATE pg_operator SET oprcom = 6564 WHERE oid = 6563; +UPDATE pg_operator SET oprcom = 6563 WHERE oid = 6564; UPDATE pg_operator SET oprnegate = 6560 WHERE oid = 6559; UPDATE pg_operator SET oprnegate = 6559 WHERE oid = 6560; UPDATE pg_operator SET oprnegate = 6564 WHERE oid = 6561; diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_835.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_835.sql index a7c8fbb4b282f2319fe47a051ce36a0f1f2f086a..0d5d514b1ebc7a67909f3eb401d961bf385ae9e7 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_835.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_835.sql @@ -7,5 +7,4 @@ SET LOCAL inplace_upgrade_next_system_object_oids = IUO_GENERAL, 6565; CREATE OPERATOR pg_catalog.-( RIGHTARG = bool, PROCEDURE = boolum -); -COMMENT ON OPERATOR pg_catalog.-(none, bool) IS 'negate'; \ No newline at end of file +); \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_965.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_965.sql index 9bc9138fa1d2cc31889b213897d7f574529d521d..b1bacbb0e9d43f4c983454953b151ea7ce55f2a8 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_965.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_965.sql @@ -347,10 +347,3 @@ comment on function PG_CATALOG.regexp_replace(text, text, text, integer, integer comment on function PG_CATALOG.regexp_substr(text, text, integer) is 'extract text matching regular expression'; comment on function PG_CATALOG.regexp_substr(text, text, integer, integer) is 'extract text matching regular expression'; comment on function PG_CATALOG.regexp_substr(text, text, integer, integer, text) is 'extract text matching regular expression'; - -DO $upgrade$ -BEGIN -IF working_version_num() < 92780 then -DROP INDEX IF EXISTS pg_partition_tblspc_relfilenode_index CASCADE; -END IF; -END $upgrade$; \ No newline at end of file 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 index 7c71c306b5aaa3e8ee7160063b07de2389c58216..4368949964d010455f587aaf125304a5537594f0 100644 --- 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 @@ -12,42 +12,4 @@ CREATE FUNCTION pg_catalog.json_object() RETURNS json LANGUAGE INTERNAL IMMUTABLE STRICT NOT FENCED NOT SHIPPABLE -as 'json_object'; - -DECLARE -ans boolean; -BEGIN - select case when count(*)=1 then true else false end as ans from (select nspname from pg_namespace where nspname='dbe_perf' limit 1) into ans; - if ans = true then ------------------------------------------------------------------------------------------------------------------------------------------------------ - DROP VIEW IF EXISTS DBE_PERF.local_active_session cascade; - DROP FUNCTION IF EXISTS pg_catalog.get_local_active_session(OUT sampleid bigint, OUT sample_time timestamp with time zone, OUT need_flush_sample boolean, OUT databaseid oid, OUT thread_id bigint, OUT sessionid bigint, OUT start_time timestamp with time zone, OUT event text, OUT lwtid integer, OUT psessionid bigint, OUT tlevel integer, OUT smpid integer, OUT userid oid, OUT application_name text, OUT client_addr inet, OUT client_hostname text, OUT client_port integer, OUT query_id bigint, OUT unique_query_id bigint, OUT user_id oid, OUT cn_id integer, OUT unique_query text, OUT locktag text, OUT lockmode text, OUT block_sessionid bigint, OUT wait_status text, OUT global_sessionid text) cascade; - - SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5721; - CREATE OR REPLACE FUNCTION pg_catalog.get_local_active_session - (OUT sampleid bigint, OUT sample_time timestamp with time zone, OUT need_flush_sample boolean, OUT databaseid oid, OUT thread_id bigint, OUT sessionid bigint, OUT start_time timestamp with time zone, OUT event text, OUT lwtid integer, OUT psessionid bigint, OUT tlevel integer, OUT smpid integer, OUT userid oid, OUT application_name text, OUT client_addr inet, OUT client_hostname text, OUT client_port integer, OUT query_id bigint, OUT unique_query_id bigint, OUT user_id oid, OUT cn_id integer, OUT unique_query text, OUT locktag text, OUT lockmode text, OUT block_sessionid bigint, OUT wait_status text, OUT global_sessionid text, OUT xact_start_time timestamp with time zone, OUT query_start_time timestamp with time zone, OUT state text) - RETURNS setof record LANGUAGE INTERNAL STABLE NOT FENCED NOT SHIPPABLE ROWS 100 as 'get_local_active_session'; - CREATE OR REPLACE VIEW DBE_PERF.local_active_session AS - WITH RECURSIVE - las(sampleid, sample_time, need_flush_sample, databaseid, thread_id, sessionid, start_time, event, lwtid, psessionid, - tlevel, smpid, userid, application_name, client_addr, client_hostname, client_port, query_id, unique_query_id, - user_id, cn_id, unique_query, locktag, lockmode, block_sessionid, wait_status, global_sessionid, xact_start_time, query_start_time, state) - AS (select t.* from get_local_active_session() as t), - tt(sampleid, sample_time, need_flush_sample, databaseid, thread_id, sessionid, start_time, event, lwtid, psessionid, - tlevel, smpid, userid, application_name, client_addr, client_hostname, client_port, query_id, unique_query_id, - user_id, cn_id, unique_query, locktag, lockmode, block_sessionid, wait_status, global_sessionid, xact_start_time, query_start_time, state, final_block_sessionid, level, head) - AS(SELECT las.*, las.block_sessionid AS final_block_sessionid, 1 AS level, array_append('{}', las.sessionid) AS head FROM las - UNION ALL - SELECT tt.sampleid, tt.sample_time, tt.need_flush_sample, tt.databaseid, tt.thread_id, tt.sessionid, tt.start_time, tt.event, tt.lwtid, tt.psessionid, - tt.tlevel, tt.smpid, tt.userid, tt.application_name, tt.client_addr, tt.client_hostname, tt.client_port, tt.query_id, tt.unique_query_id, - tt.user_id, tt.cn_id, tt.unique_query, tt.locktag, tt.lockmode, tt.block_sessionid, tt.wait_status, tt.global_sessionid, tt.xact_start_time, tt.query_start_time, tt.state, las.block_sessionid AS final_block_sessionid, tt.level + 1 AS level, array_append(tt.head, las.sessionid) AS head - FROM tt INNER JOIN las ON tt.final_block_sessionid = las.sessionid - WHERE las.sampleid = tt.sampleid AND (las.block_sessionid IS NOT NULL OR las.block_sessionid != 0) - AND las.sessionid != all(head) AND las.sessionid != las.block_sessionid) - SELECT sampleid, sample_time, need_flush_sample, databaseid, thread_id, sessionid, start_time, event, lwtid, psessionid, - tlevel, smpid, userid, application_name, client_addr, client_hostname, client_port, query_id, unique_query_id, - user_id, cn_id, unique_query, locktag, lockmode, block_sessionid, final_block_sessionid, wait_status, global_sessionid, xact_start_time, query_start_time, state FROM tt - WHERE level = (SELECT MAX(level) FROM tt t1 WHERE t1.sampleid = tt.sampleid AND t1.sessionid = tt.sessionid); - end if; -END; -/ \ No newline at end of file +as 'json_object'; \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_93_038.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_93_038.sql index 146a7980ed8970bb89e2a3b960f826c9bcbab00a..20c9528c38508d5ff255515ea43cd671ab7ce780 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_93_038.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_93_038.sql @@ -5,73 +5,4 @@ unknown, unknown ) RETURNS text LANGUAGE INTERNAL STABLE SHIPPABLE STRICT as 'unknown_to_char2'; -COMMENT ON FUNCTION pg_catalog.to_char(unknown, unknown) is 'unknown,unknown to char for compatibility'; - --- DROP: gs_get_parallel_decode_status() -DROP FUNCTION IF EXISTS pg_catalog.gs_get_parallel_decode_status(OUT slot_name text, OUT parallel_decode_num int4, OUT read_change_queue_length text, OUT decode_change_queue_length text) CASCADE; --- CREATE: gs_get_parallel_decode_status -SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 9377; -CREATE OR REPLACE FUNCTION pg_catalog.gs_get_parallel_decode_status(OUT slot_name text, OUT parallel_decode_num int4, OUT read_change_queue_length text, OUT decode_change_queue_length text, OUT reader_lsn text, OUT working_txn_cnt int8, OUT working_txn_memory int8) - RETURNS SETOF RECORD - LANGUAGE internal - STABLE NOT FENCED NOT SHIPPABLE -AS $function$gs_get_parallel_decode_status$function$; - -DROP FUNCTION IF EXISTS pg_catalog.gs_get_history_memory_detail() cascade; -SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5257; -CREATE OR REPLACE FUNCTION pg_catalog.gs_get_history_memory_detail( -memlog_filename cstring, -OUT memory_info text) RETURNS SETOF TEXT LANGUAGE INTERNAL IMMUTABLE NOT FENCED NOT SHIPPABLE ROWS 100 as 'gs_get_history_memory_detail'; - -DROP FUNCTION IF EXISTS gs_is_dw_io_blocked() CASCADE; -SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4772; -CREATE OR REPLACE FUNCTION pg_catalog.gs_is_dw_io_blocked(OUT boolean) - RETURNS SETOF boolean - LANGUAGE internal - STABLE STRICT NOT FENCED NOT SHIPPABLE ROWS 1000 -AS $function$gs_is_dw_io_blocked$function$; - -/*------ add sys fuction gs_undo_meta_dump_zone ------*/ -DROP FUNCTION IF EXISTS pg_catalog.gs_undo_meta_dump_zone(int4, boolean, OUT zone_id oid, OUT persist_type oid, OUT insert text, OUT discard text, OUT forcediscard text, OUT lsn text) CASCADE; -SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4433; -CREATE OR REPLACE FUNCTION pg_catalog.gs_undo_meta_dump_zone(zone_id int4, read_memory boolean, OUT zone_id oid, OUT persist_type oid, OUT insert text, OUT discard text, OUT forcediscard text, OUT lsn text) -RETURNS SETOF record LANGUAGE INTERNAL STABLE NOT FENCED NOT SHIPPABLE ROWS 1 as 'gs_undo_meta_dump_zone'; - -/*------ add sys fuction gs_undo_meta_dump_spaces ------*/ -DROP FUNCTION IF EXISTS pg_catalog.gs_undo_meta_dump_spaces(int4, boolean, OUT zone_id oid, OUT undorecord_space_tail text, OUT undorecord_space_head text, OUT undorecord_space_lsn text, OUT undoslot_space_tail text, OUT undoslot_space_head text, OUT undoreslot_space_lsn text) CASCADE; -SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4432; -CREATE OR REPLACE FUNCTION pg_catalog.gs_undo_meta_dump_spaces(zone_id int4, read_memory boolean, OUT zone_id oid, OUT undorecord_space_tail text, OUT undorecord_space_head text, OUT undorecord_space_lsn text, OUT undoslot_space_tail text, OUT undoslot_space_head text, OUT undoreslot_space_lsn text) -RETURNS SETOF record LANGUAGE INTERNAL STABLE NOT FENCED NOT SHIPPABLE ROWS 1 as 'gs_undo_meta_dump_spaces'; - -/*------ add sys fuction gs_undo_meta_dump_slot ------*/ -DROP FUNCTION IF EXISTS pg_catalog.gs_undo_meta_dump_slot(int4, boolean, OUT zone_id oid, OUT allocate text, OUT recycle text, OUT frozen_xid text, OUT global_frozen_xid text, OUT recycle_xid text, OUT global_recycle_xid text) CASCADE; -SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4437; -CREATE OR REPLACE FUNCTION pg_catalog.gs_undo_meta_dump_slot(zone_id int4, read_memory boolean, OUT zone_id oid, OUT allocate text, OUT recycle text, OUT frozen_xid text, OUT global_frozen_xid text, OUT recycle_xid text, OUT global_recycle_xid text) -RETURNS SETOF record LANGUAGE INTERNAL STABLE NOT FENCED NOT SHIPPABLE ROWS 1 as 'gs_undo_meta_dump_slot'; - -/*------ add sys fuction gs_undo_dump_record ------*/ -DROP FUNCTION IF EXISTS pg_catalog.gs_undo_dump_record(bigint, OUT undoptr oid, OUT xactid oid, OUT cid text, -OUT reloid text, OUT relfilenode text, OUT utype text, OUT blkprev text, OUT blockno text, OUT uoffset text, -OUT prevurp text, OUT payloadlen text, OUT oldxactid text, OUT partitionoid text, OUT tablespace text, OUT alreadyread_bytes text, OUT prev_undorec_len text, OUT td_id text, OUT reserved text, OUT flag text, OUT flag2 text, OUT t_hoff text) CASCADE; -SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4539; -CREATE FUNCTION pg_catalog.gs_undo_dump_record(undoptr bigint, OUT undoptr oid, OUT xactid oid, OUT cid text, -OUT reloid text, OUT relfilenode text, OUT utype text, OUT blkprev text, OUT blockno text, OUT uoffset text, -OUT prevurp text, OUT payloadlen text, OUT oldxactid text, OUT partitionoid text, OUT tablespace text, OUT alreadyread_bytes text, OUT prev_undorec_len text, OUT td_id text, OUT reserved text, OUT flag text, OUT flag2 text, OUT t_hoff text) -RETURNS SETOF record LANGUAGE INTERNAL STABLE NOT FENCED NOT SHIPPABLE ROWS 1 as 'gs_undo_dump_record'; - -/*------ add sys fuction gs_undo_dump_xid ------*/ -DROP FUNCTION IF EXISTS pg_catalog.gs_undo_dump_xid(xid, OUT undoptr oid, OUT xactid oid, OUT cid text, -OUT reloid text, OUT relfilenode text, OUT utype text, OUT blkprev text, OUT blockno text, OUT uoffset text, -OUT prevurp text, OUT payloadlen text, OUT oldxactid text, OUT partitionoid text, OUT tablespace text, OUT alreadyread_bytes text, OUT prev_undorec_len text, OUT td_id text, OUT reserved text, OUT flag text, OUT flag2 text, OUT t_hoff text) CASCADE; -SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4540; -CREATE FUNCTION pg_catalog.gs_undo_dump_xid(undoptr xid, OUT undoptr oid, OUT xactid oid, OUT cid text, -OUT reloid text, OUT relfilenode text, OUT utype text, OUT blkprev text, OUT blockno text, OUT uoffset text, -OUT prevurp text, OUT payloadlen text, OUT oldxactid text, OUT partitionoid text, OUT tablespace text, OUT alreadyread_bytes text, OUT prev_undorec_len text, OUT td_id text, OUT reserved text, OUT flag text, OUT flag2 text, OUT t_hoff text) -RETURNS SETOF record LANGUAGE INTERNAL STABLE NOT FENCED NOT SHIPPABLE ROWS 1 as 'gs_undo_dump_xid'; - -DROP FUNCTION IF EXISTS pg_catalog.array_count(anyarray, integer) CASCADE; -DROP FUNCTION IF EXISTS pg_catalog.gs_repair_urq(oid, OUT result text) CASCADE; -DROP FUNCTION IF EXISTS pg_catalog.gs_verify_undo_meta(text, int8, int8, boolean, OUT zone_id oid, OUT detail text) CASCADE; -DROP FUNCTION IF EXISTS pg_catalog.gs_verify_undo_record(text, int8, int8, boolean, OUT zone_id oid, OUT detail text) CASCADE; -DROP FUNCTION IF EXISTS pg_catalog.gs_verify_undo_translot(text, int8, int8, boolean, OUT zone_id int8, OUT detail text) CASCADE; -DROP FUNCTION IF EXISTS pg_catalog.gs_verify_urq(oid, text, int8, text, OUT error_code text, OUT detail text) CASCADE; \ No newline at end of file +COMMENT ON FUNCTION pg_catalog.to_char(unknown, unknown) is 'unknown,unknown to char for compatibility'; \ No newline at end of file