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-289 Fix MCOL(0) handling

Browse Source 
Now throws an error instead of returning NULL to align with MariaDB
This commit is contained in:
Andrew Hutchings
2016-10-03 22:27:30 +01:00
parent a966fa3382
commit 9606375939
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
utils/funcexp/func_math.cpp
View File

@ -469,7 +469,7 @@ double Func_cot::getDoubleVal(Row& row,
bool& isNull, bool& isNull,
CalpontSystemCatalog::ColType&) CalpontSystemCatalog::ColType&)
{ {
switch (parm[0]->data()->resultType().colDataType) switch (parm[0]->data()->resultType().colDataType)
{ {
case execplan::CalpontSystemCatalog::BIGINT: case execplan::CalpontSystemCatalog::BIGINT:
case execplan::CalpontSystemCatalog::INT: case execplan::CalpontSystemCatalog::INT:
@ -492,6 +492,14 @@ double Func_cot::getDoubleVal(Row& row,
{ {
// null value is indicated by isNull // null value is indicated by isNull
double value = parm[0]->data()->getDoubleVal(row, isNull); double value = parm[0]->data()->getDoubleVal(row, isNull);
if (value == 0)
{
Message::Args args;
args.add("cot");
args.add(value);
unsigned errcode = ERR_INCORRECT_VALUE;
throw IDBExcept(IDBErrorInfo::instance()->errorMsg(errcode, args), errcode);
}
if (isNull) if (isNull)
{ {
isNull = true; isNull = true;
@ -505,6 +513,15 @@ double Func_cot::getDoubleVal(Row& row,
case execplan::CalpontSystemCatalog::DATE: case execplan::CalpontSystemCatalog::DATE:
{ {
int32_t value = parm[0]->data()->getDateIntVal(row, isNull); int32_t value = parm[0]->data()->getDateIntVal(row, isNull);
if (value == 0)
{
Message::Args args;
args.add("cot");
args.add(value);
unsigned errcode = ERR_INCORRECT_VALUE;
throw IDBExcept(IDBErrorInfo::instance()->errorMsg(errcode, args), errcode);
}
if (isNull) if (isNull)
{ {
isNull = true; isNull = true;
@ -518,6 +535,14 @@ double Func_cot::getDoubleVal(Row& row,
case execplan::CalpontSystemCatalog::DATETIME: case execplan::CalpontSystemCatalog::DATETIME:
{ {
int64_t value = parm[0]->data()->getDatetimeIntVal(row, isNull); int64_t value = parm[0]->data()->getDatetimeIntVal(row, isNull);
if (value == 0)
{
Message::Args args;
args.add("cot");
args.add((uint64_t)value);
unsigned errcode = ERR_INCORRECT_VALUE;
throw IDBExcept(IDBErrorInfo::instance()->errorMsg(errcode, args), errcode);
}
if (isNull) if (isNull)
{ {
isNull = true; isNull = true;
@ -530,7 +555,7 @@ double Func_cot::getDoubleVal(Row& row,
default: default:
{ {
std::ostringstream oss; std::ostringstream oss;
oss << "cot: datatype of " << execplan::colDataTypeToString(parm[0]->data()->resultType().colDataType); oss << "cot: datatype of " << execplan::colDataTypeToString(parm[0]->data()->resultType().colDataType);
throw logging::IDBExcept(oss.str(), ERR_DATATYPE_NOT_SUPPORT); throw logging::IDBExcept(oss.str(), ERR_DATATYPE_NOT_SUPPORT);
} }