You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cd...@apache.org on 2010/02/18 10:15:04 UTC
svn commit: r911292 - in /hadoop/common/branches/branch-0.20: ./
src/mapred/org/apache/hadoop/mapred/
src/mapred/org/apache/hadoop/mapred/lib/ src/webapps/job/ src/webapps/task/
Author: cdouglas
Date: Thu Feb 18 09:15:03 2010
New Revision: 911292
URL: http://svn.apache.org/viewvc?rev=911292&view=rev
Log:
MAPREDUCE-623. Resolve javac warnings in mapreduce. Contributed by Jothi Padmanabhan
Modified:
hadoop/common/branches/branch-0.20/CHANGES.txt
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/DisallowedTaskTrackerException.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/FileAlreadyExistsException.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InvalidFileTypeException.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InvalidInputException.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InvalidJobConfException.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobHistory.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Task.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskTrackerStatus.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java
hadoop/common/branches/branch-0.20/src/webapps/job/analysejobhistory.jsp
hadoop/common/branches/branch-0.20/src/webapps/job/jobblacklistedtrackers.jsp
hadoop/common/branches/branch-0.20/src/webapps/job/jobconf.jsp
hadoop/common/branches/branch-0.20/src/webapps/job/jobconf_history.jsp
hadoop/common/branches/branch-0.20/src/webapps/job/jobdetails.jsp
hadoop/common/branches/branch-0.20/src/webapps/job/jobdetailshistory.jsp
hadoop/common/branches/branch-0.20/src/webapps/job/jobfailures.jsp
hadoop/common/branches/branch-0.20/src/webapps/job/jobhistory.jsp
hadoop/common/branches/branch-0.20/src/webapps/job/jobtasks.jsp
hadoop/common/branches/branch-0.20/src/webapps/job/jobtaskshistory.jsp
hadoop/common/branches/branch-0.20/src/webapps/job/jobtracker.jsp
hadoop/common/branches/branch-0.20/src/webapps/job/loadhistory.jsp
hadoop/common/branches/branch-0.20/src/webapps/job/machines.jsp
hadoop/common/branches/branch-0.20/src/webapps/job/taskdetails.jsp
hadoop/common/branches/branch-0.20/src/webapps/job/taskdetailshistory.jsp
hadoop/common/branches/branch-0.20/src/webapps/job/taskstats.jsp
hadoop/common/branches/branch-0.20/src/webapps/task/tasktracker.jsp
Modified: hadoop/common/branches/branch-0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/CHANGES.txt?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20/CHANGES.txt Thu Feb 18 09:15:03 2010
@@ -2,6 +2,9 @@
Release 0.20.3 - Unreleased
+ MAPREDUCE-623. Resolve javac warnings in mapreduce. (Jothi Padmanabhan
+ via sharad)
+
Release 0.20.2 - 2010-2-16
NEW FEATURES
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/DisallowedTaskTrackerException.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/DisallowedTaskTrackerException.java?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/DisallowedTaskTrackerException.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/DisallowedTaskTrackerException.java Thu Feb 18 09:15:03 2010
@@ -29,6 +29,8 @@
*/
class DisallowedTaskTrackerException extends IOException {
+ private static final long serialVersionUID = 1L;
+
public DisallowedTaskTrackerException(TaskTrackerStatus tracker) {
super("Tasktracker denied communication with jobtracker: " + tracker.getTrackerName());
}
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/FileAlreadyExistsException.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/FileAlreadyExistsException.java?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/FileAlreadyExistsException.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/FileAlreadyExistsException.java Thu Feb 18 09:15:03 2010
@@ -27,6 +27,8 @@
public class FileAlreadyExistsException
extends IOException {
+ private static final long serialVersionUID = 1L;
+
public FileAlreadyExistsException() {
super();
}
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InvalidFileTypeException.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InvalidFileTypeException.java?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InvalidFileTypeException.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InvalidFileTypeException.java Thu Feb 18 09:15:03 2010
@@ -27,6 +27,8 @@
public class InvalidFileTypeException
extends IOException {
+ private static final long serialVersionUID = 1L;
+
public InvalidFileTypeException() {
super();
}
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InvalidInputException.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InvalidInputException.java?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InvalidInputException.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InvalidInputException.java Thu Feb 18 09:15:03 2010
@@ -27,6 +27,8 @@
* by one.
*/
public class InvalidInputException extends IOException {
+
+ private static final long serialVersionUID = 1L;
private List<IOException> problems;
/**
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InvalidJobConfException.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InvalidJobConfException.java?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InvalidJobConfException.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InvalidJobConfException.java Thu Feb 18 09:15:03 2010
@@ -27,6 +27,8 @@
public class InvalidJobConfException
extends IOException {
+ private static final long serialVersionUID = 1L;
+
public InvalidJobConfException() {
super();
}
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobHistory.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobHistory.java?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobHistory.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobHistory.java Thu Feb 18 09:15:03 2010
@@ -857,7 +857,8 @@
* @deprecated Use
* {@link #logSubmitted(JobID, JobConf, String, long, boolean)} instead.
*/
- public static void logSubmitted(JobID jobId, JobConf jobConf,
+ @Deprecated
+ public static void logSubmitted(JobID jobId, JobConf jobConf,
String jobConfPath, long submitTime)
throws IOException {
logSubmitted(jobId, jobConf, jobConfPath, submitTime, true);
@@ -1212,6 +1213,7 @@
* @param restartCount number of times the job got restarted
* @deprecated Use {@link #logJobInfo(JobID, long, long)} instead.
*/
+ @Deprecated
public static void logJobInfo(JobID jobid, long submitTime, long launchTime,
int restartCount){
logJobInfo(jobid, submitTime, launchTime);
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java Thu Feb 18 09:15:03 2010
@@ -134,6 +134,9 @@
* A client tried to submit a job before the Job Tracker was ready.
*/
public static class IllegalStateException extends IOException {
+
+ private static final long serialVersionUID = 1L;
+
public IllegalStateException(String msg) {
super(msg);
}
@@ -3299,13 +3302,13 @@
Vector<TaskInProgress> completeTasks = job.reportCleanupTIPs(true);
for (Iterator<TaskInProgress> it = completeTasks.iterator();
it.hasNext();) {
- TaskInProgress tip = (TaskInProgress) it.next();
+ TaskInProgress tip = it.next();
reports.add(tip.generateSingleReport());
}
Vector<TaskInProgress> incompleteTasks = job.reportCleanupTIPs(false);
for (Iterator<TaskInProgress> it = incompleteTasks.iterator();
it.hasNext();) {
- TaskInProgress tip = (TaskInProgress) it.next();
+ TaskInProgress tip = it.next();
reports.add(tip.generateSingleReport());
}
return reports.toArray(new TaskReport[reports.size()]);
@@ -3322,13 +3325,13 @@
Vector<TaskInProgress> completeTasks = job.reportSetupTIPs(true);
for (Iterator<TaskInProgress> it = completeTasks.iterator();
it.hasNext();) {
- TaskInProgress tip = (TaskInProgress) it.next();
+ TaskInProgress tip = it.next();
reports.add(tip.generateSingleReport());
}
Vector<TaskInProgress> incompleteTasks = job.reportSetupTIPs(false);
for (Iterator<TaskInProgress> it = incompleteTasks.iterator();
it.hasNext();) {
- TaskInProgress tip = (TaskInProgress) it.next();
+ TaskInProgress tip = it.next();
reports.add(tip.generateSingleReport());
}
return reports.toArray(new TaskReport[reports.size()]);
@@ -3740,7 +3743,7 @@
jobStatusList.add(status);
}
}
- return (JobStatus[]) jobStatusList.toArray(
+ return jobStatusList.toArray(
new JobStatus[jobStatusList.size()]);
}
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java Thu Feb 18 09:15:03 2010
@@ -104,6 +104,7 @@
return profile;
}
+ @SuppressWarnings("unchecked")
@Override
public void run() {
JobID jobId = profile.getJobID();
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Task.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Task.java?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Task.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Task.java Thu Feb 18 09:15:03 2010
@@ -1089,6 +1089,7 @@
) throws IOException, InterruptedException,
ClassNotFoundException;
+ @SuppressWarnings("unchecked")
static <K,V>
CombinerRunner<K,V> create(JobConf job,
TaskAttemptID taskId,
@@ -1098,6 +1099,7 @@
) throws ClassNotFoundException {
Class<? extends Reducer<K,V,K,V>> cls =
(Class<? extends Reducer<K,V,K,V>>) job.getCombinerClass();
+
if (cls != null) {
return new OldCombinerRunner(cls, job, inputCounter, reporter);
}
@@ -1122,6 +1124,7 @@
private final Class<V> valueClass;
private final RawComparator<K> comparator;
+ @SuppressWarnings("unchecked")
protected OldCombinerRunner(Class<? extends Reducer<K,V,K,V>> cls,
JobConf conf,
Counters.Counter inputCounter,
@@ -1164,6 +1167,7 @@
private final Class<V> valueClass;
private final org.apache.hadoop.mapreduce.OutputCommitter committer;
+ @SuppressWarnings("unchecked")
NewCombinerRunner(Class reducerClass,
JobConf job,
org.apache.hadoop.mapreduce.TaskAttemptID taskId,
@@ -1198,6 +1202,7 @@
}
}
+ @SuppressWarnings("unchecked")
@Override
void combine(RawKeyValueIterator iterator,
OutputCollector<K,V> collector
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskTracker.java?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskTracker.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskTracker.java Thu Feb 18 09:15:03 2010
@@ -2843,6 +2843,7 @@
* to other nodes.
*/
public static class MapOutputServlet extends HttpServlet {
+ private static final long serialVersionUID = 1L;
private static final int MAX_BYTES_TO_READ = 64 * 1024;
@Override
public void doGet(HttpServletRequest request,
@@ -3061,7 +3062,7 @@
fConf.getClass(MAPRED_TASKTRACKER_MEMORY_CALCULATOR_PLUGIN_PROPERTY,
null, MemoryCalculatorPlugin.class);
MemoryCalculatorPlugin memoryCalculatorPlugin =
- (MemoryCalculatorPlugin) MemoryCalculatorPlugin
+ MemoryCalculatorPlugin
.getMemoryCalculatorPlugin(clazz, fConf);
LOG.info(" Using MemoryCalculatorPlugin : " + memoryCalculatorPlugin);
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskTrackerStatus.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskTrackerStatus.java?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskTrackerStatus.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskTrackerStatus.java Thu Feb 18 09:15:03 2010
@@ -253,8 +253,8 @@
*/
public int countMapTasks() {
int mapCount = 0;
- for (Iterator it = taskReports.iterator(); it.hasNext();) {
- TaskStatus ts = (TaskStatus) it.next();
+ for (Iterator<TaskStatus> it = taskReports.iterator(); it.hasNext();) {
+ TaskStatus ts = it.next();
TaskStatus.State state = ts.getRunState();
if (ts.getIsMap() &&
((state == TaskStatus.State.RUNNING) ||
@@ -271,8 +271,8 @@
*/
public int countReduceTasks() {
int reduceCount = 0;
- for (Iterator it = taskReports.iterator(); it.hasNext();) {
- TaskStatus ts = (TaskStatus) it.next();
+ for (Iterator<TaskStatus> it = taskReports.iterator(); it.hasNext();) {
+ TaskStatus ts = it.next();
TaskStatus.State state = ts.getRunState();
if ((!ts.getIsMap()) &&
((state == TaskStatus.State.RUNNING) ||
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java Thu Feb 18 09:15:03 2010
@@ -90,6 +90,8 @@
* queue, to a put, which waits on a full queue.
*/
private static class BlockingArrayQueue extends ArrayBlockingQueue<Runnable> {
+
+ private static final long serialVersionUID = 1L;
public BlockingArrayQueue(int capacity) {
super(capacity);
}
Modified: hadoop/common/branches/branch-0.20/src/webapps/job/analysejobhistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/webapps/job/analysejobhistory.jsp?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/webapps/job/analysejobhistory.jsp (original)
+++ hadoop/common/branches/branch-0.20/src/webapps/job/analysejobhistory.jsp Thu Feb 18 09:15:03 2010
@@ -15,6 +15,8 @@
<%! private static SimpleDateFormat dateFormat
= new SimpleDateFormat("d/MM HH:mm:ss") ;
%>
+<%! private static final long serialVersionUID = 1L;
+%>
<html><body>
<%
String jobid = request.getParameter("jobid");
Modified: hadoop/common/branches/branch-0.20/src/webapps/job/jobblacklistedtrackers.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/webapps/job/jobblacklistedtrackers.jsp?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/webapps/job/jobblacklistedtrackers.jsp (original)
+++ hadoop/common/branches/branch-0.20/src/webapps/job/jobblacklistedtrackers.jsp Thu Feb 18 09:15:03 2010
@@ -7,6 +7,8 @@
import="org.apache.hadoop.mapred.*"
import="org.apache.hadoop.util.*"
%>
+<%! private static final long serialVersionUID = 1L;
+%>
<%
JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");
@@ -37,7 +39,7 @@
return;
}
- JobInProgress job = (JobInProgress) tracker.getJob(JobID.forName(jobId));
+ JobInProgress job = tracker.getJob(JobID.forName(jobId));
if (job == null) {
out.print("<b>Job " + jobId + " not found.</b><br>\n");
return;
Modified: hadoop/common/branches/branch-0.20/src/webapps/job/jobconf.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/webapps/job/jobconf.jsp?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/webapps/job/jobconf.jsp (original)
+++ hadoop/common/branches/branch-0.20/src/webapps/job/jobconf.jsp Thu Feb 18 09:15:03 2010
@@ -7,6 +7,8 @@
import="org.apache.hadoop.mapred.*"
import="org.apache.hadoop.util.*"
%>
+<%! private static final long serialVersionUID = 1L;
+%>
<%
Modified: hadoop/common/branches/branch-0.20/src/webapps/job/jobconf_history.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/webapps/job/jobconf_history.jsp?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/webapps/job/jobconf_history.jsp (original)
+++ hadoop/common/branches/branch-0.20/src/webapps/job/jobconf_history.jsp Thu Feb 18 09:15:03 2010
@@ -9,6 +9,8 @@
import="org.apache.hadoop.util.*"
%>
+<%! private static final long serialVersionUID = 1L;
+%>
<%
JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");
Modified: hadoop/common/branches/branch-0.20/src/webapps/job/jobdetails.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/webapps/job/jobdetails.jsp?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/webapps/job/jobdetails.jsp (original)
+++ hadoop/common/branches/branch-0.20/src/webapps/job/jobdetails.jsp Thu Feb 18 09:15:03 2010
@@ -10,6 +10,9 @@
import="org.apache.hadoop.util.*"
%>
+<%! private static final long serialVersionUID = 1L;
+%>
+
<%
JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");
String trackerName =
@@ -156,7 +159,7 @@
}
}
JobID jobIdObj = JobID.forName(jobId);
- JobInProgress job = (JobInProgress) tracker.getJob(jobIdObj);
+ JobInProgress job = tracker.getJob(jobIdObj);
String action = request.getParameter("action");
if(JSPUtil.conf.getBoolean(PRIVATE_ACTIONS_KEY, false) &&
Modified: hadoop/common/branches/branch-0.20/src/webapps/job/jobdetailshistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/webapps/job/jobdetailshistory.jsp?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/webapps/job/jobdetailshistory.jsp (original)
+++ hadoop/common/branches/branch-0.20/src/webapps/job/jobdetailshistory.jsp Thu Feb 18 09:15:03 2010
@@ -9,6 +9,8 @@
import="java.text.SimpleDateFormat"
import="org.apache.hadoop.mapred.JobHistory.*"
%>
+<%! private static final long serialVersionUID = 1L;
+%>
<jsp:include page="loadhistory.jsp">
<jsp:param name="jobid" value="<%=request.getParameter("jobid") %>"/>
<jsp:param name="logFile" value="<%=request.getParameter("logFile") %>"/>
Modified: hadoop/common/branches/branch-0.20/src/webapps/job/jobfailures.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/webapps/job/jobfailures.jsp?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/webapps/job/jobfailures.jsp (original)
+++ hadoop/common/branches/branch-0.20/src/webapps/job/jobfailures.jsp Thu Feb 18 09:15:03 2010
@@ -8,6 +8,9 @@
import="org.apache.hadoop.util.*"
%>
+<%! private static final long serialVersionUID = 1L;
+%>
+
<%
JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");
String trackerName =
@@ -83,7 +86,7 @@
JobID jobId,
String kind,
String cause) throws IOException {
- JobInProgress job = (JobInProgress) tracker.getJob(jobId);
+ JobInProgress job = tracker.getJob(jobId);
if (job == null) {
out.print("<b>Job " + jobId + " not found.</b><br>\n");
return;
Modified: hadoop/common/branches/branch-0.20/src/webapps/job/jobhistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/webapps/job/jobhistory.jsp?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/webapps/job/jobhistory.jsp (original)
+++ hadoop/common/branches/branch-0.20/src/webapps/job/jobhistory.jsp Thu Feb 18 09:15:03 2010
@@ -14,6 +14,8 @@
private static SimpleDateFormat dateFormat =
new SimpleDateFormat("d/MM HH:mm:ss");
%>
+<%! private static final long serialVersionUID = 1L;
+%>
<html>
<head>
<title>Hadoop Map/Reduce Administration</title>
Modified: hadoop/common/branches/branch-0.20/src/webapps/job/jobtasks.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/webapps/job/jobtasks.jsp?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/webapps/job/jobtasks.jsp (original)
+++ hadoop/common/branches/branch-0.20/src/webapps/job/jobtasks.jsp Thu Feb 18 09:15:03 2010
@@ -9,6 +9,8 @@
import="java.lang.Integer"
import="java.text.SimpleDateFormat"
%>
+<%! private static final long serialVersionUID = 1L;
+%>
<%! static SimpleDateFormat dateFormat = new SimpleDateFormat("d-MMM-yyyy HH:mm:ss") ; %>
<%
JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");
@@ -27,7 +29,7 @@
int next_page = pnum+1;
int numperpage = 2000;
JobID jobidObj = JobID.forName(jobid);
- JobInProgress job = (JobInProgress) tracker.getJob(jobidObj);
+ JobInProgress job = tracker.getJob(jobidObj);
JobProfile profile = (job != null) ? (job.getProfile()) : null;
JobStatus status = (job != null) ? (job.getStatus()) : null;
TaskReport[] reports = null;
Modified: hadoop/common/branches/branch-0.20/src/webapps/job/jobtaskshistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/webapps/job/jobtaskshistory.jsp?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/webapps/job/jobtaskshistory.jsp (original)
+++ hadoop/common/branches/branch-0.20/src/webapps/job/jobtaskshistory.jsp Thu Feb 18 09:15:03 2010
@@ -16,6 +16,8 @@
private static SimpleDateFormat dateFormat =
new SimpleDateFormat("d/MM HH:mm:ss") ;
%>
+<%! private static final long serialVersionUID = 1L;
+%>
<%
String jobid = request.getParameter("jobid");
Modified: hadoop/common/branches/branch-0.20/src/webapps/job/jobtracker.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/webapps/job/jobtracker.jsp?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/webapps/job/jobtracker.jsp (original)
+++ hadoop/common/branches/branch-0.20/src/webapps/job/jobtracker.jsp Thu Feb 18 09:15:03 2010
@@ -8,6 +8,8 @@
import="org.apache.hadoop.mapred.*"
import="org.apache.hadoop.util.*"
%>
+<%! private static final long serialVersionUID = 1L;
+%>
<%
JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");
ClusterStatus status = tracker.getClusterStatus();
Modified: hadoop/common/branches/branch-0.20/src/webapps/job/loadhistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/webapps/job/loadhistory.jsp?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/webapps/job/loadhistory.jsp (original)
+++ hadoop/common/branches/branch-0.20/src/webapps/job/loadhistory.jsp Thu Feb 18 09:15:03 2010
@@ -9,6 +9,8 @@
import="java.text.SimpleDateFormat"
import="org.apache.hadoop.mapred.JobHistory.*"
%>
+<%! private static final long serialVersionUID = 1L;
+%>
<%
PathFilter jobLogFileFilter = new PathFilter() {
public boolean accept(Path path) {
@@ -17,7 +19,7 @@
};
FileSystem fs = (FileSystem) application.getAttribute("fileSys");
- String jobId = (String)request.getParameter("jobid");
+ String jobId = request.getParameter("jobid");
JobHistory.JobInfo job = (JobHistory.JobInfo)
request.getSession().getAttribute("job");
// if session attribute of JobInfo exists and is of different job's,
@@ -40,7 +42,7 @@
}
if (null == job) {
- String jobLogFile = (String)request.getParameter("logFile");
+ String jobLogFile = request.getParameter("logFile");
job = new JobHistory.JobInfo(jobId);
DefaultJobHistoryParser.parseJobTasks(jobLogFile, job, fs) ;
request.getSession().setAttribute("job", job);
Modified: hadoop/common/branches/branch-0.20/src/webapps/job/machines.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/webapps/job/machines.jsp?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/webapps/job/machines.jsp (original)
+++ hadoop/common/branches/branch-0.20/src/webapps/job/machines.jsp Thu Feb 18 09:15:03 2010
@@ -8,6 +8,8 @@
import="org.apache.hadoop.mapred.*"
import="org.apache.hadoop.util.*"
%>
+<%! private static final long serialVersionUID = 1L;
+%>
<%
JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");
String trackerName =
Modified: hadoop/common/branches/branch-0.20/src/webapps/job/taskdetails.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/webapps/job/taskdetails.jsp?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/webapps/job/taskdetails.jsp (original)
+++ hadoop/common/branches/branch-0.20/src/webapps/job/taskdetails.jsp Thu Feb 18 09:15:03 2010
@@ -14,6 +14,8 @@
"d-MMM-yyyy HH:mm:ss");
private static final String PRIVATE_ACTIONS_KEY = "webinterface.private.actions";%>
+<%! private static final long serialVersionUID = 1L;
+%>
<%!private void printConfirm(JspWriter out, String jobid, String tipid,
String taskid, String action) throws IOException {
String url = "taskdetails.jsp?jobid=" + jobid + "&tipid=" + tipid
@@ -38,7 +40,7 @@
TaskID tipidObj = TaskID.forName(tipid);
TaskAttemptID taskidObj = TaskAttemptID.forName(taskid);
- JobInProgress job = (JobInProgress) tracker.getJob(jobidObj);
+ JobInProgress job = tracker.getJob(jobidObj);
boolean privateActions = JSPUtil.conf.getBoolean(PRIVATE_ACTIONS_KEY,
false);
Modified: hadoop/common/branches/branch-0.20/src/webapps/job/taskdetailshistory.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/webapps/job/taskdetailshistory.jsp?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/webapps/job/taskdetailshistory.jsp (original)
+++ hadoop/common/branches/branch-0.20/src/webapps/job/taskdetailshistory.jsp Thu Feb 18 09:15:03 2010
@@ -13,6 +13,8 @@
<jsp:param name="jobTrackerId" value="<%=request.getParameter("jobTrackerId") %>"/>
</jsp:include>
<%! private static SimpleDateFormat dateFormat = new SimpleDateFormat("d/MM HH:mm:ss") ; %>
+<%! private static final long serialVersionUID = 1L;
+%>
<%
String jobid = request.getParameter("jobid");
Modified: hadoop/common/branches/branch-0.20/src/webapps/job/taskstats.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/webapps/job/taskstats.jsp?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/webapps/job/taskstats.jsp (original)
+++ hadoop/common/branches/branch-0.20/src/webapps/job/taskstats.jsp Thu Feb 18 09:15:03 2010
@@ -10,6 +10,8 @@
import="org.apache.hadoop.util.*"
import="java.text.SimpleDateFormat"
%>
+<%! private static final long serialVersionUID = 1L;
+%>
<%
JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");
String trackerName =
@@ -21,7 +23,7 @@
TaskID tipidObj = TaskID.forName(tipid);
TaskAttemptID taskidObj = TaskAttemptID.forName(taskid);
- JobInProgress job = (JobInProgress) tracker.getJob(jobidObj);
+ JobInProgress job = tracker.getJob(jobidObj);
Format decimal = new DecimalFormat();
Counters counters;
Modified: hadoop/common/branches/branch-0.20/src/webapps/task/tasktracker.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/webapps/task/tasktracker.jsp?rev=911292&r1=911291&r2=911292&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/webapps/task/tasktracker.jsp (original)
+++ hadoop/common/branches/branch-0.20/src/webapps/task/tasktracker.jsp Thu Feb 18 09:15:03 2010
@@ -8,6 +8,8 @@
import="org.apache.hadoop.mapred.*"
import="org.apache.hadoop.util.*"
%>
+<%! private static final long serialVersionUID = 1L;
+%>
<%
TaskTracker tracker = (TaskTracker) application.getAttribute("task.tracker");
String trackerName = tracker.getName();