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

fix not set expr_datum when warn_on_fail

Browse Source
This commit is contained in:
obdev
2023-02-24 14:13:19 +00:00
committed by ob-robot
parent a781dd3676
commit 3081f5616f
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/sql/engine/expr/ob_expr_day_of_func.cpp
View File

@ -198,6 +198,7 @@ int ObExprSecToTime::calc_sectotime(const ObExpr &expr, ObEvalCtx &ctx, ObDatum
ObSQLUtils::get_default_cast_mode(session->get_stmt_type(), session, cast_mode); ObSQLUtils::get_default_cast_mode(session->get_stmt_type(), session, cast_mode);
if (CM_IS_WARN_ON_FAIL(cast_mode)) { if (CM_IS_WARN_ON_FAIL(cast_mode)) {
ret = OB_SUCCESS; ret = OB_SUCCESS;
expr_datum.set_null();
} else { } else {
LOG_WARN("time value is out of range", K(ret), K(int_usec)); LOG_WARN("time value is out of range", K(ret), K(int_usec));
} }
@ -369,6 +370,7 @@ int ObExprSubAddtime::calc_result2(common::ObObj &result,
if (OB_FAIL(ObTimeConverter::time_overflow_trunc(int_usec))) { if (OB_FAIL(ObTimeConverter::time_overflow_trunc(int_usec))) {
if (CM_IS_WARN_ON_FAIL(cast_ctx.cast_mode_)) { if (CM_IS_WARN_ON_FAIL(cast_ctx.cast_mode_)) {
ret = OB_SUCCESS; ret = OB_SUCCESS;
result.set_time(int_usec);
} else { } else {
LOG_WARN("time value is out of range", K(ret), K(int_usec)); LOG_WARN("time value is out of range", K(ret), K(int_usec));
} }
@ -609,10 +611,13 @@ int ObExprSubAddtime::subaddtime_varchar(const ObExpr &expr, ObEvalCtx &ctx, ObD
} }
} }
} }
if (OB_FAIL(ret) && OB_ALLOCATE_MEMORY_FAILED != ret) {
uint64_t cast_mode = 0; uint64_t cast_mode = 0;
ObSQLUtils::get_default_cast_mode(session->get_stmt_type(), session, cast_mode); ObSQLUtils::get_default_cast_mode(session->get_stmt_type(), session, cast_mode);
if (CM_IS_WARN_ON_FAIL(cast_mode) && OB_ALLOCATE_MEMORY_FAILED != ret) { if (CM_IS_WARN_ON_FAIL(cast_mode) ) {
ret = OB_SUCCESS; ret = OB_SUCCESS;
expr_datum.set_null();
}
} }
} }
return ret; return ret;