database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-18 13:54:11 +03:00
Code Activity

Merge pull request #646 from mariadb-corporation/MCOL-1969

Browse Source 
MCOL-1969 change reference array for multi-column UDAF in fixup code …
This commit is contained in:
Andrew Hutchings
2018-11-27 07:11:54 +00:00
committed by GitHub
parent 954e5892b1 8a021dba81
commit 36d95e033b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dbcon/joblist/tupleaggregatestep.cpp
View File

@@ -2709,8 +2709,8 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
} }
functionVec2[i]->fAuxColumnIndex = lastCol++; functionVec2[i]->fAuxColumnIndex = lastCol++;
oidsAggDist.push_back(oidsAggDist[j]); // Dummy? oidsAggDist.push_back(oidsAgg[j]); // Dummy?
keysAggDist.push_back(keysAggDist[j]); // Dummy? keysAggDist.push_back(keysAgg[j]); // Dummy?
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
precisionAggDist.push_back(0); precisionAggDist.push_back(0);
typeAggDist.push_back(CalpontSystemCatalog::UBIGINT); typeAggDist.push_back(CalpontSystemCatalog::UBIGINT);
@@ -3797,8 +3797,8 @@ void TupleAggregateStep::prep2PhasesAggregate(
} }
functionVecUm[i]->fAuxColumnIndex = lastCol++; functionVecUm[i]->fAuxColumnIndex = lastCol++;
oidsAggUm.push_back(oidsAggUm[j]); // Dummy? oidsAggUm.push_back(oidsAggPm[j]); // Dummy?
keysAggUm.push_back(keysAggUm[j]); // Dummy? keysAggUm.push_back(keysAggPm[j]); // Dummy?
scaleAggUm.push_back(0); scaleAggUm.push_back(0);
precisionAggUm.push_back(0); precisionAggUm.push_back(0);
typeAggUm.push_back(CalpontSystemCatalog::UBIGINT); typeAggUm.push_back(CalpontSystemCatalog::UBIGINT);
@@ -4897,8 +4897,8 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
} }
functionVecUm[i]->fAuxColumnIndex = lastCol++; functionVecUm[i]->fAuxColumnIndex = lastCol++;
oidsAggDist.push_back(oidsAggUm[j]); // Dummy? oidsAggDist.push_back(oidsAggPm[j]); // Dummy?
keysAggDist.push_back(keysAggUm[j]); // Dummy? keysAggDist.push_back(keysAggPm[j]); // Dummy?
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
precisionAggDist.push_back(0); precisionAggDist.push_back(0);
typeAggDist.push_back(CalpontSystemCatalog::UBIGINT); typeAggDist.push_back(CalpontSystemCatalog::UBIGINT);