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:53 UTC
[4/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/insert_values_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_values_partitioned.q b/ql/src/test/queries/clientpositive/insert_values_partitioned.q
index e78b92e..f3e4e47 100644
--- a/ql/src/test/queries/clientpositive/insert_values_partitioned.q
+++ b/ql/src/test/queries/clientpositive/insert_values_partitioned.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.support.concurrency=true;
set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/insert_values_tmp_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_values_tmp_table.q b/ql/src/test/queries/clientpositive/insert_values_tmp_table.q
index 07737c0..082b2c0 100644
--- a/ql/src/test/queries/clientpositive/insert_values_tmp_table.q
+++ b/ql/src/test/queries/clientpositive/insert_values_tmp_table.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.support.concurrency=true;
set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/interval_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/interval_3.q b/ql/src/test/queries/clientpositive/interval_3.q
index dec9bed..3b05448 100644
--- a/ql/src/test/queries/clientpositive/interval_3.q
+++ b/ql/src/test/queries/clientpositive/interval_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- where clause
select
l_orderkey, l_shipdate, l_receiptdate
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join0.q b/ql/src/test/queries/clientpositive/join0.q
index 6ef6843..66f2ef3 100644
--- a/ql/src/test/queries/clientpositive/join0.q
+++ b/ql/src/test/queries/clientpositive/join0.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
-- JAVA_VERSION_SPECIFIC_OUTPUT
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join1.q b/ql/src/test/queries/clientpositive/join1.q
index de97e8c..72bd611 100644
--- a/ql/src/test/queries/clientpositive/join1.q
+++ b/ql/src/test/queries/clientpositive/join1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join10.q b/ql/src/test/queries/clientpositive/join10.q
index 03cd81d..c3cbfea 100644
--- a/ql/src/test/queries/clientpositive/join10.q
+++ b/ql/src/test/queries/clientpositive/join10.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
EXPLAIN FROM
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join11.q b/ql/src/test/queries/clientpositive/join11.q
index 4224a38..59c54c4 100644
--- a/ql/src/test/queries/clientpositive/join11.q
+++ b/ql/src/test/queries/clientpositive/join11.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
EXPLAIN
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join12.q b/ql/src/test/queries/clientpositive/join12.q
index 121b2fd..6545fae 100644
--- a/ql/src/test/queries/clientpositive/join12.q
+++ b/ql/src/test/queries/clientpositive/join12.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
EXPLAIN
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join13.q b/ql/src/test/queries/clientpositive/join13.q
index 4492ccb..4206f6a 100644
--- a/ql/src/test/queries/clientpositive/join13.q
+++ b/ql/src/test/queries/clientpositive/join13.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
EXPLAIN
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join14.q b/ql/src/test/queries/clientpositive/join14.q
index bacd446..d4bc0ae 100644
--- a/ql/src/test/queries/clientpositive/join14.q
+++ b/ql/src/test/queries/clientpositive/join14.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
-- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20S)
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join16.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join16.q b/ql/src/test/queries/clientpositive/join16.q
index 4c9c961..901f9ca 100644
--- a/ql/src/test/queries/clientpositive/join16.q
+++ b/ql/src/test/queries/clientpositive/join16.q
@@ -1 +1,2 @@
+set hive.mapred.mode=nonstrict;
EXPLAIN SELECT subq.key, tab.value FROM (select a.key, a.value from src a where a.key > 10 ) subq JOIN src tab ON (subq.key = tab.key and subq.key > 20 and subq.value = tab.value) where tab.value < 200;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join17.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join17.q b/ql/src/test/queries/clientpositive/join17.q
index 4b6a1ef..4a7eb99 100644
--- a/ql/src/test/queries/clientpositive/join17.q
+++ b/ql/src/test/queries/clientpositive/join17.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE dest1(key1 INT, value1 STRING, key2 INT, value2 STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join18.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join18.q b/ql/src/test/queries/clientpositive/join18.q
index e8be582..702735d 100644
--- a/ql/src/test/queries/clientpositive/join18.q
+++ b/ql/src/test/queries/clientpositive/join18.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
EXPLAIN
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join19.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join19.q b/ql/src/test/queries/clientpositive/join19.q
index d5e0f42..d49a107 100644
--- a/ql/src/test/queries/clientpositive/join19.q
+++ b/ql/src/test/queries/clientpositive/join19.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE triples (foo string, subject string, predicate string, object string, foo2 string);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join2.q b/ql/src/test/queries/clientpositive/join2.q
index 7b782b4..8aedd56 100644
--- a/ql/src/test/queries/clientpositive/join2.q
+++ b/ql/src/test/queries/clientpositive/join2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join22.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join22.q b/ql/src/test/queries/clientpositive/join22.q
index 4a67d74..525adfe 100644
--- a/ql/src/test/queries/clientpositive/join22.q
+++ b/ql/src/test/queries/clientpositive/join22.q
@@ -1,2 +1,3 @@
+set hive.mapred.mode=nonstrict;
explain
SELECT src5.src1_value FROM (SELECT src3.*, src4.value as src4_value, src4.key as src4_key FROM src src4 JOIN (SELECT src2.*, src1.key as src1_key, src1.value as src1_value FROM src src1 JOIN src src2 ON src1.key = src2.key) src3 ON src3.src1_key = src4.key) src5;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join23.q b/ql/src/test/queries/clientpositive/join23.q
index c7e78bd..d48941a 100644
--- a/ql/src/test/queries/clientpositive/join23.q
+++ b/ql/src/test/queries/clientpositive/join23.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
EXPLAIN
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join28.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join28.q b/ql/src/test/queries/clientpositive/join28.q
index c52a195..2d96f97 100644
--- a/ql/src/test/queries/clientpositive/join28.q
+++ b/ql/src/test/queries/clientpositive/join28.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE dest_j1(key STRING, value STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join29.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join29.q b/ql/src/test/queries/clientpositive/join29.q
index dd912fa..8b631e2 100644
--- a/ql/src/test/queries/clientpositive/join29.q
+++ b/ql/src/test/queries/clientpositive/join29.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE dest_j1(key STRING, cnt1 INT, cnt2 INT);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join3.q b/ql/src/test/queries/clientpositive/join3.q
index c9c6703..af4c51b 100644
--- a/ql/src/test/queries/clientpositive/join3.q
+++ b/ql/src/test/queries/clientpositive/join3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join31.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join31.q b/ql/src/test/queries/clientpositive/join31.q
index e90467e..c79105f 100644
--- a/ql/src/test/queries/clientpositive/join31.q
+++ b/ql/src/test/queries/clientpositive/join31.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE dest_j1(key STRING, cnt INT);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join32.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join32.q b/ql/src/test/queries/clientpositive/join32.q
index 6517fe7..d89e3c5 100644
--- a/ql/src/test/queries/clientpositive/join32.q
+++ b/ql/src/test/queries/clientpositive/join32.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join32_lessSize.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join32_lessSize.q b/ql/src/test/queries/clientpositive/join32_lessSize.q
index 63592de..cffdfc7 100644
--- a/ql/src/test/queries/clientpositive/join32_lessSize.q
+++ b/ql/src/test/queries/clientpositive/join32_lessSize.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join33.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join33.q b/ql/src/test/queries/clientpositive/join33.q
index 6517fe7..d89e3c5 100644
--- a/ql/src/test/queries/clientpositive/join33.q
+++ b/ql/src/test/queries/clientpositive/join33.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join34.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join34.q b/ql/src/test/queries/clientpositive/join34.q
index be97630..381464d 100644
--- a/ql/src/test/queries/clientpositive/join34.q
+++ b/ql/src/test/queries/clientpositive/join34.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join35.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join35.q b/ql/src/test/queries/clientpositive/join35.q
index b637f18..ed41b3e 100644
--- a/ql/src/test/queries/clientpositive/join35.q
+++ b/ql/src/test/queries/clientpositive/join35.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE dest_j1(key STRING, value STRING, val2 INT) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join4.q b/ql/src/test/queries/clientpositive/join4.q
index 94e9c14..2ab9506 100644
--- a/ql/src/test/queries/clientpositive/join4.q
+++ b/ql/src/test/queries/clientpositive/join4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join40.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join40.q b/ql/src/test/queries/clientpositive/join40.q
index 64b65e0..1e6b2b3 100644
--- a/ql/src/test/queries/clientpositive/join40.q
+++ b/ql/src/test/queries/clientpositive/join40.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.join.cache.size=1;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join41.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join41.q b/ql/src/test/queries/clientpositive/join41.q
index b8d9397..b3bea80 100644
--- a/ql/src/test/queries/clientpositive/join41.q
+++ b/ql/src/test/queries/clientpositive/join41.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table s1 as select * from src where key = 0;
set hive.auto.convert.join.noconditionaltask=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join42.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join42.q b/ql/src/test/queries/clientpositive/join42.q
index f379058..a48c127 100644
--- a/ql/src/test/queries/clientpositive/join42.q
+++ b/ql/src/test/queries/clientpositive/join42.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table L as select 4436 id;
create table LA as select 4436 loan_id, 4748 aid, 4415 pi_id;
create table FR as select 4436 loan_id;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join43.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join43.q b/ql/src/test/queries/clientpositive/join43.q
index 68694c6..12c45a6 100644
--- a/ql/src/test/queries/clientpositive/join43.q
+++ b/ql/src/test/queries/clientpositive/join43.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table purchase_history (s string, product string, price double, time int);
insert into purchase_history values ('1', 'Belt', 20.00, 21);
insert into purchase_history values ('1', 'Socks', 3.50, 31);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join5.q b/ql/src/test/queries/clientpositive/join5.q
index 660ebf6..f9154ba 100644
--- a/ql/src/test/queries/clientpositive/join5.q
+++ b/ql/src/test/queries/clientpositive/join5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join6.q b/ql/src/test/queries/clientpositive/join6.q
index c62db57..7542685 100644
--- a/ql/src/test/queries/clientpositive/join6.q
+++ b/ql/src/test/queries/clientpositive/join6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join7.q b/ql/src/test/queries/clientpositive/join7.q
index 153983e..d87789f 100644
--- a/ql/src/test/queries/clientpositive/join7.q
+++ b/ql/src/test/queries/clientpositive/join7.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING, c5 INT, c6 STRING) STORED AS TEXTFILE;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join8.q b/ql/src/test/queries/clientpositive/join8.q
index d1b3063..5c3ad60 100644
--- a/ql/src/test/queries/clientpositive/join8.q
+++ b/ql/src/test/queries/clientpositive/join8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join9.q b/ql/src/test/queries/clientpositive/join9.q
index 80364e7..c3d6178 100644
--- a/ql/src/test/queries/clientpositive/join9.q
+++ b/ql/src/test/queries/clientpositive/join9.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_acid_non_acid.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_acid_non_acid.q b/ql/src/test/queries/clientpositive/join_acid_non_acid.q
index 43d768f..8dd5f0b 100644
--- a/ql/src/test/queries/clientpositive/join_acid_non_acid.q
+++ b/ql/src/test/queries/clientpositive/join_acid_non_acid.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.support.concurrency=true;
set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_alt_syntax.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_alt_syntax.q b/ql/src/test/queries/clientpositive/join_alt_syntax.q
index 0658518..7bf7943 100644
--- a/ql/src/test/queries/clientpositive/join_alt_syntax.q
+++ b/ql/src/test/queries/clientpositive/join_alt_syntax.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
explain select p1.p_name, p2.p_name
from part p1 , part p2;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_cond_pushdown_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_1.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_1.q
index 4c1a384..c59e02c 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_1.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
explain select *
from part p1 join part p2 join part p3 on p1.p_name = p2.p_name and p2.p_name = p3.p_name;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_cond_pushdown_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_2.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_2.q
index cc7ca51..0fa29c7 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_2.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
explain select *
from part p1 join part p2 join part p3 on p1.p_name = p2.p_name join part p4 on p2.p_name = p3.p_name and p1.p_name = p4.p_name;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_cond_pushdown_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_3.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_3.q
index d158b40..f959554 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_3.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
explain select *
from part p1 join part p2 join part p3
where p1.p_name = p2.p_name and p2.p_name = p3.p_name;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_cond_pushdown_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_4.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_4.q
index 6830d38..ee52342 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_4.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
explain select *
from part p1 join part p2 join part p3 on p1.p_name = p2.p_name join part p4
where p2.p_name = p3.p_name and p1.p_name = p4.p_name;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual1.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual1.q
index 9b038f5..a8aade8 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual1.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table part2(
p2_partkey INT,
p2_name STRING,
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual2.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual2.q
index 0d18609..0ab61d0 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual2.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table part2(
p2_partkey INT,
p2_name STRING,
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual3.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual3.q
index 5478db2..fbcebe3 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual3.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table part2(
p2_partkey INT,
p2_name STRING,
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual4.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual4.q
index 152c77c..160c291 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual4.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table part2(
p2_partkey INT,
p2_name STRING,
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_empty.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_empty.q b/ql/src/test/queries/clientpositive/join_empty.q
index 1982487..1409fa6 100644
--- a/ql/src/test/queries/clientpositive/join_empty.q
+++ b/ql/src/test/queries/clientpositive/join_empty.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table srcpart_empty(key int, value string) partitioned by (ds string);
create table src2_empty (key int, value string);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_filters.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_filters.q b/ql/src/test/queries/clientpositive/join_filters.q
index cd7f807..027a627 100644
--- a/ql/src/test/queries/clientpositive/join_filters.q
+++ b/ql/src/test/queries/clientpositive/join_filters.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_AND_HASH_QUERY_RESULTS
CREATE TABLE myinput1(key int, value int);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_filters_overlap.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_filters_overlap.q b/ql/src/test/queries/clientpositive/join_filters_overlap.q
index 83fa348..277db70 100644
--- a/ql/src/test/queries/clientpositive/join_filters_overlap.q
+++ b/ql/src/test/queries/clientpositive/join_filters_overlap.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
-- HIVE-3411 Filter predicates on outer join overlapped on single alias is not handled properly
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_grp_diff_keys.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_grp_diff_keys.q b/ql/src/test/queries/clientpositive/join_grp_diff_keys.q
index 571df43..fb110b4 100644
--- a/ql/src/test/queries/clientpositive/join_grp_diff_keys.q
+++ b/ql/src/test/queries/clientpositive/join_grp_diff_keys.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table split (id int, line_id int, orders string);
create table bar (id int, line_id int, orders string);
create table foo (id int, line_id int, orders string);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_hive_626.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_hive_626.q b/ql/src/test/queries/clientpositive/join_hive_626.q
index c4c239c..458d78b 100644
--- a/ql/src/test/queries/clientpositive/join_hive_626.q
+++ b/ql/src/test/queries/clientpositive/join_hive_626.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_literals.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_literals.q b/ql/src/test/queries/clientpositive/join_literals.q
index 250bf83..3c79a12 100644
--- a/ql/src/test/queries/clientpositive/join_literals.q
+++ b/ql/src/test/queries/clientpositive/join_literals.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- Test Joins with a variety of literals in the on clause
SELECT COUNT(*) FROM src a JOIN src b ON a.key = b.key AND a.key = 0L;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_merge_multi_expressions.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_merge_multi_expressions.q b/ql/src/test/queries/clientpositive/join_merge_multi_expressions.q
index baef756..6ce88ea 100644
--- a/ql/src/test/queries/clientpositive/join_merge_multi_expressions.q
+++ b/ql/src/test/queries/clientpositive/join_merge_multi_expressions.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.cbo.enable=true;
-- SORT_QUERY_RESULTS
explain
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_merging.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_merging.q b/ql/src/test/queries/clientpositive/join_merging.q
index aedbb37..4efb860 100644
--- a/ql/src/test/queries/clientpositive/join_merging.q
+++ b/ql/src/test/queries/clientpositive/join_merging.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
explain select p1.p_size, p2.p_size
from part p1 left outer join part p2 on p1.p_partkey = p2.p_partkey
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_nulls.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_nulls.q b/ql/src/test/queries/clientpositive/join_nulls.q
index 6a2a7df..09c55af 100644
--- a/ql/src/test/queries/clientpositive/join_nulls.q
+++ b/ql/src/test/queries/clientpositive/join_nulls.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE myinput1(key int, value int);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_on_varchar.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_on_varchar.q b/ql/src/test/queries/clientpositive/join_on_varchar.q
index 2cf261e..a1ce1ff 100644
--- a/ql/src/test/queries/clientpositive/join_on_varchar.q
+++ b/ql/src/test/queries/clientpositive/join_on_varchar.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
create table tbl1(c1 varchar(10), intcol int);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_parse.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_parse.q b/ql/src/test/queries/clientpositive/join_parse.q
index 5955efd..080933c 100644
--- a/ql/src/test/queries/clientpositive/join_parse.q
+++ b/ql/src/test/queries/clientpositive/join_parse.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
explain
select srcpart.key, src1.value from
((srcpart inner join src on srcpart.key = src.key))
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_rc.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_rc.q b/ql/src/test/queries/clientpositive/join_rc.q
index b2e8c38..b02db62 100644
--- a/ql/src/test/queries/clientpositive/join_rc.q
+++ b/ql/src/test/queries/clientpositive/join_rc.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
create table join_rc1(key string, value string) stored as RCFile;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_reorder.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_reorder.q b/ql/src/test/queries/clientpositive/join_reorder.q
index 8846113..55aaaed 100644
--- a/ql/src/test/queries/clientpositive/join_reorder.q
+++ b/ql/src/test/queries/clientpositive/join_reorder.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_star.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_star.q b/ql/src/test/queries/clientpositive/join_star.q
index c95a13b..70cc8f7 100644
--- a/ql/src/test/queries/clientpositive/join_star.q
+++ b/ql/src/test/queries/clientpositive/join_star.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table fact(m1 int, m2 int, d1 int, d2 int);
create table dim1(f1 int, f2 int);
create table dim2(f3 int, f4 int);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/join_vc.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_vc.q b/ql/src/test/queries/clientpositive/join_vc.q
index 3f2190e..6d2d9c5 100644
--- a/ql/src/test/queries/clientpositive/join_vc.q
+++ b/ql/src/test/queries/clientpositive/join_vc.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- see HIVE-4033 earlier a flag named hasVC was not initialized correctly in MapOperator.java, resulting in NPE for following query. order by and limit in the query is not relevant, problem would be evident even without those. They are there to keep .q.out file small and sorted.
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/leftsemijoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/leftsemijoin.q b/ql/src/test/queries/clientpositive/leftsemijoin.q
index 76cf6fb..71c3a0d 100644
--- a/ql/src/test/queries/clientpositive/leftsemijoin.q
+++ b/ql/src/test/queries/clientpositive/leftsemijoin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
drop table sales;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/limit_join_transpose.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/limit_join_transpose.q b/ql/src/test/queries/clientpositive/limit_join_transpose.q
index bfc2378..98eefe9 100644
--- a/ql/src/test/queries/clientpositive/limit_join_transpose.q
+++ b/ql/src/test/queries/clientpositive/limit_join_transpose.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.optimize.limitjointranspose=false;
explain
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q b/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q
index 85125ea..42c5feb 100644
--- a/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q
+++ b/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.limit.query.max.table.partition=1;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/limit_pushdown.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/limit_pushdown.q b/ql/src/test/queries/clientpositive/limit_pushdown.q
index 74030e3..a2aeaed 100644
--- a/ql/src/test/queries/clientpositive/limit_pushdown.q
+++ b/ql/src/test/queries/clientpositive/limit_pushdown.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.limit.pushdown.memory.usage=0.3f;
set hive.optimize.reducededuplication.min.reducer=1;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/limit_pushdown_negative.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/limit_pushdown_negative.q b/ql/src/test/queries/clientpositive/limit_pushdown_negative.q
index e17ded1..95c491c 100644
--- a/ql/src/test/queries/clientpositive/limit_pushdown_negative.q
+++ b/ql/src/test/queries/clientpositive/limit_pushdown_negative.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.limit.pushdown.memory.usage=0.3f;
-- negative, RS + join
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/lineage1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lineage1.q b/ql/src/test/queries/clientpositive/lineage1.q
index 4743b7f..b5b099b 100644
--- a/ql/src/test/queries/clientpositive/lineage1.q
+++ b/ql/src/test/queries/clientpositive/lineage1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
CREATE TABLE dest_l1(key INT, value STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/lineage2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lineage2.q b/ql/src/test/queries/clientpositive/lineage2.q
index d3fe64a..31694cb 100644
--- a/ql/src/test/queries/clientpositive/lineage2.q
+++ b/ql/src/test/queries/clientpositive/lineage2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.LineageLogger;
drop table if exists src2;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/lineage3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lineage3.q b/ql/src/test/queries/clientpositive/lineage3.q
index d1fb454..c907e21 100644
--- a/ql/src/test/queries/clientpositive/lineage3.q
+++ b/ql/src/test/queries/clientpositive/lineage3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.LineageLogger;
set hive.metastore.disallow.incompatible.col.type.changes=false;
drop table if exists d1;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_dml_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_1.q b/ql/src/test/queries/clientpositive/list_bucket_dml_1.q
index 1f3b616..e38930f 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_1.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_dml_11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_11.q b/ql/src/test/queries/clientpositive/list_bucket_dml_11.q
index 80e6a97..2d22d66 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_11.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_11.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set mapred.input.dir.recursive=true;
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/list_bucket_dml_12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_12.q b/ql/src/test/queries/clientpositive/list_bucket_dml_12.q
index 7c1a67c..ac063cc 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_12.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_12.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set mapred.input.dir.recursive=true;
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/list_bucket_dml_13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_13.q b/ql/src/test/queries/clientpositive/list_bucket_dml_13.q
index b355147..d68ca93 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_13.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_13.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set mapred.input.dir.recursive=true;
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/list_bucket_dml_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_2.q b/ql/src/test/queries/clientpositive/list_bucket_dml_2.q
index 5970f1b..263a002 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_2.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
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/list_bucket_dml_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_3.q b/ql/src/test/queries/clientpositive/list_bucket_dml_3.q
index 53f0a24..ef01529 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_3.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_dml_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_4.q b/ql/src/test/queries/clientpositive/list_bucket_dml_4.q
index f863dde..86ff342 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_4.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
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/list_bucket_dml_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_5.q b/ql/src/test/queries/clientpositive/list_bucket_dml_5.q
index cc14529..ace7ba9 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_5.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_dml_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_6.q b/ql/src/test/queries/clientpositive/list_bucket_dml_6.q
index d25ff63..5684788 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_6.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_6.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
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/list_bucket_dml_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_7.q b/ql/src/test/queries/clientpositive/list_bucket_dml_7.q
index a74b7cf..e2af1b3 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_7.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_7.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
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/list_bucket_dml_8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_8.q b/ql/src/test/queries/clientpositive/list_bucket_dml_8.q
index 85cea9d..d904543 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_8.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_8.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
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/list_bucket_dml_9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_9.q b/ql/src/test/queries/clientpositive/list_bucket_dml_9.q
index 175f812..620750c 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_9.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_9.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
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/list_bucket_query_multiskew_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_1.q b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_1.q
index 13d2e16..1a4fbc2 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_1.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.optimize.listbucketing=true;
set mapred.input.dir.recursive=true;
set hive.merge.mapfiles=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q
index 532188b..996dce6 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.optimize.listbucketing=true;
set mapred.input.dir.recursive=true;
set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q
index 2fd7b13..f09026f 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.optimize.listbucketing=true;
set mapred.input.dir.recursive=true;
set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q
index c3912dc..cc597dc 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.optimize.listbucketing=true;
set mapred.input.dir.recursive=true;
set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q
index 7bdb3b2..fb4cf6d 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.optimize.listbucketing=true;
set mapred.input.dir.recursive=true;
set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q
index d34c52a..702de64 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.optimize.listbucketing=true;
set mapred.input.dir.recursive=true;
set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/llap_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/llap_partitioned.q b/ql/src/test/queries/clientpositive/llap_partitioned.q
index 2e0c07a..41d17aa 100644
--- a/ql/src/test/queries/clientpositive/llap_partitioned.q
+++ b/ql/src/test/queries/clientpositive/llap_partitioned.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
SET hive.vectorized.execution.enabled=true;
SET hive.llap.io.enabled=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/llapdecider.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/llapdecider.q b/ql/src/test/queries/clientpositive/llapdecider.q
index 52cdf77..ab9f5e0 100644
--- a/ql/src/test/queries/clientpositive/llapdecider.q
+++ b/ql/src/test/queries/clientpositive/llapdecider.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.stats.fetch.column.stats=true;
set hive.execution.mode=llap;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/load_dyn_part13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/load_dyn_part13.q b/ql/src/test/queries/clientpositive/load_dyn_part13.q
index 0b8d44f..28b9aca 100644
--- a/ql/src/test/queries/clientpositive/load_dyn_part13.q
+++ b/ql/src/test/queries/clientpositive/load_dyn_part13.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
show partitions srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/louter_join_ppr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/louter_join_ppr.q b/ql/src/test/queries/clientpositive/louter_join_ppr.q
index 90d6724..ef6f541 100644
--- a/ql/src/test/queries/clientpositive/louter_join_ppr.q
+++ b/ql/src/test/queries/clientpositive/louter_join_ppr.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.optimize.ppd=true;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/macro_duplicate.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/macro_duplicate.q b/ql/src/test/queries/clientpositive/macro_duplicate.q
index f0afd79..1b27268 100644
--- a/ql/src/test/queries/clientpositive/macro_duplicate.q
+++ b/ql/src/test/queries/clientpositive/macro_duplicate.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
drop table macro_testing;
CREATE TABLE macro_testing(a int, b int, c int);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mapjoin_decimal.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_decimal.q b/ql/src/test/queries/clientpositive/mapjoin_decimal.q
index 105195b..1f3b081 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_decimal.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_decimal.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.auto.convert.join=true;
set hive.auto.convert.join.noconditionaltask=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mapjoin_mapjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_mapjoin.q b/ql/src/test/queries/clientpositive/mapjoin_mapjoin.q
index 9723b3a..f4ea69d 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_mapjoin.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_mapjoin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.auto.convert.join=true;
set hive.auto.convert.join.noconditionaltask=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mapjoin_memcheck.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_memcheck.q b/ql/src/test/queries/clientpositive/mapjoin_memcheck.q
index faddbee..9ca1fa2 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_memcheck.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_memcheck.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.auto.convert.join = true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mapjoin_subquery.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_subquery.q b/ql/src/test/queries/clientpositive/mapjoin_subquery.q
index d0b58d5..ebd584e 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_subquery.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_subquery.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.auto.convert.join=true;
set hive.auto.convert.join.noconditionaltask=true;
set hive.auto.convert.join.noconditionaltask.size=10000;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mapjoin_subquery2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_subquery2.q b/ql/src/test/queries/clientpositive/mapjoin_subquery2.q
index aed8990..95051d4 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_subquery2.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_subquery2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
drop table x;
drop table y;
drop table z;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mapreduce2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapreduce2.q b/ql/src/test/queries/clientpositive/mapreduce2.q
index 0398b49..5a19b3c 100644
--- a/ql/src/test/queries/clientpositive/mapreduce2.q
+++ b/ql/src/test/queries/clientpositive/mapreduce2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/merge1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge1.q b/ql/src/test/queries/clientpositive/merge1.q
index 847a50b..e64492b 100644
--- a/ql/src/test/queries/clientpositive/merge1.q
+++ b/ql/src/test/queries/clientpositive/merge1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.merge.mapredfiles=true;
set hive.merge.sparkfiles=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/merge2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge2.q b/ql/src/test/queries/clientpositive/merge2.q
index c36a909..c719716 100644
--- a/ql/src/test/queries/clientpositive/merge2.q
+++ b/ql/src/test/queries/clientpositive/merge2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.merge.mapfiles=true;
set hive.merge.mapredfiles=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/merge3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge3.q b/ql/src/test/queries/clientpositive/merge3.q
index 7091dbc..98b15d5 100644
--- a/ql/src/test/queries/clientpositive/merge3.q
+++ b/ql/src/test/queries/clientpositive/merge3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/merge4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge4.q b/ql/src/test/queries/clientpositive/merge4.q
index ca3cedf..14aca1a 100644
--- a/ql/src/test/queries/clientpositive/merge4.q
+++ b/ql/src/test/queries/clientpositive/merge4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.merge.mapfiles=true;
set hive.merge.mapredfiles=true;
set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/merge_dynamic_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge_dynamic_partition.q b/ql/src/test/queries/clientpositive/merge_dynamic_partition.q
index 848c45f..fa4d442 100644
--- a/ql/src/test/queries/clientpositive/merge_dynamic_partition.q
+++ b/ql/src/test/queries/clientpositive/merge_dynamic_partition.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q b/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q
index 5897170..33388c6 100644
--- a/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q
+++ b/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- this test verifies that the block merge task that can follow a query to generate dynamic
-- partitions does not produce incorrect results by dropping partitions
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q b/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q
index 9f64724..9a35101 100644
--- a/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q
+++ b/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- this is to test the case where some dynamic partitions are merged and some are moved
create table srcpart_merge_dp like srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mergejoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mergejoin.q b/ql/src/test/queries/clientpositive/mergejoin.q
index 82e1c93..fa53a76 100644
--- a/ql/src/test/queries/clientpositive/mergejoin.q
+++ b/ql/src/test/queries/clientpositive/mergejoin.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.join.emit.interval=100000;
set hive.optimize.ppd=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mergejoins.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mergejoins.q b/ql/src/test/queries/clientpositive/mergejoins.q
index 2857c86..2c11b3a 100644
--- a/ql/src/test/queries/clientpositive/mergejoins.q
+++ b/ql/src/test/queries/clientpositive/mergejoins.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table a (val1 int, val2 int);
create table b (val1 int, val2 int);
create table c (val1 int, val2 int);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mergejoins_mixed.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mergejoins_mixed.q b/ql/src/test/queries/clientpositive/mergejoins_mixed.q
index a7df4e3..51f04cd 100644
--- a/ql/src/test/queries/clientpositive/mergejoins_mixed.q
+++ b/ql/src/test/queries/clientpositive/mergejoins_mixed.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- HIVE-3464
create table a (key string, value string);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/metadataOnlyOptimizer.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/metadataOnlyOptimizer.q b/ql/src/test/queries/clientpositive/metadataOnlyOptimizer.q
index d530f6a..77fa654 100644
--- a/ql/src/test/queries/clientpositive/metadataOnlyOptimizer.q
+++ b/ql/src/test/queries/clientpositive/metadataOnlyOptimizer.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
select key from(
select '1' as key from srcpart where ds="2008-04-09"
UNION all
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/metadata_only_queries.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/metadata_only_queries.q b/ql/src/test/queries/clientpositive/metadata_only_queries.q
index 7fea6b5..bce121d 100644
--- a/ql/src/test/queries/clientpositive/metadata_only_queries.q
+++ b/ql/src/test/queries/clientpositive/metadata_only_queries.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.compute.query.using.stats=true;
set hive.stats.autogather=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/metadataonly1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/metadataonly1.q b/ql/src/test/queries/clientpositive/metadataonly1.q
index eb59529..5420ea9 100644
--- a/ql/src/test/queries/clientpositive/metadataonly1.q
+++ b/ql/src/test/queries/clientpositive/metadataonly1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
CREATE TABLE TEST1(A INT, B DOUBLE) partitioned by (ds string);
explain extended select max(ds) from TEST1;
select max(ds) from TEST1;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mi.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mi.q b/ql/src/test/queries/clientpositive/mi.q
index 52578bc..b79b869 100644
--- a/ql/src/test/queries/clientpositive/mi.q
+++ b/ql/src/test/queries/clientpositive/mi.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/mrr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mrr.q b/ql/src/test/queries/clientpositive/mrr.q
index a8eddaf..324f2b1 100644
--- a/ql/src/test/queries/clientpositive/mrr.q
+++ b/ql/src/test/queries/clientpositive/mrr.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.auto.convert.join.noconditionaltask.size=60000000;
set hive.log.trace.id=mrrTest;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/multiMapJoin1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multiMapJoin1.q b/ql/src/test/queries/clientpositive/multiMapJoin1.q
index 455f550..5c49b4c 100644
--- a/ql/src/test/queries/clientpositive/multiMapJoin1.q
+++ b/ql/src/test/queries/clientpositive/multiMapJoin1.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;
create table smallTbl1(key string, value string);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/multiMapJoin2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multiMapJoin2.q b/ql/src/test/queries/clientpositive/multiMapJoin2.q
index 141db4d..cf5dbb0 100644
--- a/ql/src/test/queries/clientpositive/multiMapJoin2.q
+++ b/ql/src/test/queries/clientpositive/multiMapJoin2.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;
set hive.auto.convert.join=true;
set hive.auto.convert.join.noconditionaltask=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/multi_column_in.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_column_in.q b/ql/src/test/queries/clientpositive/multi_column_in.q
index 18a56cc..288406c 100644
--- a/ql/src/test/queries/clientpositive/multi_column_in.q
+++ b/ql/src/test/queries/clientpositive/multi_column_in.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
drop table emps;
create table emps (empno int, deptno int, empname string);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/multi_insert_gby2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_insert_gby2.q b/ql/src/test/queries/clientpositive/multi_insert_gby2.q
index fa29261..c23c854 100644
--- a/ql/src/test/queries/clientpositive/multi_insert_gby2.q
+++ b/ql/src/test/queries/clientpositive/multi_insert_gby2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
--HIVE-3699 Multiple insert overwrite into multiple tables query stores same results in all tables
create table e1 (count int);
create table e2 (percentile double);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/multi_insert_gby3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_insert_gby3.q b/ql/src/test/queries/clientpositive/multi_insert_gby3.q
index d85ff9a..68f6644 100644
--- a/ql/src/test/queries/clientpositive/multi_insert_gby3.q
+++ b/ql/src/test/queries/clientpositive/multi_insert_gby3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
create table e1 (key string, keyD double);
create table e2 (key string, keyD double, value string);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/multi_insert_mixed.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_insert_mixed.q b/ql/src/test/queries/clientpositive/multi_insert_mixed.q
index 8fb577a..7be6d13 100644
--- a/ql/src/test/queries/clientpositive/multi_insert_mixed.q
+++ b/ql/src/test/queries/clientpositive/multi_insert_mixed.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
create table src_multi1 like src;
create table src_multi2 like src;
create table src_multi3 like src;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/multi_insert_union_src.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_insert_union_src.q b/ql/src/test/queries/clientpositive/multi_insert_union_src.q
index f9b6f87..fa6be17 100644
--- a/ql/src/test/queries/clientpositive/multi_insert_union_src.q
+++ b/ql/src/test/queries/clientpositive/multi_insert_union_src.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
drop table if exists src2;
drop table if exists src_multi1;
drop table if exists src_multi1;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/multi_join_union.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_join_union.q b/ql/src/test/queries/clientpositive/multi_join_union.q
index c555b38..2bdc921 100644
--- a/ql/src/test/queries/clientpositive/multi_join_union.q
+++ b/ql/src/test/queries/clientpositive/multi_join_union.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.auto.convert.join=true;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/newline.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/newline.q b/ql/src/test/queries/clientpositive/newline.q
index 49e9437..e7dcb62 100644
--- a/ql/src/test/queries/clientpositive/newline.q
+++ b/ql/src/test/queries/clientpositive/newline.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
add file ../../data/scripts/newline.py;
set hive.transform.escape.input=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/no_hooks.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/no_hooks.q b/ql/src/test/queries/clientpositive/no_hooks.q
index bbd1fea..7e80a9d 100644
--- a/ql/src/test/queries/clientpositive/no_hooks.q
+++ b/ql/src/test/queries/clientpositive/no_hooks.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.exec.pre.hooks=;
EXPLAIN
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/noalias_subq1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/noalias_subq1.q b/ql/src/test/queries/clientpositive/noalias_subq1.q
index dca8a42..cf49301 100644
--- a/ql/src/test/queries/clientpositive/noalias_subq1.q
+++ b/ql/src/test/queries/clientpositive/noalias_subq1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
EXPLAIN
SELECT c1 FROM (select value as c1, key as c2 from src) x where c2 < 100;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/nonblock_op_deduplicate.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nonblock_op_deduplicate.q b/ql/src/test/queries/clientpositive/nonblock_op_deduplicate.q
index 4b762fd..77dee5a 100644
--- a/ql/src/test/queries/clientpositive/nonblock_op_deduplicate.q
+++ b/ql/src/test/queries/clientpositive/nonblock_op_deduplicate.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
-- negative, references twice for result of funcion
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/nonmr_fetch.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nonmr_fetch.q b/ql/src/test/queries/clientpositive/nonmr_fetch.q
index 2a52888..a446217 100644
--- a/ql/src/test/queries/clientpositive/nonmr_fetch.q
+++ b/ql/src/test/queries/clientpositive/nonmr_fetch.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.fetch.task.conversion=minimal;
set hive.exec.submitviachild=true;
set hive.exec.submit.local.task.via.child=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q b/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q
index a272360..bbf33f9 100644
--- a/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q
+++ b/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q
@@ -1,5 +1,5 @@
set hive.fetch.task.conversion=more;
-
+set hive.mapred.mode=nonstrict;
explain select * from srcpart where ds='2008-04-08' AND hr='11' limit 10;
explain select cast(key as int) * 10, upper(value) from src limit 10;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/notable_alias1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/notable_alias1.q b/ql/src/test/queries/clientpositive/notable_alias1.q
index ed7e318..90230d5 100644
--- a/ql/src/test/queries/clientpositive/notable_alias1.q
+++ b/ql/src/test/queries/clientpositive/notable_alias1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
CREATE TABLE dest1(dummy STRING, key INT, value DOUBLE) STORED AS TEXTFILE;
EXPLAIN
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/notable_alias2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/notable_alias2.q b/ql/src/test/queries/clientpositive/notable_alias2.q
index b9c963c..2f32b32 100644
--- a/ql/src/test/queries/clientpositive/notable_alias2.q
+++ b/ql/src/test/queries/clientpositive/notable_alias2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
CREATE TABLE dest1(dummy STRING, key INT, value DOUBLE) STORED AS TEXTFILE;
EXPLAIN
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/nullgroup.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nullgroup.q b/ql/src/test/queries/clientpositive/nullgroup.q
index 5ec67e5..1e4cffc 100644
--- a/ql/src/test/queries/clientpositive/nullgroup.q
+++ b/ql/src/test/queries/clientpositive/nullgroup.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.map.aggr=true;
set hive.groupby.skewindata=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/nullgroup2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nullgroup2.q b/ql/src/test/queries/clientpositive/nullgroup2.q
index fecd6d4..bdee893 100644
--- a/ql/src/test/queries/clientpositive/nullgroup2.q
+++ b/ql/src/test/queries/clientpositive/nullgroup2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.map.aggr=true;
set hive.groupby.skewindata=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/nullgroup3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nullgroup3.q b/ql/src/test/queries/clientpositive/nullgroup3.q
index 19e5b10..282f6c3 100644
--- a/ql/src/test/queries/clientpositive/nullgroup3.q
+++ b/ql/src/test/queries/clientpositive/nullgroup3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
CREATE TABLE tstparttbl(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE;
LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-09');
LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-08');
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/nullgroup4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nullgroup4.q b/ql/src/test/queries/clientpositive/nullgroup4.q
index 917d1a7..61b0f2c 100644
--- a/ql/src/test/queries/clientpositive/nullgroup4.q
+++ b/ql/src/test/queries/clientpositive/nullgroup4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.map.aggr=true;
set hive.groupby.skewindata=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/nullgroup4_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nullgroup4_multi_distinct.q b/ql/src/test/queries/clientpositive/nullgroup4_multi_distinct.q
index fcee629..500cb9e 100644
--- a/ql/src/test/queries/clientpositive/nullgroup4_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/nullgroup4_multi_distinct.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.map.aggr=true;
set hive.groupby.skewindata=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/optimize_nullscan.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/optimize_nullscan.q b/ql/src/test/queries/clientpositive/optimize_nullscan.q
index 89293c5..ac56275 100644
--- a/ql/src/test/queries/clientpositive/optimize_nullscan.q
+++ b/ql/src/test/queries/clientpositive/optimize_nullscan.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.cbo.enable=false;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/optional_outer.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/optional_outer.q b/ql/src/test/queries/clientpositive/optional_outer.q
index 10971ab..518e9c5 100644
--- a/ql/src/test/queries/clientpositive/optional_outer.q
+++ b/ql/src/test/queries/clientpositive/optional_outer.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
EXPLAIN SELECT * FROM src a LEFT OUTER JOIN src b on (a.key=b.key);
EXPLAIN SELECT * FROM src a LEFT JOIN src b on (a.key=b.key);
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_analyze.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_analyze.q b/ql/src/test/queries/clientpositive/orc_analyze.q
index bd22e6f..71903a2 100644
--- a/ql/src/test/queries/clientpositive/orc_analyze.q
+++ b/ql/src/test/queries/clientpositive/orc_analyze.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.exec.submitviachild=true;
set hive.exec.submit.local.task.via.child=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_create.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_create.q b/ql/src/test/queries/clientpositive/orc_create.q
index e42c5ae..57912ef 100644
--- a/ql/src/test/queries/clientpositive/orc_create.q
+++ b/ql/src/test/queries/clientpositive/orc_create.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
DROP TABLE orc_create;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_createas1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_createas1.q b/ql/src/test/queries/clientpositive/orc_createas1.q
index 874d16c..b39d65d 100644
--- a/ql/src/test/queries/clientpositive/orc_createas1.q
+++ b/ql/src/test/queries/clientpositive/orc_createas1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set mapred.max.split.size=100;
set mapred.min.split.size=1;
set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_diff_part_cols.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_diff_part_cols.q b/ql/src/test/queries/clientpositive/orc_diff_part_cols.q
index 450f19e..3bfdf99 100644
--- a/ql/src/test/queries/clientpositive/orc_diff_part_cols.q
+++ b/ql/src/test/queries/clientpositive/orc_diff_part_cols.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
CREATE TABLE test_orc (key STRING)
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_file_dump.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_file_dump.q b/ql/src/test/queries/clientpositive/orc_file_dump.q
index ed0da75..3d4f1a9 100644
--- a/ql/src/test/queries/clientpositive/orc_file_dump.q
+++ b/ql/src/test/queries/clientpositive/orc_file_dump.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
CREATE TABLE staging(t tinyint,
si smallint,
i int,
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_int_type_promotion.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_int_type_promotion.q b/ql/src/test/queries/clientpositive/orc_int_type_promotion.q
index c3e2cf9..3dfed2b 100644
--- a/ql/src/test/queries/clientpositive/orc_int_type_promotion.q
+++ b/ql/src/test/queries/clientpositive/orc_int_type_promotion.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.metastore.disallow.incompatible.col.type.changes=false;
create table if not exists alltypes (
bo boolean,
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_llap.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_llap.q b/ql/src/test/queries/clientpositive/orc_llap.q
index 4b2a3f7..d2bd086 100644
--- a/ql/src/test/queries/clientpositive/orc_llap.q
+++ b/ql/src/test/queries/clientpositive/orc_llap.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
SET hive.vectorized.execution.enabled=true;
SET hive.llap.io.enabled=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_merge1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge1.q b/ql/src/test/queries/clientpositive/orc_merge1.q
index afef1e5..d0f0b28 100644
--- a/ql/src/test/queries/clientpositive/orc_merge1.q
+++ b/ql/src/test/queries/clientpositive/orc_merge1.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.merge.orcfile.stripe.level=false;
set hive.exec.dynamic.partition=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_merge10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge10.q b/ql/src/test/queries/clientpositive/orc_merge10.q
index 7f81947..98d3aa3 100644
--- a/ql/src/test/queries/clientpositive/orc_merge10.q
+++ b/ql/src/test/queries/clientpositive/orc_merge10.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.merge.orcfile.stripe.level=false;
set hive.exec.dynamic.partition=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_merge2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge2.q b/ql/src/test/queries/clientpositive/orc_merge2.q
index 6d229f1..667e878 100644
--- a/ql/src/test/queries/clientpositive/orc_merge2.q
+++ b/ql/src/test/queries/clientpositive/orc_merge2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.merge.orcfile.stripe.level=true;
set hive.exec.dynamic.partition=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_merge3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge3.q b/ql/src/test/queries/clientpositive/orc_merge3.q
index f5600c6..d5230b1 100644
--- a/ql/src/test/queries/clientpositive/orc_merge3.q
+++ b/ql/src/test/queries/clientpositive/orc_merge3.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.merge.orcfile.stripe.level=true;
set hive.merge.sparkfiles=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_merge4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge4.q b/ql/src/test/queries/clientpositive/orc_merge4.q
index 536e717..0f91641 100644
--- a/ql/src/test/queries/clientpositive/orc_merge4.q
+++ b/ql/src/test/queries/clientpositive/orc_merge4.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.merge.orcfile.stripe.level=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_merge_diff_fs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge_diff_fs.q b/ql/src/test/queries/clientpositive/orc_merge_diff_fs.q
index a8ab7b8..1787f08 100644
--- a/ql/src/test/queries/clientpositive/orc_merge_diff_fs.q
+++ b/ql/src/test/queries/clientpositive/orc_merge_diff_fs.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.merge.orcfile.stripe.level=false;
set hive.exec.dynamic.partition=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/d13b5db2/ql/src/test/queries/clientpositive/orc_merge_incompat2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge_incompat2.q b/ql/src/test/queries/clientpositive/orc_merge_incompat2.q
index 11d16c2..4d8674f 100644
--- a/ql/src/test/queries/clientpositive/orc_merge_incompat2.q
+++ b/ql/src/test/queries/clientpositive/orc_merge_incompat2.q
@@ -1,3 +1,4 @@
+set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
-- SORT_QUERY_RESULTS