Repository: hive Updated Branches: refs/heads/master f7c51b6ce -> af5c9d42b
HIVE-14346: Change the default value for hive.mapred.mode to null (Chao Sun, reviewed by Xuefu Zhang and Sergey Shelukhin) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/af5c9d42 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/af5c9d42 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/af5c9d42 Branch: refs/heads/master Commit: af5c9d42b975de52d2122d525b2dd9c4bcfb1b5d Parents: f7c51b6 Author: Chao Sun <sunc...@apache.org> Authored: Tue Aug 2 09:26:29 2016 -0700 Committer: Chao Sun <sunc...@apache.org> Committed: Tue Aug 2 09:26:29 2016 -0700 ---------------------------------------------------------------------- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java | 2 +- ql/src/test/queries/clientpositive/constant_prop_1.q | 1 + ql/src/test/queries/clientpositive/constprog3.q | 2 ++ ql/src/test/queries/clientpositive/cross_join_merge.q | 2 ++ ql/src/test/queries/clientpositive/join_view.q | 2 ++ ql/src/test/queries/clientpositive/mapjoin2.q | 1 + ql/src/test/queries/clientpositive/vector_include_no_sel.q | 3 ++- 7 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/af5c9d42/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 1b64c77..ee9c6db 100644 --- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -990,7 +990,7 @@ public class HiveConf extends Configuration { "Enabling strict large query checks disallows the following:\n" + " Cartesian product (cross join)."), @Deprecated - HIVEMAPREDMODE("hive.mapred.mode", "nonstrict", + HIVEMAPREDMODE("hive.mapred.mode", null, "Deprecated; use hive.strict.checks.* settings instead."), HIVEALIAS("hive.alias", "", ""), HIVEMAPSIDEAGGREGATE("hive.map.aggr", true, "Whether to use map-side aggregation in Hive Group By queries"), http://git-wip-us.apache.org/repos/asf/hive/blob/af5c9d42/ql/src/test/queries/clientpositive/constant_prop_1.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/constant_prop_1.q b/ql/src/test/queries/clientpositive/constant_prop_1.q index 9a0a17c..cfe0c30 100644 --- a/ql/src/test/queries/clientpositive/constant_prop_1.q +++ b/ql/src/test/queries/clientpositive/constant_prop_1.q @@ -1,4 +1,5 @@ set hive.cbo.enable=false; +set hive.mapred.mode=nonstrict; explain http://git-wip-us.apache.org/repos/asf/hive/blob/af5c9d42/ql/src/test/queries/clientpositive/constprog3.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/constprog3.q b/ql/src/test/queries/clientpositive/constprog3.q index 2911fe2..e80eb26 100644 --- a/ql/src/test/queries/clientpositive/constprog3.q +++ b/ql/src/test/queries/clientpositive/constprog3.q @@ -1,3 +1,5 @@ +set hive.mapred.mode=nonstrict; + create temporary table table1(id int, val int, val1 int, dimid int); create temporary table table3(id int, val int, val1 int); http://git-wip-us.apache.org/repos/asf/hive/blob/af5c9d42/ql/src/test/queries/clientpositive/cross_join_merge.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/cross_join_merge.q b/ql/src/test/queries/clientpositive/cross_join_merge.q index 50f5813..0e492f7 100644 --- a/ql/src/test/queries/clientpositive/cross_join_merge.q +++ b/ql/src/test/queries/clientpositive/cross_join_merge.q @@ -1,3 +1,5 @@ +set hive.mapred.mode=nonstrict; + explain select src1.key from src src1 join src src2 join src src3; http://git-wip-us.apache.org/repos/asf/hive/blob/af5c9d42/ql/src/test/queries/clientpositive/join_view.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/join_view.q b/ql/src/test/queries/clientpositive/join_view.q index 69c96be..880a506 100644 --- a/ql/src/test/queries/clientpositive/join_view.q +++ b/ql/src/test/queries/clientpositive/join_view.q @@ -1,3 +1,5 @@ +set hive.mapred.mode=nonstrict; + drop table invites; drop table invites2; create table invites (foo int, bar string) partitioned by (ds string); http://git-wip-us.apache.org/repos/asf/hive/blob/af5c9d42/ql/src/test/queries/clientpositive/mapjoin2.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/mapjoin2.q b/ql/src/test/queries/clientpositive/mapjoin2.q index 068ecbe..b132e49 100644 --- a/ql/src/test/queries/clientpositive/mapjoin2.q +++ b/ql/src/test/queries/clientpositive/mapjoin2.q @@ -1,3 +1,4 @@ +set hive.mapred.mode=nonstrict; set hive.auto.convert.join=true; create table tbl (n bigint, t string); http://git-wip-us.apache.org/repos/asf/hive/blob/af5c9d42/ql/src/test/queries/clientpositive/vector_include_no_sel.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vector_include_no_sel.q b/ql/src/test/queries/clientpositive/vector_include_no_sel.q index b78b149..03f676b 100644 --- a/ql/src/test/queries/clientpositive/vector_include_no_sel.q +++ b/ql/src/test/queries/clientpositive/vector_include_no_sel.q @@ -5,6 +5,7 @@ set hive.cbo.enable=false; SET hive.auto.convert.join=true; SET hive.auto.convert.join.noconditionaltask=true; SET hive.auto.convert.join.noconditionaltask.size=1000000000; +SET hive.mapred.mode=nonstrict; -- HIVE-13872 -- Looking for TableScan immediately followed by ReduceSink (no intervening SEL operator). @@ -75,4 +76,4 @@ where ((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk and customer_ select count(1) from customer_demographics,store_sales where ((customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk and customer_demographics.cd_marital_status = 'M') or - (customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk and customer_demographics.cd_marital_status = 'U')); \ No newline at end of file + (customer_demographics.cd_demo_sk = store_sales.ss_cdemo_sk and customer_demographics.cd_marital_status = 'U'));
