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

Reapply "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 f807ebcdfd.
This commit is contained in:
drrtuy
2025-09-10 15:02:49 +00:00
parent 00c81ab758
commit 0d609ec485
16 changed files with 195 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
dbcon/execplan/aggregatecolumn.cpp
View File

@@ -83,6 +83,18 @@ 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
*/
@@ -129,18 +141,36 @@ 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;
parm->setSimpleColumnList();
for (auto* sc : parm->simpleColumnList())
auto aggParmsAsSCVec = (extractSCsfromAggCol) ? getSCsFromRCForExtended(parm) : getSCsFromRC(parm);
for (auto* sc : aggParmsAsSCVec)
{
if (sc)
{
fSimpleColumnList.push_back(sc);
if (extractSCsfromAggCol)
{
fSimpleColumnListExtended.push_back(sc);
}
else
{
fSimpleColumnList.push_back(sc);
}
}
}
}