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

Merge pull request #1713 from dhall-MariaDB/MCOL-4472-dev

Browse Source 
MCOL-4472 Fix up floor() for the new format MariaDB 10.5
This commit is contained in:
benthompson15
2021-01-19 13:32:13 -06:00
committed by GitHub
parent 2b030f6f5a 6e41b41637
commit ef1268b5a2
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:
{
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)
ret = atoll(str.c_str());
ret = d.convertToMySQLint();
}
break;
@ -127,14 +129,7 @@ int64_t Func_floor::getIntVal(Row& row,
case execplan::CalpontSystemCatalog::TIME:
{
string str =
DataConvert::timeToString1(parm[0]->data()->getTimeIntVal(row, isNull));
// strip off micro seconds
str = str.substr(0, 14);
if (!isNull)
ret = atoll(str.c_str());
ret = parm[0]->data()->getTimeIntVal(row, isNull);
}
break;