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

MCOL-911 getAggCols needs to look into the objects

Browse Source
This commit is contained in:
David Hall
2017-09-14 23:29:54 -05:00
committed by Andrew Hutchings
parent de457bfe4b
commit c4269871fe
3 changed files with 57 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dbcon/execplan/aggregatecolumn.cpp
View File

@ -55,16 +55,30 @@ void getAggCols(execplan::ParseTree* n, void* obj)
SimpleFilter *sf = dynamic_cast<SimpleFilter*>(tn); SimpleFilter *sf = dynamic_cast<SimpleFilter*>(tn);
ConstantFilter *cf = dynamic_cast<ConstantFilter*>(tn); ConstantFilter *cf = dynamic_cast<ConstantFilter*>(tn);
if (sc) if (sc)
{
list->push_back(sc); list->push_back(sc);
}
else if (fc) else if (fc)
{
fc->hasAggregate();
list->insert(list->end(), fc->aggColumnList().begin(), fc->aggColumnList().end()); list->insert(list->end(), fc->aggColumnList().begin(), fc->aggColumnList().end());
}
else if (ac) else if (ac)
{
ac->hasAggregate();
list->insert(list->end(), ac->aggColumnList().begin(), ac->aggColumnList().end()); list->insert(list->end(), ac->aggColumnList().begin(), ac->aggColumnList().end());
}
else if (sf) else if (sf)
{
sf->hasAggregate();
list->insert(list->end(), sf->aggColumnList().begin(), sf->aggColumnList().end()); list->insert(list->end(), sf->aggColumnList().begin(), sf->aggColumnList().end());
}
else if (cf) else if (cf)
{
cf->hasAggregate();
list->insert(list->end(), cf->aggColumnList().begin(), cf->aggColumnList().end()); list->insert(list->end(), cf->aggColumnList().begin(), cf->aggColumnList().end());
} }
}
/** /**
* Constructors/Destructors * Constructors/Destructors

12
dbcon/execplan/constantfilter.cpp
View File

@ -121,14 +121,22 @@ ostream& operator<<(ostream& output, const ConstantFilter& rhs)
bool ConstantFilter::hasAggregate() bool ConstantFilter::hasAggregate()
{ {
fAggColumnList.clear(); if (fAggColumnList.empty())
{
for (uint32_t i = 0; i < fFilterList.size(); i++) for (uint32_t i = 0; i < fFilterList.size(); i++)
{ {
if (fFilterList[i]->hasAggregate()) if (fFilterList[i]->hasAggregate())
{ {
return true; fAggColumnList.insert(fAggColumnList.end(),
fFilterList[i]->aggColumnList().begin(),
fFilterList[i]->aggColumnList().end());
} }
} }
}
if (!fAggColumnList.empty())
{
return true;
}
return false; return false;
} }

30
dbcon/execplan/simplefilter.cpp
View File

@ -647,6 +647,8 @@ void SimpleFilter::setSimpleColumnList()
} }
bool SimpleFilter::hasAggregate() bool SimpleFilter::hasAggregate()
{
if (fAggColumnList.empty())
{ {
AggregateColumn *lac = dynamic_cast<AggregateColumn*>(fLhs); AggregateColumn *lac = dynamic_cast<AggregateColumn*>(fLhs);
AggregateColumn *rac = dynamic_cast<AggregateColumn*>(fRhs); AggregateColumn *rac = dynamic_cast<AggregateColumn*>(fRhs);
@ -654,21 +656,31 @@ bool SimpleFilter::hasAggregate()
if (lac) if (lac)
{ {
return true; fAggColumnList.insert(fAggColumnList.end(), lac);
} }
else if (fLhs)
{
if (fLhs->hasAggregate())
return true;
}
if (rac) if (rac)
{ {
return true; fAggColumnList.insert(fAggColumnList.end(), rac);
} }
else if (fRhs)
if (fLhs)
{
if (fLhs->hasAggregate())
fAggColumnList.insert(fAggColumnList.end(),
fLhs->aggColumnList().begin(),
fLhs->aggColumnList().end());
}
if (fRhs)
{ {
if (fRhs->hasAggregate()) if (fRhs->hasAggregate())
fAggColumnList.insert(fAggColumnList.end(),
fRhs->aggColumnList().begin(),
fRhs->aggColumnList().end());
}
}
if (!fAggColumnList.empty())
{
return true; return true;
} }
return false; return false;