Repository: hive Updated Branches: refs/heads/master b38239165 -> fb7291ac4
HIVE-12812: Enable mapred.input.dir.recursive by default to support union with aggregate function (Chaoyu Tang and Alice Fan, reviewed by Naveen Gangam and Yongzhi Chen) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/fb7291ac Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/fb7291ac Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/fb7291ac Branch: refs/heads/master Commit: fb7291ac4e8686a0bf91eba5a945b8a8d1ea8b6d Parents: b382391 Author: Yongzhi Chen <ych...@apache.org> Authored: Thu Sep 27 12:58:10 2018 -0400 Committer: Yongzhi Chen <ych...@apache.org> Committed: Thu Sep 27 12:58:10 2018 -0400 ---------------------------------------------------------------------- .../apache/hadoop/hive/ql/parse/MapReduceCompiler.java | 13 +++++++++++++ .../queries/clientpositive/skewjoin_union_remove_1.q | 1 - .../queries/clientpositive/skewjoin_union_remove_2.q | 1 - ql/src/test/queries/clientpositive/union_remove_1.q | 1 - ql/src/test/queries/clientpositive/union_remove_10.q | 1 - ql/src/test/queries/clientpositive/union_remove_11.q | 1 - ql/src/test/queries/clientpositive/union_remove_12.q | 1 - ql/src/test/queries/clientpositive/union_remove_13.q | 1 - ql/src/test/queries/clientpositive/union_remove_14.q | 1 - ql/src/test/queries/clientpositive/union_remove_15.q | 1 - ql/src/test/queries/clientpositive/union_remove_16.q | 1 - ql/src/test/queries/clientpositive/union_remove_17.q | 1 - ql/src/test/queries/clientpositive/union_remove_18.q | 1 - ql/src/test/queries/clientpositive/union_remove_19.q | 1 - ql/src/test/queries/clientpositive/union_remove_2.q | 1 - ql/src/test/queries/clientpositive/union_remove_20.q | 1 - ql/src/test/queries/clientpositive/union_remove_21.q | 1 - ql/src/test/queries/clientpositive/union_remove_22.q | 1 - ql/src/test/queries/clientpositive/union_remove_23.q | 1 - ql/src/test/queries/clientpositive/union_remove_24.q | 1 - ql/src/test/queries/clientpositive/union_remove_25.q | 1 - ql/src/test/queries/clientpositive/union_remove_26.q | 2 -- ql/src/test/queries/clientpositive/union_remove_3.q | 1 - ql/src/test/queries/clientpositive/union_remove_4.q | 1 - ql/src/test/queries/clientpositive/union_remove_5.q | 1 - ql/src/test/queries/clientpositive/union_remove_6.q | 1 - .../test/queries/clientpositive/union_remove_6_subq.q | 1 - ql/src/test/queries/clientpositive/union_remove_7.q | 1 - ql/src/test/queries/clientpositive/union_remove_8.q | 1 - ql/src/test/queries/clientpositive/union_remove_9.q | 1 - ql/src/test/queries/clientpositive/union_remove_plan.q | 1 - 31 files changed, 13 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/java/org/apache/hadoop/hive/ql/parse/MapReduceCompiler.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/MapReduceCompiler.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/MapReduceCompiler.java index 9f4a201..302b350 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/MapReduceCompiler.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/MapReduceCompiler.java @@ -34,6 +34,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.PathFilter; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.ql.Context; +import org.apache.hadoop.hive.ql.QueryState; import org.apache.hadoop.hive.ql.exec.ConditionalTask; import org.apache.hadoop.hive.ql.exec.FileSinkOperator; import org.apache.hadoop.hive.ql.exec.MapJoinOperator; @@ -54,6 +55,7 @@ import org.apache.hadoop.hive.ql.lib.Node; import org.apache.hadoop.hive.ql.lib.NodeProcessor; import org.apache.hadoop.hive.ql.lib.Rule; import org.apache.hadoop.hive.ql.lib.RuleRegExp; +import org.apache.hadoop.hive.ql.metadata.Hive; import org.apache.hadoop.hive.ql.optimizer.GenMRFileSink1; import org.apache.hadoop.hive.ql.optimizer.GenMROperator; import org.apache.hadoop.hive.ql.optimizer.GenMRProcContext; @@ -70,6 +72,7 @@ import org.apache.hadoop.hive.ql.plan.MapWork; import org.apache.hadoop.hive.ql.plan.MapredWork; import org.apache.hadoop.hive.ql.plan.MoveWork; import org.apache.hadoop.hive.ql.plan.OperatorDesc; +import org.apache.hadoop.hive.ql.session.SessionState.LogHelper; import org.apache.hadoop.hive.shims.ShimLoader; public class MapReduceCompiler extends TaskCompiler { @@ -79,6 +82,16 @@ public class MapReduceCompiler extends TaskCompiler { public MapReduceCompiler() { } + @Override + public void init(QueryState queryState, LogHelper console, Hive db) { + super.init(queryState, console, db); + + //It is required the use of recursive input dirs when hive.optimize.union.remove = true + if(conf.getBoolVar(HiveConf.ConfVars.HIVE_OPTIMIZE_UNION_REMOVE)) { + conf.setBoolean("mapred.input.dir.recursive", true); + } + } + // loop over all the tasks recursively @Override protected void setInputFormat(Task<? extends Serializable> task) { http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q b/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q index 2db13f0..a661665 100644 --- a/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q +++ b/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q @@ -7,7 +7,6 @@ set hive.optimize.union.remove=true; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; set hive.merge.sparkfiles=false; -set mapred.input.dir.recursive=true; -- This is to test the union->selectstar->filesink and skewjoin optimization -- Union of 2 map-reduce subqueries is performed for the skew join http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q b/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q index 2a41e3a..5b09bc2 100644 --- a/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q +++ b/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q @@ -7,7 +7,6 @@ set hive.optimize.union.remove=true; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; set hive.merge.sparkfiles=false; -set mapred.input.dir.recursive=true; CREATE TABLE T1_n8(key STRING, val STRING) SKEWED BY (key) ON ((2), (8)) STORED AS TEXTFILE; http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_1.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_1.q b/ql/src/test/queries/clientpositive/union_remove_1.q index 7276804..01543f5 100644 --- a/ql/src/test/queries/clientpositive/union_remove_1.q +++ b/ql/src/test/queries/clientpositive/union_remove_1.q @@ -5,7 +5,6 @@ set hive.optimize.union.remove=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_10.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_10.q b/ql/src/test/queries/clientpositive/union_remove_10.q index dfd5d0a..3ae057f 100644 --- a/ql/src/test/queries/clientpositive/union_remove_10.q +++ b/ql/src/test/queries/clientpositive/union_remove_10.q @@ -6,7 +6,6 @@ set hive.merge.sparkfiles=true; set hive.merge.mapfiles=true; set hive.merge.mapredfiles=true; set hive.merge.smallfiles.avgsize=1; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_11.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_11.q b/ql/src/test/queries/clientpositive/union_remove_11.q index 6017336..a92d574 100644 --- a/ql/src/test/queries/clientpositive/union_remove_11.q +++ b/ql/src/test/queries/clientpositive/union_remove_11.q @@ -6,7 +6,6 @@ set hive.merge.sparkfiles=true; set hive.merge.mapfiles=true; set hive.merge.mapredfiles=true; set hive.merge.smallfiles.avgsize=1; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_12.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_12.q b/ql/src/test/queries/clientpositive/union_remove_12.q index 392c297..1352bc0 100644 --- a/ql/src/test/queries/clientpositive/union_remove_12.q +++ b/ql/src/test/queries/clientpositive/union_remove_12.q @@ -7,7 +7,6 @@ set hive.merge.sparkfiles=true; set hive.merge.mapfiles=true; set hive.merge.mapredfiles=true; set hive.merge.smallfiles.avgsize=1; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_13.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_13.q b/ql/src/test/queries/clientpositive/union_remove_13.q index 6f337ad..5bac272 100644 --- a/ql/src/test/queries/clientpositive/union_remove_13.q +++ b/ql/src/test/queries/clientpositive/union_remove_13.q @@ -7,7 +7,6 @@ set hive.merge.sparkfiles=true; set hive.merge.mapfiles=true; set hive.merge.mapredfiles=true; set hive.merge.smallfiles.avgsize=1; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_14.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_14.q b/ql/src/test/queries/clientpositive/union_remove_14.q index d98dbe5..64a5f23 100644 --- a/ql/src/test/queries/clientpositive/union_remove_14.q +++ b/ql/src/test/queries/clientpositive/union_remove_14.q @@ -7,7 +7,6 @@ set hive.merge.mapfiles=true; set hive.merge.mapredfiles=true; set hive.auto.convert.join=true; set hive.merge.smallfiles.avgsize=1; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_15.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_15.q b/ql/src/test/queries/clientpositive/union_remove_15.q index 9c0f3a3..effd590 100644 --- a/ql/src/test/queries/clientpositive/union_remove_15.q +++ b/ql/src/test/queries/clientpositive/union_remove_15.q @@ -8,7 +8,6 @@ set hive.merge.mapredfiles=false; set hive.exec.dynamic.partition.mode=nonstrict; set hive.exec.dynamic.partition=true; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_16.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_16.q b/ql/src/test/queries/clientpositive/union_remove_16.q index ec24cf0..3bdb0f3 100644 --- a/ql/src/test/queries/clientpositive/union_remove_16.q +++ b/ql/src/test/queries/clientpositive/union_remove_16.q @@ -6,7 +6,6 @@ set hive.merge.sparkfiles=true; set hive.merge.mapfiles=true; set hive.merge.mapredfiles=true; set hive.merge.smallfiles.avgsize=1; -set mapred.input.dir.recursive=true; set hive.exec.dynamic.partition.mode=nonstrict; set hive.exec.dynamic.partition=true; http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_17.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_17.q b/ql/src/test/queries/clientpositive/union_remove_17.q index 92fa2e9..16649c1 100644 --- a/ql/src/test/queries/clientpositive/union_remove_17.q +++ b/ql/src/test/queries/clientpositive/union_remove_17.q @@ -8,7 +8,6 @@ set hive.merge.mapredfiles=false; set hive.exec.dynamic.partition.mode=nonstrict; set hive.exec.dynamic.partition=true; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_18.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_18.q b/ql/src/test/queries/clientpositive/union_remove_18.q index 8259198..db8d99f 100644 --- a/ql/src/test/queries/clientpositive/union_remove_18.q +++ b/ql/src/test/queries/clientpositive/union_remove_18.q @@ -8,7 +8,6 @@ set hive.merge.mapredfiles=false; set hive.exec.dynamic.partition.mode=nonstrict; set hive.exec.dynamic.partition=true; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_19.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_19.q b/ql/src/test/queries/clientpositive/union_remove_19.q index 675f01b..1466c98 100644 --- a/ql/src/test/queries/clientpositive/union_remove_19.q +++ b/ql/src/test/queries/clientpositive/union_remove_19.q @@ -5,7 +5,6 @@ set hive.optimize.union.remove=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_2.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_2.q b/ql/src/test/queries/clientpositive/union_remove_2.q index e5fe0bf..7337a4c 100644 --- a/ql/src/test/queries/clientpositive/union_remove_2.q +++ b/ql/src/test/queries/clientpositive/union_remove_2.q @@ -5,7 +5,6 @@ set hive.optimize.union.remove=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_20.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_20.q b/ql/src/test/queries/clientpositive/union_remove_20.q index 79a9059..a84bce6 100644 --- a/ql/src/test/queries/clientpositive/union_remove_20.q +++ b/ql/src/test/queries/clientpositive/union_remove_20.q @@ -5,7 +5,6 @@ set hive.optimize.union.remove=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_21.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_21.q b/ql/src/test/queries/clientpositive/union_remove_21.q index 088a80e..4581445 100644 --- a/ql/src/test/queries/clientpositive/union_remove_21.q +++ b/ql/src/test/queries/clientpositive/union_remove_21.q @@ -5,7 +5,6 @@ set hive.optimize.union.remove=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_22.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_22.q b/ql/src/test/queries/clientpositive/union_remove_22.q index ef3ba51..1e7fa44 100644 --- a/ql/src/test/queries/clientpositive/union_remove_22.q +++ b/ql/src/test/queries/clientpositive/union_remove_22.q @@ -5,7 +5,6 @@ set hive.optimize.union.remove=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_23.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_23.q b/ql/src/test/queries/clientpositive/union_remove_23.q index 3145ac0..ce807e5 100644 --- a/ql/src/test/queries/clientpositive/union_remove_23.q +++ b/ql/src/test/queries/clientpositive/union_remove_23.q @@ -5,7 +5,6 @@ set hive.optimize.union.remove=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_24.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_24.q b/ql/src/test/queries/clientpositive/union_remove_24.q index 6c34f56..15f4ccd 100644 --- a/ql/src/test/queries/clientpositive/union_remove_24.q +++ b/ql/src/test/queries/clientpositive/union_remove_24.q @@ -5,7 +5,6 @@ set hive.optimize.union.remove=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_25.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_25.q b/ql/src/test/queries/clientpositive/union_remove_25.q index b186c2c..df9ab7e 100644 --- a/ql/src/test/queries/clientpositive/union_remove_25.q +++ b/ql/src/test/queries/clientpositive/union_remove_25.q @@ -7,7 +7,6 @@ set hive.exec.dynamic.partition.mode=nonstrict; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_26.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_26.q b/ql/src/test/queries/clientpositive/union_remove_26.q index 6f88918..73953c6 100644 --- a/ql/src/test/queries/clientpositive/union_remove_26.q +++ b/ql/src/test/queries/clientpositive/union_remove_26.q @@ -21,7 +21,6 @@ insert into inputTbl3 select * from inputSrcTbl3; set hive.compute.query.using.stats=true; set hive.optimize.union.remove=true; -set mapred.input.dir.recursive=true; --- union remove optimization effects, stats optimization does not though it is on since inputTbl2 column stats is not available analyze table inputTbl1_n6 compute statistics for columns; @@ -76,7 +75,6 @@ select count(*) from ( set hive.compute.query.using.stats=false; set hive.optimize.union.remove=true; -set mapred.input.dir.recursive=true; explain SELECT count(1) as rowcnt, min(val) as ms, max(val) as mx from inputTbl1_n6 http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_3.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_3.q b/ql/src/test/queries/clientpositive/union_remove_3.q index 490be99..b60b01a 100644 --- a/ql/src/test/queries/clientpositive/union_remove_3.q +++ b/ql/src/test/queries/clientpositive/union_remove_3.q @@ -5,7 +5,6 @@ set hive.optimize.union.remove=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->remove->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_4.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_4.q b/ql/src/test/queries/clientpositive/union_remove_4.q index adc45e7..d4da8a5 100644 --- a/ql/src/test/queries/clientpositive/union_remove_4.q +++ b/ql/src/test/queries/clientpositive/union_remove_4.q @@ -5,7 +5,6 @@ set hive.optimize.union.remove=true; set hive.merge.sparkfiles=true; set hive.merge.mapfiles=true; set hive.merge.mapredfiles=true; -set mapred.input.dir.recursive=true; set hive.merge.smallfiles.avgsize=1; -- SORT_QUERY_RESULTS http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_5.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_5.q b/ql/src/test/queries/clientpositive/union_remove_5.q index 05f7c32..56f605d 100644 --- a/ql/src/test/queries/clientpositive/union_remove_5.q +++ b/ql/src/test/queries/clientpositive/union_remove_5.q @@ -6,7 +6,6 @@ set hive.merge.sparkfiles=true; set hive.merge.mapfiles=true; set hive.merge.mapredfiles=true; set hive.merge.smallfiles.avgsize=1; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_6.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_6.q b/ql/src/test/queries/clientpositive/union_remove_6.q index 9dd5fb3..e975641 100644 --- a/ql/src/test/queries/clientpositive/union_remove_6.q +++ b/ql/src/test/queries/clientpositive/union_remove_6.q @@ -5,7 +5,6 @@ set hive.optimize.union.remove=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_6_subq.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_6_subq.q b/ql/src/test/queries/clientpositive/union_remove_6_subq.q index 3ae5d95..ac36e5a 100644 --- a/ql/src/test/queries/clientpositive/union_remove_6_subq.q +++ b/ql/src/test/queries/clientpositive/union_remove_6_subq.q @@ -5,7 +5,6 @@ set hive.optimize.union.remove=true; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_7.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_7.q b/ql/src/test/queries/clientpositive/union_remove_7.q index caca645..7cb2847 100644 --- a/ql/src/test/queries/clientpositive/union_remove_7.q +++ b/ql/src/test/queries/clientpositive/union_remove_7.q @@ -5,7 +5,6 @@ set hive.optimize.union.remove=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_8.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_8.q b/ql/src/test/queries/clientpositive/union_remove_8.q index 397460e..2a6005b 100644 --- a/ql/src/test/queries/clientpositive/union_remove_8.q +++ b/ql/src/test/queries/clientpositive/union_remove_8.q @@ -5,7 +5,6 @@ set hive.optimize.union.remove=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_9.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_9.q b/ql/src/test/queries/clientpositive/union_remove_9.q index 3b24b95..37946eb 100644 --- a/ql/src/test/queries/clientpositive/union_remove_9.q +++ b/ql/src/test/queries/clientpositive/union_remove_9.q @@ -6,7 +6,6 @@ set hive.merge.sparkfiles=true; set hive.merge.mapfiles=true; set hive.merge.mapredfiles=true; set hive.merge.smallfiles.avgsize=1; -set mapred.input.dir.recursive=true; -- SORT_QUERY_RESULTS -- This is to test the union->selectstar->filesink optimization http://git-wip-us.apache.org/repos/asf/hive/blob/fb7291ac/ql/src/test/queries/clientpositive/union_remove_plan.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_plan.q b/ql/src/test/queries/clientpositive/union_remove_plan.q index e4ad41f..fbc83bc 100644 --- a/ql/src/test/queries/clientpositive/union_remove_plan.q +++ b/ql/src/test/queries/clientpositive/union_remove_plan.q @@ -4,7 +4,6 @@ create table if not exists test_table(column1 string, column2 int); insert into test_table values('a',1),('b',2); set hive.optimize.union.remove=true; -set mapred.input.dir.recursive=true; explain select column1 from test_table group by column1
