Repository: phoenix Updated Branches: refs/heads/4.8-HBase-1.1 762d8d3ac -> 9c2b998b7
PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9c2b998b Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9c2b998b Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9c2b998b Branch: refs/heads/4.8-HBase-1.1 Commit: 9c2b998b713724f6366563f55e427a547d55fe07 Parents: 762d8d3 Author: Lars Hofhansl <[email protected]> Authored: Mon Aug 22 13:37:02 2016 -0700 Committer: Lars Hofhansl <[email protected]> Committed: Mon Aug 22 13:39:33 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/phoenix/iterate/BaseResultIterators.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/9c2b998b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java index ceba000..8b9adfd 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java @@ -227,7 +227,7 @@ public abstract class BaseResultIterators extends ExplainTable implements Result } int cols = plan.getGroupBy().getOrderPreservingColumnCount(); - if (cols > 0 && context.getWhereConditionColumns().size() == 0 && + if (cols > 0 && keyOnlyFilter && !plan.getStatement().getHint().hasHint(HintNode.Hint.RANGE_SCAN) && cols < plan.getTableRef().getTable().getRowKeySchema().getFieldCount() && plan.getGroupBy().isOrderPreserving() &&
