From 8a021dba813ff798cd9885255da66e5e8f54c520 Mon Sep 17 00:00:00 2001 From: David Hall Date: Mon, 26 Nov 2018 17:41:31 -0600 Subject: [PATCH] MCOL-1969 change reference array for multi-column UDAF in fixup code during prepPhase** --- dbcon/joblist/tupleaggregatestep.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dbcon/joblist/tupleaggregatestep.cpp b/dbcon/joblist/tupleaggregatestep.cpp index da4f73823..9ddf42cc9 100644 --- a/dbcon/joblist/tupleaggregatestep.cpp +++ b/dbcon/joblist/tupleaggregatestep.cpp @@ -2709,8 +2709,8 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate( } functionVec2[i]->fAuxColumnIndex = lastCol++; - oidsAggDist.push_back(oidsAggDist[j]); // Dummy? - keysAggDist.push_back(keysAggDist[j]); // Dummy? + oidsAggDist.push_back(oidsAgg[j]); // Dummy? + keysAggDist.push_back(keysAgg[j]); // Dummy? scaleAggDist.push_back(0); precisionAggDist.push_back(0); typeAggDist.push_back(CalpontSystemCatalog::UBIGINT); @@ -3797,8 +3797,8 @@ void TupleAggregateStep::prep2PhasesAggregate( } functionVecUm[i]->fAuxColumnIndex = lastCol++; - oidsAggUm.push_back(oidsAggUm[j]); // Dummy? - keysAggUm.push_back(keysAggUm[j]); // Dummy? + oidsAggUm.push_back(oidsAggPm[j]); // Dummy? + keysAggUm.push_back(keysAggPm[j]); // Dummy? scaleAggUm.push_back(0); precisionAggUm.push_back(0); typeAggUm.push_back(CalpontSystemCatalog::UBIGINT); @@ -4897,8 +4897,8 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate( } functionVecUm[i]->fAuxColumnIndex = lastCol++; - oidsAggDist.push_back(oidsAggUm[j]); // Dummy? - keysAggDist.push_back(keysAggUm[j]); // Dummy? + oidsAggDist.push_back(oidsAggPm[j]); // Dummy? + keysAggDist.push_back(keysAggPm[j]); // Dummy? scaleAggDist.push_back(0); precisionAggDist.push_back(0); typeAggDist.push_back(CalpontSystemCatalog::UBIGINT);