Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 258CB10A0E for ; Wed, 2 Apr 2014 20:49:55 +0000 (UTC) Received: (qmail 90824 invoked by uid 500); 2 Apr 2014 20:49:52 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 90540 invoked by uid 500); 2 Apr 2014 20:49:51 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 90523 invoked by uid 99); 2 Apr 2014 20:49:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Apr 2014 20:49:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Apr 2014 20:49:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 095292388BBD; Wed, 2 Apr 2014 20:49:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1584164 - in /hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/io/hfile: HFile.java HFileReaderV1.java HFileReaderV2.java Date: Wed, 02 Apr 2014 20:49:14 -0000 To: commits@hbase.apache.org From: liyin@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140402204915.095292388BBD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 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); + } }