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

!6427 修复6.0.0版本直装和升级至6.0.0版本后get_global_full_sql_by_timestamp元数据不一致的问题

Browse Source 
Merge pull request !6427 from 蒋宏博/master
This commit is contained in:
opengauss_bot
2024-09-24 03:32:32 +00:00
committed by Gitee
parent bb25941e51 4b3f8015ed
commit 9db841db7c
11 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/backend/catalog/performance_views.sql
View File

@ -4010,7 +4010,8 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_full_sql_by_timestamp
OUT srt12_u bigint,
OUT srt13_before_query bigint,
OUT srt14_after_query bigint,
OUT rtt_unknown bigint
OUT rtt_unknown bigint,
OUT net_trans_time bigint
)
RETURNS setof record
AS $$
@ -4026,6 +4027,7 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_full_sql_by_timestamp
FOR row_name IN EXECUTE(query_str_nodes) LOOP
query_str := 'SELECT * FROM DBE_PERF.statement_history where start_time >= ''' ||$1|| ''' and start_time <= ''' || $2 || '''';
FOR row_data IN EXECUTE(query_str) LOOP
IF row_data.parent_query_id = 0 then
node_name := row_name.node_name;
db_name := row_data.db_name;
schema_name := row_data.schema_name;
@ -4096,7 +4098,9 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_full_sql_by_timestamp
srt13_before_query := row_data.srt13_before_query;
srt14_after_query := row_data.srt14_after_query;
rtt_unknown := row_data.rtt_unknown;
net_trans_time := row_data.net_trans_time;
return next;
END IF;
END LOOP;
END LOOP;
return;
@ -4175,7 +4179,8 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_slow_sql_by_timestamp
OUT srt12_u bigint,
OUT srt13_before_query bigint,
OUT srt14_after_query bigint,
OUT rtt_unknown bigint)
OUT rtt_unknown bigint,
OUT net_trans_time bigint)
RETURNS setof record
AS $$
DECLARE
@ -4190,6 +4195,7 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_slow_sql_by_timestamp
FOR row_name IN EXECUTE(query_str_nodes) LOOP
query_str := 'SELECT * FROM DBE_PERF.statement_history where start_time >= ''' ||$1|| ''' and start_time <= ''' || $2 || ''' and is_slow_sql = true ';
FOR row_data IN EXECUTE(query_str) LOOP
IF row_data.parent_query_id = 0 THEN
node_name := row_name.node_name;
db_name := row_data.db_name;
schema_name := row_data.schema_name;
@ -4260,7 +4266,9 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_slow_sql_by_timestamp
srt13_before_query := row_data.srt13_before_query;
srt14_after_query := row_data.srt14_after_query;
rtt_unknown := row_data.rtt_unknown;
net_trans_time := row_data.net_trans_time;
return next;
END IF;
END LOOP;
END LOOP;
return;

4
src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_914.sql
View File

@ -390,7 +390,7 @@ BEGIN
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;
@ -555,7 +555,7 @@ BEGIN
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;

4
src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_945.sql
View File

@ -504,7 +504,7 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_full_sql_by_timestamp
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;
@ -669,7 +669,7 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_full_sql_by_timestamp
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;

4
src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_914.sql
View File

@ -390,7 +390,7 @@ FOR row_data IN EXECUTE(query_str) LOOP
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;
@ -555,7 +555,7 @@ FOR row_data IN EXECUTE(query_str) LOOP
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;

4
src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_945.sql
View File

@ -504,7 +504,7 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_full_sql_by_timestamp
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;
@ -669,7 +669,7 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_full_sql_by_timestamp
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;

4
src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_906.sql
View File

@ -525,7 +525,7 @@ CREATE OR REPLACE FUNCTION dbe_perf.get_global_full_sql_by_timestamp
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;
@ -690,7 +690,7 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_slow_sql_by_timestamp
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;

4
src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_914.sql
View File

@ -393,7 +393,7 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_full_sql_by_timestamp
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;
@ -560,7 +560,7 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_full_sql_by_timestamp
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;

4
src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_945.sql
View File

@ -510,7 +510,7 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_full_sql_by_timestamp
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;
@ -679,7 +679,7 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_full_sql_by_timestamp
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;

4
src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_906.sql
View File

@ -525,7 +525,7 @@ CREATE OR REPLACE FUNCTION dbe_perf.get_global_full_sql_by_timestamp
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;
@ -690,7 +690,7 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_slow_sql_by_timestamp
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;

4
src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_914.sql
View File

@ -393,7 +393,7 @@ FOR row_data IN EXECUTE(query_str) LOOP
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;
@ -560,7 +560,7 @@ FOR row_data IN EXECUTE(query_str) LOOP
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;

4
src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_945.sql
View File

@ -510,7 +510,7 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_full_sql_by_timestamp
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;
@ -679,7 +679,7 @@ CREATE OR REPLACE FUNCTION DBE_PERF.get_global_full_sql_by_timestamp
is_slow_sql := row_data.is_slow_sql;
trace_id := row_data.trace_id;
advise := row_data.advise;
net_send_time =row_data.net_send_time;
net_send_time := row_data.net_send_time;
srt1_q := row_data.srt1_q;
srt2_simple_query := row_data.srt2_simple_query;
srt3_analyze_rewrite := row_data.srt3_analyze_rewrite;