Repository: phoenix Updated Branches: refs/heads/4.0 46d365a96 -> 46e99bb1b refs/heads/4.2 a66a02cbd -> 63bc8a72e refs/heads/4.3 16df2344c -> 83dae8d2a refs/heads/master 36b88651c -> 66fb38cad
PHOENIX-1731 Add getNextIndexedKey() to IndexHalfStoreFileReader and FilteredKeyValueScanner. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/66fb38ca Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/66fb38ca Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/66fb38ca Branch: refs/heads/master Commit: 66fb38cade511d3544a748eb1a2c9da446cf2984 Parents: 36b8865 Author: Lars Hofhansl <la...@apache.org> Authored: Fri Mar 13 11:50:04 2015 -0700 Committer: Lars Hofhansl <la...@apache.org> Committed: Fri Mar 13 11:50:04 2015 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/regionserver/IndexHalfStoreFileReader.java | 7 +++++++ .../phoenix/hbase/index/scanner/FilteredKeyValueScanner.java | 7 +++++++ 2 files changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/66fb38ca/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java index fa1def3..172486d 100644 --- a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java +++ b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java @@ -363,6 +363,13 @@ public class IndexHalfStoreFileReader extends StoreFile.Reader { public boolean isSeeked() { return this.delegate.isSeeked(); } + + // 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 byte[] getNextIndexedKey() { + return null; // indicate that we cannot use the optimization + } }; } http://git-wip-us.apache.org/repos/asf/phoenix/blob/66fb38ca/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 16080d1..9e5d9b2 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 @@ -157,4 +157,11 @@ public class FilteredKeyValueScanner implements KeyValueScanner { public boolean seekToPreviousRow(KeyValue 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 byte[] getNextIndexedKey() { + return null; // indicate that we cannot use the optimization + } } \ No newline at end of file
