hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject svn commit: r1094785 - in /hadoop/mapreduce/branches/MR-279: ./ mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/ mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/
Date Mon, 18 Apr 2011 21:48:57 GMT
Author: mahadev
Date: Mon Apr 18 21:48:57 2011
New Revision: 1094785

URL: http://svn.apache.org/viewvc?rev=1094785&view=rev
Log:
MAPREDUCE-2440. Name clashes in TypeConverter (luke via mahadev)

Modified:
    hadoop/mapreduce/branches/MR-279/CHANGES.txt
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java

Modified: hadoop/mapreduce/branches/MR-279/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/CHANGES.txt?rev=1094785&r1=1094784&r2=1094785&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MR-279/CHANGES.txt Mon Apr 18 21:48:57 2011
@@ -30,6 +30,7 @@ Trunk (unreleased changes)
    
     Add fail count to the command line of the application master. (mahadev)
 
+    MAPREDUCE-2440. Name clashes in TypeConverter (luke via mahadev)
   
   INCOMPATIBLE CHANGES
 

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java?rev=1094785&r1=1094784&r2=1094785&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
(original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java
Mon Apr 18 21:48:57 2011
@@ -366,7 +366,7 @@ public class TypeConverter {
     return taskTracker;
   }
 
-  public static TaskTrackerInfo[] fromYarn(List<NodeManagerInfo> nodes) {
+  public static TaskTrackerInfo[] fromYarnNodes(List<NodeManagerInfo> nodes) {
     List<TaskTrackerInfo> taskTrackers = new ArrayList<TaskTrackerInfo>();
     for (NodeManagerInfo node : nodes) {
       taskTrackers.add(fromYarn(node));
@@ -400,7 +400,7 @@ public class TypeConverter {
     return jobStatus;
   }
 
-  public static JobStatus[] fromYarn(List<Application> applications) {
+  public static JobStatus[] fromYarnApps(List<Application> applications) {
     List<JobStatus> jobStatuses = new ArrayList<JobStatus>();
     for (Application application : applications) {
       jobStatuses.add(TypeConverter.fromYarn(application));
@@ -413,10 +413,10 @@ public class TypeConverter {
       queueInfo) {
     return new QueueInfo(queueInfo.getQueueName(), 
         queueInfo.toString(), QueueState.RUNNING, 
-        TypeConverter.fromYarn(queueInfo.getApplications()));
+        TypeConverter.fromYarnApps(queueInfo.getApplications()));
   }
   
-  public static QueueInfo[] fromYarn(
+  public static QueueInfo[] fromYarnQueueInfo(
       List<org.apache.hadoop.yarn.api.records.QueueInfo> queues) {
     List<QueueInfo> queueInfos = new ArrayList<QueueInfo>(queues.size());
     for (org.apache.hadoop.yarn.api.records.QueueInfo queue : queues) {

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java?rev=1094785&r1=1094784&r2=1094785&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java
(original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ResourceMgrDelegate.java
Mon Apr 18 21:48:57 2011
@@ -108,7 +108,7 @@ public class ResourceMgrDelegate {
       recordFactory.newRecordInstance(GetClusterNodesRequest.class);
     GetClusterNodesResponse response = 
       applicationsManager.getClusterNodes(request);
-    return TypeConverter.fromYarn(response.getNodeManagerList());
+    return TypeConverter.fromYarnNodes(response.getNodeManagerList());
   }
 
 
@@ -117,7 +117,7 @@ public class ResourceMgrDelegate {
       recordFactory.newRecordInstance(GetAllApplicationsRequest.class);
     GetAllApplicationsResponse response = 
       applicationsManager.getAllApplications(request);
-    return TypeConverter.fromYarn(response.getApplicationList());
+    return TypeConverter.fromYarnApps(response.getApplicationList());
   }
 
 
@@ -205,7 +205,7 @@ public class ResourceMgrDelegate {
           getQueueInfoRequest(ROOT, false, true, true)).getQueueInfo();
     getChildQueues(rootQueue, queues);
 
-    return TypeConverter.fromYarn(queues);
+    return TypeConverter.fromYarnQueueInfo(queues);
   }
 
 
@@ -218,7 +218,7 @@ public class ResourceMgrDelegate {
           getQueueInfoRequest(ROOT, false, true, false)).getQueueInfo();
     getChildQueues(rootQueue, queues);
 
-    return TypeConverter.fromYarn(queues);
+    return TypeConverter.fromYarnQueueInfo(queues);
   }
 
   public QueueInfo[] getChildQueues(String parent) throws IOException,
@@ -231,7 +231,7 @@ public class ResourceMgrDelegate {
               getQueueInfoRequest(parent, false, true, false)).getQueueInfo();
         getChildQueues(parentQueue, queues);
         
-        return TypeConverter.fromYarn(queues);
+        return TypeConverter.fromYarnQueueInfo(queues);
   }
 
   public String getStagingAreaDir() throws IOException, InterruptedException {



Mime
View raw message