Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.0 b8ac187b7 -> 833cf3b35
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/833cf3b3 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/833cf3b3 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/833cf3b3 Branch: refs/heads/4.x-HBase-1.0 Commit: 833cf3b3528eca10c8a6e4061e8ada3699873966 Parents: b8ac187 Author: Lars Hofhansl <[email protected]> Authored: Mon Aug 22 13:37:02 2016 -0700 Committer: Lars Hofhansl <[email protected]> Committed: Mon Aug 22 13:38:38 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/833cf3b3/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() &&
