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

fix lrpad return null when param is empty string && fix nanvl return null when 1st param is binary double

Browse Source
This commit is contained in:
18523270951@163.com
2023-05-23 10:47:11 +00:00
committed by ob-robot
parent 03fdde5756
commit d38916c6f0
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sql/engine/expr/ob_expr_nvl.cpp
View File

@ -438,9 +438,7 @@ int ObExprNaNvl::cg_expr(ObExprCGCtx &expr_cg_ctx, const ObRawExpr &raw_expr,
int ObExprNaNvl::eval_nanvl_util(const ObExpr &expr, ObDatum &expr_datum, ObDatum *param1, ObDatum *param2, bool &ret_bool)
{
int ret = OB_SUCCESS;
if (param1->is_null() || param2->is_null()) {
expr_datum.set_null();
} else if (expr.args_[0]->datum_meta_.type_ != ObFloatType
if (expr.args_[0]->datum_meta_.type_ != ObFloatType
&& expr.args_[0]->datum_meta_.type_ != ObDoubleType) {
expr_datum.set_datum(*param1);
} else {
@ -470,7 +468,7 @@ int ObExprNaNvl::eval_nanvl(const ObExpr &expr, ObEvalCtx &ctx, ObDatum &expr_da
expr_datum.set_null();
} else if (OB_FAIL(expr.args_[1]->eval(ctx, param2))) {
LOG_WARN("eval second param failed", K(ret));
} else if (param1->is_null() || param2->is_null()) {
} else if (param1->is_null() || (param2->is_null() && ObDoubleType != expr.args_[1]->datum_meta_.get_type())) {
expr_datum.set_null();
} else {
if (OB_FAIL(eval_nanvl_util(expr, expr_datum, param1, param2, ret_bool))){
@ -520,7 +518,9 @@ int ObExprNaNvl::eval_nanvl_batch(const ObExpr &expr,
param1 = &expr.args_[0]->locate_expr_datum(ctx, i);
param2 = &expr.args_[1]->locate_expr_datum(ctx, i);
eval_flags.set(i);
if (OB_FAIL(eval_nanvl_util(expr, results[i], param1, param2, ret_bool))){
if (param1->is_null() || (param2->is_null() && ObDoubleType != expr.args_[1]->datum_meta_.get_type())) {
results[i].set_null();
} else if (OB_FAIL(eval_nanvl_util(expr, results[i], param1, param2, ret_bool))){
LOG_WARN("eval_nanvl unexpect error", K(ret));
} else {
// do nothing