You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by sh...@apache.org on 2009/10/15 13:24:05 UTC
svn commit: r825466 - in /hadoop/mapreduce/branches/branch-0.21: ./
src/examples/org/apache/hadoop/examples/dancing/
src/java/org/apache/hadoop/mapred/ src/java/org/apache/hadoop/mapred/pipes/
src/java/org/apache/hadoop/mapreduce/lib/db/ src/java/org/a...
Author: sharad
Date: Thu Oct 15 11:24:02 2009
New Revision: 825466
URL: http://svn.apache.org/viewvc?rev=825466&view=rev
Log:
MAPREDUCE-769. merge -r 825464:825465 from trunk to 0.21 branch.
Modified:
hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
hadoop/mapreduce/branches/branch-0.21/src/examples/org/apache/hadoop/examples/dancing/Pentomino.java
hadoop/mapreduce/branches/branch-0.21/src/examples/org/apache/hadoop/examples/dancing/Sudoku.java
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobPriority.java
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/LocalJobRunner.java
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskRunner.java
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/pipes/Submitter.java
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/db/DBRecordReader.java
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/db/MySQLDBRecordReader.java
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/db/MySQLDataDrivenDBRecordReader.java
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ProcessTree.java
hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/LinuxMemoryCalculatorPlugin.java
hadoop/mapreduce/branches/branch-0.21/src/test/findbugsExcludeFile.xml
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/NotificationTestCase.java
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestComparators.java
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerBlacklisting.java
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestTextInputFormat.java
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/jobcontrol/JobControlTestUtils.java
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/MapReduceTestUtil.java
hadoop/mapreduce/branches/branch-0.21/src/webapps/job/jobtable.jsp
hadoop/mapreduce/branches/branch-0.21/src/webapps/job/jobtracker.jspx
Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Thu Oct 15 11:24:02 2009
@@ -743,3 +743,7 @@
MAPREDUCE-1029. Fix failing TestCopyFiles by restoring the unzipping of
HDFS webapps from the hdfs jar. (Aaron Kimball and Jothi Padmanabhan via
cdouglas)
+
+ MAPREDUCE-769. Make findbugs and javac warnings to zero.
+ (Amareshwari Sriramadasu via sharad)
+
Modified: hadoop/mapreduce/branches/branch-0.21/src/examples/org/apache/hadoop/examples/dancing/Pentomino.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/examples/org/apache/hadoop/examples/dancing/Pentomino.java?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/examples/org/apache/hadoop/examples/dancing/Pentomino.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/examples/org/apache/hadoop/examples/dancing/Pentomino.java Thu Oct 15 11:24:02 2009
@@ -60,7 +60,7 @@
}
this.shape = new boolean[lines.size()][];
for(int i=0 ; i < lines.size(); i++) {
- this.shape[i] = (boolean[]) lines.get(i);
+ this.shape[i] = lines.get(i);
}
}
@@ -383,7 +383,7 @@
}
boolean[] row = new boolean[dancer.getNumberColumns()];
for(int idx = 0; idx < pieces.size(); ++idx) {
- Piece piece = (Piece) pieces.get(idx);
+ Piece piece = pieces.get(idx);
row[idx + pieceBase] = true;
generateRows(dancer, piece, width, height, false, row, idx == 0);
if (piece.getFlippable()) {
Modified: hadoop/mapreduce/branches/branch-0.21/src/examples/org/apache/hadoop/examples/dancing/Sudoku.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/examples/org/apache/hadoop/examples/dancing/Sudoku.java?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/examples/org/apache/hadoop/examples/dancing/Sudoku.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/examples/org/apache/hadoop/examples/dancing/Sudoku.java Thu Oct 15 11:24:02 2009
@@ -154,7 +154,7 @@
line = file.readLine();
}
size = result.size();
- board = (int[][]) result.toArray(new int [size][]);
+ board = result.toArray(new int [size][]);
squareYSize = (int) Math.sqrt(size);
squareXSize = size / squareYSize;
file.close();
@@ -236,8 +236,8 @@
rowValues[i] = false;
}
// find the square coordinates
- int xBox = (int) x / squareXSize;
- int yBox = (int) y / squareYSize;
+ int xBox = x / squareXSize;
+ int yBox = y / squareYSize;
// mark the column
rowValues[x*size + num - 1] = true;
// mark the row
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobPriority.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobPriority.java?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobPriority.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobPriority.java Thu Oct 15 11:24:02 2009
@@ -21,6 +21,7 @@
* Used to describe the priority of the running job.
* @deprecated Use {@link org.apache.hadoop.mapreduce.JobPriority} instead
*/
+@Deprecated
public enum JobPriority {
VERY_HIGH,
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/LocalJobRunner.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/LocalJobRunner.java?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/LocalJobRunner.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/LocalJobRunner.java Thu Oct 15 11:24:02 2009
@@ -69,6 +69,7 @@
return ClientProtocol.versionID;
}
+ @SuppressWarnings("unchecked")
static RawSplit[] getRawSplits(JobContext jContext, JobConf job)
throws Exception {
JobConf jobConf = jContext.getJobConf();
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskRunner.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskRunner.java?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskRunner.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskRunner.java Thu Oct 15 11:24:02 2009
@@ -143,6 +143,7 @@
* set via {@link JobConf#MAPRED_MAP_TASK_ENV} or
* {@link JobConf#MAPRED_REDUCE_TASK_ENV}
*/
+ @Deprecated
public String getChildEnv(JobConf jobConf) {
return jobConf.get(JobConf.MAPRED_TASK_ENV);
}
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/pipes/Submitter.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/pipes/Submitter.java?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/pipes/Submitter.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/pipes/Submitter.java Thu Oct 15 11:24:02 2009
@@ -382,7 +382,7 @@
JobConf conf,
Class<InterfaceType> cls
) throws ClassNotFoundException {
- return conf.getClassByName((String) cl.getOptionValue(key)).asSubclass(cls);
+ return conf.getClassByName(cl.getOptionValue(key)).asSubclass(cls);
}
@Override
@@ -420,15 +420,14 @@
JobConf job = new JobConf(getConf());
if (results.hasOption("input")) {
- FileInputFormat.setInputPaths(job,
- (String) results.getOptionValue("input"));
+ FileInputFormat.setInputPaths(job, results.getOptionValue("input"));
}
if (results.hasOption("output")) {
FileOutputFormat.setOutputPath(job,
- new Path((String) results.getOptionValue("output")));
+ new Path(results.getOptionValue("output")));
}
if (results.hasOption("jar")) {
- job.setJar((String) results.getOptionValue("jar"));
+ job.setJar(results.getOptionValue("jar"));
}
if (results.hasOption("inputformat")) {
setIsJavaRecordReader(job, true);
@@ -451,7 +450,7 @@
job.setReducerClass(getClass(results, "reduce", job, Reducer.class));
}
if (results.hasOption("reduces")) {
- job.setNumReduceTasks(Integer.parseInt((String)
+ job.setNumReduceTasks(Integer.parseInt(
results.getOptionValue("reduces")));
}
if (results.hasOption("writer")) {
@@ -461,18 +460,18 @@
}
if (results.hasOption("lazyOutput")) {
- if (Boolean.parseBoolean((String)results.getOptionValue("lazyOutput"))) {
+ if (Boolean.parseBoolean(results.getOptionValue("lazyOutput"))) {
LazyOutputFormat.setOutputFormatClass(job,
job.getOutputFormat().getClass());
}
}
if (results.hasOption("program")) {
- setExecutable(job, (String) results.getOptionValue("program"));
+ setExecutable(job, results.getOptionValue("program"));
}
if (results.hasOption("jobconf")) {
LOG.warn("-jobconf option is deprecated, please use -D instead.");
- String options = (String)results.getOptionValue("jobconf");
+ String options = results.getOptionValue("jobconf");
StringTokenizer tokenizer = new StringTokenizer(options, ",");
while (tokenizer.hasMoreTokens()) {
String keyVal = tokenizer.nextToken().trim();
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/db/DBRecordReader.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/db/DBRecordReader.java?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/db/DBRecordReader.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/db/DBRecordReader.java Thu Oct 15 11:24:02 2009
@@ -70,7 +70,7 @@
private Connection connection;
- private PreparedStatement statement;
+ protected PreparedStatement statement;
private DBConfiguration dbConf;
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/db/MySQLDBRecordReader.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/db/MySQLDBRecordReader.java?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/db/MySQLDBRecordReader.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/db/MySQLDBRecordReader.java Thu Oct 15 11:24:02 2009
@@ -38,10 +38,9 @@
// Execute statements for mysql in unbuffered mode.
protected ResultSet executeQuery(String query) throws SQLException {
- PreparedStatement statement = getConnection().prepareStatement(query,
+ statement = getConnection().prepareStatement(query,
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
statement.setFetchSize(Integer.MIN_VALUE); // MySQL: read row-at-a-time.
- setStatement(statement); // save a ref for cleanup in close()
return statement.executeQuery();
}
}
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/db/MySQLDataDrivenDBRecordReader.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/db/MySQLDataDrivenDBRecordReader.java?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/db/MySQLDataDrivenDBRecordReader.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/db/MySQLDataDrivenDBRecordReader.java Thu Oct 15 11:24:02 2009
@@ -39,10 +39,9 @@
// Execute statements for mysql in unbuffered mode.
protected ResultSet executeQuery(String query) throws SQLException {
- PreparedStatement statement = getConnection().prepareStatement(query,
+ statement = getConnection().prepareStatement(query,
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
statement.setFetchSize(Integer.MIN_VALUE); // MySQL: read row-at-a-time.
- setStatement(statement); // save a ref so the close() method cleans this up.
return statement.executeQuery();
}
}
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ProcessTree.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ProcessTree.java?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ProcessTree.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ProcessTree.java Thu Oct 15 11:24:02 2009
@@ -50,8 +50,8 @@
setsidSupported = false;
} finally { // handle the exit code
LOG.info("setsid exited with exit code " + shexec.getExitCode());
- return setsidSupported;
}
+ return setsidSupported;
}
/**
Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/LinuxMemoryCalculatorPlugin.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/LinuxMemoryCalculatorPlugin.java?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/LinuxMemoryCalculatorPlugin.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/LinuxMemoryCalculatorPlugin.java Thu Oct 15 11:24:02 2009
@@ -25,6 +25,7 @@
* {@link org.apache.hadoop.mapreduce.util.LinuxMemoryCalculatorPlugin}
* instead
*/
+@Deprecated
public class LinuxMemoryCalculatorPlugin extends
org.apache.hadoop.mapreduce.util.LinuxMemoryCalculatorPlugin {
// Inherits everything from the super class
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/findbugsExcludeFile.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/findbugsExcludeFile.xml?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/findbugsExcludeFile.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/findbugsExcludeFile.xml Thu Oct 15 11:24:02 2009
@@ -16,6 +16,10 @@
<Bug pattern="DLS_DEAD_LOCAL_STORE" />
</Match>
<Match>
+ <Class name="~.*_jspx" />
+ <Bug pattern="DLS_DEAD_LOCAL_STORE" />
+ </Match>
+ <Match>
<Field name="_jspx_dependants" />
<Bug pattern="UWF_UNWRITTEN_FIELD" />
</Match>
@@ -64,6 +68,14 @@
<Class name="org.apache.hadoop.mapred.SequenceFileInputFilter$Filter" />
<Bug pattern="NM_SAME_SIMPLE_NAME_AS_INTERFACE" />
</Match>
+ <Match>
+ <Class name="~org.apache.hadoop.util.*" />
+ <Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS" />
+ </Match>
+ <Match>
+ <Class name="~org.apache.hadoop.filecache.*" />
+ <Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS" />
+ </Match>
<!--
Ignore warnings for usage of System.exit. This is
required and have been well thought out
@@ -116,6 +128,11 @@
<Class name="org.apache.hadoop.mapred.FileOutputCommitter" />
<Bug pattern="NM_WRONG_PACKAGE_INTENTIONAL" />
</Match>
+ <Match>
+ <Class name="org.apache.hadoop.mapred.lib.db.DBInputFormat$DBRecordReader" />
+ <Method name="next" />
+ <Bug pattern="NM_WRONG_PACKAGE_INTENTIONAL" />
+ </Match>
<!--
Ignoring this warning as resolving this would need a non-trivial change in code
-->
@@ -163,6 +180,11 @@
<Field name="inputs" />
<Bug pattern="IS2_INCONSISTENT_SYNC" />
</Match>
+ <Match>
+ <Class name="org.apache.hadoop.mapred.JobTracker" />
+ <Method name="updateTaskTrackerStatus" />
+ <Bug pattern="DLS_DEAD_LOCAL_STORE" />
+ </Match>
<!--
This class is unlikely to get subclassed, so ignore
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/NotificationTestCase.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/NotificationTestCase.java?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/NotificationTestCase.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/NotificationTestCase.java Thu Oct 15 11:24:02 2009
@@ -96,7 +96,8 @@
public static class NotificationServlet extends HttpServlet {
public static int counter = 0;
-
+ private static final long serialVersionUID = 1L;
+
protected void doGet(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
switch (counter) {
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestComparators.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestComparators.java?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestComparators.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestComparators.java Thu Oct 15 11:24:02 2009
@@ -127,7 +127,7 @@
public void reduce(IntWritable key, Iterator<Writable> values,
OutputCollector<IntWritable, Text> out,
Reporter reporter) throws IOException {
- int currentKey = ((IntWritable)(key)).get();
+ int currentKey = key.get();
// keys should be in descending order
if (currentKey > lastKey) {
fail("Keys not in sorted descending order");
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java Thu Oct 15 11:24:02 2009
@@ -189,7 +189,7 @@
Text value = reader.createValue();
while (reader.next(key, value)) {
result.add(value);
- value = (Text) reader.createValue();
+ value = reader.createValue();
}
return result;
}
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerBlacklisting.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerBlacklisting.java?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerBlacklisting.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestTaskTrackerBlacklisting.java Thu Oct 15 11:24:02 2009
@@ -174,7 +174,7 @@
healthStatus.setLastReported(status.getLastReported());
}
jobTracker.heartbeat(tts, false, initialContact,
- false, (short) responseId);
+ false, responseId);
}
responseId++;
}
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestTextInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestTextInputFormat.java?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestTextInputFormat.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestTextInputFormat.java Thu Oct 15 11:24:02 2009
@@ -391,7 +391,7 @@
Text value = reader.createValue();
while (reader.next(key, value)) {
result.add(value);
- value = (Text) reader.createValue();
+ value = reader.createValue();
}
reader.close();
return result;
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/jobcontrol/JobControlTestUtils.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/jobcontrol/JobControlTestUtils.java?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/jobcontrol/JobControlTestUtils.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/jobcontrol/JobControlTestUtils.java Thu Oct 15 11:24:02 2009
@@ -145,7 +145,7 @@
throws IOException {
Text dumbKey = new Text("");
while (values.hasNext()) {
- Text data = (Text) values.next();
+ Text data = values.next();
output.collect(dumbKey, data);
}
}
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/MapReduceTestUtil.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/MapReduceTestUtil.java?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/MapReduceTestUtil.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapreduce/MapReduceTestUtil.java Thu Oct 15 11:24:02 2009
@@ -214,7 +214,7 @@
throws IOException, InterruptedException {
Text dumbKey = new Text("");
while (values.hasNext()) {
- Text data = (Text) values.next();
+ Text data = values.next();
context.write(dumbKey, data);
}
}
Modified: hadoop/mapreduce/branches/branch-0.21/src/webapps/job/jobtable.jsp
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/webapps/job/jobtable.jsp?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/webapps/job/jobtable.jsp (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/webapps/job/jobtable.jsp Thu Oct 15 11:24:02 2009
@@ -32,7 +32,7 @@
<%
JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");
QueueManager qmgr = tracker.getQueueManager();
-String queue = (String)request.getParameter("queue_name");
+String queue = request.getParameter("queue_name");
TaskScheduler scheduler = tracker.getTaskScheduler();
JobQueueInfo queueInfo = tracker.getQueueInfo(queue);
%>
Modified: hadoop/mapreduce/branches/branch-0.21/src/webapps/job/jobtracker.jspx
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/webapps/job/jobtracker.jspx?rev=825466&r1=825465&r2=825466&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/webapps/job/jobtracker.jspx (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/webapps/job/jobtracker.jspx Thu Oct 15 11:24:02 2009
@@ -27,6 +27,10 @@
<jsp:directive.page import="org.apache.hadoop.mapreduce.*" />
<jsp:directive.page import="org.apache.hadoop.mapred.JSPUtil" />
+ <jsp:declaration>
+ private static final long serialVersionUID = 1L;
+ </jsp:declaration>
+
<jsp:scriptlet>
response.setHeader("Pragma", "no-cache");
response.setHeader("Cache-Control", "no-store");