diff --git a/src/common/backend/catalog/performance_views.sql b/src/common/backend/catalog/performance_views.sql
index 6505adbe5784c43e8cbb40a38c70f16d1cf02734..dfc5b641e289863cbb98486eb94412bab388c682 100644
--- a/src/common/backend/catalog/performance_views.sql
+++ b/src/common/backend/catalog/performance_views.sql
@@ -4026,6 +4026,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 +4097,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;
@@ -4190,6 +4193,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 +4264,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 032e03b81be51a9544545b74bc0bd3f8a851503a..a53957bab9f6d86b342bd946e7a6ca68163137c2 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 9038fab3a0e3116f80ba70462d828004f07c21fc..a5e59538d5e0f6fd3e65cc2a7fcaf8615302fa19 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 f214316b1090823eccbfe2dfd2aad33c98e73a09..42a7aac5aa508b00eebfec88dc11cbdc972ee381 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 ab53647d3ea9f27c1c4da18baa613086963919c2..c5c9a312b620195862fb42f70aa0ffc199532f27 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 71943ca07c0c258bd39ea50325777858dcd057c8..73cb6a160af4ccd3818c84fbc451d78b0a6c5e33 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 11efd81d745a17132cbe9a1feb7cb75510500e38..9eff0ff6e34c6b6822274f90e264992e92fe34f6 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 7a3f2fa7f0987a5b959f30016836b6922d22cbea..69ca28d1adb1762e0643ed7e7343b4a07e3a255b 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 71943ca07c0c258bd39ea50325777858dcd057c8..73cb6a160af4ccd3818c84fbc451d78b0a6c5e33 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 06518a540438dd8fe9152925ab94152fa3cea7f6..469871c6391475971c382ab21cd4b07b6f594698 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 7a3f2fa7f0987a5b959f30016836b6922d22cbea..69ca28d1adb1762e0643ed7e7343b4a07e3a255b 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;