database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-09-05 11:04:01 +03:00
Code Activity

Merge pull request #766 from mariadb-corporation/MCOL-3314-1.1

Browse Source 
MCOL-3314 When setting up statistics functions for the UM, use values…
This commit is contained in:
Andrew Hutchings
2019-05-17 20:34:26 +01:00
committed by GitHub
parent 0af69944c1 01ff86096a
commit 4628346746
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
dbcon/joblist/tupleaggregatestep.cpp
View File

@@ -2325,8 +2325,8 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
throw logic_error("(9)A UDAF function is called but there's no RowUDAFFunctionCol"); throw logic_error("(9)A UDAF function is called but there's no RowUDAFFunctionCol");
} }
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);
@@ -2340,8 +2340,8 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
functionVec2[i]->fAuxColumnIndex = lastCol; functionVec2[i]->fAuxColumnIndex = lastCol;
// sum(x) // sum(x)
oidsAggDist.push_back(oidsAggDist[j]); oidsAggDist.push_back(oidsAgg[j]);
keysAggDist.push_back(keysAggDist[j]); keysAggDist.push_back(keysAgg[j]);
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
precisionAggDist.push_back(0); precisionAggDist.push_back(0);
typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);
@@ -2349,8 +2349,8 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
++lastCol; ++lastCol;
// sum(x**2) // sum(x**2)
oidsAggDist.push_back(oidsAggDist[j]); oidsAggDist.push_back(oidsAgg[j]);
keysAggDist.push_back(keysAggDist[j]); keysAggDist.push_back(keysAgg[j]);
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
precisionAggDist.push_back(0); precisionAggDist.push_back(0);
typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);
@@ -3258,8 +3258,8 @@ void TupleAggregateStep::prep2PhasesAggregate(
throw logic_error("(9)A UDAF function is called but there's no RowUDAFFunctionCol"); throw logic_error("(9)A UDAF function is called but there's no RowUDAFFunctionCol");
} }
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);
@@ -3273,8 +3273,8 @@ void TupleAggregateStep::prep2PhasesAggregate(
functionVecUm[i]->fAuxColumnIndex = lastCol; functionVecUm[i]->fAuxColumnIndex = lastCol;
// sum(x) // sum(x)
oidsAggUm.push_back(oidsAggUm[j]); oidsAggUm.push_back(oidsAggPm[j]);
keysAggUm.push_back(keysAggUm[j]); keysAggUm.push_back(keysAggPm[j]);
scaleAggUm.push_back(0); scaleAggUm.push_back(0);
precisionAggUm.push_back(0); precisionAggUm.push_back(0);
typeAggUm.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggUm.push_back(CalpontSystemCatalog::LONGDOUBLE);
@@ -3282,8 +3282,8 @@ void TupleAggregateStep::prep2PhasesAggregate(
++lastCol; ++lastCol;
// sum(x**2) // sum(x**2)
oidsAggUm.push_back(oidsAggUm[j]); oidsAggUm.push_back(oidsAggPm[j]);
keysAggUm.push_back(keysAggUm[j]); keysAggUm.push_back(keysAggPm[j]);
scaleAggUm.push_back(0); scaleAggUm.push_back(0);
precisionAggUm.push_back(0); precisionAggUm.push_back(0);
typeAggUm.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggUm.push_back(CalpontSystemCatalog::LONGDOUBLE);
@@ -4189,8 +4189,8 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
throw logic_error("(9)A UDAF function is called but there's no RowUDAFFunctionCol"); throw logic_error("(9)A UDAF function is called but there's no RowUDAFFunctionCol");
} }
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);
@@ -4203,8 +4203,8 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
functionVecUm[i]->fAuxColumnIndex = lastCol; functionVecUm[i]->fAuxColumnIndex = lastCol;
// sum(x) // sum(x)
oidsAggDist.push_back(oidsAggDist[j]); oidsAggDist.push_back(oidsAggPm[j]);
keysAggDist.push_back(keysAggDist[j]); keysAggDist.push_back(keysAggPm[j]);
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
precisionAggDist.push_back(0); precisionAggDist.push_back(0);
typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);
@@ -4212,8 +4212,8 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
++lastCol; ++lastCol;
// sum(x**2) // sum(x**2)
oidsAggDist.push_back(oidsAggDist[j]); oidsAggDist.push_back(oidsAggPm[j]);
keysAggDist.push_back(keysAggDist[j]); keysAggDist.push_back(keysAggPm[j]);
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
precisionAggDist.push_back(0); precisionAggDist.push_back(0);
typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);