database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-10-31 18:30:33 +03:00
Code Activity

Revert "fix(joblist,QA): introduced extended SC ptrs collector to resolve the issue when ParseTree consist of ArithmCol-AggCol does not return SCs from AggCol."

Browse Source 
This reverts commit 8c0c85080c.
This commit is contained in:
drrtuy
2025-09-08 11:59:31 +00:00
parent ed2c89196b
commit f807ebcdfd
16 changed files with 39 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
dbcon/execplan/simplecolumn.cpp
View File

@@ -91,48 +91,6 @@ void getSimpleCols(execplan::ParseTree* n, void* obj)
}
}
void getSimpleColsExtended(execplan::ParseTree* n, void* obj)
{
vector<SimpleColumn*>* list = reinterpret_cast<vector<SimpleColumn*>*>(obj);
TreeNode* tn = n->data();
SimpleColumn* sc = dynamic_cast<SimpleColumn*>(tn);
FunctionColumn* fc = dynamic_cast<FunctionColumn*>(tn);
ArithmeticColumn* ac = dynamic_cast<ArithmeticColumn*>(tn);
SimpleFilter* sf = dynamic_cast<SimpleFilter*>(tn);
ConstantFilter* cf = dynamic_cast<ConstantFilter*>(tn);
AggregateColumn* agc = dynamic_cast<AggregateColumn*>(tn);
if (sc)
{
list->push_back(sc);
}
else if (fc)
{
fc->setSimpleColumnListExtended();
list->insert(list->end(), fc->simpleColumnListExtended().begin(), fc->simpleColumnListExtended().end());
}
else if (ac)
{
ac->setSimpleColumnListExtended();
list->insert(list->end(), ac->simpleColumnListExtended().begin(), ac->simpleColumnListExtended().end());
}
else if (agc)
{
agc->setSimpleColumnListExtended();
list->insert(list->end(), agc->simpleColumnListExtended().begin(), agc->simpleColumnListExtended().end());
}
else if (sf)
{
sf->setSimpleColumnListExtended();
list->insert(list->end(), sf->simpleColumnListExtended().begin(), sf->simpleColumnListExtended().end());
}
else if (cf)
{
cf->setSimpleColumnListExtended();
list->insert(list->end(), cf->simpleColumnListExtended().begin(), cf->simpleColumnListExtended().end());
}
}
ParseTree* replaceRefCol(ParseTree*& n, CalpontSelectExecutionPlan::ReturnedColumnList& derivedColList)
{
ParseTree* lhs = n->left();
@@ -824,18 +782,6 @@ void SimpleColumn::setSimpleColumnList()
}
}
void SimpleColumn::setSimpleColumnListExtended()
{
if (fSimpleColumnListExtended.empty())
{
fSimpleColumnListExtended.push_back(this);
}
else
{
fSimpleColumnListExtended.back() = this;
}
}
std::optional<CalpontSystemCatalog::TableAliasName> sameTableCheck(
std::vector<SimpleColumn*> simpleColumnList)
{