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/08/11 00:29:23 UTC
svn commit: r1617173 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/backend/hadoop/executionengine/tez/TezDagBuilder.java
src/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/LoaderProcessor.java
Author: cheolsoo
Date: Sun Aug 10 22:29:22 2014
New Revision: 1617173
URL: http://svn.apache.org/r1617173
Log:
PIG-4113: TEZ-1386 breaks hadoop 2 compilation in trunk (cheolsoo)
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/optimizers/LoaderProcessor.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1617173&r1=1617172&r2=1617173&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sun Aug 10 22:29:22 2014
@@ -56,6 +56,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-4113: TEZ-1386 breaks hadoop 2 compilation in trunk (cheolsoo)
+
PIG-4110: TEZ-1382 breaks Hadoop 2 compilation (cheolsoo)
PIG-4105: Fix TestAvroStorage with ibm jdk (fang fang chen via daijy)
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=1617173&r1=1617172&r2=1617173&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 Sun Aug 10 22:29:22 2014
@@ -597,7 +597,7 @@ public class TezDagBuilder extends TezOp
vertex.addDataSource(ld.getOperatorKey().toString(),
new DataSourceDescriptor(new InputDescriptor(MRInput.class.getName())
.setUserPayload(MRHelpers.createMRInputPayload(
- userPayload,
+ payloadConf,
tezOp.getLoaderInfo().getInputSplitInfo().getSplitsProto())),
new InputInitializerDescriptor(MRInputSplitDistributor.class.getName()), dag.getCredentials()));
}
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/LoaderProcessor.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/LoaderProcessor.java?rev=1617173&r1=1617172&r2=1617173&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/LoaderProcessor.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/optimizers/LoaderProcessor.java Sun Aug 10 22:29:22 2014
@@ -130,7 +130,7 @@ public class LoaderProcessor extends Tez
tezOp.getLoaderInfo().setInpLimits(inpLimits);
// Not using MRInputAMSplitGenerator because delegation tokens are
// fetched in FileInputFormat
- tezOp.getLoaderInfo().setInputSplitInfo(MRHelpers.generateInputSplitsToMem(conf));
+ tezOp.getLoaderInfo().setInputSplitInfo(MRHelpers.generateInputSplitsToMem(conf, false, 0));
}
return lds;
}