[master] misc refine for log print and others

This commit is contained in:
chinaxing
2023-07-04 04:12:23 +00:00
committed by ob-robot
parent 3a746dedb9
commit 26ed5c0da6
6 changed files with 47 additions and 16 deletions

View File

@ -894,8 +894,8 @@ int ObResultSet::close()
}
}
// notify close fail to listener
int err = COVER_SUCC(do_close_plan_ret);
if (OB_SUCCESS != err && close_fail_cb_.is_valid()) {
int err = OB_SUCCESS != do_close_plan_ret ? do_close_plan_ret : ret;
if (OB_SUCCESS != err && err != errcode_ && close_fail_cb_.is_valid()) {
close_fail_cb_(err);
}
//NG_TRACE_EXT(result_set_close, OB_ID(ret), ret, OB_ID(arg1), prev_ret,