You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by an...@apache.org on 2018/04/13 09:34:53 UTC
[1/2] phoenix git commit: PHOENIX-4496 Fix RowValueConstructorIT and
IndexMetadataIT
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.3 e79228c4f -> f543d99a3
PHOENIX-4496 Fix RowValueConstructorIT and IndexMetadataIT
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/672f195a
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/672f195a
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/672f195a
Branch: refs/heads/4.x-HBase-1.3
Commit: 672f195ae71e20f2358e16bec5c8bb7a3d608858
Parents: e79228c
Author: Ankit Singhal <an...@gmail.com>
Authored: Fri Apr 13 12:10:51 2018 +0530
Committer: Ankit Singhal <an...@gmail.com>
Committed: Fri Apr 13 12:10:51 2018 +0530
----------------------------------------------------------------------
.../phoenix/hbase/index/scanner/ScannerBuilder.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/672f195a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/ScannerBuilder.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/ScannerBuilder.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/ScannerBuilder.java
index ad09c0c..4c42fe4 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/ScannerBuilder.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/ScannerBuilder.java
@@ -31,6 +31,7 @@ import org.apache.hadoop.hbase.filter.BinaryComparator;
import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp;
import org.apache.hadoop.hbase.filter.FamilyFilter;
import org.apache.hadoop.hbase.filter.Filter;
+import org.apache.hadoop.hbase.filter.FilterBase;
import org.apache.hadoop.hbase.filter.FilterList;
import org.apache.hadoop.hbase.filter.QualifierFilter;
import org.apache.hadoop.hbase.util.Bytes;
@@ -98,6 +99,15 @@ public class ScannerBuilder {
}
columnFilters.addFilter(columnFilter);
}
+
+ if(columns.isEmpty()){
+ columnFilters.addFilter(new FilterBase(){
+ @Override
+ public boolean filterAllRemaining() throws IOException {
+ return true;
+ }
+ });
+ }
return columnFilters;
}
[2/2] phoenix git commit: PHOENIX-4496 Fix RowValueConstructorIT and
IndexMetadataIT
Posted by an...@apache.org.
PHOENIX-4496 Fix RowValueConstructorIT and IndexMetadataIT
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/f543d99a
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f543d99a
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f543d99a
Branch: refs/heads/4.x-HBase-1.3
Commit: f543d99a358a3bd3164754bfb81f9f1582c320f9
Parents: 672f195
Author: Ankit Singhal <an...@gmail.com>
Authored: Fri Apr 13 15:04:43 2018 +0530
Committer: Ankit Singhal <an...@gmail.com>
Committed: Fri Apr 13 15:04:43 2018 +0530
----------------------------------------------------------------------
.../apache/phoenix/hbase/index/scanner/ScannerBuilder.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f543d99a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/ScannerBuilder.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/ScannerBuilder.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/ScannerBuilder.java
index 4c42fe4..703fcd2 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/ScannerBuilder.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/ScannerBuilder.java
@@ -101,11 +101,17 @@ public class ScannerBuilder {
}
if(columns.isEmpty()){
- columnFilters.addFilter(new FilterBase(){
+ columnFilters.addFilter(new FilterBase() {
+
@Override
public boolean filterAllRemaining() throws IOException {
return true;
}
+
+ @Override
+ public ReturnCode filterKeyValue(Cell v) throws IOException {
+ return Filter.ReturnCode.INCLUDE;
+ }
});
}
return columnFilters;