tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ss...@apache.org
Subject [1/2] TEZ-645. Re-use ID instances in the AM, intern vertex names etc where possible. (sseth)
Date Wed, 27 Nov 2013 18:43:26 GMT
Updated Branches:
  refs/heads/master fc3a9480e -> b3665f411


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordInputProcessor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordInputProcessor.java
b/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordInputProcessor.java
index 423cd1e..04dccb0 100644
--- a/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordInputProcessor.java
+++ b/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordInputProcessor.java
@@ -126,4 +126,4 @@ public class FilterByWordInputProcessor implements LogicalIOProcessor
{
       }
     }
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordOutputProcessor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordOutputProcessor.java
b/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordOutputProcessor.java
index e56e2a7..7355ab7 100644
--- a/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordOutputProcessor.java
+++ b/tez-mapreduce-examples/src/main/java/org/apache/tez/processor/FilterByWordOutputProcessor.java
@@ -97,4 +97,4 @@ public class FilterByWordOutputProcessor implements LogicalIOProcessor {
       mrOutput.abort();
     }
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/split/TezGroupedSplit.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/split/TezGroupedSplit.java
b/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/split/TezGroupedSplit.java
index 6ed8eac..5c69720 100644
--- a/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/split/TezGroupedSplit.java
+++ b/tez-mapreduce/src/main/java/org/apache/hadoop/mapred/split/TezGroupedSplit.java
@@ -158,4 +158,4 @@ public class TezGroupedSplit implements InputSplit, Configurable {
   public String getRack() {
     return rack;
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezGroupedSplit.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezGroupedSplit.java
b/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezGroupedSplit.java
index 3643275..5c5aa3c 100644
--- a/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezGroupedSplit.java
+++ b/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezGroupedSplit.java
@@ -168,4 +168,4 @@ public class TezGroupedSplit extends InputSplit
   public String getRack() {
     return rack;
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/IDConverter.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/IDConverter.java
b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/IDConverter.java
index f7c4f50..eabe007 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/IDConverter.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/IDConverter.java
@@ -54,15 +54,15 @@ public class IDConverter {
   // FIXME hardcoded assumption that one app is one dag
   public static TezDAGID fromMRJobId(
       org.apache.hadoop.mapreduce.JobID jobId) {
-    return new TezDAGID(ApplicationId.newInstance(
+    return TezDAGID.getInstance(ApplicationId.newInstance(
         Long.valueOf(jobId.getJtIdentifier()), jobId.getId()), 1);
   }
 
   // FIXME hack alert converting objects with hard coded id
   public static TezTaskID
       fromMRTaskId(org.apache.hadoop.mapreduce.TaskID taskid) {
-    return new TezTaskID(
-        new TezVertexID(fromMRJobId(taskid.getJobID()),
+    return TezTaskID.getInstance(
+        TezVertexID.getInstance(fromMRJobId(taskid.getJobID()),
                 (taskid.getTaskType() == TaskType.MAP ? 0 : 1)
             ),
         taskid.getId());
@@ -70,7 +70,7 @@ public class IDConverter {
 
   public static TezTaskAttemptID fromMRTaskAttemptId(
       org.apache.hadoop.mapreduce.TaskAttemptID taskAttemptId) {
-    return new TezTaskAttemptID(
+    return TezTaskAttemptID.getInstance(
         fromMRTaskId(taskAttemptId.getTaskID()),
         taskAttemptId.getId());
   }

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/InputSplitInfo.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/InputSplitInfo.java
b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/InputSplitInfo.java
index 34ec56f..0cf52bc 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/InputSplitInfo.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/InputSplitInfo.java
@@ -72,4 +72,4 @@ public interface InputSplitInfo {
    * Get the {@link Type} of the InputSplitInfo
    */
   public abstract Type getType();
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRTaskStatus.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRTaskStatus.java
b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRTaskStatus.java
index e63b704..f04a759 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRTaskStatus.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRTaskStatus.java
@@ -272,7 +272,7 @@ public class MRTaskStatus implements TezTaskStatus {
 
   @Override
   public void readFields(DataInput in) throws IOException {
-    taskAttemptId = TezTaskAttemptID.read(in);
+    taskAttemptId = TezTaskAttemptID.readTezTaskAttemptID(in);
     state = WritableUtils.readEnum(in, State.class);
     progress = in.readFloat();
     diagnostics = WritableUtils.readString(in);
@@ -291,7 +291,7 @@ public class MRTaskStatus implements TezTaskStatus {
     
     int numFailedDependencies = in.readInt();
     for (int i = 0 ; i < numFailedDependencies ; i++) {
-      TezTaskAttemptID taskAttemptId = TezTaskAttemptID.read(in);
+      TezTaskAttemptID taskAttemptId = TezTaskAttemptID.readTezTaskAttemptID(in);
       failedTaskDependencies.add(taskAttemptId);
     }
     

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TezTestUtils.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TezTestUtils.java b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TezTestUtils.java
index 9a3a666..10f2024 100644
--- a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TezTestUtils.java
+++ b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/TezTestUtils.java
@@ -27,10 +27,10 @@ public class TezTestUtils {
 
   public static TezTaskAttemptID getMockTaskAttemptId(
       int jobId, int vertexId, int taskId, int taskAttemptId) {
-    return new TezTaskAttemptID(
-        new TezTaskID(
-            new TezVertexID(
-                new TezDAGID(
+    return TezTaskAttemptID.getInstance(
+        TezTaskID.getInstance(
+            TezVertexID.getInstance(
+                TezDAGID.getInstance(
                     ApplicationId.newInstance(0, jobId), jobId),
                     vertexId),
                     taskId)
@@ -39,21 +39,21 @@ public class TezTestUtils {
   
   public static TezTaskID getMockTaskId(int jobId,
       int vertexId, int taskId) {
-    return new TezTaskID(
-        new TezVertexID(new TezDAGID(
+    return TezTaskID.getInstance(
+        TezVertexID.getInstance(TezDAGID.getInstance(
             ApplicationId.newInstance(0, jobId),
             jobId), vertexId),
             taskId);
   }
   
   public static TezDAGID getMockJobId(int jobId) {
-    return new TezDAGID(
+    return TezDAGID.getInstance(
         ApplicationId.newInstance(0, jobId), jobId);
   }
   
   public static TezVertexID getMockVertexId(int jobId, int vId) {
-    return new TezVertexID(
-        new TezDAGID(
+    return TezVertexID.getInstance(
+        TezDAGID.getInstance(
             ApplicationId.newInstance(0, jobId), jobId),
             vId);
   }

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java
b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java
index 128e6b1..da4b24c 100644
--- a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java
+++ b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/MapUtils.java
@@ -202,7 +202,6 @@ public class MapUtils {
 
     TaskSpec taskSpec = new TaskSpec(
         TezTestUtils.getMockTaskAttemptId(0, 0, mapId, 0),
-        "testuser",
         vertexName,
         mapProcessorDesc,
         inputSpecs,

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/reduce/TestReduceProcessor.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/reduce/TestReduceProcessor.java
b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/reduce/TestReduceProcessor.java
index 7672983..ad0ec19 100644
--- a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/reduce/TestReduceProcessor.java
+++ b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/processor/reduce/TestReduceProcessor.java
@@ -166,7 +166,6 @@ public class TestReduceProcessor {
     // Now run a reduce
     TaskSpec taskSpec = new TaskSpec(
         TezTestUtils.getMockTaskAttemptId(0, 1, 0, 0),
-        "testUser",
         reduceVertexName,
         reduceProcessorDesc,
         Collections.singletonList(reduceInputSpec),

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/EventMetaData.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/EventMetaData.java
b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/EventMetaData.java
index d650fa3..b745987 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/EventMetaData.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/EventMetaData.java
@@ -23,6 +23,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.util.StringInterner;
 import org.apache.tez.dag.records.TezTaskAttemptID;
 
 /**
@@ -71,8 +72,8 @@ public class EventMetaData implements Writable {
       String taskVertexName, String edgeVertexName,
       TezTaskAttemptID taskAttemptID) {
     this.producerConsumerType = generator;
-    this.taskVertexName = taskVertexName;
-    this.edgeVertexName = edgeVertexName;
+    this.taskVertexName = StringInterner.weakIntern(taskVertexName);
+    this.edgeVertexName = StringInterner.weakIntern(edgeVertexName);
     this.taskAttemptID = taskAttemptID;
   }
 
@@ -121,14 +122,13 @@ public class EventMetaData implements Writable {
   public void readFields(DataInput in) throws IOException {
     producerConsumerType = EventProducerConsumerType.values()[in.readInt()];
     if (in.readBoolean()) {
-      taskVertexName = in.readUTF();
+      taskVertexName = StringInterner.weakIntern(in.readUTF());
     }
     if (in.readBoolean()) {
-      edgeVertexName = in.readUTF();
+      edgeVertexName = StringInterner.weakIntern(in.readUTF());
     }
     if (in.readBoolean()) {
-      taskAttemptID = new TezTaskAttemptID();
-      taskAttemptID.readFields(in);
+      taskAttemptID = TezTaskAttemptID.readTezTaskAttemptID(in);
     }
     index = in.readInt();
   }

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/InputSpec.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/InputSpec.java
b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/InputSpec.java
index 6e5e7b5..1e9265a 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/InputSpec.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/InputSpec.java
@@ -23,6 +23,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.util.StringInterner;
 import org.apache.tez.dag.api.InputDescriptor;
 
 public class InputSpec implements Writable {
@@ -36,7 +37,7 @@ public class InputSpec implements Writable {
 
   public InputSpec(String sourceVertexName, InputDescriptor inputDescriptor,
       int physicalEdgeCount) {
-    this.sourceVertexName = sourceVertexName;
+    this.sourceVertexName = StringInterner.weakIntern(sourceVertexName);
     this.inputDescriptor = inputDescriptor;
     this.physicalEdgeCount = physicalEdgeCount;
   }
@@ -63,7 +64,7 @@ public class InputSpec implements Writable {
 
   @Override
   public void readFields(DataInput in) throws IOException {
-    sourceVertexName = in.readUTF();
+    sourceVertexName = StringInterner.weakIntern(in.readUTF());
     physicalEdgeCount = in.readInt();
     inputDescriptor = new InputDescriptor();
     inputDescriptor.readFields(in);

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/OutputSpec.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/OutputSpec.java
b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/OutputSpec.java
index c45a117..d224a0f 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/OutputSpec.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/OutputSpec.java
@@ -23,6 +23,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.util.StringInterner;
 import org.apache.tez.dag.api.OutputDescriptor;
 
 public class OutputSpec implements Writable {
@@ -36,7 +37,7 @@ public class OutputSpec implements Writable {
 
   public OutputSpec(String destinationVertexName,
       OutputDescriptor outputDescriptor, int physicalEdgeCount) {
-    this.destinationVertexName = destinationVertexName;
+    this.destinationVertexName = StringInterner.weakIntern(destinationVertexName);
     this.outputDescriptor = outputDescriptor;
     this.physicalEdgeCount = physicalEdgeCount;
   }
@@ -63,7 +64,7 @@ public class OutputSpec implements Writable {
 
   @Override
   public void readFields(DataInput in) throws IOException {
-    destinationVertexName = in.readUTF();
+    destinationVertexName = StringInterner.weakIntern(in.readUTF());
     physicalEdgeCount = in.readInt();
     outputDescriptor = new OutputDescriptor();
     outputDescriptor.readFields(in);

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TaskSpec.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TaskSpec.java
b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TaskSpec.java
index e76dbe4..600be91 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TaskSpec.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TaskSpec.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.util.StringInterner;
 import org.apache.tez.dag.api.ProcessorDescriptor;
 import org.apache.tez.dag.records.TezTaskAttemptID;
 
@@ -31,7 +32,6 @@ public class TaskSpec implements Writable {
 
   private TezTaskAttemptID taskAttemptId;
   private String vertexName;
-  private String user;
   private ProcessorDescriptor processorDescriptor;
   private List<InputSpec> inputSpecList;
   private List<OutputSpec> outputSpecList;
@@ -39,13 +39,11 @@ public class TaskSpec implements Writable {
   public TaskSpec() {
   }
 
-  // TODO NEWTEZ Remove user
-  public TaskSpec(TezTaskAttemptID taskAttemptID, String user,
+  public TaskSpec(TezTaskAttemptID taskAttemptID,
       String vertexName, ProcessorDescriptor processorDescriptor,
       List<InputSpec> inputSpecList, List<OutputSpec> outputSpecList) {
     this.taskAttemptId = taskAttemptID;
-    this.vertexName = vertexName;
-    this.user = user;
+    this.vertexName = StringInterner.weakIntern(vertexName);
     this.processorDescriptor = processorDescriptor;
     this.inputSpecList = inputSpecList;
     this.outputSpecList = outputSpecList;
@@ -59,10 +57,6 @@ public class TaskSpec implements Writable {
     return taskAttemptId;
   }
 
-  public String getUser() {
-    return user;
-  }
-
   public ProcessorDescriptor getProcessorDescriptor() {
     return processorDescriptor;
   }
@@ -92,9 +86,9 @@ public class TaskSpec implements Writable {
 
   @Override
   public void readFields(DataInput in) throws IOException {
-    taskAttemptId = new TezTaskAttemptID();
-    taskAttemptId.readFields(in);
-    vertexName = in.readUTF();
+    taskAttemptId = TezTaskAttemptID.readTezTaskAttemptID(in);
+    // TODO ZZZ Intern this.
+    vertexName = StringInterner.weakIntern(in.readUTF());
     // TODO TEZ-305 convert this to PB
     processorDescriptor = new ProcessorDescriptor();
     processorDescriptor.readFields(in);

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezHeartbeatRequest.java
----------------------------------------------------------------------
diff --git a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezHeartbeatRequest.java
b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezHeartbeatRequest.java
index 4bbf5ca..3baef93 100644
--- a/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezHeartbeatRequest.java
+++ b/tez-runtime-internals/src/main/java/org/apache/tez/runtime/api/impl/TezHeartbeatRequest.java
@@ -112,8 +112,7 @@ public class TezHeartbeatRequest implements Writable {
       }
     }
     if (in.readBoolean()) {
-      currentTaskAttemptID = new TezTaskAttemptID();
-      currentTaskAttemptID.readFields(in);
+      currentTaskAttemptID = TezTaskAttemptID.readTezTaskAttemptID(in);
     } else {
       currentTaskAttemptID = null;
     }

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/broadcast/output/FileBasedKVWriter.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/broadcast/output/FileBasedKVWriter.java
b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/broadcast/output/FileBasedKVWriter.java
index 7f58594..7071b87 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/broadcast/output/FileBasedKVWriter.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/broadcast/output/FileBasedKVWriter.java
@@ -160,4 +160,4 @@ public class FileBasedKVWriter implements KeyValueWriter {
     }
     return buf;
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestIFile.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestIFile.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestIFile.java
index 17b7174..581d28c 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestIFile.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestIFile.java
@@ -202,4 +202,4 @@ public class TestIFile {
 
     return writer;
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java
index c7626fd..eb9b548 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java
@@ -99,10 +99,10 @@ public class TestOnFileUnorderedKVOutput {
     TezUmbilical tezUmbilical = null; // ZZZ TestUmbilical from mapreduce
     String taskVertexName = "currentVertex";
     String destinationVertexName = "destinationVertex";
-    TezDAGID dagID = new TezDAGID("2000", 1, 1);
-    TezVertexID vertexID = new TezVertexID(dagID, 1);
-    TezTaskID taskID = new TezTaskID(vertexID, 1);
-    TezTaskAttemptID taskAttemptID = new TezTaskAttemptID(taskID, 1);
+    TezDAGID dagID = TezDAGID.getInstance("2000", 1, 1);
+    TezVertexID vertexID = TezVertexID.getInstance(dagID, 1);
+    TezTaskID taskID = TezTaskID.getInstance(vertexID, 1);
+    TezTaskAttemptID taskAttemptID = TezTaskAttemptID.getInstance(taskID, 1);
     TezCounters counters = new TezCounters();
     byte[] userPayload = TezUtils.createUserPayloadFromConf(conf);
     RuntimeTask runtimeTask = null;
@@ -152,4 +152,4 @@ public class TestOnFileUnorderedKVOutput {
       return "host";
     }
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/b3665f41/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/testutils/KVDataGen.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/testutils/KVDataGen.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/testutils/KVDataGen.java
index 90bb0b3..9786ada 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/testutils/KVDataGen.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/testutils/KVDataGen.java
@@ -61,4 +61,4 @@ public class KVDataGen {
       return this.value;
     }
   }
-}
\ No newline at end of file
+}


Mime
View raw message