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

Merge branch 'master' into fix_new_05

Browse Source
This commit is contained in:
csch
2023-09-06 11:23:56 +08:00
committed by GitHub
parent 8c370ea7c9 eb1d1ff665
commit 73c770ebab
422 changed files with 48915 additions and 4032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/engine/cmd/ob_ddl_executor_util.cpp
View File

@ -47,7 +47,7 @@ int ObDDLExecutorUtil::handle_session_exception(ObSQLSessionInfo &session)
int ObDDLExecutorUtil::wait_ddl_finish(
const uint64_t tenant_id,
const int64_t task_id,
ObSQLSessionInfo &session,
ObSQLSessionInfo *session,
obrpc::ObCommonRpcProxy *common_rpc_proxy,
const bool is_support_cancel)
{
@ -93,8 +93,8 @@ int ObDDLExecutorUtil::wait_ddl_finish(
}
if (OB_FAIL(ret)) {
} else if (OB_FAIL(handle_session_exception(session))) {
LOG_WARN("session exception happened", K(ret), K(is_support_cancel));
} else if (nullptr != session && OB_FAIL(handle_session_exception(*session))) {
LOG_WARN("session exeception happened", K(ret), K(is_support_cancel));
if (is_support_cancel && OB_TMP_FAIL(cancel_ddl_task(tenant_id, common_rpc_proxy))) {
LOG_WARN("cancel ddl task failed", K(tmp_ret));
ret = OB_SUCCESS;