You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by kn...@apache.org on 2014/07/12 04:28:37 UTC
svn commit: r1609879 - in /pig/trunk: ./
src/org/apache/pig/backend/hadoop/executionengine/tez/
Author: knoguchi
Date: Sat Jul 12 02:28:36 2014
New Revision: 1609879
URL: http://svn.apache.org/r1609879
Log:
PIG-4055 Build broke after TEZ-1130 API rename (knoguchi)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezDagBuilder.java
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezJob.java
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezLauncher.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1609879&r1=1609878&r2=1609879&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sat Jul 12 02:28:36 2014
@@ -42,6 +42,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-4055 Build broke after TEZ-1130 API rename (knoguchi)
+
PIG-3935: Port more mini cluster tests to Tez - part 5 (rohini)
PIG-3984: PigServer.shutdown removes the tez resource folder (daijy via rohini)
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezDagBuilder.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezDagBuilder.java?rev=1609879&r1=1609878&r2=1609879&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezDagBuilder.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezDagBuilder.java Sat Jul 12 02:28:36 2014
@@ -674,15 +674,15 @@ public class TezDagBuilder extends TezOp
ClientDistributedCacheManager.getDelegationTokens(globalConf,
job.getCredentials());
MRApps.setupDistributedCache(globalConf, localResources);
- vertex.setTaskLocalResources(localResources);
+ vertex.setTaskLocalFiles(localResources);
- vertex.setJavaOpts(isMap ? MRHelpers.getMapJavaOpts(globalConf)
+ vertex.setTaskLaunchCmdOpts(isMap ? MRHelpers.getMapJavaOpts(globalConf)
: MRHelpers.getReduceJavaOpts(globalConf));
log.info("For vertex - " + tezOp.getOperatorKey().toString()
+ ": parallelism=" + parallelism
+ ", memory=" + vertex.getTaskResource().getMemory()
- + ", java opts=" + vertex.getJavaOpts()
+ + ", java opts=" + vertex.getTaskLaunchCmdOpts()
);
// Right now there can only be one of each of these. Will need to be
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezJob.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezJob.java?rev=1609879&r1=1609878&r2=1609879&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezJob.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezJob.java Sat Jul 12 02:28:36 2014
@@ -193,7 +193,7 @@ public class TezJob extends ControlledJo
private void collectVertexCounters() {
for (Vertex v : dag.getVertices()) {
- String name = v.getVertexName();
+ String name = v.getName();
try {
VertexStatus s = dagClient.getVertexStatus(name, statusGetOpts);
TezCounters counters = s.getVertexCounters();
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezLauncher.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezLauncher.java?rev=1609879&r1=1609878&r2=1609879&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezLauncher.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezLauncher.java Sat Jul 12 02:28:36 2014
@@ -167,7 +167,7 @@ public class TezLauncher extends Launche
if (aggregateWarning && job.getJobState() == ControlledJob.State.SUCCESS) {
for (Vertex vertex : job.getDAG().getVertices()) {
- String vertexName = vertex.getVertexName();
+ String vertexName = vertex.getName();
Map<String, Map<String, Long>> counterGroups = job.getVertexCounters(vertexName);
computeWarningAggregate(counterGroups, warningAggMap);
}
@@ -226,12 +226,12 @@ public class TezLauncher extends Launche
private void notifyStarted(TezJob job) throws IOException {
for (Vertex v : job.getDAG().getVertices()) {
- TezTaskStats tts = tezStats.getVertexStats(v.getVertexName());
+ TezTaskStats tts = tezStats.getVertexStats(v.getName());
byte[] bb = v.getProcessorDescriptor().getUserPayload();
Configuration conf = TezUtils.createConfFromUserPayload(bb);
tts.setConf(conf);
- tts.setId(v.getVertexName());
- tezScriptState.emitJobStartedNotification(v.getVertexName());
+ tts.setId(v.getName());
+ tezScriptState.emitJobStartedNotification(v.getName());
}
}
@@ -254,12 +254,12 @@ public class TezLauncher extends Launche
private void notifyFinishedOrFailed(TezJob job) {
if (job.getJobState() == ControlledJob.State.SUCCESS) {
for (Vertex v : job.getDAG().getVertices()) {
- TezTaskStats tts = tezStats.getVertexStats(v.getVertexName());
+ TezTaskStats tts = tezStats.getVertexStats(v.getName());
tezScriptState.emitjobFinishedNotification(tts);
}
} else if (job.getJobState() == ControlledJob.State.FAILED) {
for (Vertex v : ((TezJob)job).getDAG().getVertices()) {
- TezTaskStats tts = tezStats.getVertexStats(v.getVertexName());
+ TezTaskStats tts = tezStats.getVertexStats(v.getName());
tezScriptState.emitJobFailedNotification(tts);
}
}