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

Resolve the issue of incorrect results when combining two timestamps using UNION ALL.

Browse Source
This commit is contained in:
obdev
2023-10-11 10:40:16 +00:00
committed by ob-robot
parent 2d338d0f35
commit 1b389cb973
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,6 +71,7 @@ int ObExprUnixTimestamp::calc_result_typeN(ObExprResType &type,
ret = calc_result_type_column(type, date_type); ret = calc_result_type_column(type, date_type);
} }
date_type.set_calc_type(ObTimestampType); date_type.set_calc_type(ObTimestampType);
date_type.set_calc_scale(type.get_scale());
} }
ret = OB_SUCCESS;//just let it go if error happened ret = OB_SUCCESS;//just let it go if error happened
return ret; return ret;
@ -115,7 +116,8 @@ int ObExprUnixTimestamp::calc_result_type_literal(ObExprResType &type,
if (!type1.is_string_type()) { if (!type1.is_string_type()) {
type.set_scale(type1.get_scale()); type.set_scale(type1.get_scale());
} }
type.set_precision(static_cast<ObPrecision>(TIMESTAMP_VALUE_LENGTH + type.get_scale())); type.set_precision(static_cast<ObPrecision>(TIMESTAMP_VALUE_LENGTH +
easy_max(0, type.get_scale())));
} else { } else {
type.set_int(); type.set_int();
@ -132,7 +134,8 @@ int ObExprUnixTimestamp::calc_result_type_column(ObExprResType &type,
if (type1.is_string_type() || type1.is_double()) { if (type1.is_string_type() || type1.is_double()) {
type.set_number(); type.set_number();
type.set_scale(MAX_SCALE_FOR_TEMPORAL); type.set_scale(MAX_SCALE_FOR_TEMPORAL);
type.set_precision(static_cast<ObPrecision>(TIMESTAMP_VALUE_LENGTH + type.get_scale())); type.set_precision(static_cast<ObPrecision>(TIMESTAMP_VALUE_LENGTH +
easy_max(0, type.get_scale())));
} else { } else {
if (DEFAULT_SCALE_FOR_INTEGER == type1.get_scale()) { if (DEFAULT_SCALE_FOR_INTEGER == type1.get_scale()) {
type.set_int(); type.set_int();
@ -141,7 +144,8 @@ int ObExprUnixTimestamp::calc_result_type_column(ObExprResType &type,
} else { } else {
type.set_number(); type.set_number();
type.set_scale(type1.get_scale()); type.set_scale(type1.get_scale());
type.set_precision(static_cast<ObPrecision>(TIMESTAMP_VALUE_LENGTH + type.get_scale())); type.set_precision(static_cast<ObPrecision>(TIMESTAMP_VALUE_LENGTH +
easy_max(0, type.get_scale())));
} }
} }
return ret; return ret;