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 dev-merge-up-20180430

Browse Source
This commit is contained in:
Andrew Hutchings
2018-04-30 08:51:58 +01:00
parent 6324d4917f 585388188f
commit b58122589b
11 changed files with 341 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
utils/funcexp/func_case.cpp
View File

@ -52,9 +52,10 @@ inline uint64_t simple_case_cmp(Row& row,
CalpontSystemCatalog::ColType& operationColType)
{
uint64_t i = 0; // index to the parm list
uint64_t n = parm.size() - 1; // remove expression from count of expression_i + result_i
uint64_t hasElse = n % 2; // if 1, then ELSE exist
n -= hasElse; // index to expression
uint64_t n = 0; // remove expression from count of expression_i + result_i
uint64_t hasElse = (parm.size() - 1) % 2; // if 1, then ELSE exist
uint64_t whereCount = hasElse ? (parm.size() - 2) / 2 : (parm.size() - 1) / 2;
bool foundIt = false;
switch (operationColType.colDataType)
{
@ -71,10 +72,13 @@ inline uint64_t simple_case_cmp(Row& row,
if (isNull)
break;
for (; i < n; i += 2)
for (i = 1; i <= whereCount; i++)
{
if (ev == parm[i]->data()->getIntVal(row, isNull) && !isNull)
{
foundIt = true;
break;
}
else
isNull = false;
}
@ -93,10 +97,13 @@ inline uint64_t simple_case_cmp(Row& row,
if (isNull)
break;
for (; i < n; i += 2)
for (i = 1; i <= whereCount; i++)
{
if (ev == parm[i]->data()->getUintVal(row, isNull) && !isNull)
{
foundIt = true;
break;
}
else
isNull = false;
}
@ -113,11 +120,14 @@ inline uint64_t simple_case_cmp(Row& row,
if (isNull)
break;
for (; i < n; i += 2)
for (i = 1; i <= whereCount; i++)
{
//BUG 5362
if (utf8::idb_strcoll(ev.c_str(), parm[i]->data()->getStrVal(row, isNull).c_str()) == 0 && !isNull)
{
foundIt = true;
break;
}
else
isNull = false;
}
@ -133,10 +143,13 @@ inline uint64_t simple_case_cmp(Row& row,
if (isNull)
break;
for (; i < n; i += 2)
for (i = 1; i <= whereCount; i++)
{
if (ev == parm[i]->data()->getDecimalVal(row, isNull) && !isNull)
{
foundIt = true;
break;
}
else
isNull = false;
}
@ -152,10 +165,13 @@ inline uint64_t simple_case_cmp(Row& row,
if (isNull)
break;
for (; i < n; i += 2)
for (i = 1; i <= whereCount; i++)
{
if (ev == parm[i]->data()->getDoubleVal(row, isNull) && !isNull)
{
foundIt = true;
break;
}
else
isNull = false;
}
@ -171,10 +187,13 @@ inline uint64_t simple_case_cmp(Row& row,
if (isNull)
break;
for (; i < n; i += 2)
for (i = 1; i <= whereCount; i++)
{
if (ev == parm[i]->data()->getFloatVal(row, isNull) && !isNull)
{
foundIt = true;
break;
}
else
isNull = false;
}
@ -190,16 +209,24 @@ inline uint64_t simple_case_cmp(Row& row,
}
}
if (i == n && !hasElse)
if (!foundIt && !hasElse)
isNull = true;
else if (!foundIt && hasElse && !isNull)
{
i = parm.size() - 1;
}
else if (isNull && hasElse)
// BUG 5110. Only way we can exit above with isNull == true is when ev is NULL
// if so and we have else condition we need to use it by setting i = n
// if so and we have else condition we need to use it by setting i = else
{
i = n;
i = parm.size() - 1;
isNull = false;
}
if (foundIt)
{
i += whereCount;
}
return i;
}
@ -210,22 +237,35 @@ inline uint64_t searched_case_cmp(Row& row,
bool& isNull)
{
uint64_t i = 0; // index to the parm list
uint64_t n = parm.size(); // count of boolean_expression_i + result_i
uint64_t hasElse = n % 2; // if 1, then ELSE exist
n -= hasElse; // index to expression
uint64_t hasElse = parm.size() % 2; // if 1, then ELSE exist
uint64_t whereCount = hasElse ? (parm.size() - 1) / 2 : parm.size() / 2;
bool foundIt = false;
for (; i < n; i += 2)
for (i = 0; i < whereCount; i++)
{
if (parm[i]->getBoolVal(row, isNull))
{
foundIt = true;
break;
}
}
isNull = false;
if (i == n && !hasElse)
if (!foundIt && !hasElse)
isNull = true;
else if (!foundIt && hasElse)
{
i = parm.size() - 1;
}
return (i == n ? i - 1 : i);
if (foundIt)
{
i += whereCount;
}
return i;
}
@ -233,7 +273,6 @@ CalpontSystemCatalog::ColType caseOperationType(FunctionParm& fp,
CalpontSystemCatalog::ColType& resultType,
bool simpleCase)
{
// ... expression_i + result_i + ... [[expression] + result_N]
FunctionParm::size_type n = fp.size();
if (simpleCase) // simple case has an expression
@ -244,6 +283,9 @@ CalpontSystemCatalog::ColType caseOperationType(FunctionParm& fp,
if (hasElse)
--n; // n now is an even number
uint64_t parmCount = hasElse ? (fp.size() - 2) : (fp.size() - 1);
uint64_t whereCount = hasElse ? (fp.size() - 2 + simpleCase) / 2 : (fp.size() - 1) / 2 + simpleCase;
idbassert((n % 2) == 0);
bool allStringO = true;
@ -255,10 +297,10 @@ CalpontSystemCatalog::ColType caseOperationType(FunctionParm& fp,
CalpontSystemCatalog::ColType rct = resultType;
bool operation = true;
for (uint64_t i = 0; i <= n; i++)
for (uint64_t i = 0; i <= parmCount; i++)
{
// operation or result type
operation = ((i % 2) == 0);
operation = ((i > 0) && (i <= whereCount));
// the result type of ELSE, if exists.
if (i == n)
@ -353,8 +395,9 @@ namespace funcexp
// END
//
// simple CASE parm order:
// expression1 result1 expression2 result2 ... expression [resultN]
// expression condition1 condition2 ... result1 result2 ... [resultN]
//
// Note that this order changed in 10.2.14, see MCOL-1341
CalpontSystemCatalog::ColType Func_simple_case::operationType(FunctionParm& fp, CalpontSystemCatalog::ColType& resultType)
{
@ -372,7 +415,7 @@ bool Func_simple_case::getBoolVal(Row& row,
if (isNull)
return joblist::BIGINTNULL;
return parm[i + 1]->data()->getBoolVal(row, isNull);
return parm[i]->data()->getBoolVal(row, isNull);
}
@ -386,7 +429,7 @@ int64_t Func_simple_case::getIntVal(Row& row,
if (isNull)
return joblist::BIGINTNULL;
return parm[i + 1]->data()->getIntVal(row, isNull);
return parm[i]->data()->getIntVal(row, isNull);
}
@ -400,7 +443,7 @@ string Func_simple_case::getStrVal(Row& row,
if (isNull)
return string("");
return parm[i + 1]->data()->getStrVal(row, isNull);
return parm[i]->data()->getStrVal(row, isNull);
}
@ -414,7 +457,7 @@ IDB_Decimal Func_simple_case::getDecimalVal(Row& row,
if (isNull)
return IDB_Decimal(); // need a null value for IDB_Decimal??
return parm[i + 1]->data()->getDecimalVal(row, isNull);
return parm[i]->data()->getDecimalVal(row, isNull);
}
@ -428,7 +471,7 @@ double Func_simple_case::getDoubleVal(Row& row,
if (isNull)
return doubleNullVal();
return parm[i + 1]->data()->getDoubleVal(row, isNull);
return parm[i]->data()->getDoubleVal(row, isNull);
}
@ -442,7 +485,7 @@ int32_t Func_simple_case::getDateIntVal(rowgroup::Row& row,
if (isNull)
return joblist::DATENULL;
return parm[i + 1]->data()->getDateIntVal(row, isNull);
return parm[i]->data()->getDateIntVal(row, isNull);
}
@ -456,7 +499,7 @@ int64_t Func_simple_case::getDatetimeIntVal(rowgroup::Row& row,
if (isNull)
return joblist::DATETIMENULL;
return parm[i + 1]->data()->getDatetimeIntVal(row, isNull);
return parm[i]->data()->getDatetimeIntVal(row, isNull);
}
@ -470,8 +513,10 @@ int64_t Func_simple_case::getDatetimeIntVal(rowgroup::Row& row,
// END
//
// searched CASE parm order:
// boolean_expression1 result1 boolean_expression2 result2 ... [resultN]
// boolean_expression1 boolean_expression2 ... result1 result2 ... [resultN]
//
// Note that this order changed in 10.2.14, see MCOL-1341
CalpontSystemCatalog::ColType Func_searched_case::operationType(FunctionParm& fp, CalpontSystemCatalog::ColType& resultType)
{
// operation type not used by this functor.
@ -489,15 +534,15 @@ bool Func_searched_case::getBoolVal(Row& row,
if (isNull)
return joblist::BIGINTNULL;
ParseTree* lop = parm[i + 1]->left();
ParseTree* rop = parm[i + 1]->right();
ParseTree* lop = parm[i]->left();
ParseTree* rop = parm[i]->right();
if (lop && rop)
{
return (reinterpret_cast<Operator*>(parm[i + 1]->data()))->getBoolVal(row, isNull, lop, rop);
return (reinterpret_cast<Operator*>(parm[i]->data()))->getBoolVal(row, isNull, lop, rop);
}
return parm[i + 1]->data()->getBoolVal(row, isNull);
return parm[i]->data()->getBoolVal(row, isNull);
}
int64_t Func_searched_case::getIntVal(Row& row,
@ -510,7 +555,7 @@ int64_t Func_searched_case::getIntVal(Row& row,
if (isNull)
return joblist::BIGINTNULL;
return parm[i + 1]->data()->getIntVal(row, isNull);
return parm[i]->data()->getIntVal(row, isNull);
}
@ -524,7 +569,7 @@ string Func_searched_case::getStrVal(Row& row,
if (isNull)
return string("");
return parm[i + 1]->data()->getStrVal(row, isNull);
return parm[i]->data()->getStrVal(row, isNull);
}
@ -538,7 +583,7 @@ IDB_Decimal Func_searched_case::getDecimalVal(Row& row,
if (isNull)
return IDB_Decimal(); // need a null value for IDB_Decimal??
return parm[i + 1]->data()->getDecimalVal(row, isNull);
return parm[i]->data()->getDecimalVal(row, isNull);
}
@ -552,7 +597,7 @@ double Func_searched_case::getDoubleVal(Row& row,
if (isNull)
return doubleNullVal();
return parm[i + 1]->data()->getDoubleVal(row, isNull);
return parm[i]->data()->getDoubleVal(row, isNull);
}
@ -566,7 +611,7 @@ int32_t Func_searched_case::getDateIntVal(rowgroup::Row& row,
if (isNull)
return joblist::DATENULL;
return parm[i + 1]->data()->getDateIntVal(row, isNull);
return parm[i]->data()->getDateIntVal(row, isNull);
}
@ -580,7 +625,7 @@ int64_t Func_searched_case::getDatetimeIntVal(rowgroup::Row& row,
if (isNull)
return joblist::DATETIMENULL;
return parm[i + 1]->data()->getDatetimeIntVal(row, isNull);
return parm[i]->data()->getDatetimeIntVal(row, isNull);
}