Index: ql/src/java/org/apache/hadoop/hive/ql/parse/TezCompiler.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/parse/TezCompiler.java (revision 1571461) +++ ql/src/java/org/apache/hadoop/hive/ql/parse/TezCompiler.java (working copy) @@ -60,6 +60,7 @@ import org.apache.hadoop.hive.ql.optimizer.SetReducerParallelism; import org.apache.hadoop.hive.ql.optimizer.physical.PhysicalContext; import org.apache.hadoop.hive.ql.optimizer.physical.Vectorizer; +import org.apache.hadoop.hive.ql.optimizer.physical.StageIDsRearranger; import org.apache.hadoop.hive.ql.plan.BaseWork; import org.apache.hadoop.hive.ql.plan.MapWork; import org.apache.hadoop.hive.ql.plan.MoveWork; @@ -251,6 +252,9 @@ if (conf.getBoolVar(HiveConf.ConfVars.HIVE_VECTORIZATION_ENABLED)) { (new Vectorizer()).resolve(physicalCtx); } + if (!"none".equalsIgnoreCase(conf.getVar(HiveConf.ConfVars.HIVESTAGEIDREARRANGE))) { + (new StageIDsRearranger()).resolve(physicalCtx); + } return; } } Index: ql/src/test/results/clientpositive/tez/insert1.q.out =================================================================== --- ql/src/test/results/clientpositive/tez/insert1.q.out (revision 1571461) +++ ql/src/test/results/clientpositive/tez/insert1.q.out (working copy) @@ -264,10 +264,10 @@ STAGE DEPENDENCIES: Stage-2 is a root stage Stage-3 depends on stages: Stage-2 + Stage-0 depends on stages: Stage-3 + Stage-4 depends on stages: Stage-0 Stage-1 depends on stages: Stage-3 - Stage-4 depends on stages: Stage-1 - Stage-0 depends on stages: Stage-3 - Stage-5 depends on stages: Stage-0 + Stage-5 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-2 @@ -313,28 +313,28 @@ Stage: Stage-3 Dependency Collection - Stage: Stage-1 + Stage: Stage-0 Move Operator tables: - replace: true + replace: false table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - name: x.insert1 + name: default.insert1 Stage: Stage-4 Stats-Aggr Operator - Stage: Stage-0 + Stage: Stage-1 Move Operator tables: - replace: false + replace: true table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - name: default.insert1 + name: x.insert1 Stage: Stage-5 Stats-Aggr Operator Index: ql/src/test/results/clientpositive/tez/load_dyn_part1.q.out =================================================================== --- ql/src/test/results/clientpositive/tez/load_dyn_part1.q.out (revision 1571461) +++ ql/src/test/results/clientpositive/tez/load_dyn_part1.q.out (working copy) @@ -45,10 +45,10 @@ STAGE DEPENDENCIES: Stage-2 is a root stage Stage-3 depends on stages: Stage-2 + Stage-0 depends on stages: Stage-3 + Stage-4 depends on stages: Stage-0 Stage-1 depends on stages: Stage-3 - Stage-4 depends on stages: Stage-1 - Stage-0 depends on stages: Stage-3 - Stage-5 depends on stages: Stage-0 + Stage-5 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-2 @@ -94,11 +94,11 @@ Stage: Stage-3 Dependency Collection - Stage: Stage-1 + Stage: Stage-0 Move Operator tables: partition: - ds 2008-12-31 + ds hr replace: true table: @@ -105,16 +105,16 @@ input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - name: default.nzhang_part2 + name: default.nzhang_part1 Stage: Stage-4 Stats-Aggr Operator - Stage: Stage-0 + Stage: Stage-1 Move Operator tables: partition: - ds + ds 2008-12-31 hr replace: true table: @@ -121,7 +121,7 @@ input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - name: default.nzhang_part1 + name: default.nzhang_part2 Stage: Stage-5 Stats-Aggr Operator