Author: atm
Date: Wed Aug 22 22:45:30 2012
New Revision: 1376298
URL: http://svn.apache.org/viewvc?rev=1376298&view=rev
Log:
MAPREDUCE-4577. HDFS-3672 broke TestCombineFileInputFormat.testMissingBlocks()
test. Contributed by Aaron T. Myers.
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1376298&r1=1376297&r2=1376298&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Wed
Aug 22 22:45:30 2012
@@ -50,6 +50,9 @@ Branch-2 ( Unreleased changes )
MAPREDUCE-4068. Jars in lib subdirectory of the submittable JAR are not
added to the
classpath (rkanter via tucu)
+ MAPREDUCE-4577. HDFS-3672 broke
+ TestCombineFileInputFormat.testMissingBlocks() test (atm)
+
Release 2.1.0-alpha - Unreleased
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java?rev=1376298&r1=1376297&r2=1376298&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java
Wed Aug 22 22:45:30 2012
@@ -125,9 +125,9 @@ public class TestCombineFileInputFormat
BlockLocation[] locs =
super.getFileBlockLocations(stat, start, len);
if (name.equals(fileWithMissingBlocks)) {
- System.out.println("Returing missing blocks for " +
fileWithMissingBlocks);
- locs[0] = new BlockLocation(new String[0], new String[0],
- locs[0].getOffset(), locs[0].getLength());
+ System.out.println("Returning missing blocks for " +
fileWithMissingBlocks);
+ locs[0] = new HdfsBlockLocation(new BlockLocation(new String[0],
+ new String[0], locs[0].getOffset(), locs[0].getLength()), null);
}
return locs;
}
