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

MCOL-3435 push an implicit group by for Window Functions in same query as aggregates.

Browse Source
This commit is contained in:
David Hall
2019-08-29 09:44:17 -05:00
parent a35e011e6d
commit 5c8ff4a1eb
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/joblist/joblistfactory.cpp
View File

@@ -1525,7 +1525,7 @@ void parseExecutionPlan(CalpontSelectExecutionPlan* csep, JobInfo& jobInfo,
// bug4531, window function support
WindowFunctionStep::checkWindowFunction(csep, jobInfo);
// bug3391, move forward the aggregation check for no aggregte having clause.
// bug3391, move forward the aggregation check for no aggregate having clause.
checkAggregation(csep, jobInfo);
// include filters in having clause, if any.

26
dbcon/joblist/windowfunctionstep.cpp
View File

@@ -477,6 +477,17 @@ void WindowFunctionStep::checkWindowFunction(CalpontSelectExecutionPlan* csep, J
colSet.insert(key);
}
// MCOL-3435 We haven't yet checked for aggregate, but we need to know
bool hasAggregation = false;
for (uint64_t i = 0; i < jobInfo.deliveredCols.size(); i++)
{
if (dynamic_cast<AggregateColumn*>(jobInfo.deliveredCols[i].get()) != NULL)
{
hasAggregation = true;
break;
}
}
// add non-duplicate auxiliary columns
RetColsVector colsInAf;
@@ -499,10 +510,17 @@ void WindowFunctionStep::checkWindowFunction(CalpontSelectExecutionPlan* csep, J
if (colSet.find(key) == colSet.end())
{
jobInfo.deliveredCols.push_back(*j);
// MCOL-3343 Enable this if we decide to allow Window Functions to run with
// aggregates with no group by. MariaDB allows this. Nobody else in the world does.
// There will be more work to get it to function if we try this.
// jobInfo.windowSet.insert(getTupleKey(jobInfo, *j, true));
// MCOL-3435 Allow Window Functions to run with aggregates with
// no group by by inserting a group by for window parameters.
if (hasAggregation)
{
uint32_t tupleKey = getTupleKey(jobInfo, *j, true);
if (find(jobInfo.groupByColVec.begin(), jobInfo.groupByColVec.end(), tupleKey)
== jobInfo.groupByColVec.end())
{
jobInfo.groupByColVec.push_back(tupleKey);
}
}
}
colSet.insert(key);