You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2014/06/30 19:42:59 UTC
git commit: Change misleading variable name.
Repository: incubator-optiq
Updated Branches:
refs/heads/master 8a91027c1 -> 89475fe8f
Change misleading variable name.
Project: http://git-wip-us.apache.org/repos/asf/incubator-optiq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-optiq/commit/89475fe8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-optiq/tree/89475fe8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-optiq/diff/89475fe8
Branch: refs/heads/master
Commit: 89475fe8f6302550accf68bf3f975cdcd999e825
Parents: 8a91027
Author: Julian Hyde <ju...@gmail.com>
Authored: Mon Jun 30 10:42:45 2014 -0700
Committer: Julian Hyde <ju...@gmail.com>
Committed: Mon Jun 30 10:42:45 2014 -0700
----------------------------------------------------------------------
core/src/main/java/org/eigenbase/rex/RexBuilder.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/89475fe8/core/src/main/java/org/eigenbase/rex/RexBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/eigenbase/rex/RexBuilder.java b/core/src/main/java/org/eigenbase/rex/RexBuilder.java
index 7d3f92a..2e1cec9 100644
--- a/core/src/main/java/org/eigenbase/rex/RexBuilder.java
+++ b/core/src/main/java/org/eigenbase/rex/RexBuilder.java
@@ -281,11 +281,16 @@ public class RexBuilder {
final List<RelDataType> aggArgTypes) {
if (aggCall.getAggregation() instanceof SqlCountAggFunction
&& !aggCall.isDistinct()) {
- final List<Integer> notNullArgList =
- nullableArgs(aggCall.getArgList(), aggArgTypes);
- if (!notNullArgList.equals(aggCall.getArgList())) {
+ final List<Integer> nullableArgs = new ArrayList<Integer>();
+ for (Pair<Integer, RelDataType> pair
+ : Pair.zip(aggCall.getArgList(), aggArgTypes)) {
+ if (pair.right.isNullable()) {
+ nullableArgs.add(pair.left);
+ }
+ }
+ if (!nullableArgs.equals(aggCall.getArgList())) {
aggCall = new AggregateCall(aggCall.getAggregation(),
- aggCall.isDistinct(), notNullArgList,
+ aggCall.isDistinct(), nullableArgs,
aggCall.getType(), aggCall.getName());
}
}