1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00

MCOL-3314 When setting up statistics functions for the UM, use values that actually exist.

This commit is contained in:
David Hall
2019-05-17 12:43:18 -05:00
parent 92d662491a
commit 750b6ea0ff

View File

@ -2622,8 +2622,8 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
functionVec2[i]->fAuxColumnIndex = lastCol;
// sum(x)
oidsAggDist.push_back(oidsAggDist[j]);
keysAggDist.push_back(keysAggDist[j]);
oidsAggDist.push_back(oidsAgg[j]);
keysAggDist.push_back(keysAgg[j]);
scaleAggDist.push_back(0);
precisionAggDist.push_back(0);
typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);
@ -2631,8 +2631,8 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
++lastCol;
// sum(x**2)
oidsAggDist.push_back(oidsAggDist[j]);
keysAggDist.push_back(keysAggDist[j]);
oidsAggDist.push_back(oidsAgg[j]);
keysAggDist.push_back(keysAgg[j]);
scaleAggDist.push_back(0);
precisionAggDist.push_back(-1);
typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);
@ -3667,8 +3667,8 @@ void TupleAggregateStep::prep2PhasesAggregate(
functionVecUm[i]->fAuxColumnIndex = lastCol;
// sum(x)
oidsAggUm.push_back(oidsAggUm[j]);
keysAggUm.push_back(keysAggUm[j]);
oidsAggUm.push_back(oidsAggPm[j]);
keysAggUm.push_back(keysAggPm[j]);
scaleAggUm.push_back(0);
precisionAggUm.push_back(-1);
typeAggUm.push_back(CalpontSystemCatalog::LONGDOUBLE);
@ -3676,8 +3676,8 @@ void TupleAggregateStep::prep2PhasesAggregate(
++lastCol;
// sum(x**2)
oidsAggUm.push_back(oidsAggUm[j]);
keysAggUm.push_back(keysAggUm[j]);
oidsAggUm.push_back(oidsAggPm[j]);
keysAggUm.push_back(keysAggPm[j]);
scaleAggUm.push_back(0);
precisionAggUm.push_back(-1);
typeAggUm.push_back(CalpontSystemCatalog::LONGDOUBLE);
@ -4704,8 +4704,8 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
functionVecUm[i]->fAuxColumnIndex = lastCol;
// sum(x)
oidsAggDist.push_back(oidsAggDist[j]);
keysAggDist.push_back(keysAggDist[j]);
oidsAggDist.push_back(oidsAggPm[j]);
keysAggDist.push_back(keysAggPm[j]);
scaleAggDist.push_back(0);
precisionAggDist.push_back(-1);
typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);
@ -4713,8 +4713,8 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
++lastCol;
// sum(x**2)
oidsAggDist.push_back(oidsAggDist[j]);
keysAggDist.push_back(keysAggDist[j]);
oidsAggDist.push_back(oidsAggPm[j]);
keysAggDist.push_back(keysAggPm[j]);
scaleAggDist.push_back(0);
precisionAggDist.push_back(-1);
typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);