Author: gunther Date: Fri Dec 20 19:58:14 2013 New Revision: 1552800 URL: http://svn.apache.org/r1552800 Log: HIVE-6080: Non-deterministic stage dependencies in tez (Vikram Dixit K via Gunther Hagleitner)
Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java hive/branches/tez/ql/src/test/results/clientpositive/tez/ctas.q.out hive/branches/tez/ql/src/test/results/clientpositive/tez/tez_dml.q.out Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java?rev=1552800&r1=1552799&r2=1552800&view=diff ============================================================================== --- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java (original) +++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java Fri Dec 20 19:58:14 2013 @@ -21,6 +21,7 @@ package org.apache.hadoop.hive.ql.parse; import java.io.Serializable; import java.util.ArrayList; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -229,7 +230,7 @@ public abstract class TaskCompiler { // find all leaf tasks and make the DDLTask as a dependent task of all of // them - HashSet<Task<? extends Serializable>> leaves = new HashSet<Task<? extends Serializable>>(); + HashSet<Task<? extends Serializable>> leaves = new LinkedHashSet<Task<? extends Serializable>>(); getLeafTasks(rootTasks, leaves); assert (leaves.size() > 0); for (Task<? extends Serializable> task : leaves) { Modified: hive/branches/tez/ql/src/test/results/clientpositive/tez/ctas.q.out URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/tez/ctas.q.out?rev=1552800&r1=1552799&r2=1552800&view=diff ============================================================================== --- hive/branches/tez/ql/src/test/results/clientpositive/tez/ctas.q.out (original) +++ hive/branches/tez/ql/src/test/results/clientpositive/tez/ctas.q.out Fri Dec 20 19:58:14 2013 @@ -27,7 +27,7 @@ STAGE DEPENDENCIES: Stage-8 depends on stages: Stage-1 , consists of Stage-5, Stage-4, Stage-6 Stage-5 Stage-2 depends on stages: Stage-5, Stage-4, Stage-7 - Stage-9 depends on stages: Stage-0, Stage-2 + Stage-9 depends on stages: Stage-2, Stage-0 Stage-3 depends on stages: Stage-9 Stage-0 depends on stages: Stage-5, Stage-4, Stage-7 Stage-4 @@ -669,7 +669,7 @@ STAGE DEPENDENCIES: Stage-8 depends on stages: Stage-1 , consists of Stage-5, Stage-4, Stage-6 Stage-5 Stage-2 depends on stages: Stage-5, Stage-4, Stage-7 - Stage-9 depends on stages: Stage-0, Stage-2 + Stage-9 depends on stages: Stage-2, Stage-0 Stage-3 depends on stages: Stage-9 Stage-0 depends on stages: Stage-5, Stage-4, Stage-7 Stage-4 Modified: hive/branches/tez/ql/src/test/results/clientpositive/tez/tez_dml.q.out URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/tez/tez_dml.q.out?rev=1552800&r1=1552799&r2=1552800&view=diff ============================================================================== --- hive/branches/tez/ql/src/test/results/clientpositive/tez/tez_dml.q.out (original) +++ hive/branches/tez/ql/src/test/results/clientpositive/tez/tez_dml.q.out Fri Dec 20 19:58:14 2013 @@ -12,7 +12,7 @@ STAGE DEPENDENCIES: Stage-8 depends on stages: Stage-1 , consists of Stage-5, Stage-4, Stage-6 Stage-5 Stage-2 depends on stages: Stage-5, Stage-4, Stage-7 - Stage-9 depends on stages: Stage-0, Stage-2 + Stage-9 depends on stages: Stage-2, Stage-0 Stage-3 depends on stages: Stage-9 Stage-0 depends on stages: Stage-5, Stage-4, Stage-7 Stage-4