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

fix aggregate scale for temporal type bug

Browse Source
This commit is contained in:
st0
2022-03-04 11:45:50 +08:00
committed by LINxiansheng
parent 5022a0609f
commit f0d7d9d626
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/engine/expr/ob_expr_ifnull.cpp
View File

@ -68,9 +68,9 @@ int ObExprIfNull::calc_result_type2(
type.set_accuracy(ObAccuracy::DDL_DEFAULT_ACCURACY[ObIntType].get_accuracy()); type.set_accuracy(ObAccuracy::DDL_DEFAULT_ACCURACY[ObIntType].get_accuracy());
} }
// set scale //set scale
ObScale scale1 = type1.get_scale(); ObScale scale1 = type1.is_null() ? 0 : type1.get_scale();
ObScale scale2 = type2.get_scale(); ObScale scale2 = type2.is_null() ? 0 : type2.get_scale();
if (-1 != scale1 && -1 != scale2) { if (-1 != scale1 && -1 != scale2) {
type.set_scale(static_cast<ObScale>(max(scale1, scale2))); type.set_scale(static_cast<ObScale>(max(scale1, scale2)));
} else { } else {

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

@ -98,8 +98,8 @@ int ObExprNvl::calc_result_type2(
} else { } else {
type.set_accuracy(type2.get_accuracy()); type.set_accuracy(type2.get_accuracy());
} }
ObScale scale1 = type1.get_scale(); ObScale scale1 = type1.is_null() ? 0 : type1.get_scale();
ObScale scale2 = type2.get_scale(); ObScale scale2 = type2.is_null() ? 0 : type2.get_scale();
if (-1 != scale1 && -1 != scale2) { if (-1 != scale1 && -1 != scale2) {
type.set_scale(static_cast<ObScale>(max(scale1, scale2))); type.set_scale(static_cast<ObScale>(max(scale1, scale2)));
} else { } else {

3
src/sql/engine/expr/ob_expr_operator.cpp
View File

@ -1127,8 +1127,7 @@ int ObExprOperator::aggregate_temporal_accuracy_for_merge(
} }
} }
if (OB_UNLIKELY(scale < 0)) { if (OB_UNLIKELY(scale < 0)) {
ret = OB_ERR_UNEXPECTED; type.set_scale(ObAccuracy::MAX_ACCURACY2[is_oracle_mode()][type.get_type()].get_scale());
LOG_WARN("unexpected scale.", K(ret), K(scale));
} else { } else {
type.set_scale(scale); type.set_scale(scale);
} }