Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 71412200B11 for ; Mon, 13 Jun 2016 23:19:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6FC0B160A5E; Mon, 13 Jun 2016 21:19:16 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B956B160A1A for ; Mon, 13 Jun 2016 23:19:15 +0200 (CEST) Received: (qmail 9537 invoked by uid 500); 13 Jun 2016 21:19:14 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 9528 invoked by uid 99); 13 Jun 2016 21:19:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Jun 2016 21:19:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BB383DFC7E; Mon, 13 Jun 2016 21:19:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aengineer@apache.org To: common-commits@hadoop.apache.org Date: Mon, 13 Jun 2016 21:19:14 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/25] hadoop git commit: MAPREDUCE-6741. Refactor UncompressedSplitLineReader.fillBuffer(). Contributed by Daniel Templeton. archived-at: Mon, 13 Jun 2016 21:19:16 -0000 Repository: hadoop Updated Branches: refs/heads/HDFS-1312 9d3bb1544 -> 982bee0a1 MAPREDUCE-6741. Refactor UncompressedSplitLineReader.fillBuffer(). Contributed by Daniel Templeton. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0b7b8a37 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0b7b8a37 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0b7b8a37 Branch: refs/heads/HDFS-1312 Commit: 0b7b8a377611b2a3041a2995504a437c36dfa6e6 Parents: 9581fb7 Author: Akira Ajisaka Authored: Fri Jun 10 19:15:36 2016 +0900 Committer: Akira Ajisaka Committed: Fri Jun 10 19:15:36 2016 +0900 ---------------------------------------------------------------------- .../mapreduce/lib/input/UncompressedSplitLineReader.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0b7b8a37/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/UncompressedSplitLineReader.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/UncompressedSplitLineReader.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/UncompressedSplitLineReader.java index bda0218..c2b005b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/UncompressedSplitLineReader.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/UncompressedSplitLineReader.java @@ -53,10 +53,10 @@ public class UncompressedSplitLineReader extends SplitLineReader { throws IOException { int maxBytesToRead = buffer.length; if (totalBytesRead < splitLength) { - long leftBytesForSplit = splitLength - totalBytesRead; - // check if leftBytesForSplit exceed Integer.MAX_VALUE - if (leftBytesForSplit <= Integer.MAX_VALUE) { - maxBytesToRead = Math.min(maxBytesToRead, (int)leftBytesForSplit); + long bytesLeftInSplit = splitLength - totalBytesRead; + + if (bytesLeftInSplit < maxBytesToRead) { + maxBytesToRead = (int)bytesLeftInSplit; } } int bytesRead = in.read(buffer, 0, maxBytesToRead); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org