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

MCOL-392 Apply astyle

Browse Source 
Make this branch apply our style guidelines
This commit is contained in:
Andrew Hutchings
2018-05-01 09:52:26 +01:00
parent 4ef4286022
commit c40903de9b
31 changed files with 176 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
utils/funcexp/func_nullif.cpp
View File

@ -129,8 +129,8 @@ int64_t Func_nullif::getIntVal(rowgroup::Row& row,
if ((parm[0]->data()->resultType().colDataType ==
execplan::CalpontSystemCatalog::DATE) ||
(parm[0]->data()->resultType().colDataType ==
execplan::CalpontSystemCatalog::DATETIME))
(parm[0]->data()->resultType().colDataType ==
execplan::CalpontSystemCatalog::DATETIME))
{
// NULLIF arg0 is DATE, arg1 is DATETIME,
@ -164,8 +164,8 @@ int64_t Func_nullif::getIntVal(rowgroup::Row& row,
if ((parm[0]->data()->resultType().colDataType ==
execplan::CalpontSystemCatalog::DATETIME) ||
(parm[0]->data()->resultType().colDataType ==
execplan::CalpontSystemCatalog::TIME))
(parm[0]->data()->resultType().colDataType ==
execplan::CalpontSystemCatalog::TIME))
{
// NULLIF arg0 is DATETIME, arg1 is TIME,
// Upgrade arg1 to time
@ -495,9 +495,9 @@ int64_t Func_nullif::getDatetimeIntVal(rowgroup::Row& row,
}
int64_t Func_nullif::getTimeIntVal(rowgroup::Row& row,
FunctionParm& parm,
bool& isNull,
CalpontSystemCatalog::ColType& ct)
FunctionParm& parm,
bool& isNull,
CalpontSystemCatalog::ColType& ct)
{
int64_t exp1 = parm[0]->data()->getTimeIntVal(row, isNull);
int64_t exp2 = 0;