You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by td...@apache.org on 2015/03/27 20:25:37 UTC
phoenix git commit: PHOENIX-1792 Fix 4.x-HBase-1.x compilation error
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.x f0c2ed4e5 -> 709d86706
PHOENIX-1792 Fix 4.x-HBase-1.x compilation error
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/709d8670
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/709d8670
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/709d8670
Branch: refs/heads/4.x-HBase-1.x
Commit: 709d867061dcc4bb7fea6153a9924bf52cfa2d08
Parents: f0c2ed4
Author: Thomas <td...@salesforce.com>
Authored: Fri Mar 27 12:08:10 2015 -0700
Committer: Thomas <td...@salesforce.com>
Committed: Fri Mar 27 12:08:10 2015 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java | 2 +-
.../phoenix/hbase/index/scanner/FilteredKeyValueScanner.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/709d8670/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 654daf0..49e2022 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
@@ -387,7 +387,7 @@ public class IndexHalfStoreFileReader extends StoreFile.Reader {
// 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() {
+ public Cell getNextIndexedKey() {
return null; // indicate that we cannot use the optimization
}
};
http://git-wip-us.apache.org/repos/asf/phoenix/blob/709d8670/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 bdf7126..7350eef 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
@@ -163,7 +163,7 @@ public class FilteredKeyValueScanner implements KeyValueScanner {
// 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() {
+ public Cell getNextIndexedKey() {
return null; // indicate that we cannot use the optimization
}
}
\ No newline at end of file