More reworks based on Hans' comments (missed one place)
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/c48966a9 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/c48966a9 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/c48966a9 Branch: refs/heads/master Commit: c48966a9ec9bd3a614d5116f42375bdddcfc30c5 Parents: 1400b7e Author: Dave Birdsall <[email protected]> Authored: Tue Feb 27 18:47:03 2018 +0000 Committer: Dave Birdsall <[email protected]> Committed: Tue Feb 27 18:47:03 2018 +0000 ---------------------------------------------------------------------- core/sql/optimizer/RelExpr.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/c48966a9/core/sql/optimizer/RelExpr.cpp ---------------------------------------------------------------------- diff --git a/core/sql/optimizer/RelExpr.cpp b/core/sql/optimizer/RelExpr.cpp index f263d7e..3a3e457 100644 --- a/core/sql/optimizer/RelExpr.cpp +++ b/core/sql/optimizer/RelExpr.cpp @@ -11390,7 +11390,7 @@ void RelRoot::setMvBindContext(MvBindContext * pMvBindContext) NABoolean RelRoot::addOneRowAggregates(BindWA* bindWA, NABoolean forceGroupByAgg) { - NABoolean GroupByAggNodeAdded = FALSE; + NABoolean groupByAggNodeAdded = FALSE; RelExpr * childOfRoot = child(0); GroupByAgg *aggNode = NULL; // If the One Row Subquery is already enforced by a scalar aggregate @@ -11426,7 +11426,7 @@ NABoolean RelRoot::addOneRowAggregates(BindWA* bindWA, NABoolean forceGroupByAgg } if (aggNode) - return GroupByAggNodeAdded; + return groupByAggNodeAdded; const RETDesc *oldTable = getRETDesc(); RETDesc *resultTable = new(bindWA->wHeap()) RETDesc(bindWA); @@ -11474,12 +11474,12 @@ NABoolean RelRoot::addOneRowAggregates(BindWA* bindWA, NABoolean forceGroupByAgg newGrby->bindNode(bindWA) ; child(0) = newGrby ; - GroupByAggNodeAdded = TRUE; + groupByAggNodeAdded = TRUE; // Set the return descriptor // setRETDesc(resultTable); - return GroupByAggNodeAdded; + return groupByAggNodeAdded; } // ----------------------------------------------------------------------- // member functions for class PhysicalRelRoot
