[17/50] [abbrv] phoenix git commit: Revert "PHOENIX-4496 Fix RowValueConstructorIT and IndexMetadataIT"
Revert "PHOENIX-4496 Fix RowValueConstructorIT and IndexMetadataIT" This reverts commit 70c9c6bb2d2073bb40640a0a794032b166c4b63b. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7b2c7e13 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7b2c7e13 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7b2c7e13 Branch: refs/heads/system-catalog Commit: 7b2c7e135916d5a6087ec3e6c4b6c261779795ac Parents: 70c9c6b Author: James Taylor Authored: Fri Apr 13 10:10:07 2018 -0700 Committer: James Taylor Committed: Fri Apr 13 10:10:07 2018 -0700 -- .../phoenix/hbase/index/scanner/ScannerBuilder.java | 10 -- 1 file changed, 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/7b2c7e13/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..ad09c0c 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,7 +31,6 @@ 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; @@ -99,15 +98,6 @@ public class ScannerBuilder { } columnFilters.addFilter(columnFilter); } - -if(columns.isEmpty()){ -columnFilters.addFilter(new FilterBase(){ -@Override -public boolean filterAllRemaining() throws IOException { -return true; -} -}); -} return columnFilters; }
phoenix git commit: Revert "PHOENIX-4496 Fix RowValueConstructorIT and IndexMetadataIT"
Repository: phoenix Updated Branches: refs/heads/master 70c9c6bb2 -> 7b2c7e135 Revert "PHOENIX-4496 Fix RowValueConstructorIT and IndexMetadataIT" This reverts commit 70c9c6bb2d2073bb40640a0a794032b166c4b63b. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7b2c7e13 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7b2c7e13 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7b2c7e13 Branch: refs/heads/master Commit: 7b2c7e135916d5a6087ec3e6c4b6c261779795ac Parents: 70c9c6b Author: James Taylor Authored: Fri Apr 13 10:10:07 2018 -0700 Committer: James Taylor Committed: Fri Apr 13 10:10:07 2018 -0700 -- .../phoenix/hbase/index/scanner/ScannerBuilder.java | 10 -- 1 file changed, 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/7b2c7e13/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..ad09c0c 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,7 +31,6 @@ 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; @@ -99,15 +98,6 @@ public class ScannerBuilder { } columnFilters.addFilter(columnFilter); } - -if(columns.isEmpty()){ -columnFilters.addFilter(new FilterBase(){ -@Override -public boolean filterAllRemaining() throws IOException { -return true; -} -}); -} return columnFilters; }