1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-24 14:20:59 +03:00

Merge pull request #143 from mariadb-corporation/MCOL-653

MCOL-653 Revert SUM(1) behaviour
This commit is contained in:
dhall-InfiniDB
2017-04-03 09:48:55 -05:00
committed by GitHub

View File

@@ -3563,10 +3563,6 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
if (ac->aggOp() == AggregateColumn::COUNT)
ac->aggOp(AggregateColumn::COUNT_ASTERISK);
// MCOL-301: treat SUM(1) as MAX(1) to get constant result
if (ac->aggOp() == AggregateColumn::SUM)
ac->aggOp(AggregateColumn::MAX);
ac->constCol(SRCP(buildReturnedColumn(sfitemp, gwi, gwi.fatalParseError)));
break;
}
@@ -3605,10 +3601,6 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
ReturnedColumn* rc = buildReturnedColumn(sfitemp, gwi, gwi.fatalParseError);
if (dynamic_cast<ConstantColumn*>(rc))
{
// MCOL-301: treat SUM(1) as MAX(1) to get constant result
if (ac->aggOp() == AggregateColumn::SUM)
ac->aggOp(AggregateColumn::MAX);
//@bug5229. handle constant function on aggregate argument
ac->constCol(SRCP(rc));
break;