From c19633da5b0cc190cc64e812ee89c38f28d5a670 Mon Sep 17 00:00:00 2001 From: Alejandro Abdelnur Date: Tue, 19 Mar 2013 17:56:29 +0000 Subject: [PATCH] Reverting MAPREDUCE-5028 (commit 1457918) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1458433 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 --- .../main/java/org/apache/hadoop/mapred/MapTask.java | 12 +++++------- .../hadoop/mapreduce/task/ReduceContextImpl.java | 3 +-- .../hadoop/mapreduce/task/reduce/InMemoryReader.java | 4 ++-- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index d1721a16c8..8f809407b1 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -238,9 +238,6 @@ Release 2.0.5-beta - UNRELEASED MAPREDUCE-4716. TestHsWebServicesJobsQuery.testJobsQueryStateInvalid fails with jdk7. (tgraves via tucu) - MAPREDUCE-5028. Maps fail when io.sort.mb is set to high value. - (kkambatl via tucu) - Release 2.0.4-alpha - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java index 496ca2e656..cd4ba51c31 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java @@ -1165,9 +1165,8 @@ private void setEquator(int pos) { equator = pos; // set index prior to first entry, aligned at meta boundary final int aligned = pos - (pos % METASIZE); - // Cast one of the operands to long to ensure large values don't cause int - // overflow - kvindex = (int) (((long) aligned - METASIZE + kvbuffer.length) % kvbuffer.length) / 4; + kvindex = + ((aligned - METASIZE + kvbuffer.length) % kvbuffer.length) / 4; if (LOG.isInfoEnabled()) { LOG.info("(EQUATOR) " + pos + " kvi " + kvindex + "(" + (kvindex * 4) + ")"); @@ -1184,9 +1183,8 @@ private void resetSpill() { bufstart = bufend = e; final int aligned = e - (e % METASIZE); // set start/end to point to first meta record - // Cast one of the operands to long to ensure large values don't cause int - // overflow - kvstart = kvend = (int) (((long) aligned - METASIZE + kvbuffer.length) % kvbuffer.length) / 4; + kvstart = kvend = + ((aligned - METASIZE + kvbuffer.length) % kvbuffer.length) / 4; if (LOG.isInfoEnabled()) { LOG.info("(RESET) equator " + e + " kv " + kvstart + "(" + (kvstart * 4) + ")" + " kvi " + kvindex + "(" + (kvindex * 4) + ")"); @@ -1750,7 +1748,7 @@ public void reset(byte[] buffer, int start, int length) { this.start = 0; } - super.reset(this.buffer, this.start, this.length - this.start); + super.reset(this.buffer, this.start, this.length); } } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/ReduceContextImpl.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/ReduceContextImpl.java index 8736de52f8..7ad08e956d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/ReduceContextImpl.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/ReduceContextImpl.java @@ -205,8 +205,7 @@ public VALUEIN next() { if (backupStore.hasNext()) { backupStore.next(); DataInputBuffer next = backupStore.nextValue(); - buffer.reset(next.getData(), next.getPosition(), next.getLength() - - next.getPosition()); + buffer.reset(next.getData(), next.getPosition(), next.getLength()); value = valueDeserializer.deserialize(value); return value; } else { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/InMemoryReader.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/InMemoryReader.java index 6def88b97b..543ff3f9cc 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/InMemoryReader.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/InMemoryReader.java @@ -49,14 +49,14 @@ public InMemoryReader(MergeManagerImpl merger, TaskAttemptID taskAttemptId, buffer = data; bufferSize = (int)fileLength; - memDataIn.reset(buffer, start, length - start); + memDataIn.reset(buffer, start, length); this.start = start; this.length = length; } @Override public void reset(int offset) { - memDataIn.reset(buffer, start + offset, length - start - offset); + memDataIn.reset(buffer, start + offset, length); bytesRead = offset; eof = false; }