You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by zl...@apache.org on 2017/04/27 02:06:37 UTC
svn commit: r1792835 - in
/pig/branches/spark/src/org/apache/pig/backend/hadoop/executionengine/spark:
JobGraphBuilder.java plan/SparkCompiler.java
Author: zly
Date: Thu Apr 27 02:06:36 2017
New Revision: 1792835
URL: http://svn.apache.org/viewvc?rev=1792835&view=rev
Log:
PIG-5165:MultiQuery_Union_7 is failing with spark exec type(Adam via Liyun)
Modified:
pig/branches/spark/src/org/apache/pig/backend/hadoop/executionengine/spark/JobGraphBuilder.java
pig/branches/spark/src/org/apache/pig/backend/hadoop/executionengine/spark/plan/SparkCompiler.java
Modified: pig/branches/spark/src/org/apache/pig/backend/hadoop/executionengine/spark/JobGraphBuilder.java
URL: http://svn.apache.org/viewvc/pig/branches/spark/src/org/apache/pig/backend/hadoop/executionengine/spark/JobGraphBuilder.java?rev=1792835&r1=1792834&r2=1792835&view=diff
==============================================================================
--- pig/branches/spark/src/org/apache/pig/backend/hadoop/executionengine/spark/JobGraphBuilder.java (original)
+++ pig/branches/spark/src/org/apache/pig/backend/hadoop/executionengine/spark/JobGraphBuilder.java Thu Apr 27 02:06:36 2017
@@ -311,7 +311,7 @@ public class JobGraphBuilder extends Spa
List preds = null;
if (!(op instanceof POJoinGroupSpark)) {
preds = plan.getPredecessors(op);
- if (preds != null && preds.size() > 1) {
+ if (preds != null && preds.size() > 1 && !(op instanceof POSkewedJoin)) {
Collections.sort(preds);
}
} else {
Modified: pig/branches/spark/src/org/apache/pig/backend/hadoop/executionengine/spark/plan/SparkCompiler.java
URL: http://svn.apache.org/viewvc/pig/branches/spark/src/org/apache/pig/backend/hadoop/executionengine/spark/plan/SparkCompiler.java?rev=1792835&r1=1792834&r2=1792835&view=diff
==============================================================================
--- pig/branches/spark/src/org/apache/pig/backend/hadoop/executionengine/spark/plan/SparkCompiler.java (original)
+++ pig/branches/spark/src/org/apache/pig/backend/hadoop/executionengine/spark/plan/SparkCompiler.java Thu Apr 27 02:06:36 2017
@@ -1028,6 +1028,7 @@ public class SparkCompiler extends PhyPl
for (E e : plans) {
finPlan.merge(e);
}
+ Collections.sort(finPlan.getLeaves());
}
@Override