You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2015/12/03 22:41:51 UTC
[2/8] hive git commit: HIVE-12413 : Default mode for hive.mapred.mode
should be strict (Ashutosh Chauhan via Prasanth J)
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt4.q b/ql/src/test/queries/clientpositive/skewjoinopt4.q
index 7d5b335..b66a02a 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt4.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.optimize.skewjoin.compiletime = true;
CREATE TABLE T1(key STRING, val STRING)
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt5.q b/ql/src/test/queries/clientpositive/skewjoinopt5.q
index b19b7bc..3024903 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt5.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.optimize.skewjoin.compiletime = true;
CREATE TABLE T1(key STRING, val STRING)
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt6.q b/ql/src/test/queries/clientpositive/skewjoinopt6.q
index 134bf03..152fbe7 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt6.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.optimize.skewjoin.compiletime = true;
CREATE TABLE T1(key STRING, val STRING)
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt7.q b/ql/src/test/queries/clientpositive/skewjoinopt7.q
index 3dd53a3..ba559ca 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt7.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt7.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.optimize.skewjoin.compiletime = true;
CREATE TABLE T1(key STRING, val STRING)
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt8.q b/ql/src/test/queries/clientpositive/skewjoinopt8.q
index 917db65..6f9807d 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt8.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.optimize.skewjoin.compiletime = true;
CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/skewjoinopt9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt9.q b/ql/src/test/queries/clientpositive/skewjoinopt9.q
index 10cdca4..626b1b2 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt9.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt9.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.optimize.skewjoin.compiletime = true;
CREATE TABLE T1(key STRING, val STRING)
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/smb_join_partition_key.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_join_partition_key.q b/ql/src/test/queries/clientpositive/smb_join_partition_key.q
index 49e2d2f..21245cd 100644
--- a/ql/src/test/queries/clientpositive/smb_join_partition_key.q
+++ b/ql/src/test/queries/clientpositive/smb_join_partition_key.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
SET hive.execution.engine=mr;
SET hive.enforce.sortmergebucketmapjoin=false;
SET hive.auto.convert.sortmerge.join=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/smb_mapjoin_11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_11.q b/ql/src/test/queries/clientpositive/smb_mapjoin_11.q
index 97e3b08..ccb97b3 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_11.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_11.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.optimize.bucketmapjoin = true;
set hive.optimize.bucketmapjoin.sortedmerge = true;
set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/smb_mapjoin_14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_14.q b/ql/src/test/queries/clientpositive/smb_mapjoin_14.q
index b8b939c..f0b0e6e 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_14.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_14.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
set hive.exec.reducers.max = 1;
CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/smb_mapjoin_17.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_17.q b/ql/src/test/queries/clientpositive/smb_mapjoin_17.q
index 276bfcc..3374693 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_17.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_17.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.optimize.bucketmapjoin = true;
set hive.optimize.bucketmapjoin.sortedmerge = true;
set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/smb_mapjoin_25.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_25.q b/ql/src/test/queries/clientpositive/smb_mapjoin_25.q
index 498d337..834d44c 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_25.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_25.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/smb_mapjoin_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_6.q b/ql/src/test/queries/clientpositive/smb_mapjoin_6.q
index b50c494..ab95b46 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_6.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_6.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
set hive.exec.reducers.max = 1;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/smb_mapjoin_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_7.q b/ql/src/test/queries/clientpositive/smb_mapjoin_7.q
index d192036..bd859b7 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_7.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_7.q
@@ -1,5 +1,4 @@
-;
-
+set hive.mapred.mode=nonstrict;
set hive.exec.reducers.max = 1;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/stats1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats1.q b/ql/src/test/queries/clientpositive/stats1.q
index dd35608..e5133c8 100644
--- a/ql/src/test/queries/clientpositive/stats1.q
+++ b/ql/src/test/queries/clientpositive/stats1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set datanucleus.cache.collections=false;
set hive.stats.autogather=true;
set hive.merge.mapfiles=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/stats10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats10.q b/ql/src/test/queries/clientpositive/stats10.q
index 2ad6a4f..1732f36 100644
--- a/ql/src/test/queries/clientpositive/stats10.q
+++ b/ql/src/test/queries/clientpositive/stats10.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set datanucleus.cache.collections=false;
set hive.stats.autogather=true;
;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/stats3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats3.q b/ql/src/test/queries/clientpositive/stats3.q
index fd7e0ea..93162de 100644
--- a/ql/src/test/queries/clientpositive/stats3.q
+++ b/ql/src/test/queries/clientpositive/stats3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set datanucleus.cache.collections=false;
set hive.stats.autogather=true;
drop table hive_test_src;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/stats_only_null.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_only_null.q b/ql/src/test/queries/clientpositive/stats_only_null.q
index 29ff5f8..7fd22c5 100644
--- a/ql/src/test/queries/clientpositive/stats_only_null.q
+++ b/ql/src/test/queries/clientpositive/stats_only_null.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.stats.dbclass=fs;
set hive.compute.query.using.stats=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/stats_ppr_all.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_ppr_all.q b/ql/src/test/queries/clientpositive/stats_ppr_all.q
index b611e83..12a2012 100644
--- a/ql/src/test/queries/clientpositive/stats_ppr_all.q
+++ b/ql/src/test/queries/clientpositive/stats_ppr_all.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.fetch.column.stats=true;
drop table ss;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/storage_format_descriptor.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/storage_format_descriptor.q b/ql/src/test/queries/clientpositive/storage_format_descriptor.q
index 548890f..2e4d73d 100644
--- a/ql/src/test/queries/clientpositive/storage_format_descriptor.q
+++ b/ql/src/test/queries/clientpositive/storage_format_descriptor.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
DROP TABLE stored_as_custom_text_serde;
CREATE TABLE stored_as_custom_text_serde(key string, value string) STORED AS customtextserde;
LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE stored_as_custom_text_serde;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/str_to_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/str_to_map.q b/ql/src/test/queries/clientpositive/str_to_map.q
index cc5ecf2..f2993b1 100644
--- a/ql/src/test/queries/clientpositive/str_to_map.q
+++ b/ql/src/test/queries/clientpositive/str_to_map.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.fetch.task.conversion=more;
-- JAVA_VERSION_SPECIFIC_OUTPUT
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subq.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subq.q b/ql/src/test/queries/clientpositive/subq.q
index 14fa321..678620f 100644
--- a/ql/src/test/queries/clientpositive/subq.q
+++ b/ql/src/test/queries/clientpositive/subq.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
EXPLAIN
FROM (
FROM src select src.* WHERE src.key < 100
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subq2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subq2.q b/ql/src/test/queries/clientpositive/subq2.q
index 7e174da..98e663b 100644
--- a/ql/src/test/queries/clientpositive/subq2.q
+++ b/ql/src/test/queries/clientpositive/subq2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
EXPLAIN
SELECT a.k, a.c
FROM (SELECT b.key as k, count(1) as c FROM src b GROUP BY b.key) a
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subq_where_serialization.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subq_where_serialization.q b/ql/src/test/queries/clientpositive/subq_where_serialization.q
index 1d53982..91290c4 100644
--- a/ql/src/test/queries/clientpositive/subq_where_serialization.q
+++ b/ql/src/test/queries/clientpositive/subq_where_serialization.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.auto.convert.join=true;
set hive.auto.convert.join.noconditionaltask.size=10000000;
explain select src.key from src where src.key in ( select distinct key from src);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_alias.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_alias.q b/ql/src/test/queries/clientpositive/subquery_alias.q
index ffc33dc..fcdb64c 100644
--- a/ql/src/test/queries/clientpositive/subquery_alias.q
+++ b/ql/src/test/queries/clientpositive/subquery_alias.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
EXPLAIN
FROM (
FROM src select src.* WHERE src.key < 100
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_exists.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_exists.q b/ql/src/test/queries/clientpositive/subquery_exists.q
index 720e360..dfae49d 100644
--- a/ql/src/test/queries/clientpositive/subquery_exists.q
+++ b/ql/src/test/queries/clientpositive/subquery_exists.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_exists_having.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_exists_having.q b/ql/src/test/queries/clientpositive/subquery_exists_having.q
index 39d2d17..878a0cb 100644
--- a/ql/src/test/queries/clientpositive/subquery_exists_having.q
+++ b/ql/src/test/queries/clientpositive/subquery_exists_having.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.optimize.correlation=false;
-- no agg, corr
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_in.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_in.q b/ql/src/test/queries/clientpositive/subquery_in.q
index e81872f..c01ae70 100644
--- a/ql/src/test/queries/clientpositive/subquery_in.q
+++ b/ql/src/test/queries/clientpositive/subquery_in.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_in_having.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_in_having.q b/ql/src/test/queries/clientpositive/subquery_in_having.q
index af87eb4..2433556 100644
--- a/ql/src/test/queries/clientpositive/subquery_in_having.q
+++ b/ql/src/test/queries/clientpositive/subquery_in_having.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
-- data setup
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_multiinsert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_multiinsert.q b/ql/src/test/queries/clientpositive/subquery_multiinsert.q
index 06763f0..bea2e13 100644
--- a/ql/src/test/queries/clientpositive/subquery_multiinsert.q
+++ b/ql/src/test/queries/clientpositive/subquery_multiinsert.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecutePrinter,org.apache.hadoop.hive.ql.hooks.PrintCompletedTasksHook;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_notexists.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_notexists.q b/ql/src/test/queries/clientpositive/subquery_notexists.q
index 43a801f..2d7e9ce 100644
--- a/ql/src/test/queries/clientpositive/subquery_notexists.q
+++ b/ql/src/test/queries/clientpositive/subquery_notexists.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- no agg, corr
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_notexists_having.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_notexists_having.q b/ql/src/test/queries/clientpositive/subquery_notexists_having.q
index 7205d17..24b0a66 100644
--- a/ql/src/test/queries/clientpositive/subquery_notexists_having.q
+++ b/ql/src/test/queries/clientpositive/subquery_notexists_having.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- no agg, corr
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_notin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_notin.q b/ql/src/test/queries/clientpositive/subquery_notin.q
index c75e082..3f4fb7f 100644
--- a/ql/src/test/queries/clientpositive/subquery_notin.q
+++ b/ql/src/test/queries/clientpositive/subquery_notin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- non agg, non corr
explain
select *
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_notin_having.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_notin_having.q b/ql/src/test/queries/clientpositive/subquery_notin_having.q
index 1494d1e..8b2914d 100644
--- a/ql/src/test/queries/clientpositive/subquery_notin_having.q
+++ b/ql/src/test/queries/clientpositive/subquery_notin_having.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- non agg, non corr
-- JAVA_VERSION_SPECIFIC_OUTPUT
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_unqual_corr_expr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_unqual_corr_expr.q b/ql/src/test/queries/clientpositive/subquery_unqual_corr_expr.q
index 1d766a1..78a8b20 100644
--- a/ql/src/test/queries/clientpositive/subquery_unqual_corr_expr.q
+++ b/ql/src/test/queries/clientpositive/subquery_unqual_corr_expr.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
explain
select * from src tablesample (10 rows) where lower(key) in (select key from src);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_unqualcolumnrefs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_unqualcolumnrefs.q b/ql/src/test/queries/clientpositive/subquery_unqualcolumnrefs.q
index d2b4c36..bdfa648 100644
--- a/ql/src/test/queries/clientpositive/subquery_unqualcolumnrefs.q
+++ b/ql/src/test/queries/clientpositive/subquery_unqualcolumnrefs.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table src11 (key1 string, value1 string);
create table part2(
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/subquery_views.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_views.q b/ql/src/test/queries/clientpositive/subquery_views.q
index e646310..87c055b 100644
--- a/ql/src/test/queries/clientpositive/subquery_views.q
+++ b/ql/src/test/queries/clientpositive/subquery_views.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
-- exists test
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/sum_expr_with_order.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sum_expr_with_order.q b/ql/src/test/queries/clientpositive/sum_expr_with_order.q
index 4de9837..d3e9ea5 100644
--- a/ql/src/test/queries/clientpositive/sum_expr_with_order.q
+++ b/ql/src/test/queries/clientpositive/sum_expr_with_order.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
select
cast(sum(key)*100 as decimal(15,3)) as c1
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/symlink_text_input_format.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/symlink_text_input_format.q b/ql/src/test/queries/clientpositive/symlink_text_input_format.q
index d633b97..521a617 100644
--- a/ql/src/test/queries/clientpositive/symlink_text_input_format.q
+++ b/ql/src/test/queries/clientpositive/symlink_text_input_format.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
DROP TABLE IF EXISTS symlink_text_input_format;
EXPLAIN
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/table_access_keys_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/table_access_keys_stats.q b/ql/src/test/queries/clientpositive/table_access_keys_stats.q
index 7bd0422..2339121 100644
--- a/ql/src/test/queries/clientpositive/table_access_keys_stats.q
+++ b/ql/src/test/queries/clientpositive/table_access_keys_stats.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
SET hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.CheckTableAccessHook;
SET hive.stats.collect.tablekeys=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/table_nonprintable.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/table_nonprintable.q b/ql/src/test/queries/clientpositive/table_nonprintable.q
index 5ae228e..56ede0a 100644
--- a/ql/src/test/queries/clientpositive/table_nonprintable.q
+++ b/ql/src/test/queries/clientpositive/table_nonprintable.q
@@ -1,5 +1,5 @@
set hive.msck.path.validation=skip;
-
+set hive.mapred.mode=nonstrict;
dfs ${system:test.dfs.mkdir} hdfs:///tmp/temp_table_external/day=¢Bar;
dfs -copyFromLocal ../../data/files/in1.txt hdfs:///tmp/temp_table_external/day=¢Bar;
dfs -ls hdfs:///tmp/temp_table_external/day=¢Bar;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tablename_with_select.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tablename_with_select.q b/ql/src/test/queries/clientpositive/tablename_with_select.q
index c48231b..e4aee3c 100644
--- a/ql/src/test/queries/clientpositive/tablename_with_select.q
+++ b/ql/src/test/queries/clientpositive/tablename_with_select.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
CREATE TABLE tmp_select(a INT, b STRING);
DESCRIBE tmp_select;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/temp_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/temp_table.q b/ql/src/test/queries/clientpositive/temp_table.q
index 65f3eb4..f820d67 100644
--- a/ql/src/test/queries/clientpositive/temp_table.q
+++ b/ql/src/test/queries/clientpositive/temp_table.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
EXPLAIN CREATE TEMPORARY TABLE foo AS SELECT * FROM src WHERE key % 2 = 0;
CREATE TEMPORARY TABLE foo AS SELECT * FROM src WHERE key % 2 = 0;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/temp_table_join1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/temp_table_join1.q b/ql/src/test/queries/clientpositive/temp_table_join1.q
index e1b7e15..e77d228 100644
--- a/ql/src/test/queries/clientpositive/temp_table_join1.q
+++ b/ql/src/test/queries/clientpositive/temp_table_join1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE src_nontemp AS SELECT * FROM src limit 10;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_bmj_schema_evolution.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_bmj_schema_evolution.q b/ql/src/test/queries/clientpositive/tez_bmj_schema_evolution.q
index 631b78d..a286aed 100644
--- a/ql/src/test/queries/clientpositive/tez_bmj_schema_evolution.q
+++ b/ql/src/test/queries/clientpositive/tez_bmj_schema_evolution.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_dml.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_dml.q b/ql/src/test/queries/clientpositive/tez_dml.q
index 10c8854..816da5d 100644
--- a/ql/src/test/queries/clientpositive/tez_dml.q
+++ b/ql/src/test/queries/clientpositive/tez_dml.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.exec.dynamic.partition.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q
index e3325c4..fc0edec 100644
--- a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q
+++ b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.auto.convert.join=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q
index af4e2b8..2c36189 100644
--- a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q
+++ b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.auto.convert.join=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q
index 1994b40..cecbbd7 100644
--- a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q
+++ b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q
@@ -4,7 +4,7 @@ set hive.optimize.limitjointranspose.reductiontuples=100;
set hive.explain.user=false;
set hive.auto.convert.join=false;
set hive.optimize.dynamic.partition.hashjoin=false;
-
+set hive.mapred.mode=nonstrict;
explain
select a.*
from alltypesorc a left outer join src b
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_fsstat.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_fsstat.q b/ql/src/test/queries/clientpositive/tez_fsstat.q
index 35d1f58..c7851a1 100644
--- a/ql/src/test/queries/clientpositive/tez_fsstat.q
+++ b/ql/src/test/queries/clientpositive/tez_fsstat.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.execution.engine=tez;
CREATE TABLE tab_part (key int, value string) PARTITIONED BY(ds STRING) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
CREATE TABLE t1 (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_join.q b/ql/src/test/queries/clientpositive/tez_join.q
index d590959..107080d 100644
--- a/ql/src/test/queries/clientpositive/tez_join.q
+++ b/ql/src/test/queries/clientpositive/tez_join.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.auto.convert.sortmerge.join = true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_join_hash.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_join_hash.q b/ql/src/test/queries/clientpositive/tez_join_hash.q
index 09a1d8b..f2808b8 100644
--- a/ql/src/test/queries/clientpositive/tez_join_hash.q
+++ b/ql/src/test/queries/clientpositive/tez_join_hash.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_join_result_complex.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_join_result_complex.q b/ql/src/test/queries/clientpositive/tez_join_result_complex.q
index 5bc9151..42c5506 100644
--- a/ql/src/test/queries/clientpositive/tez_join_result_complex.q
+++ b/ql/src/test/queries/clientpositive/tez_join_result_complex.q
@@ -2,7 +2,7 @@ SET hive.auto.convert.join=true;
SET hive.auto.convert.join.noconditionaltask=true;
SET hive.auto.convert.join.noconditionaltask.size=1000000000;
set hive.mapjoin.optimized.hashtable=true;
-
+set hive.mapred.mode=nonstrict;
create table service_request_clean(
cnctevn_id string ,
svcrqst_id string ,
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_join_tests.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_join_tests.q b/ql/src/test/queries/clientpositive/tez_join_tests.q
index ff42f13..9a62805 100644
--- a/ql/src/test/queries/clientpositive/tez_join_tests.q
+++ b/ql/src/test/queries/clientpositive/tez_join_tests.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_joins_explain.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_joins_explain.q b/ql/src/test/queries/clientpositive/tez_joins_explain.q
index 3187e79..5f26ee2 100644
--- a/ql/src/test/queries/clientpositive/tez_joins_explain.q
+++ b/ql/src/test/queries/clientpositive/tez_joins_explain.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
-- SORT_QUERY_RESULTS
explain
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_schema_evolution.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_schema_evolution.q b/ql/src/test/queries/clientpositive/tez_schema_evolution.q
index 632878a..d855cd2 100644
--- a/ql/src/test/queries/clientpositive/tez_schema_evolution.q
+++ b/ql/src/test/queries/clientpositive/tez_schema_evolution.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
create table test (key int, value string) partitioned by (p int) stored as textfile;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_self_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_self_join.q b/ql/src/test/queries/clientpositive/tez_self_join.q
index 093491d..bde56bd 100644
--- a/ql/src/test/queries/clientpositive/tez_self_join.q
+++ b/ql/src/test/queries/clientpositive/tez_self_join.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
drop table if exists tez_self_join1;
drop table if exists tez_self_join2;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_smb_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_smb_1.q b/ql/src/test/queries/clientpositive/tez_smb_1.q
index b8147b8..089ffe3 100644
--- a/ql/src/test/queries/clientpositive/tez_smb_1.q
+++ b/ql/src/test/queries/clientpositive/tez_smb_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.auto.convert.join=true;
set hive.join.emit.interval=2;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_smb_empty.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_smb_empty.q b/ql/src/test/queries/clientpositive/tez_smb_empty.q
index 67acbcc..4661ada 100644
--- a/ql/src/test/queries/clientpositive/tez_smb_empty.q
+++ b/ql/src/test/queries/clientpositive/tez_smb_empty.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.mapjoin.hybridgrace.hashtable=false;
set hive.join.emit.interval=2;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_smb_main.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_smb_main.q b/ql/src/test/queries/clientpositive/tez_smb_main.q
index 44bb1d8..1890aa7 100644
--- a/ql/src/test/queries/clientpositive/tez_smb_main.q
+++ b/ql/src/test/queries/clientpositive/tez_smb_main.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.join.emit.interval=2;
explain
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_union.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_union.q b/ql/src/test/queries/clientpositive/tez_union.q
index 2211f77..c49c96d 100644
--- a/ql/src/test/queries/clientpositive/tez_union.q
+++ b/ql/src/test/queries/clientpositive/tez_union.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.auto.convert.join=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q b/ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q
index e022d81..782fc1e 100644
--- a/ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q
+++ b/ql/src/test/queries/clientpositive/tez_union_dynamic_partition.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
create table dummy(i int);
insert into table dummy values (1);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q b/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q
index 65fee16..22c5f9d 100644
--- a/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q
+++ b/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.auto.convert.join=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_2.q b/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_2.q
index 606f455..e3d1830 100644
--- a/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_2.q
+++ b/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.auto.convert.join=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/timestamp_lazy.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/timestamp_lazy.q b/ql/src/test/queries/clientpositive/timestamp_lazy.q
index e9a0cfa..e72d82e 100644
--- a/ql/src/test/queries/clientpositive/timestamp_lazy.q
+++ b/ql/src/test/queries/clientpositive/timestamp_lazy.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
drop table timestamp_lazy;
create table timestamp_lazy (t timestamp, key string, value string);
insert overwrite table timestamp_lazy select cast('2011-01-01 01:01:01' as timestamp), key, value from src tablesample (5 rows);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/topn.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/topn.q b/ql/src/test/queries/clientpositive/topn.q
index 4821b5a..509a7ab 100644
--- a/ql/src/test/queries/clientpositive/topn.q
+++ b/ql/src/test/queries/clientpositive/topn.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
CREATE TABLE `sample_07` ( `code` string , `description` string , `total_emp` int , `salary` int ) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS TextFile;
set hive.limit.pushdown.memory.usage=0.9999999;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/transform_ppr1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/transform_ppr1.q b/ql/src/test/queries/clientpositive/transform_ppr1.q
index 5156aba..5d0a48b 100644
--- a/ql/src/test/queries/clientpositive/transform_ppr1.q
+++ b/ql/src/test/queries/clientpositive/transform_ppr1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.optimize.ppd=true;
set hive.entity.capture.transform=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/truncate_column.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/truncate_column.q b/ql/src/test/queries/clientpositive/truncate_column.q
index 0bfb23e..4cfa180 100644
--- a/ql/src/test/queries/clientpositive/truncate_column.q
+++ b/ql/src/test/queries/clientpositive/truncate_column.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- Tests truncating column(s) from a table, also tests that stats are updated
CREATE TABLE test_tab (key STRING, value STRING)
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/truncate_column_buckets.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/truncate_column_buckets.q b/ql/src/test/queries/clientpositive/truncate_column_buckets.q
index 4375843..1cda1bf 100644
--- a/ql/src/test/queries/clientpositive/truncate_column_buckets.q
+++ b/ql/src/test/queries/clientpositive/truncate_column_buckets.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- Tests truncating columns from a bucketed table, table should remain bucketed
CREATE TABLE test_tab (key STRING, value STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS RCFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q b/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q
index 4067c5f..476120a 100644
--- a/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q
+++ b/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/truncate_column_merge.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/truncate_column_merge.q b/ql/src/test/queries/clientpositive/truncate_column_merge.q
index 7a59efc..c11b7f6 100644
--- a/ql/src/test/queries/clientpositive/truncate_column_merge.q
+++ b/ql/src/test/queries/clientpositive/truncate_column_merge.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- Tests truncating a column from a table with multiple files, then merging those files
CREATE TABLE test_tab (key STRING, value STRING) STORED AS RCFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/type_widening.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/type_widening.q b/ql/src/test/queries/clientpositive/type_widening.q
index b18c014..b504cf9 100644
--- a/ql/src/test/queries/clientpositive/type_widening.q
+++ b/ql/src/test/queries/clientpositive/type_widening.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.fetch.task.conversion=more;
-- Check for int, bigint automatic type widening conversions in UDFs, UNIONS
EXPLAIN SELECT COALESCE(0, 9223372036854775807) FROM src LIMIT 1;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udaf_corr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udaf_corr.q b/ql/src/test/queries/clientpositive/udaf_corr.q
index a2edec4..5e9840e 100644
--- a/ql/src/test/queries/clientpositive/udaf_corr.q
+++ b/ql/src/test/queries/clientpositive/udaf_corr.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
DROP TABLE covar_tab;
CREATE TABLE covar_tab (a INT, b INT, c INT)
ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t'
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udaf_covar_pop.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udaf_covar_pop.q b/ql/src/test/queries/clientpositive/udaf_covar_pop.q
index e5879d4..4408107 100644
--- a/ql/src/test/queries/clientpositive/udaf_covar_pop.q
+++ b/ql/src/test/queries/clientpositive/udaf_covar_pop.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
DROP TABLE covar_tab;
CREATE TABLE covar_tab (a INT, b INT, c INT)
ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t'
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udaf_covar_samp.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udaf_covar_samp.q b/ql/src/test/queries/clientpositive/udaf_covar_samp.q
index 61f951a..9caf421 100644
--- a/ql/src/test/queries/clientpositive/udaf_covar_samp.q
+++ b/ql/src/test/queries/clientpositive/udaf_covar_samp.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
DROP TABLE covar_tab;
CREATE TABLE covar_tab (a INT, b INT, c INT)
ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t'
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q b/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q
index 3685b1e..aa4a4ce 100644
--- a/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q
+++ b/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23)
-- 0.23 changed input order of data in reducer task, which affects result of percentile_approx
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf1.q b/ql/src/test/queries/clientpositive/udf1.q
index 2292c3f..9df913d 100644
--- a/ql/src/test/queries/clientpositive/udf1.q
+++ b/ql/src/test/queries/clientpositive/udf1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
CREATE TABLE dest1(c1 STRING, c2 STRING, c3 STRING, c4 STRING,
c5 STRING, c6 STRING, c7 STRING, c8 STRING,
c9 STRING, c10 STRING, c11 STRING, c12 STRING, c13 STRING,
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf3.q b/ql/src/test/queries/clientpositive/udf3.q
index dcffeea..4e0d339 100644
--- a/ql/src/test/queries/clientpositive/udf3.q
+++ b/ql/src/test/queries/clientpositive/udf3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
CREATE TABLE dest1(c1 STRING, c2 STRING, c3 STRING, c4 STRING, c5 STRING) STORED AS TEXTFILE;
EXPLAIN
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf9.q b/ql/src/test/queries/clientpositive/udf9.q
index 3b179b3..6e76f52 100644
--- a/ql/src/test/queries/clientpositive/udf9.q
+++ b/ql/src/test/queries/clientpositive/udf9.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
EXPLAIN
SELECT DATEDIFF('2008-12-31', '2009-01-01'), DATEDIFF('2008-03-01', '2008-02-28'),
DATEDIFF('2007-03-01', '2007-01-28'), DATEDIFF('2008-03-01 23:59:59', '2008-03-02 00:00:00'),
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_10_trims.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_10_trims.q b/ql/src/test/queries/clientpositive/udf_10_trims.q
index 8a7e3a5..92488fa 100644
--- a/ql/src/test/queries/clientpositive/udf_10_trims.q
+++ b/ql/src/test/queries/clientpositive/udf_10_trims.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE;
EXPLAIN
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_between.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_between.q b/ql/src/test/queries/clientpositive/udf_between.q
index b22ee9c..cba8d31 100644
--- a/ql/src/test/queries/clientpositive/udf_between.q
+++ b/ql/src/test/queries/clientpositive/udf_between.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.fetch.task.conversion=more;
describe function between;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_case_column_pruning.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_case_column_pruning.q b/ql/src/test/queries/clientpositive/udf_case_column_pruning.q
index da92551..d6c9e9d 100644
--- a/ql/src/test/queries/clientpositive/udf_case_column_pruning.q
+++ b/ql/src/test/queries/clientpositive/udf_case_column_pruning.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
EXPLAIN
SELECT CASE a.key
WHEN '1' THEN 2
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_folder_constants.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_folder_constants.q b/ql/src/test/queries/clientpositive/udf_folder_constants.q
index fcb5162..d616a04 100644
--- a/ql/src/test/queries/clientpositive/udf_folder_constants.q
+++ b/ql/src/test/queries/clientpositive/udf_folder_constants.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
drop table if exists udf_tb1;
drop table if exists udf_tb2;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_hour.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_hour.q b/ql/src/test/queries/clientpositive/udf_hour.q
index b9811e6..43d23c7 100644
--- a/ql/src/test/queries/clientpositive/udf_hour.q
+++ b/ql/src/test/queries/clientpositive/udf_hour.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.fetch.task.conversion=more;
DESCRIBE FUNCTION hour;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_like.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_like.q b/ql/src/test/queries/clientpositive/udf_like.q
index 12983bd..c70cbdd 100644
--- a/ql/src/test/queries/clientpositive/udf_like.q
+++ b/ql/src/test/queries/clientpositive/udf_like.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.fetch.task.conversion=more;
DESCRIBE FUNCTION like;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_lower.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_lower.q b/ql/src/test/queries/clientpositive/udf_lower.q
index c07d2db..e30fa69 100644
--- a/ql/src/test/queries/clientpositive/udf_lower.q
+++ b/ql/src/test/queries/clientpositive/udf_lower.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
DESCRIBE FUNCTION lower;
DESCRIBE FUNCTION EXTENDED lower;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_minute.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_minute.q b/ql/src/test/queries/clientpositive/udf_minute.q
index 0e4d855..c5d55ee 100644
--- a/ql/src/test/queries/clientpositive/udf_minute.q
+++ b/ql/src/test/queries/clientpositive/udf_minute.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
DESCRIBE FUNCTION minute;
DESCRIBE FUNCTION EXTENDED minute;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_parse_url.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_parse_url.q b/ql/src/test/queries/clientpositive/udf_parse_url.q
index 62c67db..e834fd7 100644
--- a/ql/src/test/queries/clientpositive/udf_parse_url.q
+++ b/ql/src/test/queries/clientpositive/udf_parse_url.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
DESCRIBE FUNCTION parse_url;
DESCRIBE FUNCTION EXTENDED parse_url;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_reflect2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_reflect2.q b/ql/src/test/queries/clientpositive/udf_reflect2.q
index a65294b..255dcdb 100644
--- a/ql/src/test/queries/clientpositive/udf_reflect2.q
+++ b/ql/src/test/queries/clientpositive/udf_reflect2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.fetch.task.conversion=more;
DESCRIBE FUNCTION reflect2;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_second.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_second.q b/ql/src/test/queries/clientpositive/udf_second.q
index f63426d..8cbc2f0 100644
--- a/ql/src/test/queries/clientpositive/udf_second.q
+++ b/ql/src/test/queries/clientpositive/udf_second.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.fetch.task.conversion=more;
DESCRIBE FUNCTION second;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_sentences.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_sentences.q b/ql/src/test/queries/clientpositive/udf_sentences.q
index 009e4cb..97a3f18 100644
--- a/ql/src/test/queries/clientpositive/udf_sentences.q
+++ b/ql/src/test/queries/clientpositive/udf_sentences.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
CREATE TABLE sent_tmp (val array<string>);
CREATE TABLE sent_tmp2 (val string);
INSERT OVERWRITE TABLE sent_tmp
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udf_unix_timestamp.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_unix_timestamp.q b/ql/src/test/queries/clientpositive/udf_unix_timestamp.q
index bb598c2..a0bc08b 100644
--- a/ql/src/test/queries/clientpositive/udf_unix_timestamp.q
+++ b/ql/src/test/queries/clientpositive/udf_unix_timestamp.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.fetch.task.conversion=more;
DESCRIBE FUNCTION unix_timestamp;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udtf_explode.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udtf_explode.q b/ql/src/test/queries/clientpositive/udtf_explode.q
index db9018c..cc69dbe 100644
--- a/ql/src/test/queries/clientpositive/udtf_explode.q
+++ b/ql/src/test/queries/clientpositive/udtf_explode.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.fetch.task.conversion=more;
DESCRIBE FUNCTION explode;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udtf_json_tuple.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udtf_json_tuple.q b/ql/src/test/queries/clientpositive/udtf_json_tuple.q
index 93d829d..a46905c 100644
--- a/ql/src/test/queries/clientpositive/udtf_json_tuple.q
+++ b/ql/src/test/queries/clientpositive/udtf_json_tuple.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table json_t (key string, jstring string);
insert overwrite table json_t
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q b/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q
index 0870cbc..69ee7be 100644
--- a/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q
+++ b/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table url_t (key string, fullurl string);
insert overwrite table url_t
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union.q b/ql/src/test/queries/clientpositive/union.q
index f1bf126..69e430f 100644
--- a/ql/src/test/queries/clientpositive/union.q
+++ b/ql/src/test/queries/clientpositive/union.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_BEFORE_DIFF
-- union case: both subqueries are map jobs on same input, followed by filesink
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union10.q b/ql/src/test/queries/clientpositive/union10.q
index 7860980..7d971be 100644
--- a/ql/src/test/queries/clientpositive/union10.q
+++ b/ql/src/test/queries/clientpositive/union10.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.map.aggr = true;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union11.q b/ql/src/test/queries/clientpositive/union11.q
index 1f11ff6..ac00ab6 100644
--- a/ql/src/test/queries/clientpositive/union11.q
+++ b/ql/src/test/queries/clientpositive/union11.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.map.aggr = true;
-- SORT_BEFORE_DIFF
-- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by reducesink
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union12.q b/ql/src/test/queries/clientpositive/union12.q
index de0acd2..418ec2d 100644
--- a/ql/src/test/queries/clientpositive/union12.q
+++ b/ql/src/test/queries/clientpositive/union12.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.map.aggr = true;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union13.q b/ql/src/test/queries/clientpositive/union13.q
index c9cee66..e4fe2bf 100644
--- a/ql/src/test/queries/clientpositive/union13.q
+++ b/ql/src/test/queries/clientpositive/union13.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_BEFORE_DIFF
-- union case: both subqueries are a map-only jobs, same input, followed by filesink
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union14.q b/ql/src/test/queries/clientpositive/union14.q
index ccd1444..01a352e 100644
--- a/ql/src/test/queries/clientpositive/union14.q
+++ b/ql/src/test/queries/clientpositive/union14.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.map.aggr = true;
-- SORT_BEFORE_DIFF
-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union15.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union15.q b/ql/src/test/queries/clientpositive/union15.q
index 65eceeb..1dea476 100644
--- a/ql/src/test/queries/clientpositive/union15.q
+++ b/ql/src/test/queries/clientpositive/union15.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.map.aggr = true;
-- SORT_BEFORE_DIFF
-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union16.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union16.q b/ql/src/test/queries/clientpositive/union16.q
index bf15fc9..bafcba9 100644
--- a/ql/src/test/queries/clientpositive/union16.q
+++ b/ql/src/test/queries/clientpositive/union16.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_BEFORE_DIFF
EXPLAIN
SELECT count(1) FROM (
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union2.q b/ql/src/test/queries/clientpositive/union2.q
index 58765c7..4884d18 100644
--- a/ql/src/test/queries/clientpositive/union2.q
+++ b/ql/src/test/queries/clientpositive/union2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
-- SORT_BEFORE_DIFF
-- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union20.q b/ql/src/test/queries/clientpositive/union20.q
index e7d99bd..66f94ad 100644
--- a/ql/src/test/queries/clientpositive/union20.q
+++ b/ql/src/test/queries/clientpositive/union20.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
-- union :map-reduce sub-queries followed by join
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union22.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union22.q b/ql/src/test/queries/clientpositive/union22.q
index 7477d2c..d6937f7 100644
--- a/ql/src/test/queries/clientpositive/union22.q
+++ b/ql/src/test/queries/clientpositive/union22.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
create table dst_union22(k1 string, k2 string, k3 string, k4 string) partitioned by (ds string);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union23.q b/ql/src/test/queries/clientpositive/union23.q
index 41dca46..052f34a 100644
--- a/ql/src/test/queries/clientpositive/union23.q
+++ b/ql/src/test/queries/clientpositive/union23.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
explain
select s.key2, s.value2
from (
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union24.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union24.q b/ql/src/test/queries/clientpositive/union24.q
index 0564a3a..073ceeb 100644
--- a/ql/src/test/queries/clientpositive/union24.q
+++ b/ql/src/test/queries/clientpositive/union24.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
create table src2 as select key, count(1) as count from src group by key;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union25.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union25.q b/ql/src/test/queries/clientpositive/union25.q
index 04e782e..5c5687c 100644
--- a/ql/src/test/queries/clientpositive/union25.q
+++ b/ql/src/test/queries/clientpositive/union25.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table tmp_srcpart like srcpart;
insert overwrite table tmp_srcpart partition (ds='2008-04-08', hr='11')
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union27.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union27.q b/ql/src/test/queries/clientpositive/union27.q
index 8f3af6b..19fab80 100644
--- a/ql/src/test/queries/clientpositive/union27.q
+++ b/ql/src/test/queries/clientpositive/union27.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
create table jackson_sev_same as select * from src;
create table dim_pho as select * from src;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union28.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union28.q b/ql/src/test/queries/clientpositive/union28.q
index 6aebfeb..f099c3a 100644
--- a/ql/src/test/queries/clientpositive/union28.q
+++ b/ql/src/test/queries/clientpositive/union28.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table union_subq_union(key int, value string);
explain
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union30.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union30.q b/ql/src/test/queries/clientpositive/union30.q
index 9763bc3..0072dae 100644
--- a/ql/src/test/queries/clientpositive/union30.q
+++ b/ql/src/test/queries/clientpositive/union30.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table union_subq_union(key int, value string);
explain
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union32.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union32.q b/ql/src/test/queries/clientpositive/union32.q
index 86e97d7..f47f0af 100644
--- a/ql/src/test/queries/clientpositive/union32.q
+++ b/ql/src/test/queries/clientpositive/union32.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
-- This tests various union queries which have columns on one side of the query
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union33.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union33.q b/ql/src/test/queries/clientpositive/union33.q
index 90a7a3d..017442e 100644
--- a/ql/src/test/queries/clientpositive/union33.q
+++ b/ql/src/test/queries/clientpositive/union33.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.groupby.skewindata=true;
-- SORT_BEFORE_DIFF
-- This tests that a union all with a map only subquery on one side and a
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union34.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union34.q b/ql/src/test/queries/clientpositive/union34.q
index 238b583..2ab16de 100644
--- a/ql/src/test/queries/clientpositive/union34.q
+++ b/ql/src/test/queries/clientpositive/union34.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table src10_1 (key string, value string);
create table src10_2 (key string, value string);
create table src10_3 (key string, value string);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union36.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union36.q b/ql/src/test/queries/clientpositive/union36.q
index e929749..c38e7b1 100644
--- a/ql/src/test/queries/clientpositive/union36.q
+++ b/ql/src/test/queries/clientpositive/union36.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.cbo.enable=false;
select (x/sum(x) over()) as y from(select cast(1 as decimal(10,0)) as x from (select * from src limit 2)s1 union all select cast(1 as decimal(10,0)) x from (select * from src limit 2) s2 union all select '100000000' x from (select * from src limit 2) s3)u order by y;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union4.q b/ql/src/test/queries/clientpositive/union4.q
index 5e4f6fd..a5eefde 100644
--- a/ql/src/test/queries/clientpositive/union4.q
+++ b/ql/src/test/queries/clientpositive/union4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.map.aggr = true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union5.q b/ql/src/test/queries/clientpositive/union5.q
index b495d01..edfd1ca 100644
--- a/ql/src/test/queries/clientpositive/union5.q
+++ b/ql/src/test/queries/clientpositive/union5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.map.aggr = true;
-- SORT_BEFORE_DIFF
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union6.q b/ql/src/test/queries/clientpositive/union6.q
index 87347b1..9d18421 100644
--- a/ql/src/test/queries/clientpositive/union6.q
+++ b/ql/src/test/queries/clientpositive/union6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.map.aggr = true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union7.q b/ql/src/test/queries/clientpositive/union7.q
index 872b09e..9ecab8e 100644
--- a/ql/src/test/queries/clientpositive/union7.q
+++ b/ql/src/test/queries/clientpositive/union7.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.map.aggr = true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union8.q b/ql/src/test/queries/clientpositive/union8.q
index bc5f3b1..e26cdd9 100644
--- a/ql/src/test/queries/clientpositive/union8.q
+++ b/ql/src/test/queries/clientpositive/union8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
-- SORT_BEFORE_DIFF
-- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by filesink
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union9.q b/ql/src/test/queries/clientpositive/union9.q
index 064cf10..de6490c 100644
--- a/ql/src/test/queries/clientpositive/union9.q
+++ b/ql/src/test/queries/clientpositive/union9.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
-- SORT_BEFORE_DIFF
-- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by reducesink
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/unionDistinct_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/unionDistinct_1.q b/ql/src/test/queries/clientpositive/unionDistinct_1.q
index a86b37a..fd7f075 100644
--- a/ql/src/test/queries/clientpositive/unionDistinct_1.q
+++ b/ql/src/test/queries/clientpositive/unionDistinct_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
-- union10.q
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 2b1a99b..702f71a 100644
--- a/ql/src/test/queries/clientpositive/union_remove_1.q
+++ b/ql/src/test/queries/clientpositive/union_remove_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 a00599c..508f354 100644
--- a/ql/src/test/queries/clientpositive/union_remove_10.q
+++ b/ql/src/test/queries/clientpositive/union_remove_10.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 a6378f7..bdfbf66 100644
--- a/ql/src/test/queries/clientpositive/union_remove_11.q
+++ b/ql/src/test/queries/clientpositive/union_remove_11.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 ca4885a..f6436f5 100644
--- a/ql/src/test/queries/clientpositive/union_remove_12.q
+++ b/ql/src/test/queries/clientpositive/union_remove_12.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.auto.convert.join=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 4fcec6b..b02451b 100644
--- a/ql/src/test/queries/clientpositive/union_remove_13.q
+++ b/ql/src/test/queries/clientpositive/union_remove_13.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.auto.convert.join=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 0044db3..bec6226 100644
--- a/ql/src/test/queries/clientpositive/union_remove_14.q
+++ b/ql/src/test/queries/clientpositive/union_remove_14.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 ca5706d..e384739 100644
--- a/ql/src/test/queries/clientpositive/union_remove_15.q
+++ b/ql/src/test/queries/clientpositive/union_remove_15.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 ebb0a5f..41305bf 100644
--- a/ql/src/test/queries/clientpositive/union_remove_16.q
+++ b/ql/src/test/queries/clientpositive/union_remove_16.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 20cf534..8f91d03 100644
--- a/ql/src/test/queries/clientpositive/union_remove_17.q
+++ b/ql/src/test/queries/clientpositive/union_remove_17.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 f5cbed2..ad38742 100644
--- a/ql/src/test/queries/clientpositive/union_remove_18.q
+++ b/ql/src/test/queries/clientpositive/union_remove_18.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 6244eb0..34f8b5a 100644
--- a/ql/src/test/queries/clientpositive/union_remove_19.q
+++ b/ql/src/test/queries/clientpositive/union_remove_19.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 a9cd571..274608c 100644
--- a/ql/src/test/queries/clientpositive/union_remove_2.q
+++ b/ql/src/test/queries/clientpositive/union_remove_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 3c19c59..93a49f3 100644
--- a/ql/src/test/queries/clientpositive/union_remove_20.q
+++ b/ql/src/test/queries/clientpositive/union_remove_20.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 f7a1e0f..fa8ff27 100644
--- a/ql/src/test/queries/clientpositive/union_remove_21.q
+++ b/ql/src/test/queries/clientpositive/union_remove_21.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 981f440..0e97cae 100644
--- a/ql/src/test/queries/clientpositive/union_remove_22.q
+++ b/ql/src/test/queries/clientpositive/union_remove_22.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 7f741f7..436719d 100644
--- a/ql/src/test/queries/clientpositive/union_remove_23.q
+++ b/ql/src/test/queries/clientpositive/union_remove_23.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 055a428..3a1e225 100644
--- a/ql/src/test/queries/clientpositive/union_remove_24.q
+++ b/ql/src/test/queries/clientpositive/union_remove_24.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 33ed118..d70adb9 100644
--- a/ql/src/test/queries/clientpositive/union_remove_25.q
+++ b/ql/src/test/queries/clientpositive/union_remove_25.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.exec.dynamic.partition=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 8d28277..2e6e3e6 100644
--- a/ql/src/test/queries/clientpositive/union_remove_3.q
+++ b/ql/src/test/queries/clientpositive/union_remove_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 1affbc5..a08bcc1 100644
--- a/ql/src/test/queries/clientpositive/union_remove_4.q
+++ b/ql/src/test/queries/clientpositive/union_remove_4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 5769ba8..4ac3edf 100644
--- a/ql/src/test/queries/clientpositive/union_remove_5.q
+++ b/ql/src/test/queries/clientpositive/union_remove_5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 5bc62d7..f37f409 100644
--- a/ql/src/test/queries/clientpositive/union_remove_6.q
+++ b/ql/src/test/queries/clientpositive/union_remove_6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 1b717c7..6853728 100644
--- a/ql/src/test/queries/clientpositive/union_remove_6_subq.q
+++ b/ql/src/test/queries/clientpositive/union_remove_6_subq.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 4e33188..cd6a75a 100644
--- a/ql/src/test/queries/clientpositive/union_remove_7.q
+++ b/ql/src/test/queries/clientpositive/union_remove_7.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 e809710..93aabe6 100644
--- a/ql/src/test/queries/clientpositive/union_remove_8.q
+++ b/ql/src/test/queries/clientpositive/union_remove_8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/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 906c2a5..1bb8d6d 100644
--- a/ql/src/test/queries/clientpositive/union_remove_9.q
+++ b/ql/src/test/queries/clientpositive/union_remove_9.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_script.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_script.q b/ql/src/test/queries/clientpositive/union_script.q
index df35859..7687104 100644
--- a/ql/src/test/queries/clientpositive/union_script.q
+++ b/ql/src/test/queries/clientpositive/union_script.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
select * from (
select transform(key) using 'cat' as cola from src)s order by cola;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_top_level.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_top_level.q b/ql/src/test/queries/clientpositive/union_top_level.q
index 1101a45..d93fe38 100644
--- a/ql/src/test/queries/clientpositive/union_top_level.q
+++ b/ql/src/test/queries/clientpositive/union_top_level.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
-- top level
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/union_type_chk.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_type_chk.q b/ql/src/test/queries/clientpositive/union_type_chk.q
index 0c8282a..3b7b478 100644
--- a/ql/src/test/queries/clientpositive/union_type_chk.q
+++ b/ql/src/test/queries/clientpositive/union_type_chk.q
@@ -1,5 +1,7 @@
+set hive.mapred.mode=nonstrict;
set hive.cbo.enable=false;
set hive.execution.engine=mr;
+set hive.mapred.mode=nonstrict;
select (x/sum(x) over()) as y from(select cast(1 as decimal(10,0)) as x from (select * from src limit 2)s1 union all select cast(1 as decimal(10,0)) x from (select * from src limit 2) s2 union all select '100000000' x from (select * from src limit 2) s3)u order by y;