Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.0 d970a54df -> 768d4967d
PHOENIX-2756 - FilteredKeyValueScanner should not implement KeyValueScanner Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/768d4967 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/768d4967 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/768d4967 Branch: refs/heads/4.x-HBase-1.0 Commit: 768d4967d69d9e98481ba1d74851275511ebdc2d Parents: d970a54 Author: rahul gidwani <[email protected]> Authored: Thu Mar 10 14:45:26 2016 -0800 Committer: Thomas D'Silva <[email protected]> Committed: Mon Mar 14 11:10:06 2016 -0700 ---------------------------------------------------------------------- .../index/scanner/FilteredKeyValueScanner.java | 56 +------------------- 1 file changed, 1 insertion(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/768d4967/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java index e225696..49b5bd1 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/scanner/FilteredKeyValueScanner.java @@ -19,12 +19,10 @@ package org.apache.phoenix.hbase.index.scanner; import java.io.IOException; -import java.util.SortedSet; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.filter.Filter; import org.apache.hadoop.hbase.filter.Filter.ReturnCode; import org.apache.hadoop.hbase.regionserver.KeyValueScanner; @@ -35,7 +33,7 @@ import org.apache.phoenix.hbase.index.covered.KeyValueStore; * here because we are only concerned with a single MemStore for the index; we don't need to worry about multiple column * families or minimizing seeking through file - we just want to iterate the kvs quickly, in-memory. */ -public class FilteredKeyValueScanner implements KeyValueScanner { +public class FilteredKeyValueScanner implements Scanner { private KeyValueScanner delegate; private Filter filter; @@ -102,67 +100,15 @@ public class FilteredKeyValueScanner implements KeyValueScanner { } } - @Override public boolean reseek(Cell key) throws IOException { this.delegate.reseek(key); return this.seekToNextUnfilteredKeyValue(); } - @Override - public boolean requestSeek(Cell kv, boolean forward, boolean useBloom) throws IOException { - return this.reseek(kv); - } - - @Override - public boolean isFileScanner() { - return false; - } - - @Override - public long getSequenceID() { - return this.delegate.getSequenceID(); - } - - @Override - public boolean shouldUseScanner(Scan scan, SortedSet<byte[]> columns, long oldestUnexpiredTS) { - throw new UnsupportedOperationException(this.getClass().getName() - + " doesn't support checking to see if it should use a scanner!"); - } - - @Override - public boolean realSeekDone() { - return this.delegate.realSeekDone(); - } - - @Override - public void enforceSeek() throws IOException { - this.delegate.enforceSeek(); - } @Override public void close() { this.delegate.close(); } - @Override - public boolean backwardSeek(Cell arg0) throws IOException { - return this.delegate.backwardSeek(arg0); - } - - @Override - public boolean seekToLastRow() throws IOException { - return this.delegate.seekToLastRow(); - } - - @Override - public boolean seekToPreviousRow(Cell arg0) throws IOException { - return this.delegate.seekToPreviousRow(arg0); - } - - // Added for compatibility with HBASE-13109 - // Once we drop support for older versions, add an @override annotation here - // and figure out how to get the next indexed key - public Cell getNextIndexedKey() { - return null; // indicate that we cannot use the optimization - } }
