hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

disable sample temp_table_ssid expr in dynamic sampling and disable print timeout error msg in inner sql

Browse Source
This commit is contained in:
wangt1xiuyi
2024-03-04 10:50:10 +00:00
committed by ob-robot
parent eef2f96aa5
commit c71007cee0
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/observer/mysql/ob_async_plan_driver.cpp
View File

@ -144,7 +144,7 @@ int ObAsyncPlanDriver::response_result(ObMySQLResultSet &result)
K(ret), K(async_resp_used), K(retry_ctrl_.need_retry())); K(ret), K(async_resp_used), K(retry_ctrl_.need_retry()));
//if the error code is ob_timeout, we add more error info msg for dml query. //if the error code is ob_timeout, we add more error info msg for dml query.
if (OB_TIMEOUT == ret) { if (OB_TIMEOUT == ret && session_.is_user_session()) {
LOG_USER_ERROR(OB_TIMEOUT, THIS_WORKER.get_timeout_ts() - session_.get_query_start_time()); LOG_USER_ERROR(OB_TIMEOUT, THIS_WORKER.get_timeout_ts() - session_.get_query_start_time());
} }

2
src/observer/mysql/ob_sync_plan_driver.cpp
View File

@ -248,7 +248,7 @@ int ObSyncPlanDriver::response_result(ObMySQLResultSet &result)
} }
} }
//if the error code is ob_timeout, we add more error info msg for dml query. //if the error code is ob_timeout, we add more error info msg for dml query.
if (OB_TIMEOUT == ret) { if (OB_TIMEOUT == ret && session_.is_user_session()) {
LOG_USER_ERROR(OB_TIMEOUT, THIS_WORKER.get_timeout_ts() - session_.get_query_start_time()); LOG_USER_ERROR(OB_TIMEOUT, THIS_WORKER.get_timeout_ts() - session_.get_query_start_time());
} }

2
src/sql/ob_sql.cpp
View File

@ -1185,6 +1185,7 @@ int ObSql::do_real_prepare(const ObString &sql,
} }
//if the error code is ob_timeout, we add more error info msg for dml query. //if the error code is ob_timeout, we add more error info msg for dml query.
if (OB_TIMEOUT == ret && if (OB_TIMEOUT == ret &&
session.is_user_session() &&
parse_result.result_tree_ != NULL && parse_result.result_tree_ != NULL &&
parse_result.result_tree_->children_ != NULL && parse_result.result_tree_->children_ != NULL &&
parse_result.result_tree_->num_child_ >= 1 && parse_result.result_tree_->num_child_ >= 1 &&
@ -4931,6 +4932,7 @@ OB_NOINLINE int ObSql::handle_physical_plan(const ObString &trimed_stmt,
#endif #endif
//if the error code is ob_timeout, we add more error info msg for dml query. //if the error code is ob_timeout, we add more error info msg for dml query.
if (OB_TIMEOUT == ret && if (OB_TIMEOUT == ret &&
result.get_session().is_user_session() &&
parse_result.result_tree_ != NULL && parse_result.result_tree_ != NULL &&
parse_result.result_tree_->children_ != NULL && parse_result.result_tree_->children_ != NULL &&
parse_result.result_tree_->num_child_ >= 1 && parse_result.result_tree_->num_child_ >= 1 &&

3
src/sql/optimizer/ob_dynamic_sampling.cpp
View File

@ -1361,7 +1361,8 @@ int ObDynamicSamplingUtils::check_ds_can_use_filter(const ObRawExpr *filter,
filter->get_expr_type() == T_FUN_ENUM_TO_STR || filter->get_expr_type() == T_FUN_ENUM_TO_STR ||
filter->get_expr_type() == T_OP_GET_PACKAGE_VAR || filter->get_expr_type() == T_OP_GET_PACKAGE_VAR ||
(filter->get_expr_type() >= T_FUN_SYS_IS_JSON && (filter->get_expr_type() >= T_FUN_SYS_IS_JSON &&
filter->get_expr_type() <= T_FUN_SYS_TREAT)) { filter->get_expr_type() <= T_FUN_SYS_TREAT) ||
filter->get_expr_type() == T_FUN_GET_TEMP_TABLE_SESSID) {
no_use = true; no_use = true;
} else if (filter->get_expr_type() == T_FUN_SYS_LNNVL) { } else if (filter->get_expr_type() == T_FUN_SYS_LNNVL) {
const ObRawExpr *real_expr = NULL; const ObRawExpr *real_expr = NULL;