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

TIMESTAMP namespace fixes

Browse Source 
Namespace issues in the TIMESTAMP code caused compiling to break. This
patch fixes that.
This commit is contained in:
Andrew Hutchings
2019-06-12 15:05:20 +01:00
parent d6cdef3d86
commit 1db56546ee
22 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utils/funcexp/func_timediff.cpp
View File

@ -134,11 +134,11 @@ string Func_timediff::getStrVal(rowgroup::Row& row,
break;
}
int64_t temp = parm[0]->data()->getTimestampIntVal(row, isNull);
TimeStamp timestamp(temp);
dataconvert::TimeStamp timestamp(temp);
int64_t seconds = timestamp.second;
MySQLTime time;
gmtSecToMySQLTime(seconds, time, fTimeZone);
DateTime dt;
dataconvert::MySQLTime time;
dataconvert::gmtSecToMySQLTime(seconds, time, fTimeZone);
dataconvert::DateTime dt;
dt.year = time.year;
dt.month = time.month;
dt.day = time.day;
@ -196,11 +196,11 @@ string Func_timediff::getStrVal(rowgroup::Row& row,
case execplan::CalpontSystemCatalog::TIMESTAMP:
{
int64_t temp = parm[1]->data()->getTimestampIntVal(row, isNull);
TimeStamp timestamp(temp);
dataconvert::TimeStamp timestamp(temp);
int64_t seconds = timestamp.second;
MySQLTime time;
gmtSecToMySQLTime(seconds, time, fTimeZone);
DateTime dt;
dataconvert::MySQLTime time;
dataconvert::gmtSecToMySQLTime(seconds, time, fTimeZone);
dataconvert::DateTime dt;
dt.year = time.year;
dt.month = time.month;
dt.day = time.day;