Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 95759f4ee -> 305e3cb21
PHOENIX-3516 Performance Issues with queries that have compound filters and specify phoenix.query.force.rowkeyorder=true (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/305e3cb2 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/305e3cb2 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/305e3cb2 Branch: refs/heads/4.x-HBase-0.98 Commit: 305e3cb2113e441e705f34cf390eae97fa0cb42a Parents: 95759f4 Author: Thomas D'Silva <tdsi...@salesforce.com> Authored: Thu Dec 22 17:29:35 2016 -0800 Committer: Thomas D'Silva <tdsi...@salesforce.com> Committed: Tue Dec 27 11:40:39 2016 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/phoenix/compile/WhereOptimizer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/305e3cb2/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 0681925..5e15f61 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 @@ -439,7 +439,12 @@ public class WhereOptimizer { if (l.size() == 1) { return l.get(0); } - return new AndExpression(l); + try { + return AndExpression.create(l); + } catch (SQLException e) { + //shouldn't happen + throw new RuntimeException(e); + } } return node; }
