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

[CP] fix bug about datetime when serlize

Browse Source
This commit is contained in:
obdev
2023-07-24 09:12:33 +00:00
committed by ob-robot
parent ae0cd73243
commit 9974a38e66
1 changed files with 64 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
deps/oblib/src/rpc/obmysql/ob_mysql_util.cpp vendored
View File

@ -475,30 +475,44 @@ int ObMySQLUtil::datetime_cell_str(
if (OB_FAIL(ObTimeConverter::datetime_to_ob_time(val, tz_info, ob_time))) { if (OB_FAIL(ObTimeConverter::datetime_to_ob_time(val, tz_info, ob_time))) {
LOG_WARN("convert usec ", K(ret)); LOG_WARN("convert usec ", K(ret));
} else { } else {
timelen = 11; if (ob_time.parts_[DT_USEC]) {
timelen = 11;
} else if (ob_time.parts_[DT_HOUR] || ob_time.parts_[DT_MIN] || ob_time.parts_[DT_SEC]) {
timelen = 7;
} else if (ob_time.parts_[DT_YEAR] || ob_time.parts_[DT_MON] || ob_time.parts_[DT_MDAY]) {
timelen = 4;
} else {
timelen = 0;
}
if (OB_FAIL(ObMySQLUtil::store_int1(buf, len, timelen, pos))) { if (OB_FAIL(ObMySQLUtil::store_int1(buf, len, timelen, pos))) {
LOG_WARN("failed to store int", K(len), K(timelen), K(pos), K(ret)); LOG_WARN("failed to store int", K(len), K(timelen), K(pos), K(ret));
} else if (OB_FAIL( }
ObMySQLUtil::store_int2(buf, len, static_cast<int16_t>(ob_time.parts_[DT_YEAR]), pos))) {
LOG_WARN("failed to store int", K(len), K(timelen), K(pos), K(ret)); if(timelen > 0 && OB_SUCC(ret)) {
} else if (OB_FAIL( if (OB_FAIL(ObMySQLUtil::store_int2(buf, len, static_cast<int16_t>(ob_time.parts_[DT_YEAR]), pos))) {
ObMySQLUtil::store_int1(buf, len, static_cast<int8_t>(ob_time.parts_[DT_MON]), pos))) { LOG_WARN("failed to store int", K(len), K(timelen), K(pos), K(ret));
LOG_WARN("failed to store int", K(len), K(timelen), K(pos), K(ret)); } else if (OB_FAIL(ObMySQLUtil::store_int1(buf, len, static_cast<int8_t>(ob_time.parts_[DT_MON]), pos))) {
} else if (OB_FAIL( LOG_WARN("failed to store int", K(len), K(timelen), K(pos), K(ret));
ObMySQLUtil::store_int1(buf, len, static_cast<int8_t>(ob_time.parts_[DT_MDAY]), pos))) { } else if (OB_FAIL(ObMySQLUtil::store_int1(buf, len, static_cast<int8_t>(ob_time.parts_[DT_MDAY]), pos))) {
LOG_WARN("failed to store int", K(len), K(timelen), K(pos), K(ret)); LOG_WARN("failed to store int", K(len), K(timelen), K(pos), K(ret));
} else if (OB_FAIL( }
ObMySQLUtil::store_int1(buf, len, static_cast<int8_t>(ob_time.parts_[DT_HOUR]), pos))) { }
LOG_WARN("failed to store int", K(len), K(timelen), K(pos), K(ret));
} else if (OB_FAIL( if(timelen > 4 && OB_SUCC(ret)) {
ObMySQLUtil::store_int1(buf, len, static_cast<int8_t>(ob_time.parts_[DT_MIN]), pos))) { if (OB_FAIL(ObMySQLUtil::store_int1(buf, len, static_cast<int8_t>(ob_time.parts_[DT_HOUR]), pos))) {
LOG_WARN("failed to store int", K(len), K(timelen), K(pos), K(ret)); LOG_WARN("failed to store int", K(len), K(timelen), K(pos), K(ret));
} else if (OB_FAIL( } else if (OB_FAIL(ObMySQLUtil::store_int1(buf, len, static_cast<int8_t>(ob_time.parts_[DT_MIN]), pos))) {
ObMySQLUtil::store_int1(buf, len, static_cast<int8_t>(ob_time.parts_[DT_SEC]), pos))) { LOG_WARN("failed to store int", K(len), K(timelen), K(pos), K(ret));
LOG_WARN("failed to store int", K(len), K(timelen), K(pos), K(ret)); } else if (OB_FAIL(ObMySQLUtil::store_int1(buf, len, static_cast<int8_t>(ob_time.parts_[DT_SEC]), pos))) {
} else if (OB_FAIL( LOG_WARN("failed to store int", K(len), K(timelen), K(pos), K(ret));
ObMySQLUtil::store_int4(buf, len, static_cast<int32_t>(ob_time.parts_[DT_USEC]), pos))) { }
LOG_WARN("failed to store int", K(len), K(timelen), K(pos), K(ret)); }
if(timelen > 7 && OB_SUCC(ret)) {
if (OB_FAIL(ObMySQLUtil::store_int4(buf, len, static_cast<int32_t>(ob_time.parts_[DT_USEC]), pos))) {
LOG_WARN("failed to store int", K(len), K(timelen), K(pos), K(ret));
}
} }
} }
} else { } else {
@ -673,23 +687,38 @@ int ObMySQLUtil::time_cell_str(
if (OB_FAIL(ObTimeConverter::time_to_ob_time(val, ob_time))) { if (OB_FAIL(ObTimeConverter::time_to_ob_time(val, ob_time))) {
LOG_WARN("convert usec to timestamp failed", K(ret)); LOG_WARN("convert usec to timestamp failed", K(ret));
} else { } else {
timelen = 12;
int ob_time_day = ob_time.parts_[DT_DATE] + ob_time.parts_[DT_HOUR] / 24; int ob_time_day = ob_time.parts_[DT_DATE] + ob_time.parts_[DT_HOUR] / 24;
int ob_time_hour = ob_time.parts_[DT_HOUR] % 24; int ob_time_hour = ob_time.parts_[DT_HOUR] % 24;
if (ob_time.parts_[DT_USEC]) {
timelen = 12;
} else if (ob_time_day || ob_time_hour || ob_time.parts_[DT_MIN] || ob_time.parts_[DT_SEC]) {
timelen = 8;
} else {
timelen = 0;
}
if (OB_FAIL(ObMySQLUtil::store_int1(buf, len, timelen, pos))) {//length if (OB_FAIL(ObMySQLUtil::store_int1(buf, len, timelen, pos))) {//length
LOG_WARN("fail to store int", K(ret)); LOG_WARN("fail to store int", K(ret));
} else if (OB_FAIL(ObMySQLUtil::store_int1(buf, len, static_cast<int8_t>(DT_MODE_NEG & ob_time.mode_), pos))) {//is_negative(1) }
LOG_WARN("fail to store int", K(ret));
} else if (OB_FAIL(ObMySQLUtil::store_int4(buf, len, static_cast<int32_t>(ob_time_day), pos))) {//days(4) if(timelen > 0 && OB_SUCC(ret)) {
LOG_WARN("fail to store int", K(ret)); if (OB_FAIL(ObMySQLUtil::store_int1(buf, len, static_cast<int8_t>(DT_MODE_NEG & ob_time.mode_), pos))) {//is_negative(1)
} else if (OB_FAIL(ObMySQLUtil::store_int1(buf, len, static_cast<int8_t>(ob_time_hour), pos))) {//hour(1) LOG_WARN("fail to store int", K(ret));
LOG_WARN("fail to store int", K(ret)); } else if (OB_FAIL(ObMySQLUtil::store_int4(buf, len, static_cast<int32_t>(ob_time_day), pos))) {//days(4)
} else if (OB_FAIL(ObMySQLUtil::store_int1(buf, len, static_cast<int8_t>(ob_time.parts_[DT_MIN]), pos))) {//minute(1) LOG_WARN("fail to store int", K(ret));
LOG_WARN("fail to store int", K(ret)); } else if (OB_FAIL(ObMySQLUtil::store_int1(buf, len, static_cast<int8_t>(ob_time_hour), pos))) {//hour(1)
} else if ( OB_FAIL(ObMySQLUtil::store_int1(buf, len, static_cast<int8_t>(ob_time.parts_[DT_SEC]), pos))) {//second(1) LOG_WARN("fail to store int", K(ret));
LOG_WARN("fail to store int", K(ret)); } else if (OB_FAIL(ObMySQLUtil::store_int1(buf, len, static_cast<int8_t>(ob_time.parts_[DT_MIN]), pos))) {//minute(1)
} else if (OB_FAIL(ObMySQLUtil::store_int4(buf, len, static_cast<int32_t>(ob_time.parts_[DT_USEC]), pos))) {//micro-second(4) LOG_WARN("fail to store int", K(ret));
LOG_WARN("fail to store int", K(ret)); } else if ( OB_FAIL(ObMySQLUtil::store_int1(buf, len, static_cast<int8_t>(ob_time.parts_[DT_SEC]), pos))) {//second(1)
LOG_WARN("fail to store int", K(ret));
}
}
if(timelen > 8 && OB_SUCC(ret)) {
if (OB_FAIL(ObMySQLUtil::store_int4(buf, len, static_cast<int32_t>(ob_time.parts_[DT_USEC]), pos))) {//micro-second(4)
LOG_WARN("fail to store int", K(ret));
}
} }
} }
} else { } else {