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

[CP] fix bug about time type for old engine and new engine

Browse Source
This commit is contained in:
obdev
2023-04-04 15:41:19 +00:00
committed by ob-robot
parent e501bbe216
commit 6cfbbe8784
6 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/engine/expr/ob_datum_cast.cpp
View File

@ -1051,11 +1051,10 @@ static OB_INLINE int common_string_time(const ObExpr &expr,
int warning = OB_SUCCESS;
int64_t out_val = 0;
ObScale res_scale; // useless
ObScale time_scale = expr.datum_meta_.scale_;
// support sqlmode TIME_TRUNCATE_FRACTIONAL
const ObCastMode cast_mode = expr.extra_;
bool need_truncate = CM_IS_COLUMN_CONVERT(cast_mode) ? CM_IS_TIME_TRUNCATE_FRACTIONAL(cast_mode) : false;
if (CAST_FAIL(ObTimeConverter::str_to_time(in_str, out_val, &res_scale, time_scale, need_truncate))) {
if (CAST_FAIL(ObTimeConverter::str_to_time(in_str, out_val, &res_scale, need_truncate))) {
LOG_WARN("str_to_time failed", K(ret), K(in_str));
} else {
SET_RES_TIME(out_val);
@ -11594,7 +11593,7 @@ int ob_datum_to_ob_time_without_date(const ObDatum &datum, const ObObjType type,
LOG_WARN("int to ob time without date failed", K(ret));
} else {
//mysql中intTC转time时，如果hour超过838，那么time应该为null，而不是最大值。
const int64_t time_max_val = TIME_MAX_VAL; // 838:59:59 .
const int64_t time_max_val = TIME_MAX_VAL; // 838:59:59.
int64_t value = ObTimeConverter::ob_time_to_time(ob_time);
if (value > time_max_val) {
ret = OB_INVALID_DATE_VALUE;
@ -11656,8 +11655,8 @@ int ob_datum_to_ob_time_without_date(const ObDatum &datum, const ObObjType type,
LOG_WARN("int to ob time without date failed", K(ret));
} else {
if ((!ob_time.parts_[DT_YEAR]) && (!ob_time.parts_[DT_MON]) && (!ob_time.parts_[DT_MDAY])) {
//mysql中intTC转time时，如果超过838:59:59.999999，那么time应该为null，而不是最大值。
const int64_t time_max_val = TIME_MAX_VAL + 999999; // 838:59:59.999999 .
//mysql中intTC转time时，如果超过838:59:59，那么time应该为null，而不是最大值。
const int64_t time_max_val = TIME_MAX_VAL; // 838:59:59.
int64_t value = ObTimeConverter::ob_time_to_time(ob_time);
if(value > time_max_val) {
ret = OB_INVALID_DATE_VALUE;