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

fix timestampadd bug

Browse Source
This commit is contained in:
obdev
2023-01-11 08:11:50 +00:00
committed by ob-robot
parent 1a6f43281b
commit 8f5facb3fe
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
deps/oblib/src/lib/timezone/ob_time_convert.cpp vendored
View File

@ -5308,6 +5308,11 @@ int ObTimeConverter::check_dfm_deterministic(const ObString format,
return ret; return ret;
} }
int32_t ObTimeConverter::get_days_of_month(int32_t year, int32_t month)
{
return DAYS_PER_MON[IS_LEAP_YEAR(year)][month];
}
int ObTimeConverter::set_ob_time_part_directly(ObTime &ob_time, int64_t &conflict_bitset, const int64_t part_offset, const int32_t part_value) int ObTimeConverter::set_ob_time_part_directly(ObTime &ob_time, int64_t &conflict_bitset, const int64_t part_offset, const int32_t part_value)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;

2
deps/oblib/src/lib/timezone/ob_time_convert.h vendored
View File

@ -585,7 +585,7 @@ public:
static int check_dfm_deterministic(const ObString format, static int check_dfm_deterministic(const ObString format,
const ObCollationType format_coll_type, const ObCollationType format_coll_type,
const bool need_tz, bool &complete); const bool need_tz, bool &complete);
static int32_t get_days_of_month(int32_t year, int32_t month);
struct ObTimeDigits { struct ObTimeDigits {
ObTimeDigits() ObTimeDigits()
: ptr_(NULL), len_(0), value_(0) : ptr_(NULL), len_(0), value_(0)

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

@ -138,6 +138,10 @@ int ObExprTimeStampAdd::calc(const int64_t unit_value,
} else { } else {
ot.parts_[DT_YEAR] = month / 12; ot.parts_[DT_YEAR] = month / 12;
ot.parts_[DT_MON] = month % 12 + 1; ot.parts_[DT_MON] = month % 12 + 1;
int32_t days = ObTimeConverter::get_days_of_month(ot.parts_[DT_YEAR], ot.parts_[DT_MON]);
if (ot.parts_[DT_MDAY] > days) {
ot.parts_[DT_MDAY] = days;
}
ot.parts_[DT_DATE] = ObTimeConverter::ob_time_to_date(ot); ot.parts_[DT_DATE] = ObTimeConverter::ob_time_to_date(ot);
if (OB_FAIL(ObTimeConverter::ob_time_to_datetime(ot, cvrt_ctx, value))) { if (OB_FAIL(ObTimeConverter::ob_time_to_datetime(ot, cvrt_ctx, value))) {
LOG_WARN("ob time to datetime failed", K(ret)); LOG_WARN("ob time to datetime failed", K(ret));