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

38
dbcon/execplan/aggregatecolumn.cpp
View File

@@ -83,18 +83,6 @@ void getAggCols(execplan::ParseTree* n, void* obj)
}
}
const std::vector<SimpleColumn*>& getSCsFromRCForExtended(const SRCP& srcp)
{
srcp->setSimpleColumnListExtended();
return srcp->simpleColumnListExtended();
}
const std::vector<SimpleColumn*>& getSCsFromRC(const SRCP& srcp)
{
srcp->setSimpleColumnList();
return srcp->simpleColumnList();
}
/**
* Constructors/Destructors
*/
@@ -141,36 +129,18 @@ AggregateColumn::AggregateColumn(const AggregateColumn& rhs, const uint32_t sess
void AggregateColumn::setSimpleColumnList()
{
fSimpleColumnList.clear();
return setSimpleColumnList_(false);
}
void AggregateColumn::setSimpleColumnListExtended()
{
fSimpleColumnListExtended.clear();
return setSimpleColumnList_(true);
}
void AggregateColumn::setSimpleColumnList_(const bool extractSCsfromAggCol)
{
for (const auto& parm : aggParms())
{
if (!parm)
continue;
auto aggParmsAsSCVec = (extractSCsfromAggCol) ? getSCsFromRCForExtended(parm) : getSCsFromRC(parm);
for (auto* sc : aggParmsAsSCVec)
parm->setSimpleColumnList();
for (auto* sc : parm->simpleColumnList())
{
if (sc)
{
if (extractSCsfromAggCol)
{
fSimpleColumnListExtended.push_back(sc);
}
else
{
fSimpleColumnList.push_back(sc);
}
fSimpleColumnList.push_back(sc);
}
}
}