Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 a17e8ef45 -> 38d70c457


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/38d70c45
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/38d70c45
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/38d70c45

Branch: refs/heads/4.x-HBase-1.1
Commit: 38d70c45742c77924267051cb58484a63a630638
Parents: a17e8ef
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:10 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/38d70c45/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() &&

Reply via email to