From 8561e98479a1f26c168e277899826d0fad41b1dc Mon Sep 17 00:00:00 2001 From: chimyue Date: Thu, 8 Jun 2023 06:42:15 +0000 Subject: [PATCH] enable outline check trace point by default --- src/sql/optimizer/ob_explain_log_plan.cpp | 7 +++---- tools/deploy/init_for_ce.sql | 3 ++- .../test_suite/optimizer/r/mysql/union_sort_opt.result | 4 ++-- .../test_suite/skyline/r/mysql/skyline_basic_mysql.result | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/sql/optimizer/ob_explain_log_plan.cpp b/src/sql/optimizer/ob_explain_log_plan.cpp index 14a7e4597..6f07c9a3d 100644 --- a/src/sql/optimizer/ob_explain_log_plan.cpp +++ b/src/sql/optimizer/ob_explain_log_plan.cpp @@ -133,10 +133,9 @@ int ObExplainLogPlan::check_explain_generate_plan_with_outline(ObLogPlan *real_p /* generate plan call by ObMPQuery::process_with_tmp_context use tmp context, do not check */ } else if (EXPLAIN_UNINITIALIZED != explain_stmt->get_explain_type() && EXPLAIN_BASIC != explain_stmt->get_explain_type() - && EXPLAIN_OUTLINE != explain_stmt->get_explain_type() - && EXPLAIN_EXTENDED_NOADDR != explain_stmt->get_explain_type()) { - /* generate plan again for explain/explain basic/explain outline/explain extended_noaddr, - do not check explain extended */ + && EXPLAIN_OUTLINE != explain_stmt->get_explain_type()) { + /* generate plan again for explain/explain basic/explain outline, + do not check explain extended/explain extended_noaddr */ } else if (0 == sql_ctx->first_plan_hash_) { /* generate plan first time */ void *tmp_ptr = NULL; sql_ctx->first_outline_data_.reset(); diff --git a/tools/deploy/init_for_ce.sql b/tools/deploy/init_for_ce.sql index b9f3d4887..d8c49682a 100644 --- a/tools/deploy/init_for_ce.sql +++ b/tools/deploy/init_for_ce.sql @@ -30,4 +30,5 @@ alter system set enable_sql_extension=true tenant all; alter system set _enable_adaptive_compaction = false tenant all; alter system set_tp tp_no = 1200, error_code = 4001, frequency = 1; alter system set_tp tp_no = 509, error_code = 4016, frequency = 1; -alter system set_tp tp_no = 368, error_code = 4016, frequency = 1; \ No newline at end of file +alter system set_tp tp_no = 368, error_code = 4016, frequency = 1; +alter system set_tp tp_no = 551, error_code = 5434, frequency = 1; diff --git a/tools/deploy/mysql_test/test_suite/optimizer/r/mysql/union_sort_opt.result b/tools/deploy/mysql_test/test_suite/optimizer/r/mysql/union_sort_opt.result index 7974bdcce..6e04d715a 100644 --- a/tools/deploy/mysql_test/test_suite/optimizer/r/mysql/union_sort_opt.result +++ b/tools/deploy/mysql_test/test_suite/optimizer/r/mysql/union_sort_opt.result @@ -808,8 +808,8 @@ Query Plan ============================================================================ |ID|OPERATOR |NAME |EST.ROWS|EST.TIME(us)| ---------------------------------------------------------------------------- -|0 |SORT | |11 |78 | -|1 |└─HASH JOIN | |11 |77 | +|0 |SORT | |17 |79 | +|1 |└─HASH JOIN | |17 |77 | |2 | ├─PX COORDINATOR | |11 |15 | |3 | │ └─EXCHANGE OUT DISTR |:EX10000 |11 |13 | |4 | │ └─PX PARTITION ITERATOR | |11 |9 | diff --git a/tools/deploy/mysql_test/test_suite/skyline/r/mysql/skyline_basic_mysql.result b/tools/deploy/mysql_test/test_suite/skyline/r/mysql/skyline_basic_mysql.result index e2c813ee8..1513592bd 100644 --- a/tools/deploy/mysql_test/test_suite/skyline/r/mysql/skyline_basic_mysql.result +++ b/tools/deploy/mysql_test/test_suite/skyline/r/mysql/skyline_basic_mysql.result @@ -252,9 +252,9 @@ Query Plan ============================================================ |ID|OPERATOR |NAME |EST.ROWS|EST.TIME(us)| ------------------------------------------------------------ -|0 |LIMIT | |1 |5 | -|1 |└─HASH DISTINCT | |1 |5 | -|2 | └─TABLE FULL SCAN|t1(idx_c_a_b)|1 |5 | +|0 |LIMIT | |1 |3 | +|1 |└─HASH DISTINCT | |1 |3 | +|2 | └─TABLE FULL SCAN|t1(idx_c_a_b)|1 |3 | ============================================================ Outputs & filters: ------------------------------------- @@ -1526,7 +1526,7 @@ Query Plan ============================================================= |ID|OPERATOR |NAME |EST.ROWS|EST.TIME(us)| ------------------------------------------------------------- -|0 |TABLE RANGE SCAN|t1(idx_c,Reverse)|0 |2 | +|0 |TABLE RANGE SCAN|t1(idx_c,Reverse)|1 |5 | ============================================================= Outputs & filters: -------------------------------------