database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-05 16:15:50 +03:00
Code Activity

MCOL-662 Fix multiple filters in CrossEngine

Browse Source 
If a CrossEngine step has multiple filters the filters were overwriting
each other. This fix stores the filters as a vector and processes them
in a loop.
This commit is contained in:
Andrew Hutchings
2017-10-23 16:26:08 +01:00
parent b5331c0a41
commit ee74e7cc62
2 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
dbcon/joblist/crossenginestep.cpp
View File

@@ -189,7 +189,7 @@ void CrossEngineStep::addFcnJoinExp(const vector<execplan::SRCP>& fe)
void CrossEngineStep::addFcnExpGroup1(const boost::shared_ptr<ParseTree>& fe) void CrossEngineStep::addFcnExpGroup1(const boost::shared_ptr<ParseTree>& fe)
{ {
fFeFilters = fe; fFeFilters.push_back(fe);
} }
@@ -217,7 +217,7 @@ void CrossEngineStep::makeMappings()
for (uint64_t i = 0; i < fColumnCount; ++i) for (uint64_t i = 0; i < fColumnCount; ++i)
fFe1Column[i] = -1; fFe1Column[i] = -1;
if (fFeFilters != NULL || fFeFcnJoin.size() > 0) if (fFeFilters.size() > 0 || fFeFcnJoin.size() > 0)
{ {
const std::vector<uint32_t>& colInFe1 = fRowGroupFe1.getKeys(); const std::vector<uint32_t>& colInFe1 = fRowGroupFe1.getKeys();
for (uint64_t i = 0; i < colInFe1.size(); i++) for (uint64_t i = 0; i < colInFe1.size(); i++)
@@ -499,7 +499,7 @@ void CrossEngineStep::execute()
// Any functions to evaluate // Any functions to evaluate
makeMappings(); makeMappings();
bool doFE1 = ((fFeFcnJoin.size() > 0) || (fFeFilters != NULL)); bool doFE1 = ((fFeFcnJoin.size() > 0) || (fFeFilters.size() > 0));
bool doFE3 = (fFeSelects.size() > 0); bool doFE3 = (fFeSelects.size() > 0);
if (!doFE1 && !doFE3) if (!doFE1 && !doFE3)
{ {
@@ -529,8 +529,20 @@ void CrossEngineStep::execute()
setField(fFe1Column[i], rowIn[i], mysql->getFieldLength(i), mysql->getField(i), rowFe1); setField(fFe1Column[i], rowIn[i], mysql->getFieldLength(i), mysql->getField(i), rowFe1);
} }
if (fFeFilters && fFeInstance->evaluate(rowFe1, fFeFilters.get()) == false) if (fFeFilters.size() > 0)
continue; {
bool feBreak = false;
for (std::vector<boost::shared_ptr<execplan::ParseTree> >::iterator it = fFeFilters.begin(); it != fFeFilters.end(); it++)
{
if (fFeInstance->evaluate(rowFe1, (*it).get()) == false)
{
feBreak = true;
break;
}
}
if (feBreak)
continue;
}
// evaluate the FE join column // evaluate the FE join column
fFeInstance->evaluate(rowFe1, fFeFcnJoin); fFeInstance->evaluate(rowFe1, fFeFcnJoin);
@@ -592,8 +604,20 @@ void CrossEngineStep::execute()
setField(fFe1Column[i], rowIn[i], mysql->getFieldLength(i), mysql->getField(i), rowFe1); setField(fFe1Column[i], rowIn[i], mysql->getFieldLength(i), mysql->getField(i), rowFe1);
} }
if (fFeFilters && fFeInstance->evaluate(rowFe1, fFeFilters.get()) == false) if (fFeFilters.size() > 0)
continue; {
bool feBreak = false;
for (std::vector<boost::shared_ptr<execplan::ParseTree> >::iterator it = fFeFilters.begin(); it != fFeFilters.end(); it++)
{
if (fFeInstance->evaluate(rowFe1, (*it).get()) == false)
{
feBreak = true;
break;
}
}
if (feBreak)
continue;
}
// evaluate the FE join column // evaluate the FE join column
fFeInstance->evaluate(rowFe1, fFeFcnJoin); fFeInstance->evaluate(rowFe1, fFeFcnJoin);

2
dbcon/joblist/crossenginestep.h
View File

@@ -211,7 +211,7 @@ protected:
std::string fSelectClause; std::string fSelectClause;
// Function & Expression columns // Function & Expression columns
boost::shared_ptr<execplan::ParseTree> fFeFilters; std::vector<boost::shared_ptr<execplan::ParseTree> > fFeFilters;
std::vector<boost::shared_ptr<execplan::ReturnedColumn> > fFeSelects; std::vector<boost::shared_ptr<execplan::ReturnedColumn> > fFeSelects;
std::vector<boost::shared_ptr<execplan::ReturnedColumn> > fFeFcnJoin; std::vector<boost::shared_ptr<execplan::ReturnedColumn> > fFeFcnJoin;
std::map<uint32_t, uint32_t> fColumnMap; // projected key position (k->p) std::map<uint32_t, uint32_t> fColumnMap; // projected key position (k->p)