Author: liyin Date: Wed Apr 2 20:49:14 2014 New Revision: 1584164 URL: http://svn.apache.org/r1584164 Log: [HBASE-9930] Fix HFile.Reader interface.
Author: manukranthk Summary: Scan preloader changes modified getScanner function with 2 arguments to 3 arguments instead of adding a new function. This caused the prometheus build to break since they were using the HFile.Reader interface in their MR jobs. This fixes this behavior. Test Plan: Unit tests. Reviewers: adela, rshroff Reviewed By: adela CC: hbase-eng@ Differential Revision: https://phabricator.fb.com/D1225138 Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV1.java hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java?rev=1584164&r1=1584163&r2=1584164&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java (original) +++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java Wed Apr 2 20:49:14 2014 @@ -468,6 +468,8 @@ public class HFile { RawComparator<byte []> getComparator(); + HFileScanner getScanner(boolean cacheBlocks, final boolean isCompaction); + HFileScanner getScanner(boolean cacheBlocks, final boolean isCompaction, boolean preloadBlocks); Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV1.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV1.java?rev=1584164&r1=1584163&r2=1584164&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV1.java (original) +++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV1.java Wed Apr 2 20:49:14 2014 @@ -754,4 +754,9 @@ public class HFileReaderV1 extends Abstr return null; } + @Override + public HFileScanner getScanner(boolean cacheBlocks, boolean isCompaction) { + return getScanner(cacheBlocks, isCompaction, false); + } + } Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java?rev=1584164&r1=1584163&r2=1584164&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java (original) +++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java Wed Apr 2 20:49:14 2014 @@ -1605,4 +1605,9 @@ public class HFileReaderV2 extends Abstr cacheConf.getBlockCache().evictBlock(cacheKey); } } + + @Override + public HFileScanner getScanner(boolean cacheBlocks, boolean isCompaction) { + return getScanner(cacheBlocks, isCompaction, false); + } }
