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

[CP] [to #53768441] fix pl retry logic with package state change & fill cursor

Browse Source
This commit is contained in:
obdev
2023-12-28 14:13:30 +00:00
committed by ob-robot
parent e771c473bc
commit 44917ddf79
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/sql/ob_spi.cpp
View File

@ -3713,6 +3713,21 @@ int ObSPIService::spi_cursor_open(ObPLExecCtx *ctx,
spi_cursor->fields_));
//}
OZ (fill_cursor(*spi_result.get_result_set(), spi_cursor));
if (OB_FAIL(ret) && OB_NOT_NULL(spi_result.get_result_set())) {
int cli_ret = OB_SUCCESS;
retry_ctrl.test_and_save_retry_state(GCTX,
spi_result.get_sql_ctx(),
*spi_result.get_result_set(),
ret,
cli_ret,
true,
true,
true);
LOG_WARN("failed to do fill_cursor, check if need retry", K(ret), K(cli_ret), K(retry_ctrl.need_retry()), K(sql), K(ps_sql));
ret = cli_ret;
spi_result.get_sql_ctx().clear();
ctx->exec_ctx_->get_my_session()->set_session_in_retry(retry_ctrl.need_retry());
}
OX (spi_cursor->row_store_.finish_add_row())
OX (cursor->open(spi_cursor));
if (OB_FAIL(ret)) {
@ -3988,7 +4003,7 @@ int ObSPIService::dbms_cursor_open(ObPLExecCtx *ctx,
}
}
OZ (fill_cursor(*spi_result.get_result_set(), spi_cursor));
if (OB_FAIL(ret)) {
if (OB_FAIL(ret) && OB_NOT_NULL(spi_result.get_result_set())) {
int cli_ret = OB_SUCCESS;
retry_ctrl.test_and_save_retry_state(GCTX,
spi_result.get_sql_ctx(),
@ -8550,6 +8565,7 @@ int ObSPIService::spi_update_package_change_info(
OZ (session_info->get_package_state(package_id, package_state));
CK (OB_NOT_NULL(package_state));
OZ (package_state->update_changed_vars(var_idx));
OX (session_info->set_pl_can_retry(false));
return ret;
}