Browse Source

MAPREDUCE-623. Resolve javac warnings in mapreduce. Contributed by Jothi Padmanabhan

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20@911292 13f79535-47bb-0310-9956-ffa450edef68
Christopher Douglas 15 years ago
parent
commit
0c7706a6e8
30 changed files with 82 additions and 19 deletions
  1. 3 0
      CHANGES.txt
  2. 2 0
      src/mapred/org/apache/hadoop/mapred/DisallowedTaskTrackerException.java
  3. 2 0
      src/mapred/org/apache/hadoop/mapred/FileAlreadyExistsException.java
  4. 2 0
      src/mapred/org/apache/hadoop/mapred/InvalidFileTypeException.java
  5. 2 0
      src/mapred/org/apache/hadoop/mapred/InvalidInputException.java
  6. 2 0
      src/mapred/org/apache/hadoop/mapred/InvalidJobConfException.java
  7. 3 1
      src/mapred/org/apache/hadoop/mapred/JobHistory.java
  8. 8 5
      src/mapred/org/apache/hadoop/mapred/JobTracker.java
  9. 1 0
      src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java
  10. 5 0
      src/mapred/org/apache/hadoop/mapred/Task.java
  11. 2 1
      src/mapred/org/apache/hadoop/mapred/TaskTracker.java
  12. 4 4
      src/mapred/org/apache/hadoop/mapred/TaskTrackerStatus.java
  13. 2 0
      src/mapred/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java
  14. 2 0
      src/webapps/job/analysejobhistory.jsp
  15. 3 1
      src/webapps/job/jobblacklistedtrackers.jsp
  16. 2 0
      src/webapps/job/jobconf.jsp
  17. 2 0
      src/webapps/job/jobconf_history.jsp
  18. 4 1
      src/webapps/job/jobdetails.jsp
  19. 2 0
      src/webapps/job/jobdetailshistory.jsp
  20. 4 1
      src/webapps/job/jobfailures.jsp
  21. 2 0
      src/webapps/job/jobhistory.jsp
  22. 3 1
      src/webapps/job/jobtasks.jsp
  23. 2 0
      src/webapps/job/jobtaskshistory.jsp
  24. 2 0
      src/webapps/job/jobtracker.jsp
  25. 4 2
      src/webapps/job/loadhistory.jsp
  26. 2 0
      src/webapps/job/machines.jsp
  27. 3 1
      src/webapps/job/taskdetails.jsp
  28. 2 0
      src/webapps/job/taskdetailshistory.jsp
  29. 3 1
      src/webapps/job/taskstats.jsp
  30. 2 0
      src/webapps/task/tasktracker.jsp

+ 3 - 0
CHANGES.txt

@@ -2,6 +2,9 @@ Hadoop Change Log
 
 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

+ 2 - 0
src/mapred/org/apache/hadoop/mapred/DisallowedTaskTrackerException.java

@@ -29,6 +29,8 @@ import java.io.IOException;
  */
 class DisallowedTaskTrackerException extends IOException {
 
+  private static final long serialVersionUID = 1L;
+
   public DisallowedTaskTrackerException(TaskTrackerStatus tracker) {
     super("Tasktracker denied communication with jobtracker: " + tracker.getTrackerName());
   }

+ 2 - 0
src/mapred/org/apache/hadoop/mapred/FileAlreadyExistsException.java

@@ -27,6 +27,8 @@ import java.io.IOException;
 public class FileAlreadyExistsException
     extends IOException {
 
+  private static final long serialVersionUID = 1L;
+
   public FileAlreadyExistsException() {
     super();
   }

+ 2 - 0
src/mapred/org/apache/hadoop/mapred/InvalidFileTypeException.java

@@ -27,6 +27,8 @@ import java.io.IOException;
 public class InvalidFileTypeException
     extends IOException {
 
+  private static final long serialVersionUID = 1L;
+
   public InvalidFileTypeException() {
     super();
   }

+ 2 - 0
src/mapred/org/apache/hadoop/mapred/InvalidInputException.java

@@ -27,6 +27,8 @@ import java.util.Iterator;
  * by one.
  */
 public class InvalidInputException extends IOException {
+ 
+  private static final long serialVersionUID = 1L;
   private List<IOException> problems;
   
   /**

+ 2 - 0
src/mapred/org/apache/hadoop/mapred/InvalidJobConfException.java

@@ -27,6 +27,8 @@ import java.io.IOException;
 public class InvalidJobConfException
     extends IOException {
 
+  private static final long serialVersionUID = 1L;
+
   public InvalidJobConfException() {
     super();
   }

+ 3 - 1
src/mapred/org/apache/hadoop/mapred/JobHistory.java

@@ -857,7 +857,8 @@ public class JobHistory {
      * @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 @@ public class JobHistory {
      * @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);

+ 8 - 5
src/mapred/org/apache/hadoop/mapred/JobTracker.java

@@ -134,6 +134,9 @@ public class JobTracker implements MRConstants, InterTrackerProtocol,
    * 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 @@ public class JobTracker implements MRConstants, InterTrackerProtocol,
       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 @@ public class JobTracker implements MRConstants, InterTrackerProtocol,
       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 @@ public class JobTracker implements MRConstants, InterTrackerProtocol,
         jobStatusList.add(status);
       }
     }
-    return (JobStatus[]) jobStatusList.toArray(
+    return  jobStatusList.toArray(
         new JobStatus[jobStatusList.size()]);
   }
 

+ 1 - 0
src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java

@@ -104,6 +104,7 @@ class LocalJobRunner implements JobSubmissionProtocol {
       return profile;
     }
     
+    @SuppressWarnings("unchecked")
     @Override
     public void run() {
       JobID jobId = profile.getJobID();

+ 5 - 0
src/mapred/org/apache/hadoop/mapred/Task.java

@@ -1089,6 +1089,7 @@ abstract class Task implements Writable, Configurable {
                          ) throws IOException, InterruptedException, 
                                   ClassNotFoundException;
 
+    @SuppressWarnings("unchecked")
     static <K,V> 
     CombinerRunner<K,V> create(JobConf job,
                                TaskAttemptID taskId,
@@ -1098,6 +1099,7 @@ abstract class Task implements Writable, Configurable {
                               ) 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 @@ abstract class Task implements Writable, Configurable {
     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 @@ abstract class Task implements Writable, Configurable {
     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 @@ abstract class Task implements Writable, Configurable {
       }
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     void combine(RawKeyValueIterator iterator, 
                  OutputCollector<K,V> collector

+ 2 - 1
src/mapred/org/apache/hadoop/mapred/TaskTracker.java

@@ -2843,6 +2843,7 @@ public class TaskTracker
    * 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 @@ public class TaskTracker
         fConf.getClass(MAPRED_TASKTRACKER_MEMORY_CALCULATOR_PLUGIN_PROPERTY,
             null, MemoryCalculatorPlugin.class);
     MemoryCalculatorPlugin memoryCalculatorPlugin =
-        (MemoryCalculatorPlugin) MemoryCalculatorPlugin
+        MemoryCalculatorPlugin
             .getMemoryCalculatorPlugin(clazz, fConf);
     LOG.info(" Using MemoryCalculatorPlugin : " + memoryCalculatorPlugin);
 

+ 4 - 4
src/mapred/org/apache/hadoop/mapred/TaskTrackerStatus.java

@@ -253,8 +253,8 @@ class TaskTrackerStatus implements Writable {
    */
   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 @@ class TaskTrackerStatus implements Writable {
    */
   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) ||  

+ 2 - 0
src/mapred/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java

@@ -90,6 +90,8 @@ public class MultithreadedMapRunner<K1, V1, K2, V2>
    * 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);
     }

+ 2 - 0
src/webapps/job/analysejobhistory.jsp

@@ -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");

+ 3 - 1
src/webapps/job/jobblacklistedtrackers.jsp

@@ -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;

+ 2 - 0
src/webapps/job/jobconf.jsp

@@ -7,6 +7,8 @@
   import="org.apache.hadoop.mapred.*"
   import="org.apache.hadoop.util.*"
 %>
+<%!	private static final long serialVersionUID = 1L;
+%>
 
 
 <%

+ 2 - 0
src/webapps/job/jobconf_history.jsp

@@ -9,6 +9,8 @@
   import="org.apache.hadoop.util.*"
 %>
 
+<%!	private static final long serialVersionUID = 1L;
+%>
 
 <%
   JobTracker tracker = (JobTracker) application.getAttribute("job.tracker");

+ 4 - 1
src/webapps/job/jobdetails.jsp

@@ -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) && 

+ 2 - 0
src/webapps/job/jobdetailshistory.jsp

@@ -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") %>"/>

+ 4 - 1
src/webapps/job/jobfailures.jsp

@@ -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;

+ 2 - 0
src/webapps/job/jobhistory.jsp

@@ -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>

+ 3 - 1
src/webapps/job/jobtasks.jsp

@@ -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;

+ 2 - 0
src/webapps/job/jobtaskshistory.jsp

@@ -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");

+ 2 - 0
src/webapps/job/jobtracker.jsp

@@ -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();

+ 4 - 2
src/webapps/job/loadhistory.jsp

@@ -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);

+ 2 - 0
src/webapps/job/machines.jsp

@@ -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 = 

+ 3 - 1
src/webapps/job/taskdetails.jsp

@@ -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);

+ 2 - 0
src/webapps/job/taskdetailshistory.jsp

@@ -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");

+ 3 - 1
src/webapps/job/taskstats.jsp

@@ -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;

+ 2 - 0
src/webapps/task/tasktracker.jsp

@@ -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();