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

MCOL-1433 Fix TIME for MAKEDATE/TIMEDIFF

Browse Source 
Fix saturation behaviour for TIME with MAKEDATE() and TIMEDIFF()
This commit is contained in:
Andrew Hutchings
2018-10-04 16:53:14 +01:00
parent c0600d0da0
commit a127f84793
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utils/funcexp/func_makedate.cpp
View File

@@ -149,9 +149,10 @@ uint64_t makedate(rowgroup::Row& row,
case CalpontSystemCatalog::TIME: case CalpontSystemCatalog::TIME:
{ {
std::ostringstream ss; std::ostringstream ss;
Time aTime = parm[1]->data()->getTimeIntVal(row, isNull); char buf[9];
ss << aTime.hour << aTime.minute << aTime.second; uint64_t aTime = parm[1]->data()->getTimeIntVal(row, isNull);
dayofyear = ss.str(); DataConvert::timeToString1(aTime, buf, 9);
dayofyear = buf;
break; break;
} }

5
utils/funcexp/func_timediff.cpp
View File

@@ -118,6 +118,11 @@ string Func_timediff::getStrVal(rowgroup::Row& row,
case execplan::CalpontSystemCatalog::TIME: case execplan::CalpontSystemCatalog::TIME:
case execplan::CalpontSystemCatalog::DATETIME: case execplan::CalpontSystemCatalog::DATETIME:
if (type1 != type2)
{
isNull = true;
break;
}
val1 = parm[0]->data()->getDatetimeIntVal(row, isNull); val1 = parm[0]->data()->getDatetimeIntVal(row, isNull);
break; break;