Repository: phoenix Updated Branches: refs/heads/4.5-HBase-0.98 578b5fc04 -> 0f44f3cc6
PHOENIX-2141 ComparisonExpression should return Boolean null if either operand is null (bug fix) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/0f44f3cc Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/0f44f3cc Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/0f44f3cc Branch: refs/heads/4.5-HBase-0.98 Commit: 0f44f3cc6bd8048f67ac2aab5768929319a3422f Parents: 578b5fc Author: maryannxue <wei....@intel.com> Authored: Tue Aug 25 14:10:05 2015 -0400 Committer: maryannxue <wei....@intel.com> Committed: Tue Aug 25 14:10:05 2015 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/phoenix/compile/WhereOptimizer.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/0f44f3cc/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java index 601eee1..01ec1bd 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java @@ -423,6 +423,11 @@ public class WhereOptimizer { public Iterator<Expression> visitEnter(AndExpression node) { return node.getChildren().iterator(); } + + @Override + public Expression visit(LiteralExpression node) { + return nodesToRemove.contains(node) ? null : node; + } @Override public Expression visitLeave(AndExpression node, List<Expression> l) {
