database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-05 15:41:14 +03:00
Code Activity

MCOL-4263 return int for func_floor on datetime

Browse Source 
For TIMESTAMP, it should do similar. However, it didn't work. For some reason, MDB has the function set as DATETIME, which for cs, isn't the same thing. Added a kludge to ha_mcs_execplan.cpp to handle it.
This commit is contained in:
David Hall
2020-12-04 16:43:32 -06:00
parent cc6c51b540
commit d35002fb65
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dbcon/mysql/ha_mcs_execplan.cpp
View File

@ -4149,6 +4149,14 @@ ReturnedColumn* buildFunctionColumn(
#endif #endif
fc->operationType(functor->operationType(funcParms, fc->resultType())); fc->operationType(functor->operationType(funcParms, fc->resultType()));
// For some reason, MDB has MYSQL_TYPE_DATETIME2 for functions on a TIMESTAMP
if (fc->operationType().colDataType == CalpontSystemCatalog::TIMESTAMP)
{
CalpontSystemCatalog::ColType ct = fc->resultType();
ct.colDataType = CalpontSystemCatalog::TIMESTAMP;
ct.colWidth = 8;
fc->resultType(ct);
}
fc->expressionId(ci->expressionId++); fc->expressionId(ci->expressionId++);
// A few functions use a different collation than that found in // A few functions use a different collation than that found in
// the base ifp class // the base ifp class

17
utils/funcexp/func_floor.cpp
View File

@ -114,27 +114,14 @@ int64_t Func_floor::getIntVal(Row& row,
case execplan::CalpontSystemCatalog::DATETIME: case execplan::CalpontSystemCatalog::DATETIME:
{ {
string str = ret = parm[0]->data()->getDatetimeIntVal(row, isNull);
DataConvert::datetimeToString1(parm[0]->data()->getDatetimeIntVal(row, isNull));
// strip off micro seconds
str = str.substr(0, 14);
if (!isNull)
ret = atoll(str.c_str());
} }
break; break;
case execplan::CalpontSystemCatalog::TIMESTAMP: case execplan::CalpontSystemCatalog::TIMESTAMP:
{ {
string str = ret = parm[0]->data()->getTimestampIntVal(row, isNull);
DataConvert::timestampToString1(parm[0]->data()->getTimestampIntVal(row, isNull), timeZone());
// strip off micro seconds
str = str.substr(0, 14);
if (!isNull)
ret = atoll(str.c_str());
} }
break; break;