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

[CP] to issue<55560063>:fix cursor expr memory leak when fail to get next row

Browse Source
This commit is contained in:
hanr881 2024-03-25 07:15:59 +00:00 committed by ob-robot
parent df86dcb9fa
commit 506f394682
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/sql/engine/expr/ob_expr_subquery_ref.cpp
View File

@ -361,17 +361,18 @@ int ObExprSubQueryRef::expr_eval(
if (OB_LIKELY(OB_ITER_END == ret)) {
ret = OB_SUCCESS;
} else {
if (OB_NOT_NULL(spi_cursor)) {
spi_cursor->~ObSPICursor();
}
LOG_WARN("get next row from row iterator failed", K(ret));
}
if (OB_SUCC(ret)) {
OX (spi_cursor->row_store_.finish_add_row());
OX (cursor->open(spi_cursor));
}
if (OB_SUCC(ret) && lib::is_oracle_mode()) {
transaction::ObTxReadSnapshot &snapshot = ctx.exec_ctx_.get_das_ctx().get_snapshot();
OZ (cursor->set_and_register_snapshot(snapshot));
}
if (OB_SUCC(ret)) {
if (lib::is_oracle_mode()) {
transaction::ObTxReadSnapshot &snapshot = ctx.exec_ctx_.get_das_ctx().get_snapshot();
OZ (cursor->set_and_register_snapshot(snapshot));
}
ObExprSubQueryRefCtx *sub_query_ctx = NULL;
uint64_t ctx_id = static_cast<uint64_t>(expr.expr_ctx_id_);
if (NULL == (sub_query_ctx = static_cast<ObExprSubQueryRefCtx *>
@ -380,6 +381,10 @@ int ObExprSubQueryRef::expr_eval(
}
CK (OB_NOT_NULL(sub_query_ctx));
OZ (sub_query_ctx->add_cursor_info(cursor, ctx.exec_ctx_.get_my_session()));
if (OB_FAIL(ret)) {
cursor->close(*ctx.exec_ctx_.get_my_session());
cursor->~ObPLCursorInfo();
}
}
#endif
} else if (extra.is_scalar_) {