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 branch 'develop-1.1' into 1.1-mergeup-20180224

Browse Source
This commit is contained in:
Andrew Hutchings
2018-02-24 11:07:24 -05:00
parent ad2f469811 ae4bb95753
commit 21d8f04a65
33 changed files with 337 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
utils/funcexp/func_case.cpp
View File

@ -362,6 +362,20 @@ CalpontSystemCatalog::ColType Func_simple_case::operationType(FunctionParm& fp,
}
bool Func_simple_case::getBoolVal(Row& row,
FunctionParm& parm,
bool& isNull,
CalpontSystemCatalog::ColType& operationColType)
{
uint64_t i = simple_case_cmp(row, parm, isNull, operationColType);
if (isNull)
return joblist::BIGINTNULL;
return parm[i + 1]->data()->getBoolVal(row, isNull);
}
int64_t Func_simple_case::getIntVal(Row& row,
FunctionParm& parm,
bool& isNull,
@ -465,6 +479,18 @@ CalpontSystemCatalog::ColType Func_searched_case::operationType(FunctionParm& fp
return caseOperationType(fp, resultType, false);
}
bool Func_searched_case::getBoolVal(Row& row,
FunctionParm& parm,
bool& isNull,
CalpontSystemCatalog::ColType&)
{
uint64_t i = searched_case_cmp(row, parm, isNull);
if (isNull)
return joblist::BIGINTNULL;
return parm[i + 1]->data()->getBoolVal(row, isNull);
}
int64_t Func_searched_case::getIntVal(Row& row,
FunctionParm& parm,

10
utils/funcexp/functor_all.h
View File

@ -70,6 +70,11 @@ public:
execplan::CalpontSystemCatalog::ColType operationType(FunctionParm& fp, execplan::CalpontSystemCatalog::ColType& resultType);
bool getBoolVal(rowgroup::Row& row,
FunctionParm& fp,
bool& isNull,
execplan::CalpontSystemCatalog::ColType& op_ct);
int64_t getIntVal(rowgroup::Row& row,
FunctionParm& fp,
bool& isNull,
@ -112,6 +117,11 @@ public:
execplan::CalpontSystemCatalog::ColType operationType(FunctionParm& fp, execplan::CalpontSystemCatalog::ColType& resultType);
bool getBoolVal(rowgroup::Row& row,
FunctionParm& fp,
bool& isNull,
execplan::CalpontSystemCatalog::ColType& op_ct);
int64_t getIntVal(rowgroup::Row& row,
FunctionParm& fp,
bool& isNull,