From 0cc2650091fe3fe870fa4fa6e66db7db64704c22 Mon Sep 17 00:00:00 2001 From: hwhbj Date: Mon, 23 Sep 2024 19:44:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D6.0.0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E7=9B=B4=E8=A3=85=E5=92=8C=E5=8D=87=E7=BA=A7=E8=87=B36.0.0?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=90=8Eget=5Fglobal=5Ffull=5Fsql=5Fby=5Ftim?= =?UTF-8?q?estamp=EF=BC=8Cget=5Fglobal=5Fslo=E2=80=A6=20=EF=BC=88cherry=20?= =?UTF-8?q?picked=20commit=20from=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/backend/catalog/performance_views.sql | 12 ++++++++++-- .../rollback-post_catalog_maindb_92_914.sql | 4 ++-- .../rollback-post_catalog_maindb_92_945.sql | 4 ++-- .../rollback-post_catalog_otherdb_92_914.sql | 4 ++-- .../rollback-post_catalog_otherdb_92_945.sql | 4 ++-- .../upgrade-post_catalog_maindb_92_906.sql | 4 ++-- .../upgrade-post_catalog_maindb_92_914.sql | 4 ++-- .../upgrade-post_catalog_maindb_92_945.sql | 4 ++-- .../upgrade-post_catalog_otherdb_92_906.sql | 4 ++-- .../upgrade-post_catalog_otherdb_92_914.sql | 4 ++-- .../upgrade-post_catalog_otherdb_92_945.sql | 4 ++-- 11 files changed, 30 insertions(+), 22 deletions(-) diff --git a/src/common/backend/catalog/performance_views.sql b/src/common/backend/catalog/performance_views.sql index 6505adbe5..0d9f0ee55 100644 --- a/src/common/backend/catalog/performance_views.sql +++ b/src/common/backend/catalog/performance_views.sql @@ -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; diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_914.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_914.sql index 032e03b81..a53957bab 100644 --- a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_914.sql +++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_914.sql @@ -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; diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_945.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_945.sql index 9038fab3a..a5e59538d 100644 --- a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_945.sql +++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_945.sql @@ -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; diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_914.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_914.sql index f214316b1..42a7aac5a 100644 --- a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_914.sql +++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_914.sql @@ -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; diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_945.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_945.sql index ab53647d3..c5c9a312b 100644 --- a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_945.sql +++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_945.sql @@ -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; diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_906.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_906.sql index 71943ca07..73cb6a160 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_906.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_906.sql @@ -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; diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_914.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_914.sql index 11efd81d7..9eff0ff6e 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_914.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_914.sql @@ -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; diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_945.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_945.sql index 7a3f2fa7f..69ca28d1a 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_945.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_945.sql @@ -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; diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_906.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_906.sql index 71943ca07..73cb6a160 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_906.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_906.sql @@ -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; diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_914.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_914.sql index 06518a540..469871c63 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_914.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_914.sql @@ -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; diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_945.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_945.sql index 7a3f2fa7f..69ca28d1a 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_945.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_945.sql @@ -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;