You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ch...@apache.org on 2014/07/31 18:41:51 UTC
svn commit: r1614934 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/backend/hadoop/executionengine/tez/PartitionerDefinedVertexManager.java
Author: cheolsoo
Date: Thu Jul 31 16:41:51 2014
New Revision: 1614934
URL: http://svn.apache.org/r1614934
Log:
PIG-4085: TEZ-1303 broke hadoop 2 compilation in trunk (cheolsoo)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/PartitionerDefinedVertexManager.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1614934&r1=1614933&r2=1614934&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu Jul 31 16:41:51 2014
@@ -52,6 +52,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-4085: TEZ-1303 broke hadoop 2 compilation in trunk (cheolsoo)
+
PIG-4082: TEZ-1278 broke hadoop 2 compilation in trunk (cheolsoo)
PIG-4079: Parallel clause is not honored in local mode (cheolsoo)
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/PartitionerDefinedVertexManager.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/PartitionerDefinedVertexManager.java?rev=1614934&r1=1614933&r2=1614934&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/PartitionerDefinedVertexManager.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/PartitionerDefinedVertexManager.java Thu Jul 31 16:41:51 2014
@@ -43,16 +43,18 @@ import com.google.common.primitives.Ints
* partition in the previous setting routes to the new vertex setting
*/
public class PartitionerDefinedVertexManager extends VertexManagerPlugin {
+ private static final Log LOG = LogFactory.getLog(PartitionerDefinedVertexManager.class);
- private VertexManagerPluginContext context;
private boolean isParallelismSet = false;
private int dynamicParallelism = -1;
-
- private static final Log LOG = LogFactory.getLog(PartitionerDefinedVertexManager.class);
+
+ public PartitionerDefinedVertexManager(VertexManagerPluginContext context) {
+ super(context);
+ }
@Override
- public void initialize(VertexManagerPluginContext context) {
- this.context = context;
+ public void initialize() {
+ // Nothing to do
}
@Override
@@ -80,19 +82,19 @@ public class PartitionerDefinedVertexMan
} else {
return;
}
- int currentParallelism = context.getVertexNumTasks(context.getVertexName());
+ int currentParallelism = getContext().getVertexNumTasks(getContext().getVertexName());
if (dynamicParallelism != -1) {
if (dynamicParallelism!=currentParallelism) {
LOG.info("Pig Partitioner Defined Vertex Manager: reset parallelism to " + dynamicParallelism
+ " from " + currentParallelism);
Map<String, EdgeManagerDescriptor> edgeManagers =
new HashMap<String, EdgeManagerDescriptor>();
- for(String vertex : context.getInputVertexEdgeProperties().keySet()) {
+ for(String vertex : getContext().getInputVertexEdgeProperties().keySet()) {
EdgeManagerDescriptor edgeManagerDescriptor =
new EdgeManagerDescriptor(ScatterGatherEdgeManager.class.getName());
edgeManagers.put(vertex, edgeManagerDescriptor);
}
- context.setVertexParallelism(dynamicParallelism, null, edgeManagers, null);
+ getContext().setVertexParallelism(dynamicParallelism, null, edgeManagers, null);
}
}
}
@@ -104,7 +106,7 @@ public class PartitionerDefinedVertexMan
for (int i=0; i<dynamicParallelism; ++i) {
tasksToStart.add(new TaskWithLocationHint(new Integer(i), null));
}
- context.scheduleVertexTasks(tasksToStart);
+ getContext().scheduleVertexTasks(tasksToStart);
}
}
}