You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jc...@apache.org on 2016/09/02 06:06:58 UTC
[1/2] calcite git commit: Fix up [CALCITE-1220],
replacing remove(i)/add(i, x) by set(i, x)
Repository: calcite
Updated Branches:
refs/heads/master 9b1624a88 -> 317802d73
Fix up [CALCITE-1220], replacing remove(i)/add(i,x) by set(i,x)
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/216035f8
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/216035f8
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/216035f8
Branch: refs/heads/master
Commit: 216035f890c298a631137fa98d83478b6c00ab3b
Parents: 9b1624a
Author: Jesus Camacho Rodriguez <jc...@apache.org>
Authored: Fri Sep 2 07:05:18 2016 +0100
Committer: Jesus Camacho Rodriguez <jc...@apache.org>
Committed: Fri Sep 2 07:05:18 2016 +0100
----------------------------------------------------------------------
core/src/main/java/org/apache/calcite/rex/RexUtil.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/216035f8/core/src/main/java/org/apache/calcite/rex/RexUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rex/RexUtil.java b/core/src/main/java/org/apache/calcite/rex/RexUtil.java
index 327b167..5f05652 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexUtil.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexUtil.java
@@ -1791,13 +1791,11 @@ public class RexUtil {
RexCall call = (RexCall) term;
if (call.getOperands().get(0).isAlwaysTrue()) {
term = call.getOperands().get(1);
- terms.remove(i);
- terms.add(i, term);
+ terms.set(i, term);
continue;
} else if (call.getOperands().get(1).isAlwaysTrue()) {
term = call.getOperands().get(0);
- terms.remove(i);
- terms.add(i, term);
+ terms.set(i, term);
continue;
}
break;
[2/2] calcite git commit: Fix up [CALCITE-1365], wrong method call
Posted by jc...@apache.org.
Fix up [CALCITE-1365], wrong method call
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/317802d7
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/317802d7
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/317802d7
Branch: refs/heads/master
Commit: 317802d7333a2efea35b6449645f948723d1814c
Parents: 216035f
Author: Jesus Camacho Rodriguez <jc...@apache.org>
Authored: Fri Sep 2 07:06:26 2016 +0100
Committer: Jesus Camacho Rodriguez <jc...@apache.org>
Committed: Fri Sep 2 07:06:26 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/317802d7/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java
index d256e9b..4572296 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java
@@ -352,7 +352,7 @@ public class RelMdPredicates
List<RexNode> preds = new ArrayList<>(finalPreds.values());
RexNode disjPred = RexUtil.composeDisjunction(rB, finalResidualPreds, false);
- if (!disjPred.isAlwaysFalse()) {
+ if (!disjPred.isAlwaysTrue()) {
preds.add(disjPred);
}
return RelOptPredicateList.of(preds);