diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/FetchTask.java ql/src/java/org/apache/hadoop/hive/ql/exec/FetchTask.java index 770d904..c4f04cb 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/FetchTask.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/FetchTask.java @@ -32,6 +32,7 @@ import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.metadata.VirtualColumn; import org.apache.hadoop.hive.ql.plan.FetchWork; +import org.apache.hadoop.hive.ql.plan.FileSinkDesc; import org.apache.hadoop.hive.ql.plan.TableDesc; import org.apache.hadoop.hive.ql.plan.api.StageType; import org.apache.hadoop.hive.serde2.ColumnProjectionUtils; @@ -154,6 +155,10 @@ public boolean fetch(List res) throws IOException, CommandNeedRetryException { } } + public boolean isFetchFrom(FileSinkDesc fs) { + return fs.getFinalDirName().equals(work.getTblDir()); + } + @Override public StageType getType() { return StageType.FETCH; diff --git ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRFileSink1.java ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRFileSink1.java index 3cef50d..f8b684f 100644 --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRFileSink1.java +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRFileSink1.java @@ -124,9 +124,10 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx opProcCtx, } FetchTask fetchTask = parseCtx.getFetchTask(); - if (fetchTask != null && currTask.getNumChild() == 0 && - fileSinkDesc.getFinalDirName().equals(fetchTask.getWork().getTblDir())) { - currTask.setFetchSource(true); + if (fetchTask != null && currTask.getNumChild() == 0) { + if (fetchTask.isFetchFrom(fileSinkDesc)) { + currTask.setFetchSource(true); + } } return true; } diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezUtils.java ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezUtils.java index 3f70092..169171c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezUtils.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezUtils.java @@ -33,6 +33,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.ql.exec.FetchTask; import org.apache.hadoop.hive.ql.exec.Operator; import org.apache.hadoop.hive.ql.exec.FileSinkOperator; import org.apache.hadoop.hive.ql.exec.HashTableDummyOperator; @@ -281,5 +282,12 @@ public void processFileSink(GenTezProcContext context, FileSinkOperator fileSink context.dependencyTask, context.moveTask, hconf, context.currentTask); } + + FetchTask fetchTask = parseContext.getFetchTask(); + if (fetchTask != null && context.currentTask.getNumChild() == 0) { + if (fetchTask.isFetchFrom(fileSink.getConf())) { + context.currentTask.setFetchSource(true); + } + } } } diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/MapReduceCompiler.java ql/src/java/org/apache/hadoop/hive/ql/parse/MapReduceCompiler.java index 2a42675..703c9d1 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/MapReduceCompiler.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/MapReduceCompiler.java @@ -118,23 +118,6 @@ private void setInputFormat(MapWork work, Operator op) { } } - @Override - public ParseContext getParseContext(ParseContext pCtx, List> rootTasks) { - return new ParseContext(conf, pCtx.getQB(), pCtx.getParseTree(), - pCtx.getOpToPartPruner(), pCtx.getOpToPartList(), pCtx.getTopOps(), - pCtx.getTopSelOps(), pCtx.getOpParseCtx(), pCtx.getJoinContext(), - pCtx.getSmbMapJoinContext(), pCtx.getTopToTable(), pCtx.getTopToProps(), - pCtx.getFsopToTable(), - pCtx.getLoadTableWork(), pCtx.getLoadFileWork(), pCtx.getContext(), - pCtx.getIdToTableNameMap(), pCtx.getDestTableId(), pCtx.getUCtx(), - pCtx.getListMapJoinOpsNoReducer(), pCtx.getGroupOpToInputTables(), - pCtx.getPrunedPartitions(), pCtx.getOpToSamplePruner(), pCtx.getGlobalLimitCtx(), - pCtx.getNameToSplitSample(), pCtx.getSemanticInputs(), rootTasks, - pCtx.getOpToPartToSkewedPruner(), pCtx.getViewAliasToInput(), - pCtx.getReduceSinkOperatorsAddedByEnforceBucketingSorting(), - pCtx.getQueryProperties()); - } - // loop over all the tasks recursively private void breakTaskTree(Task task) { @@ -223,7 +206,7 @@ public boolean accept(Path file) { for (ExecDriver mrtask : mrtasks) { try { ContentSummary inputSummary = Utilities.getInputSummary - (ctx, ((MapredWork) mrtask.getWork()).getMapWork(), p); + (ctx, mrtask.getWork().getMapWork(), p); int numReducers = getNumberOfReducers(mrtask.getWork(), conf); long estimatedInput; @@ -297,7 +280,6 @@ protected void generateTaskTree(List> rootTasks, Pa // generate map reduce plans ParseContext tempParseContext = getParseContext(pCtx, rootTasks); - tempParseContext.setFetchTask(pCtx.getFetchTask()); GenMRProcContext procCtx = new GenMRProcContext( conf, diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java index b58a0a3..68f1153 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java @@ -364,7 +364,8 @@ protected abstract void generateTaskTree(List> root * Create a clone of the parse context */ public ParseContext getParseContext(ParseContext pCtx, List> rootTasks) { - return new ParseContext(conf, pCtx.getQB(), pCtx.getParseTree(), + ParseContext clone = new ParseContext(conf, + pCtx.getQB(), pCtx.getParseTree(), pCtx.getOpToPartPruner(), pCtx.getOpToPartList(), pCtx.getTopOps(), pCtx.getTopSelOps(), pCtx.getOpParseCtx(), pCtx.getJoinContext(), pCtx.getSmbMapJoinContext(), pCtx.getTopToTable(), pCtx.getTopToProps(), @@ -377,5 +378,9 @@ public ParseContext getParseContext(ParseContext pCtx, List 1) a join (select POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -354,7 +354,7 @@ select a.key, b.key from (select key from tab_part where key > 1) a left outer j POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -430,7 +430,7 @@ select a.key, b.key from (select key from tab_part where key > 1) a right outer POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -504,7 +504,7 @@ POSTHOOK: query: explain select a.key, b.key from (select distinct key from tab) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -590,7 +590,7 @@ POSTHOOK: query: explain select a.value, b.value from (select distinct value fro POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/count.q.out ql/src/test/results/clientpositive/tez/count.q.out index 73485df..d3bd5a8 100644 --- ql/src/test/results/clientpositive/tez/count.q.out +++ ql/src/test/results/clientpositive/tez/count.q.out @@ -34,7 +34,7 @@ POSTHOOK: query: explain select a, count(distinct b), count(distinct c), sum(d) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -108,7 +108,7 @@ POSTHOOK: query: explain select count(1), count(*), count(a), count(b), count(c) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -177,7 +177,7 @@ POSTHOOK: query: explain select a, count(distinct b), count(distinct c), sum(d) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -245,7 +245,7 @@ POSTHOOK: query: explain select count(1), count(*), count(a), count(b), count(c) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/cross_join.q.out ql/src/test/results/clientpositive/tez/cross_join.q.out index d7e0223..17ecaca 100644 --- ql/src/test/results/clientpositive/tez/cross_join.q.out +++ ql/src/test/results/clientpositive/tez/cross_join.q.out @@ -7,7 +7,7 @@ explain select src.key from src join src src2 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -70,7 +70,7 @@ explain select src.key from src cross join src src2 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -132,7 +132,7 @@ explain select src.key from src cross join src src2 on src.key=src2.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out index 3cadd48..6e4a5e3 100644 --- ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out +++ ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out @@ -25,7 +25,7 @@ POSTHOOK: query: explain select * from A join B POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -87,7 +87,7 @@ POSTHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -183,7 +183,7 @@ POSTHOOK: query: explain select * from A join POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -302,7 +302,7 @@ POSTHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -420,7 +420,7 @@ POSTHOOK: query: explain select * from POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out index a9e1a61..555a9ca 100644 --- ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out +++ ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out @@ -25,7 +25,7 @@ POSTHOOK: query: explain select * from A join B POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -84,7 +84,7 @@ POSTHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -172,7 +172,7 @@ POSTHOOK: query: explain select * from A join POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -283,7 +283,7 @@ POSTHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -395,7 +395,7 @@ POSTHOOK: query: explain select * from POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/disable_merge_for_bucketing.q.out ql/src/test/results/clientpositive/tez/disable_merge_for_bucketing.q.out index cdfe275..4197841 100644 --- ql/src/test/results/clientpositive/tez/disable_merge_for_bucketing.q.out +++ ql/src/test/results/clientpositive/tez/disable_merge_for_bucketing.q.out @@ -195,7 +195,7 @@ select * from bucket2_1 tablesample (bucket 1 out of 2) s order by key POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out index b1a215b..d09f921 100644 --- ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out +++ ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out @@ -131,7 +131,7 @@ TOK_QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/having.q.out ql/src/test/results/clientpositive/tez/having.q.out index 27ffedc..e96342d 100644 --- ql/src/test/results/clientpositive/tez/having.q.out +++ ql/src/test/results/clientpositive/tez/having.q.out @@ -4,7 +4,7 @@ POSTHOOK: query: EXPLAIN SELECT count(value) AS c FROM src GROUP BY key HAVING c POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -87,7 +87,7 @@ POSTHOOK: query: EXPLAIN SELECT key, max(value) AS c FROM src GROUP BY key HAVIN POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -468,7 +468,7 @@ POSTHOOK: query: EXPLAIN SELECT key FROM src GROUP BY key HAVING max(value) > "v POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -740,7 +740,7 @@ POSTHOOK: query: EXPLAIN SELECT key FROM src where key > 300 GROUP BY key HAVING POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -941,7 +941,7 @@ POSTHOOK: query: EXPLAIN SELECT key, max(value) FROM src GROUP BY key HAVING max POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/join0.q.out ql/src/test/results/clientpositive/tez/join0.q.out index 5999467..38d4716 100644 --- ql/src/test/results/clientpositive/tez/join0.q.out +++ ql/src/test/results/clientpositive/tez/join0.q.out @@ -17,7 +17,7 @@ SELECT src1.key as k1, src1.value as v1, POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/limit_pushdown.q.out ql/src/test/results/clientpositive/tez/limit_pushdown.q.out index 22c7cca..4d9bb81 100644 --- ql/src/test/results/clientpositive/tez/limit_pushdown.q.out +++ ql/src/test/results/clientpositive/tez/limit_pushdown.q.out @@ -10,7 +10,7 @@ select key,value from src order by key limit 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -91,7 +91,7 @@ select key,value from src order by key desc limit 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -172,7 +172,7 @@ select value, sum(key + 1) as sum from src group by value limit 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -270,7 +270,7 @@ select value,avg(key + 1) from src group by value order by value limit 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -368,7 +368,7 @@ select distinct(cdouble) from alltypesorc limit 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -461,7 +461,7 @@ select ctinyint, count(distinct(cdouble)) from alltypesorc group by ctinyint lim POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -558,7 +558,7 @@ select ctinyint, count(distinct(cstring1)), count(distinct(cstring2)) from allty POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -655,7 +655,7 @@ select key,value from src order by key limit 0 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -717,7 +717,7 @@ select value, sum(key) as sum from src group by value order by sum limit 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -833,7 +833,7 @@ on subq.key=subq2.key limit 4 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -984,7 +984,7 @@ select value, sum(key) as sum from src group by value limit 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -1076,7 +1076,7 @@ select key,value,value,value,value,value,value,value,value from src order by key POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -1239,7 +1239,7 @@ select sum(key) as sum from src group by concat(key,value,value,value,value,valu POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out index 975d798..7e7d524 100644 --- ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out +++ ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out @@ -77,7 +77,7 @@ select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out index 03aae6e..9e2ae8f 100644 --- ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out +++ ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out @@ -8,7 +8,7 @@ explain select srcpart.key from srcpart join src on (srcpart.value=src.value) jo POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -90,7 +90,7 @@ select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -178,7 +178,7 @@ select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/metadata_only_queries.q.out ql/src/test/results/clientpositive/tez/metadata_only_queries.q.out index 3788d18..49be242 100644 --- ql/src/test/results/clientpositive/tez/metadata_only_queries.q.out +++ ql/src/test/results/clientpositive/tez/metadata_only_queries.q.out @@ -181,7 +181,7 @@ select count(*), sum(1), sum(0.2), count(1), count(s), count(bo), count(bin), co POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -241,7 +241,7 @@ select count(*), sum(1), sum(0.2), count(1), count(s), count(bo), count(bin), co POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -383,7 +383,7 @@ POSTHOOK: query: explain select count(ts) from stats_tbl_part POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/mrr.q.out ql/src/test/results/clientpositive/tez/mrr.q.out index 40772a9..3601742 100644 --- ql/src/test/results/clientpositive/tez/mrr.q.out +++ ql/src/test/results/clientpositive/tez/mrr.q.out @@ -6,7 +6,7 @@ EXPLAIN SELECT key, count(value) as cnt FROM src GROUP BY key ORDER BY cnt POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -397,7 +397,7 @@ EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 o POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -814,7 +814,7 @@ EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 o POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -1255,7 +1255,7 @@ ORDER BY s1.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -1643,7 +1643,7 @@ FROM POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/script_pipe.q.out ql/src/test/results/clientpositive/tez/script_pipe.q.out index 2b56c7e..dce5ae0 100644 --- ql/src/test/results/clientpositive/tez/script_pipe.q.out +++ ql/src/test/results/clientpositive/tez/script_pipe.q.out @@ -6,7 +6,7 @@ EXPLAIN SELECT TRANSFORM(*) USING 'true' AS a, b, c FROM (SELECT * FROM src LIMI POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -71,7 +71,7 @@ EXPLAIN SELECT TRANSFORM(key, value, key, value, key, value, key, value, key, va POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/subquery_exists.q.out ql/src/test/results/clientpositive/tez/subquery_exists.q.out index 3d67b90..1d90e61 100644 --- ql/src/test/results/clientpositive/tez/subquery_exists.q.out +++ ql/src/test/results/clientpositive/tez/subquery_exists.q.out @@ -20,7 +20,7 @@ where exists POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/subquery_in.q.out ql/src/test/results/clientpositive/tez/subquery_in.q.out index 4f58bb7..ab41427 100644 --- ql/src/test/results/clientpositive/tez/subquery_in.q.out +++ ql/src/test/results/clientpositive/tez/subquery_in.q.out @@ -110,7 +110,7 @@ where src.key in (select key from src s1 where s1.key > '9') POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -228,7 +228,7 @@ where b.key in POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -354,7 +354,7 @@ part where part.p_size in POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -503,7 +503,7 @@ from part b where b.p_size in POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -660,7 +660,7 @@ where b.key in POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -824,7 +824,7 @@ where li.l_linenumber = 1 and POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/tez_join_tests.q.out ql/src/test/results/clientpositive/tez/tez_join_tests.q.out index 6b792b2..2704d13 100644 --- ql/src/test/results/clientpositive/tez/tez_join_tests.q.out +++ ql/src/test/results/clientpositive/tez/tez_join_tests.q.out @@ -6,7 +6,7 @@ select * from (select b.key, b.value from src1 a left outer join src b on (a.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/tez_joins_explain.q.out ql/src/test/results/clientpositive/tez/tez_joins_explain.q.out index 0b18b51..3b0d8e8 100644 --- ql/src/test/results/clientpositive/tez/tez_joins_explain.q.out +++ ql/src/test/results/clientpositive/tez/tez_joins_explain.q.out @@ -6,7 +6,7 @@ select * from (select b.key, b.value from src1 a left outer join src b on (a.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/tez_union.q.out ql/src/test/results/clientpositive/tez/tez_union.q.out index 64a9003..adc1f1d 100644 --- ql/src/test/results/clientpositive/tez/tez_union.q.out +++ ql/src/test/results/clientpositive/tez/tez_union.q.out @@ -10,7 +10,7 @@ select s2.key as key, s2.value as value from src s2 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -142,7 +142,7 @@ u as u1 join u as u2 on (u1.key = u2.key)) a POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -289,7 +289,7 @@ join (select * from src union all select * from src) u1 on s1.key = u1.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -444,7 +444,7 @@ order by lkey POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -810,7 +810,7 @@ union all select s4.key from src s4 join src s5 on s4.key = s5.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -970,7 +970,7 @@ left outer join src s on u.key = s.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -1070,7 +1070,7 @@ right outer join src s on u.key = s.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/transform1.q.out ql/src/test/results/clientpositive/tez/transform1.q.out index b8eea13..31ff407 100644 --- ql/src/test/results/clientpositive/tez/transform1.q.out +++ ql/src/test/results/clientpositive/tez/transform1.q.out @@ -13,7 +13,7 @@ SELECT transform(*) USING 'cat' AS (col array) FROM transform1_t1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 @@ -84,7 +84,7 @@ SELECT transform('0\0021\0022') USING 'cat' AS (col array) FROM transform1_ POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/transform_ppr1.q.out ql/src/test/results/clientpositive/tez/transform_ppr1.q.out index fe0e2c3..df068c8 100644 --- ql/src/test/results/clientpositive/tez/transform_ppr1.q.out +++ ql/src/test/results/clientpositive/tez/transform_ppr1.q.out @@ -93,7 +93,7 @@ TOK_QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/transform_ppr2.q.out ql/src/test/results/clientpositive/tez/transform_ppr2.q.out index f8445af..fc1e2fd 100644 --- ql/src/test/results/clientpositive/tez/transform_ppr2.q.out +++ ql/src/test/results/clientpositive/tez/transform_ppr2.q.out @@ -95,7 +95,7 @@ TOK_QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/union2.q.out ql/src/test/results/clientpositive/tez/union2.q.out index afacf89..b311671 100644 --- ql/src/test/results/clientpositive/tez/union2.q.out +++ ql/src/test/results/clientpositive/tez/union2.q.out @@ -12,7 +12,7 @@ explain POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/union3.q.out ql/src/test/results/clientpositive/tez/union3.q.out index 66512c6..f35f853 100644 --- ql/src/test/results/clientpositive/tez/union3.q.out +++ ql/src/test/results/clientpositive/tez/union3.q.out @@ -36,7 +36,7 @@ FROM ( POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/union5.q.out ql/src/test/results/clientpositive/tez/union5.q.out index b9bc5b2..78e18eb 100644 --- ql/src/test/results/clientpositive/tez/union5.q.out +++ ql/src/test/results/clientpositive/tez/union5.q.out @@ -14,7 +14,7 @@ explain POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/union7.q.out ql/src/test/results/clientpositive/tez/union7.q.out index d690091..bd0308b 100644 --- ql/src/test/results/clientpositive/tez/union7.q.out +++ ql/src/test/results/clientpositive/tez/union7.q.out @@ -14,7 +14,7 @@ explain POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/union8.q.out ql/src/test/results/clientpositive/tez/union8.q.out index 03061b9..9ae12a0 100644 --- ql/src/test/results/clientpositive/tez/union8.q.out +++ ql/src/test/results/clientpositive/tez/union8.q.out @@ -14,7 +14,7 @@ explain POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1 diff --git ql/src/test/results/clientpositive/tez/union9.q.out ql/src/test/results/clientpositive/tez/union9.q.out index 2b7f938..5280dc5 100644 --- ql/src/test/results/clientpositive/tez/union9.q.out +++ ql/src/test/results/clientpositive/tez/union9.q.out @@ -14,7 +14,7 @@ explain POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: Stage: Stage-1