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

[master][tx-route] disable reroute sql on txn start node when sql access tmp table

Browse Source
This commit is contained in:
chinaxing
2023-03-02 14:49:23 +00:00
committed by ob-robot
parent a4895d2650
commit 14228a3f70
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/sql/engine/cmd/ob_variable_set_executor.cpp
View File

@ -935,7 +935,6 @@ int ObVariableSetExecutor::process_session_autocommit_hook(ObExecContext &exec_c
// 其它只影响AC标志位，但无需做commit操作 // 其它只影响AC标志位，但无需做commit操作
} }
} }
LOG_INFO("set var: autocommit", K(ret), K(orig_ac), "to", autocommit, K(my_session->get_sessid()));
} }
return ret; return ret;
} }

17
src/sql/ob_sql.cpp
View File

@ -4174,7 +4174,7 @@ int ObSql::after_get_plan(ObPlanCacheCtx &pc_ctx,
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
DAS_CTX(pc_ctx.exec_ctx_).unmark_need_check_server(); DAS_CTX(pc_ctx.exec_ctx_).unmark_need_check_server();
bool need_reroute = false; bool need_reroute = false;
if (OB_FAIL(check_need_reroute(pc_ctx, phy_plan, need_reroute))) { if (OB_FAIL(check_need_reroute(pc_ctx, session, phy_plan, need_reroute))) {
LOG_WARN("fail to check need reroute", K(ret)); LOG_WARN("fail to check need reroute", K(ret));
} else if (need_reroute) { } else if (need_reroute) {
ret = OB_ERR_PROXY_REROUTE; ret = OB_ERR_PROXY_REROUTE;
@ -4276,7 +4276,7 @@ int ObSql::after_get_plan(ObPlanCacheCtx &pc_ctx,
if (has_session_tmp_table || has_txn_tmp_table) { if (has_session_tmp_table || has_txn_tmp_table) {
if (!session.is_inner() && session.is_txn_free_route_temp()) { if (!session.is_inner() && session.is_txn_free_route_temp()) {
ret = OB_TRANS_FREE_ROUTE_NOT_SUPPORTED; ret = OB_TRANS_FREE_ROUTE_NOT_SUPPORTED;
LOG_WARN("access temp table is supported to be executed on txn temporary node", KR(ret)); LOG_WARN("access temp table is supported to be executed on txn temporary node", KR(ret), K(session.get_txn_free_route_ctx()));
} else if (has_session_tmp_table) { } else if (has_session_tmp_table) {
bool is_already_set = false; bool is_already_set = false;
if (OB_FAIL(session.get_session_temp_table_used(is_already_set))) { if (OB_FAIL(session.get_session_temp_table_used(is_already_set))) {
@ -4897,7 +4897,7 @@ int ObSql::handle_text_execute(const ObStmt *basic_stmt,
return ret; return ret;
} }
int ObSql::check_need_reroute(ObPlanCacheCtx &pc_ctx, ObPhysicalPlan *plan, bool &need_reroute) int ObSql::check_need_reroute(ObPlanCacheCtx &pc_ctx, ObSQLSessionInfo &session, ObPhysicalPlan *plan, bool &need_reroute)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
need_reroute = false; need_reroute = false;
@ -4919,6 +4919,17 @@ int ObSql::check_need_reroute(ObPlanCacheCtx &pc_ctx, ObPhysicalPlan *plan, bool
should_reroute = false; should_reroute = false;
} }
} }
// the SQL use tmp table can not run on TXN_FREE_ROUTE temp node
if (should_reroute && NULL != plan && !session.get_is_deserialized() && !session.is_inner() && session.is_in_transaction()) {
bool has_session_tmp_table = plan->is_contain_oracle_session_level_temporary_table() || plan->contains_temp_table();
bool has_txn_tmp_table = plan->is_contain_oracle_trx_level_temporary_table();
if ((has_session_tmp_table || has_txn_tmp_table)
// 1. TXN_FREE_ROUTE DISABLED, all query in one node -- orignal node
// 2. TXN_FREE_ROUTE ENABLED, must on orignal node
&& !session.is_txn_free_route_temp()) {
should_reroute = false;
}
}
if (OB_ISNULL(pc_ctx.sql_ctx_.schema_guard_)) { if (OB_ISNULL(pc_ctx.sql_ctx_.schema_guard_)) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid null schema guard", K(ret)); LOG_WARN("invalid null schema guard", K(ret));

2
src/sql/ob_sql.h
View File

@ -483,7 +483,7 @@ private:
ParamStore &fixed_param_store); ParamStore &fixed_param_store);
int handle_text_execute(const ObStmt *basic_stmt, ObSqlCtx &sql_ctx, ObResultSet &result); int handle_text_execute(const ObStmt *basic_stmt, ObSqlCtx &sql_ctx, ObResultSet &result);
int check_need_reroute(ObPlanCacheCtx &pc_ctx, ObPhysicalPlan *plan, bool &need_reroute); int check_need_reroute(ObPlanCacheCtx &pc_ctx, ObSQLSessionInfo &session, ObPhysicalPlan *plan, bool &need_reroute);
int get_first_batched_multi_stmt(ObMultiStmtItem& multi_stmt_item, ObString& sql); int get_first_batched_multi_stmt(ObMultiStmtItem& multi_stmt_item, ObString& sql);
static int add_param_to_param_store(const ObObjParam &param, static int add_param_to_param_store(const ObObjParam &param,
ParamStore &param_store); ParamStore &param_store);