Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-4925. The pentomino option parser may be buggy. Contributed by Karthik Kambatla. (harsh) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433416 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Harsh J 2013-01-15 13:55:49 +00:00
parent 82f03491a6
commit 0ab4e6984f
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -542,6 +542,9 @@ Release 0.23.6 - UNRELEASED
MAPREDUCE-4678. Running the Pentomino example with defaults throws MAPREDUCE-4678. Running the Pentomino example with defaults throws
java.lang.NegativeArraySizeException (Chris McConnell via harsh) java.lang.NegativeArraySizeException (Chris McConnell via harsh)
MAPREDUCE-4925. The pentomino option parser may be buggy.
(Karthik Kambatla via harsh)
Release 0.23.5 - UNRELEASED Release 0.23.5 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

12
hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DistributedPentomino.java
View File

@ -174,16 +174,16 @@ public class DistributedPentomino extends Configured implements Tool {
return 2; return 2;
} }
// check for passed parameters, otherwise use defaults // check for passed parameters, otherwise use defaults
int width = PENT_WIDTH; int width = conf.getInt(Pentomino.WIDTH, PENT_WIDTH);
int height = PENT_HEIGHT; int height = conf.getInt(Pentomino.HEIGHT, PENT_HEIGHT);
int depth = PENT_DEPTH; int depth = conf.getInt(Pentomino.DEPTH, PENT_DEPTH);
for (int i = 0; i < args.length; i++) { for (int i = 0; i < args.length; i++) {
if (args[i].equalsIgnoreCase("-depth")) { if (args[i].equalsIgnoreCase("-depth")) {
depth = Integer.parseInt(args[i++].trim()); depth = Integer.parseInt(args[++i].trim());
} else if (args[i].equalsIgnoreCase("-height")) { } else if (args[i].equalsIgnoreCase("-height")) {
height = Integer.parseInt(args[i++].trim()); height = Integer.parseInt(args[++i].trim());
} else if (args[i].equalsIgnoreCase("-width") ) { } else if (args[i].equalsIgnoreCase("-width") ) {
width = Integer.parseInt(args[i++].trim()); width = Integer.parseInt(args[++i].trim());
} }
} }
// now set the values within conf for M/R tasks to read, this // now set the values within conf for M/R tasks to read, this