database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-4472 Fix up floor() for the new format MariaDB 10.5

Browse Source 
In 105, MariaDB expects a new format from floor()
This commit is contained in:
David Hall
2021-01-08 15:00:31 -06:00
parent 0e6778378d
commit 6e41b41637
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
utils/funcexp/func_floor.cpp
View File

@ -105,10 +105,12 @@ int64_t Func_floor::getIntVal(Row& row,
case execplan::CalpontSystemCatalog::DATE: case execplan::CalpontSystemCatalog::DATE:
{ {
string str = DataConvert::dateToString1(parm[0]->data()->getDateIntVal(row, isNull)); // For some reason, MDB doesn't return this as a date,
// but datetime is returned as a datetime. Expect
// this to change in the future.
Date d (parm[0]->data()->getDateIntVal(row, isNull));
if (!isNull) if (!isNull)
ret = atoll(str.c_str()); ret = d.convertToMySQLint();
} }
break; break;
@ -127,14 +129,7 @@ int64_t Func_floor::getIntVal(Row& row,
case execplan::CalpontSystemCatalog::TIME: case execplan::CalpontSystemCatalog::TIME:
{ {
string str = ret = parm[0]->data()->getTimeIntVal(row, isNull);
DataConvert::timeToString1(parm[0]->data()->getTimeIntVal(row, isNull));
// strip off micro seconds
str = str.substr(0, 14);
if (!isNull)
ret = atoll(str.c_str());
} }
break; break;