You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by en...@apache.org on 2015/03/26 02:08:45 UTC
phoenix git commit: PHOENIX-1642 Make Phoenix Master Branch pointing
to HBase1.0.0 - ADDENDUM for HBASE-13109
Repository: phoenix
Updated Branches:
refs/heads/master d70f389ed -> ad2ad0cef
PHOENIX-1642 Make Phoenix Master Branch pointing to HBase1.0.0 - ADDENDUM for HBASE-13109
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ad2ad0ce
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ad2ad0ce
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ad2ad0ce
Branch: refs/heads/master
Commit: ad2ad0cefd5d19a9bc84345444455a9ecbb55c78
Parents: d70f389
Author: Enis Soztutar <en...@apache.org>
Authored: Wed Mar 25 18:08:35 2015 -0700
Committer: Enis Soztutar <en...@apache.org>
Committed: Wed Mar 25 18:08:35 2015 -0700
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/IndexHalfStoreFileReader.java | 2 +-
.../phoenix/hbase/index/scanner/FilteredKeyValueScanner.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ad2ad0ce/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/ad2ad0ce/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 aae13fb..e225696 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
@@ -162,7 +162,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
+}