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/07/01 09:22:22 UTC
git commit: Further tweaks.
Repository: incubator-optiq
Updated Branches:
refs/heads/master 89475fe8f -> 1299a3934
Further tweaks.
Project: http://git-wip-us.apache.org/repos/asf/incubator-optiq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-optiq/commit/1299a393
Tree: http://git-wip-us.apache.org/repos/asf/incubator-optiq/tree/1299a393
Diff: http://git-wip-us.apache.org/repos/asf/incubator-optiq/diff/1299a393
Branch: refs/heads/master
Commit: 1299a39340df5b9f347eb839071aa39bb0653598
Parents: 89475fe
Author: Julian Hyde <ju...@gmail.com>
Authored: Mon Jun 30 23:47:42 2014 -0700
Committer: Julian Hyde <ju...@gmail.com>
Committed: Mon Jun 30 23:47:42 2014 -0700
----------------------------------------------------------------------
core/src/main/java/org/eigenbase/rex/RexBuilder.java | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/1299a393/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 2e1cec9..5a82c7c 100644
--- a/core/src/main/java/org/eigenbase/rex/RexBuilder.java
+++ b/core/src/main/java/org/eigenbase/rex/RexBuilder.java
@@ -281,14 +281,9 @@ public class RexBuilder {
final List<RelDataType> aggArgTypes) {
if (aggCall.getAggregation() instanceof SqlCountAggFunction
&& !aggCall.isDistinct()) {
- 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())) {
+ final List<Integer> args = aggCall.getArgList();
+ final List<Integer> nullableArgs = nullableArgs(args, aggArgTypes);
+ if (!nullableArgs.equals(args)) {
aggCall = new AggregateCall(aggCall.getAggregation(),
aggCall.isDistinct(), nullableArgs,
aggCall.getType(), aggCall.getName());