You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2014/08/06 21:43:05 UTC
svn commit: r1616323 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/backend/hadoop/executionengine/tez/TezDagBuilder.java
Author: daijy
Date: Wed Aug 6 19:43:05 2014
New Revision: 1616323
URL: http://svn.apache.org/r1616323
Log:
PIG-4108: Pig -Dhadoopversion=23 compile fail after TEZ-1317
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezDagBuilder.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1616323&r1=1616322&r2=1616323&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Aug 6 19:43:05 2014
@@ -56,6 +56,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-4108: Pig -Dhadoopversion=23 compile fail after TEZ-1317 (daijy)
+
PIG-4086: Fix Orc e2e tests for tez (daijy)
PIG-4101: Lower tez.am.task.max.failed.attempts to 2 from 4 in Tez mini cluster (cheolsoo)
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=1616323&r1=1616322&r2=1616323&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 Wed Aug 6 19:43:05 2014
@@ -104,6 +104,8 @@ import org.apache.pig.impl.util.ObjectSe
import org.apache.pig.impl.util.UDFContext;
import org.apache.tez.common.TezUtils;
import org.apache.tez.dag.api.DAG;
+import org.apache.tez.dag.api.DataSinkDescriptor;
+import org.apache.tez.dag.api.DataSourceDescriptor;
import org.apache.tez.dag.api.Edge;
import org.apache.tez.dag.api.EdgeManagerDescriptor;
import org.apache.tez.dag.api.EdgeProperty;
@@ -222,8 +224,8 @@ public class TezDagBuilder extends TezOp
POStore store = tezOp.getVertexGroupInfo().getStore();
if (store != null) {
vertexGroup.addDataSink(store.getOperatorKey().toString(),
- tezOp.getVertexGroupInfo().getStoreOutputDescriptor(),
- new OutputCommitterDescriptor(MROutputCommitter.class.getName()));
+ new DataSinkDescriptor(tezOp.getVertexGroupInfo().getStoreOutputDescriptor(),
+ new OutputCommitterDescriptor(MROutputCommitter.class.getName()), dag.getCredentials()));
}
}
}
@@ -593,11 +595,11 @@ public class TezDagBuilder extends TezOp
// keeps settings like pig.maxCombinedSplitSize
vertex.setLocationHint(new VertexLocationHint(tezOp.getLoaderInfo().getInputSplitInfo().getTaskLocationHints()));
vertex.addDataSource(ld.getOperatorKey().toString(),
- new InputDescriptor(MRInput.class.getName())
+ new DataSourceDescriptor(new InputDescriptor(MRInput.class.getName())
.setUserPayload(MRHelpers.createMRInputPayload(
userPayload,
tezOp.getLoaderInfo().getInputSplitInfo().getSplitsProto())),
- new InputInitializerDescriptor(MRInputSplitDistributor.class.getName()));
+ new InputInitializerDescriptor(MRInputSplitDistributor.class.getName()), dag.getCredentials()));
}
for (POStore store : stores) {
@@ -624,7 +626,9 @@ public class TezDagBuilder extends TezOp
}
}
vertex.addDataSink(store.getOperatorKey().toString(),
- storeOutDescriptor, new OutputCommitterDescriptor(MROutputCommitter.class.getName()));
+ new DataSinkDescriptor(storeOutDescriptor,
+ new OutputCommitterDescriptor(MROutputCommitter.class.getName()),
+ dag.getCredentials()));
}
// LoadFunc and StoreFunc add delegation tokens to Job Credentials in