database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00
Code Activity

MCOL-1201 fix some regressions

Browse Source
This commit is contained in:
David Hall
2018-06-06 10:34:35 -05:00
parent 554e31b4ec
commit 5b3db71c8f
2 changed files with 57 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
dbcon/joblist/tupleaggregatestep.cpp
View File

@@ -1505,11 +1505,18 @@ void TupleAggregateStep::prep1PhaseAggregate(
typeAgg.push_back(typeProj[colProj]); typeAgg.push_back(typeProj[colProj]);
widthAgg.push_back(width[colProj]); widthAgg.push_back(width[colProj]);
// If the param is const // If the param is const
if (udafc)
{
ConstantColumn* cc = dynamic_cast<ConstantColumn*>(udafc->aggParms()[udafcParamIdx].get()); ConstantColumn* cc = dynamic_cast<ConstantColumn*>(udafc->aggParms()[udafcParamIdx].get());
if (cc) if (cc)
{ {
funct->fpConstCol = udafc->aggParms()[udafcParamIdx]; funct->fpConstCol = udafc->aggParms()[udafcParamIdx];
} }
}
else
{
throw QueryDataExcept("prep1PhaseAggregate: UDAF multi function with no parms", aggregateFuncErr);
}
++udafcParamIdx; ++udafcParamIdx;
} }
break; break;
@@ -2123,11 +2130,18 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
multiParmIndexes.push_back(colAgg); multiParmIndexes.push_back(colAgg);
++colAgg; ++colAgg;
// If the param is const // If the param is const
if (udafc)
{
ConstantColumn* cc = dynamic_cast<ConstantColumn*>(udafc->aggParms()[udafcParamIdx].get()); ConstantColumn* cc = dynamic_cast<ConstantColumn*>(udafc->aggParms()[udafcParamIdx].get());
if (cc) if (cc)
{ {
funct->fpConstCol = udafc->aggParms()[udafcParamIdx]; funct->fpConstCol = udafc->aggParms()[udafcParamIdx];
} }
}
else
{
throw QueryDataExcept("prep1PhaseDistinctAggregate: UDAF multi function with no parms", aggregateFuncErr);
}
++udafcParamIdx; ++udafcParamIdx;
} }
break; break;
@@ -3398,11 +3412,18 @@ void TupleAggregateStep::prep2PhasesAggregate(
widthAggPm.push_back(width[colProj]); widthAggPm.push_back(width[colProj]);
colAggPm++; colAggPm++;
// If the param is const // If the param is const
if (udafc)
{
ConstantColumn* cc = dynamic_cast<ConstantColumn*>(udafc->aggParms()[udafcParamIdx].get()); ConstantColumn* cc = dynamic_cast<ConstantColumn*>(udafc->aggParms()[udafcParamIdx].get());
if (cc) if (cc)
{ {
funct->fpConstCol = udafc->aggParms()[udafcParamIdx]; funct->fpConstCol = udafc->aggParms()[udafcParamIdx];
} }
}
else
{
throw QueryDataExcept("prep2PhasesAggregate: UDAF multi function with no parms", aggregateFuncErr);
}
++udafcParamIdx; ++udafcParamIdx;
} }
break; break;
@@ -4257,11 +4278,18 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
multiParmIndexes.push_back(colAggPm); multiParmIndexes.push_back(colAggPm);
colAggPm++; colAggPm++;
// If the param is const // If the param is const
if (udafc)
{
ConstantColumn* cc = dynamic_cast<ConstantColumn*>(udafc->aggParms()[udafcParamIdx].get()); ConstantColumn* cc = dynamic_cast<ConstantColumn*>(udafc->aggParms()[udafcParamIdx].get());
if (cc) if (cc)
{ {
funct->fpConstCol = udafc->aggParms()[udafcParamIdx]; funct->fpConstCol = udafc->aggParms()[udafcParamIdx];
} }
}
else
{
throw QueryDataExcept("prep2PhasesDistinctAggregate: UDAF multi function with no parms", aggregateFuncErr);
}
++udafcParamIdx; ++udafcParamIdx;
} }
break; break;

8
dbcon/mysql/ha_calpont_execplan.cpp
View File

@@ -10033,8 +10033,16 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
return ER_CHECK_NOT_IMPLEMENTED; return ER_CHECK_NOT_IMPLEMENTED;
} }
// Replace the last (presumably constant) object with minSc
if ((*coliter)->aggParms().empty())
{
(*coliter)->aggParms().push_back(minSc); (*coliter)->aggParms().push_back(minSc);
} }
else
{
(*coliter)->aggParms()[0] = minSc;
}
}
std::vector<FunctionColumn*>::iterator funciter; std::vector<FunctionColumn*>::iterator funciter;