You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by la...@apache.org on 2015/03/13 19:52:36 UTC
[3/4] phoenix git commit: PHOENIX-1731 Add getNextIndexedKey() to
IndexHalfStoreFileReader and FilteredKeyValueScanner.
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/83dae8d2
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/83dae8d2
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/83dae8d2
Branch: refs/heads/4.3
Commit: 83dae8d2a14d52915eead26402eefc306661a866
Parents: 16df234
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:51:35 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/83dae8d2/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/83dae8d2/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 c36e7ea..1f16bef 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
@@ -158,4 +158,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