tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlidd...@apache.org
Subject git commit: TEZ-25: rename and cleanup: toplevel name -> DAGProtos. Job message name -> DAGPlan
Date Mon, 13 May 2013 21:04:35 GMT
Updated Branches:
  refs/heads/TEZ-1 45db1be34 -> 8aa2f300c


TEZ-25: rename and cleanup: toplevel name -> DAGProtos. Job message name -> DAGPlan


Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/8aa2f300
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/8aa2f300
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/8aa2f300

Branch: refs/heads/TEZ-1
Commit: 8aa2f300c80c9251f39db77830dd6a4bf7003794
Parents: 45db1be
Author: mikelid <mikelid@microsoft.com>
Authored: Mon May 13 14:04:15 2013 -0700
Committer: mikelid <mikelid@microsoft.com>
Committed: Mon May 13 14:04:15 2013 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/tez/dag/api/DAG.java  |   15 +++++++++----
 .../org/apache/tez/dag/api/DagTypeConverters.java  |   16 +++++++++-----
 tez-dag-api/src/main/proto/DAGPlan.proto           |    4 +-
 .../java/org/apache/tez/dag/api/TestDAGPlan.java   |   15 ++++++++-----
 .../java/org/apache/tez/dag/app/DAGAppMaster.java  |   16 +++++++-------
 .../org/apache/tez/dag/app/MRRExampleHelper.java   |   10 ++++----
 .../main/java/org/apache/tez/dag/app/dag/DAG.java  |    5 +--
 .../java/org/apache/tez/dag/app/dag/Vertex.java    |    2 +-
 .../org/apache/tez/dag/app/dag/impl/DAGImpl.java   |   12 +++++-----
 .../apache/tez/dag/app/dag/impl/VertexImpl.java    |    2 +-
 .../apache/tez/dag/utils/TezEngineChildJVM.java    |    1 -
 .../java/org/apache/tez/mapreduce/YARNRunner.java  |    4 +-
 12 files changed, 56 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8aa2f300/tez-dag-api/src/main/java/org/apache/tez/dag/api/DAG.java
----------------------------------------------------------------------
diff --git a/tez-dag-api/src/main/java/org/apache/tez/dag/api/DAG.java b/tez-dag-api/src/main/java/org/apache/tez/dag/api/DAG.java
index efaf276..171921d 100644
--- a/tez-dag-api/src/main/java/org/apache/tez/dag/api/DAG.java
+++ b/tez-dag-api/src/main/java/org/apache/tez/dag/api/DAG.java
@@ -27,10 +27,15 @@ import java.util.Map.Entry;
 import org.apache.hadoop.yarn.api.records.LocalResource;
 import org.apache.hadoop.yarn.api.records.LocalResourceType;
 import org.apache.hadoop.yarn.api.records.Resource;
-import org.apache.tez.dag.api.DAGPlan.PlanTaskLocationHint;
+import org.apache.tez.dag.api.DAGProtos.DAGPlan;
+import org.apache.tez.dag.api.DAGProtos.EdgePlan;
+import org.apache.tez.dag.api.DAGProtos.PlanKeyValuePair;
+import org.apache.tez.dag.api.DAGProtos.PlanLocalResource;
+import org.apache.tez.dag.api.DAGProtos.PlanTaskConfiguration;
+import org.apache.tez.dag.api.DAGProtos.PlanTaskLocationHint;
+import org.apache.tez.dag.api.DAGProtos.PlanVertexType;
+import org.apache.tez.dag.api.DAGProtos.VertexPlan;
 import org.apache.tez.dag.api.VertexLocationHint.TaskLocationHint;
-import org.apache.tez.dag.api.DAGPlan.*;
-
 
 public class DAG { // FIXME rename to Topology
   List<Vertex> vertices;
@@ -88,8 +93,8 @@ public class DAG { // FIXME rename to Topology
   }
     
   // create protobuf message describing DAG
-  public JobPlan createDag(){
-    JobPlan.Builder jobBuilder = JobPlan.newBuilder();
+  public DAGPlan createDag(){
+    DAGPlan.Builder jobBuilder = DAGPlan.newBuilder();  
 
     jobBuilder.setName(this.name);
 

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8aa2f300/tez-dag-api/src/main/java/org/apache/tez/dag/api/DagTypeConverters.java
----------------------------------------------------------------------
diff --git a/tez-dag-api/src/main/java/org/apache/tez/dag/api/DagTypeConverters.java b/tez-dag-api/src/main/java/org/apache/tez/dag/api/DagTypeConverters.java
index afbabad..c5fd0a2 100644
--- a/tez-dag-api/src/main/java/org/apache/tez/dag/api/DagTypeConverters.java
+++ b/tez-dag-api/src/main/java/org/apache/tez/dag/api/DagTypeConverters.java
@@ -31,15 +31,19 @@ import org.apache.hadoop.yarn.api.records.URL;
 import org.apache.hadoop.yarn.api.records.impl.pb.LocalResourcePBImpl;
 import org.apache.hadoop.yarn.util.BuilderUtils;
 import org.apache.hadoop.yarn.util.ConverterUtils;
-import org.apache.tez.dag.api.DAGPlan.EdgePlan;
-import org.apache.tez.dag.api.DAGPlan.PlanKeyValuePair;
-import org.apache.tez.dag.api.DAGPlan.PlanLocalResource;
-import org.apache.tez.dag.api.DAGPlan.PlanTaskConfiguration;
-import org.apache.tez.dag.api.DAGPlan.PlanTaskLocationHint;
+import org.apache.tez.dag.api.DAGProtos.EdgePlan;
+import org.apache.tez.dag.api.DAGProtos.PlanEdgeConnectionPattern;
+import org.apache.tez.dag.api.DAGProtos.PlanEdgeSourceType;
+import org.apache.tez.dag.api.DAGProtos.PlanKeyValuePair;
+import org.apache.tez.dag.api.DAGProtos.PlanLocalResource;
+import org.apache.tez.dag.api.DAGProtos.PlanLocalResourceType;
+import org.apache.tez.dag.api.DAGProtos.PlanTaskConfiguration;
+import org.apache.tez.dag.api.DAGProtos.PlanTaskLocationHint;
+import org.apache.tez.dag.api.DAGProtos.PlanLocalResourceVisibility;
 import org.apache.tez.dag.api.EdgeProperty.ConnectionPattern;
 import org.apache.tez.dag.api.EdgeProperty.SourceType;
 import org.apache.tez.dag.api.VertexLocationHint.TaskLocationHint;
-import org.apache.tez.dag.api.DAGPlan.*;
+
 
 public class DagTypeConverters {
   

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8aa2f300/tez-dag-api/src/main/proto/DAGPlan.proto
----------------------------------------------------------------------
diff --git a/tez-dag-api/src/main/proto/DAGPlan.proto b/tez-dag-api/src/main/proto/DAGPlan.proto
index 38e8971..30fc54e 100644
--- a/tez-dag-api/src/main/proto/DAGPlan.proto
+++ b/tez-dag-api/src/main/proto/DAGPlan.proto
@@ -17,7 +17,7 @@
  */
 
 option java_package = "org.apache.tez.dag.api";
-option java_outer_classname = "DAGPlan";
+option java_outer_classname = "DAGProtos";
 option java_generate_equals_and_hash = true;
 package org.apache.tez.dag.api;
 
@@ -111,7 +111,7 @@ message EdgePlan {
   required string outputClass = 7;
 }
 
-message JobPlan {
+message DAGPlan {
   required string name = 1;
   repeated VertexPlan vertex = 3;
   repeated EdgePlan edge = 4;

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8aa2f300/tez-dag-api/src/test/java/org/apache/tez/dag/api/TestDAGPlan.java
----------------------------------------------------------------------
diff --git a/tez-dag-api/src/test/java/org/apache/tez/dag/api/TestDAGPlan.java b/tez-dag-api/src/test/java/org/apache/tez/dag/api/TestDAGPlan.java
index f89a73e..a041f41 100644
--- a/tez-dag-api/src/test/java/org/apache/tez/dag/api/TestDAGPlan.java
+++ b/tez-dag-api/src/test/java/org/apache/tez/dag/api/TestDAGPlan.java
@@ -23,8 +23,11 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import org.apache.tez.dag.api.VertexLocationHint.TaskLocationHint;
-import org.apache.tez.dag.api.DAGPlan.*;
+import org.apache.tez.dag.api.DAGProtos.DAGPlan;
+import org.apache.tez.dag.api.DAGProtos.PlanTaskConfiguration;
+import org.apache.tez.dag.api.DAGProtos.PlanTaskLocationHint;
+import org.apache.tez.dag.api.DAGProtos.PlanVertexType;
+import org.apache.tez.dag.api.DAGProtos.VertexPlan;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -38,7 +41,7 @@ public class TestDAGPlan {
   @Test
   public void testBasicJobPlanSerde() throws IOException {
 
-    JobPlan job = JobPlan.newBuilder()
+    DAGPlan job = DAGPlan.newBuilder()
        .setName("test")
        .addVertex(
            VertexPlan.newBuilder()
@@ -46,7 +49,7 @@ public class TestDAGPlan {
              .setType(PlanVertexType.NORMAL)
              .addTaskLocationHint(PlanTaskLocationHint.newBuilder().addHost("machineName").addRack("rack1").build())
              .setTaskConfig(
-                 DAGPlan.PlanTaskConfiguration.newBuilder()
+                 PlanTaskConfiguration.newBuilder()
                    .setNumTasks(2)
                    .setVirtualCores(4)
                    .setMemoryMb(1024)
@@ -67,11 +70,11 @@ public class TestDAGPlan {
      }
    }
 
-   JobPlan inJob;
+   DAGPlan inJob;
    FileInputStream inputStream;
    try {
      inputStream = new FileInputStream(file);
-     inJob = JobPlan.newBuilder().mergeFrom(inputStream).build();
+     inJob = DAGPlan.newBuilder().mergeFrom(inputStream).build();
    }
    finally {
      outStream.close();  

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8aa2f300/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
index 57003c1..174d210 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
@@ -63,8 +63,8 @@ import org.apache.hadoop.yarn.event.EventHandler;
 import org.apache.hadoop.yarn.service.CompositeService;
 import org.apache.hadoop.yarn.service.Service;
 import org.apache.hadoop.yarn.util.ConverterUtils;
-import org.apache.tez.dag.api.DAGPlan.JobPlan;
-import org.apache.tez.dag.api.DAGPlan.VertexPlan;
+import org.apache.tez.dag.api.DAGProtos.DAGPlan;
+import org.apache.tez.dag.api.DAGProtos.VertexPlan;
 import org.apache.tez.dag.api.DagTypeConverters;
 import org.apache.tez.dag.api.TezConfiguration;
 import org.apache.tez.dag.app.client.ClientService;
@@ -133,7 +133,7 @@ public class DAGAppMaster extends CompositeService {
   public static final int SHUTDOWN_HOOK_PRIORITY = 30;
 
   private Clock clock;
-  private final JobPlan jobPlan;
+  private final DAGPlan jobPlan;
   private long dagsStartTime;
   private final long startTime;
   private final long appSubmitTime;
@@ -180,14 +180,14 @@ public class DAGAppMaster extends CompositeService {
 
   public DAGAppMaster(ApplicationAttemptId applicationAttemptId,
       ContainerId containerId, String nmHost, int nmPort, int nmHttpPort,
-      long appSubmitTime, JobPlan dagPB) {
+      long appSubmitTime, DAGPlan dagPB) {
     this(applicationAttemptId, containerId, nmHost, nmPort, nmHttpPort,
         new SystemClock(), appSubmitTime, dagPB);
   }
 
   public DAGAppMaster(ApplicationAttemptId applicationAttemptId,
       ContainerId containerId, String nmHost, int nmPort, int nmHttpPort,
-      Clock clock, long appSubmitTime, JobPlan dagPB) {
+      Clock clock, long appSubmitTime, DAGPlan dagPB) {
     super(DAGAppMaster.class.getName());
     this.jobPlan = dagPB;
     this.clock = clock;
@@ -520,7 +520,7 @@ public class DAGAppMaster extends CompositeService {
 //  }
 
   /** Create and initialize (but don't start) a single dag. */
-  protected DAG createDAG(JobPlan dagPB) {
+  protected DAG createDAG(DAGPlan dagPB) {
 
     // create single job
     DAG newDag =
@@ -957,7 +957,7 @@ public class DAGAppMaster extends CompositeService {
       String type;
       TezConfiguration conf = new TezConfiguration(new YarnConfiguration());
       
-      JobPlan jobPlan = null;
+      DAGPlan jobPlan = null;
       if (cliParser.hasOption(OPT_PREDEFINED)) {
         LOG.info("Running with PreDefined configuration");
         type = cliParser.getOptionValue(OPT_PREDEFINED, "mr");
@@ -971,7 +971,7 @@ public class DAGAppMaster extends CompositeService {
       } 
       else {
         // Read the protobuf DAG
-        JobPlan.Builder dagPlanBuilder = JobPlan.newBuilder(); 
+        DAGPlan.Builder dagPlanBuilder = DAGPlan.newBuilder(); 
         FileInputStream dagPBBinaryStream = null;
         try {
           dagPBBinaryStream = new FileInputStream(TezConfiguration.DAG_AM_PLAN_PB_BINARY);

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8aa2f300/tez-dag/src/main/java/org/apache/tez/dag/app/MRRExampleHelper.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/MRRExampleHelper.java b/tez-dag/src/main/java/org/apache/tez/dag/app/MRRExampleHelper.java
index b50887a..0d845b2 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/MRRExampleHelper.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/MRRExampleHelper.java
@@ -17,7 +17,7 @@ import org.apache.hadoop.yarn.api.records.LocalResourceType;
 import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.util.BuilderUtils;
-import org.apache.tez.dag.api.DAGPlan.JobPlan;
+import org.apache.tez.dag.api.DAGProtos.DAGPlan;
 import org.apache.tez.dag.api.Edge;
 import org.apache.tez.dag.api.EdgeProperty;
 import org.apache.tez.dag.api.EdgeProperty.ConnectionPattern;
@@ -87,7 +87,7 @@ public class MRRExampleHelper {
  // TODO: these preconfigured jobs seem to require User and perhaps some other work.
  //       -> not tested with new DagPB system.
  
- static JobPlan createDAGConfigurationForMRR() throws IOException {
+ static DAGPlan createDAGConfigurationForMRR() throws IOException {
    org.apache.tez.dag.api.DAG dag = new org.apache.tez.dag.api.DAG();
    Vertex mapVertex = new Vertex("map",
        "org.apache.tez.mapreduce.task.InitialTask", 6);
@@ -149,12 +149,12 @@ public class MRRExampleHelper {
    dag.addConfiguration(MRJobConfig.MAP_SPECULATIVE, new Boolean(false).toString());
    dag.addConfiguration(MRJobConfig.REDUCE_SPECULATIVE, new Boolean(false).toString());
    
-   JobPlan dagPB = dag.createDag();
+   DAGPlan dagPB = dag.createDag();
    return dagPB;
  }
 
  // TODO remove once client is in place
- static JobPlan createDAGConfigurationForMR() throws IOException {
+ static DAGPlan createDAGConfigurationForMR() throws IOException {
    org.apache.tez.dag.api.DAG dag = new org.apache.tez.dag.api.DAG();
    Vertex mapVertex = new Vertex("map",
        "org.apache.tez.mapreduce.task.InitialTask", 6);
@@ -200,7 +200,7 @@ public class MRRExampleHelper {
    dag.addConfiguration(MRJobConfig.MAP_SPECULATIVE, new Boolean(false).toString());
    dag.addConfiguration(MRJobConfig.REDUCE_SPECULATIVE, new Boolean(false).toString());
    
-   JobPlan dagPB = dag.createDag();
+   DAGPlan dagPB = dag.createDag();
    
    return dagPB;
  }

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8aa2f300/tez-dag/src/main/java/org/apache/tez/dag/app/dag/DAG.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/DAG.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/DAG.java
index 39cfc1a..da0e38a 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/DAG.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/DAG.java
@@ -24,9 +24,8 @@ import java.util.Map;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.yarn.api.records.ApplicationAccessType;
 import org.apache.tez.common.counters.TezCounters;
-import org.apache.tez.dag.api.DAGPlan.JobPlan;
+import org.apache.tez.dag.api.DAGProtos.DAGPlan;
 import org.apache.tez.dag.api.TezConfiguration;
-import org.apache.tez.dag.api.VertexLocationHint;
 import org.apache.tez.engine.records.TezDAGID;
 import org.apache.tez.engine.records.TezVertexID;
 
@@ -60,7 +59,7 @@ public interface DAG {
   
   TezConfiguration getConf();
   
-  JobPlan getJobPlan();
+  DAGPlan getJobPlan();
   
   /**
    * @return the ACLs for this job for each type of JobACL given. 

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8aa2f300/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Vertex.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Vertex.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Vertex.java
index 8d9fbc3..1e253aa 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Vertex.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/Vertex.java
@@ -28,7 +28,7 @@ import org.apache.tez.common.InputSpec;
 import org.apache.tez.common.OutputSpec;
 import org.apache.tez.common.counters.TezCounters;
 import org.apache.tez.dag.api.EdgeProperty;
-import org.apache.tez.dag.api.DAGPlan.VertexPlan;
+import org.apache.tez.dag.api.DAGProtos.VertexPlan;
 import org.apache.tez.engine.records.TezDependentTaskCompletionEvent;
 import org.apache.tez.engine.records.TezTaskID;
 import org.apache.tez.engine.records.TezVertexID;

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8aa2f300/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
index 2e20692..cc3170e 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
@@ -52,9 +52,9 @@ import org.apache.hadoop.yarn.state.SingleArcTransition;
 import org.apache.hadoop.yarn.state.StateMachine;
 import org.apache.hadoop.yarn.state.StateMachineFactory;
 import org.apache.tez.common.counters.TezCounters;
-import org.apache.tez.dag.api.DAGPlan.EdgePlan;
-import org.apache.tez.dag.api.DAGPlan.JobPlan;
-import org.apache.tez.dag.api.DAGPlan.VertexPlan;
+import org.apache.tez.dag.api.DAGProtos.EdgePlan;
+import org.apache.tez.dag.api.DAGProtos.DAGPlan;
+import org.apache.tez.dag.api.DAGProtos.VertexPlan;
 import org.apache.tez.dag.api.EdgeProperty;
 import org.apache.tez.dag.api.TezConfiguration;
 import org.apache.tez.dag.api.VertexLocationHint;
@@ -132,7 +132,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
   private TezCounters fullCounters = null;
 
   public final TezConfiguration conf;
-  private final JobPlan jobPlan;
+  private final DAGPlan jobPlan;
 
   //fields initialized in init
   private FileSystem fs;
@@ -311,7 +311,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
 
   public DAGImpl(TezDAGID dagId, ApplicationAttemptId applicationAttemptId,
       TezConfiguration conf,
-      JobPlan jobPlan,
+      DAGPlan jobPlan,
       EventHandler eventHandler,
       TaskAttemptListener taskAttemptListener,
       JobTokenSecretManager jobTokenSecretManager,
@@ -373,7 +373,7 @@ public class DAGImpl implements org.apache.tez.dag.app.dag.DAG,
   }
   
   @Override
-  public JobPlan getJobPlan() {
+  public DAGPlan getJobPlan() {
     return jobPlan;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8aa2f300/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
index a423db1..b9e911c 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexImpl.java
@@ -55,7 +55,7 @@ import org.apache.hadoop.yarn.state.StateMachineFactory;
 import org.apache.tez.common.InputSpec;
 import org.apache.tez.common.OutputSpec;
 import org.apache.tez.common.counters.TezCounters;
-import org.apache.tez.dag.api.DAGPlan.VertexPlan;
+import org.apache.tez.dag.api.DAGProtos.VertexPlan;
 import org.apache.tez.dag.api.DagTypeConverters;
 import org.apache.tez.dag.api.TezConfiguration;
 import org.apache.tez.dag.api.EdgeProperty.ConnectionPattern;

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8aa2f300/tez-dag/src/main/java/org/apache/tez/dag/utils/TezEngineChildJVM.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/utils/TezEngineChildJVM.java b/tez-dag/src/main/java/org/apache/tez/dag/utils/TezEngineChildJVM.java
index b3db770..fee0846 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/utils/TezEngineChildJVM.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/utils/TezEngineChildJVM.java
@@ -30,7 +30,6 @@ import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.ContainerId;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.tez.dag.api.TezConfiguration;
-import org.apache.tez.dag.app.rm.container.AMContainerHelpers;
 import org.apache.tez.engine.records.TezVertexID;
 
 public class TezEngineChildJVM {

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/8aa2f300/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/YARNRunner.java
----------------------------------------------------------------------
diff --git a/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/YARNRunner.java b/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/YARNRunner.java
index 9042846..c0c9923 100644
--- a/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/YARNRunner.java
+++ b/tez-yarn-client/src/main/java/org/apache/tez/mapreduce/YARNRunner.java
@@ -99,7 +99,7 @@ import org.apache.hadoop.yarn.util.Apps;
 import org.apache.hadoop.yarn.util.BuilderUtils;
 import org.apache.hadoop.yarn.util.ConverterUtils;
 import org.apache.tez.dag.api.DAG;
-import org.apache.tez.dag.api.DAGPlan.JobPlan;
+import org.apache.tez.dag.api.DAGProtos.DAGPlan;
 import org.apache.tez.dag.api.Edge;
 import org.apache.tez.dag.api.EdgeProperty;
 import org.apache.tez.dag.api.TezConfiguration;
@@ -804,7 +804,7 @@ public class YARNRunner implements ClientProtocol {
     setDAGParamsFromMRConf(dag);
 
     // emit protobuf DAG file style
-    JobPlan dagPB = dag.createDag();
+    DAGPlan dagPB = dag.createDag();
     FSDataOutputStream dagPBOutBinaryStream = null;
     FSDataOutputStream dagPBOutTextStream = null;
     Path binaryPath =  new Path(jobSubmitDir, TezConfiguration.DAG_AM_PLAN_PB_BINARY);


Mime
View raw message