Author: harsh
Date: Tue Jan 15 13:55:49 2013
New Revision: 1433416
URL: http://svn.apache.org/viewvc?rev=1433416&view=rev
Log:
MAPREDUCE-4925. The pentomino option parser may be buggy. Contributed by
Karthik Kambatla. (harsh)
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DistributedPentomino.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=1433416&r1=1433415&r2=1433416&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue
Jan 15 13:55:49 2013
@@ -542,6 +542,9 @@ Release 0.23.6 - UNRELEASED
MAPREDUCE-4678. Running the Pentomino example with defaults throws
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
INCOMPATIBLE CHANGES
Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1433414
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DistributedPentomino.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DistributedPentomino.java?rev=1433416&r1=1433415&r2=1433416&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DistributedPentomino.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/dancing/DistributedPentomino.java
Tue Jan 15 13:55:49 2013
@@ -174,16 +174,16 @@ public class DistributedPentomino extend
return 2;
}
// check for passed parameters, otherwise use defaults
- int width = PENT_WIDTH;
- int height = PENT_HEIGHT;
- int depth = PENT_DEPTH;
+ int width = conf.getInt(Pentomino.WIDTH, PENT_WIDTH);
+ int height = conf.getInt(Pentomino.HEIGHT, PENT_HEIGHT);
+ int depth = conf.getInt(Pentomino.DEPTH, PENT_DEPTH);
for (int i = 0; i < args.length; i++) {
if (args[i].equalsIgnoreCase("-depth")) {
- depth = Integer.parseInt(args[i++].trim());
+ depth = Integer.parseInt(args[++i].trim());
} else if (args[i].equalsIgnoreCase("-height")) {
- height = Integer.parseInt(args[i++].trim());
+ height = Integer.parseInt(args[++i].trim());
} 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
