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

[FEAT MERGE] Fix the error code loss and overwriting issues on the master branch

Browse Source 
Co-authored-by: jingtaoye35 <1255153887@qq.com>
Co-authored-by: fkuner <784819644@qq.com>
Co-authored-by: lucky-sinx <2549261744@qq.com>
This commit is contained in:
hwx65
2024-06-17 13:46:15 +00:00
committed by ob-robot
parent 020eae1d2b
commit da5aece3e1
266 changed files with 661 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/sql/executor/ob_cmd_executor.cpp
View File

@ -1117,6 +1117,7 @@ int ObCmdExecutor::execute(ObExecContext &ctx, ObICmd &cmd)
LOG_WARN("failed to get schema guard", K(ret));
}
if (OB_FAIL(tmp_ret)) {
// overwrite ret
ret = tmp_ret;
}
}

1
src/sql/executor/ob_maintain_dependency_info_task.cpp
View File

@ -221,6 +221,7 @@ void ObMaintainDepInfoTaskQueue::run2()
view_info_set_.clear();
}
if (sys_view_consistent_.size() >= MAX_SYS_VIEW_SIZE) {
// ignore ret
LOG_WARN("sys_view_consistent size too much", K(sys_view_consistent_.size()));
sys_view_consistent_.clear();
}

3
src/sql/executor/ob_remote_scheduler.cpp
View File

@ -164,7 +164,8 @@ int ObRemoteScheduler::build_remote_task(ObExecContext &ctx,
K(task_exec_ctx.get_query_sys_begin_schema_version()));
remote_task.set_remote_sql_info(&plan_ctx->get_remote_sql_info());
ObDASTabletLoc *first_tablet_loc = DAS_CTX(ctx).get_table_loc_list().get_first()->get_first_tablet_loc();
if (OB_ISNULL(session = ctx.get_my_session())) {
if (OB_FAIL(ret)){
} else if (OB_ISNULL(session = ctx.get_my_session())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("session is null", K(ret));
} else {

1
src/sql/executor/ob_remote_task_executor.cpp
View File

@ -214,6 +214,7 @@ int ObRemoteTaskExecutor::handle_tx_after_rpc(ObScanner *scanner,
}
if (has_transfer_err || OB_FAIL(ret)) {
if (exec_ctx.use_remote_sql()) {
// ignore ret
LOG_WARN("remote execute use sql fail with transfer_error, tx will rollback", K(ret));
session->get_trans_result().set_incomplete();
} else {

3
src/sql/executor/ob_slice_calc.cpp
View File

@ -460,7 +460,8 @@ int ObSlaveMapRepartIdxCalcBase::init(uint64_t tenant_id)
}
const TaskIdxArray *task_idx_array = part_to_task_array_map_.get(tablet_id);
if (OB_ISNULL(task_idx_array)) {
if (OB_FAIL(ret)) {
} else if (OB_ISNULL(task_idx_array)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("task idx list is null", K(ret), K(tablet_id));
} else if (OB_FAIL(const_cast<TaskIdxArray *>(task_idx_array)->push_back(task_idx))) {