http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 769d4d3..3b50465 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.explain.user=false;
 set hive.merge.orcfile.stripe.level=true;
 
 DROP TABLE orcfile_merge3a;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/orc_merge5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge5.q 
b/ql/src/test/queries/clientpositive/orc_merge5.q
index 9682347..3d32875 100644
--- a/ql/src/test/queries/clientpositive/orc_merge5.q
+++ b/ql/src/test/queries/clientpositive/orc_merge5.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 -- SORT_QUERY_RESULTS
 
 create table orc_merge5 (userid bigint, string1 string, subtype double, 
decimal1 decimal, ts timestamp) stored as orc;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/orc_merge6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge6.q 
b/ql/src/test/queries/clientpositive/orc_merge6.q
index cddc73a..6bdaa9e 100644
--- a/ql/src/test/queries/clientpositive/orc_merge6.q
+++ b/ql/src/test/queries/clientpositive/orc_merge6.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 -- SORT_QUERY_RESULTS
 
 -- orc file merge tests for static partitions

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/orc_merge7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge7.q 
b/ql/src/test/queries/clientpositive/orc_merge7.q
index 7e0d352..7a351c6 100644
--- a/ql/src/test/queries/clientpositive/orc_merge7.q
+++ b/ql/src/test/queries/clientpositive/orc_merge7.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 -- SORT_QUERY_RESULTS
 
 -- orc merge file tests for dynamic partition case

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/orc_merge_incompat1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge_incompat1.q 
b/ql/src/test/queries/clientpositive/orc_merge_incompat1.q
index 0348948..dd58524 100644
--- a/ql/src/test/queries/clientpositive/orc_merge_incompat1.q
+++ b/ql/src/test/queries/clientpositive/orc_merge_incompat1.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 -- SORT_QUERY_RESULTS
 
 create table orc_merge5 (userid bigint, string1 string, subtype double, 
decimal1 decimal, ts timestamp) stored as orc;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 5deec3c..a8f8842 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.explain.user=false;
 -- SORT_QUERY_RESULTS
 
 -- orc merge file tests for dynamic partition case

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/parallel.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parallel.q 
b/ql/src/test/queries/clientpositive/parallel.q
index 7cd4015..b8c0445 100644
--- a/ql/src/test/queries/clientpositive/parallel.q
+++ b/ql/src/test/queries/clientpositive/parallel.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 set mapred.job.name='test_parallel';
 set hive.exec.parallel=true;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/ptf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ptf.q 
b/ql/src/test/queries/clientpositive/ptf.q
index 2599317..b5b271b 100644
--- a/ql/src/test/queries/clientpositive/ptf.q
+++ b/ql/src/test/queries/clientpositive/ptf.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 -- SORT_QUERY_RESULTS
 
 --1. test1

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/ptf_matchpath.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ptf_matchpath.q 
b/ql/src/test/queries/clientpositive/ptf_matchpath.q
index 6487135..7b67a34 100644
--- a/ql/src/test/queries/clientpositive/ptf_matchpath.q
+++ b/ql/src/test/queries/clientpositive/ptf_matchpath.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 DROP TABLE flights_tiny;
 
 create table flights_tiny ( 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/ptf_streaming.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ptf_streaming.q 
b/ql/src/test/queries/clientpositive/ptf_streaming.q
index 7795365..aa70a5c 100644
--- a/ql/src/test/queries/clientpositive/ptf_streaming.q
+++ b/ql/src/test/queries/clientpositive/ptf_streaming.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 -- SORT_QUERY_RESULTS
 
 --1. test1

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/script_pipe.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/script_pipe.q 
b/ql/src/test/queries/clientpositive/script_pipe.q
index ae2fd2e..95a08dd 100644
--- a/ql/src/test/queries/clientpositive/script_pipe.q
+++ b/ql/src/test/queries/clientpositive/script_pipe.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 set hive.exec.script.allow.partial.consumption = true;
 -- Tests exception in ScriptOperator.close() by passing to the operator a 
small amount of data
 EXPLAIN SELECT TRANSFORM(*) USING 'true' AS a, b, c FROM (SELECT * FROM src 
LIMIT 1) tmp;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/selectDistinctStar.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/selectDistinctStar.q 
b/ql/src/test/queries/clientpositive/selectDistinctStar.q
index c1c1c0b..244824f 100644
--- a/ql/src/test/queries/clientpositive/selectDistinctStar.q
+++ b/ql/src/test/queries/clientpositive/selectDistinctStar.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 -- SORT_QUERY_RESULTS
 
 explain select distinct src.* from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/select_dummy_source.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/select_dummy_source.q 
b/ql/src/test/queries/clientpositive/select_dummy_source.q
index 25a1a81..915534a 100644
--- a/ql/src/test/queries/clientpositive/select_dummy_source.q
+++ b/ql/src/test/queries/clientpositive/select_dummy_source.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 explain
 select 'a', 100;
 select 'a', 100;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/skewjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin.q 
b/ql/src/test/queries/clientpositive/skewjoin.q
index 6d43ea8..5c8b326 100644
--- a/ql/src/test/queries/clientpositive/skewjoin.q
+++ b/ql/src/test/queries/clientpositive/skewjoin.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 set hive.optimize.skewjoin = true;
 set hive.skewjoin.key = 2;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/stats_noscan_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_noscan_1.q 
b/ql/src/test/queries/clientpositive/stats_noscan_1.q
index 02b4c2a..2681f77 100644
--- a/ql/src/test/queries/clientpositive/stats_noscan_1.q
+++ b/ql/src/test/queries/clientpositive/stats_noscan_1.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 set datanucleus.cache.collections=false;
 set hive.stats.autogather=false;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 5f89499..b2bd4dc 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.explain.user=false;
 set hive.stats.dbclass=fs;
 set hive.compute.query.using.stats=true;
 set hive.stats.autogather=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 103663e..720e360 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.explain.user=false;
 -- SORT_QUERY_RESULTS
 
 -- no agg, corr

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 7090975..e81872f 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.explain.user=false;
 -- SORT_QUERY_RESULTS
 
 -- non agg, non corr

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 ac0acb1..e587f3f 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.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/8842dcaf/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 996ea88..a06bb82 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.explain.user=false;
 set hive.enforce.bucketing=true;
 set hive.enforce.sorting = true;
 set hive.optimize.bucketingsorting=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 d8480cc..10c8854 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.explain.user=false;
 set hive.exec.dynamic.partition.mode=nonstrict;
 
 -- CTAS

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 0ec1881..d590959 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.explain.user=false;
 set hive.auto.convert.sortmerge.join = true;
 
 create table t1(

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 73cd53e..09a1d8b 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.explain.user=false;
 -- SORT_QUERY_RESULTS
 
 create table orc_src (key string, value string) STORED AS ORC;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 8b65049..ff42f13 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.explain.user=false;
 -- SORT_QUERY_RESULTS
 
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 4b6b0ca..3187e79 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.explain.user=false;
 -- SORT_QUERY_RESULTS
 explain
 select * from (select b.key, b.value from src1 a left outer join src b on 
(a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) 
order by x.key;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 a1ef585..093491d 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.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/8842dcaf/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 62a415b..03a1fea 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.explain.user=false;
 set hive.auto.convert.join=true;
 set hive.join.emit.interval=2;
 set hive.auto.convert.join.noconditionaltask=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 1802709..dff5112 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.explain.user=false;
 set hive.join.emit.interval=2;
 explain
 select * from src a join src1 b on a.key = b.key;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 96f58b2..2211f77 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.explain.user=false;
 set hive.auto.convert.join=true;
 
 explain 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/tez_union2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_union2.q 
b/ql/src/test/queries/clientpositive/tez_union2.q
index af7b51c..22eab01 100644
--- a/ql/src/test/queries/clientpositive/tez_union2.q
+++ b/ql/src/test/queries/clientpositive/tez_union2.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 explain 
 SELECT key, value FROM
 (

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 1c44a6c..e022d81 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.explain.user=false;
 create table dummy(i int);
 insert into table dummy values (1);
 select * from dummy;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/tez_union_group_by.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_union_group_by.q 
b/ql/src/test/queries/clientpositive/tez_union_group_by.q
index 4a58474..200f38d 100644
--- a/ql/src/test/queries/clientpositive/tez_union_group_by.q
+++ b/ql/src/test/queries/clientpositive/tez_union_group_by.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 CREATE TABLE x
 (
 u bigint,

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/tez_union_multiinsert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_union_multiinsert.q 
b/ql/src/test/queries/clientpositive/tez_union_multiinsert.q
index f7c11a3..67a9ac5 100644
--- a/ql/src/test/queries/clientpositive/tez_union_multiinsert.q
+++ b/ql/src/test/queries/clientpositive/tez_union_multiinsert.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/transform1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/transform1.q 
b/ql/src/test/queries/clientpositive/transform1.q
index 15e42e7..f2d23b9 100644
--- a/ql/src/test/queries/clientpositive/transform1.q
+++ b/ql/src/test/queries/clientpositive/transform1.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 set hive.entity.capture.transform=true;
 
 create table transform1_t1(a string, b string);

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 272fbce..58765c7 100644
--- a/ql/src/test/queries/clientpositive/union2.q
+++ b/ql/src/test/queries/clientpositive/union2.q
@@ -1,3 +1,4 @@
+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/8842dcaf/ql/src/test/queries/clientpositive/union3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union3.q 
b/ql/src/test/queries/clientpositive/union3.q
index add4ea6..35b298b 100644
--- a/ql/src/test/queries/clientpositive/union3.q
+++ b/ql/src/test/queries/clientpositive/union3.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 -- SORT_QUERY_RESULTS
 
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 b9219d9..5e4f6fd 100644
--- a/ql/src/test/queries/clientpositive/union4.q
+++ b/ql/src/test/queries/clientpositive/union4.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 set hive.map.aggr = true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 ee2ef64..b495d01 100644
--- a/ql/src/test/queries/clientpositive/union5.q
+++ b/ql/src/test/queries/clientpositive/union5.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 set hive.map.aggr = true;
 -- 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/8842dcaf/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 085e150..87347b1 100644
--- a/ql/src/test/queries/clientpositive/union6.q
+++ b/ql/src/test/queries/clientpositive/union6.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 set hive.map.aggr = true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 67767e7..872b09e 100644
--- a/ql/src/test/queries/clientpositive/union7.q
+++ b/ql/src/test/queries/clientpositive/union7.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 set hive.map.aggr = true;
 
 -- SORT_BEFORE_DIFF

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/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 366de73..bc5f3b1 100644
--- a/ql/src/test/queries/clientpositive/union8.q
+++ b/ql/src/test/queries/clientpositive/union8.q
@@ -1,3 +1,4 @@
+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/8842dcaf/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 4cc3a96..064cf10 100644
--- a/ql/src/test/queries/clientpositive/union9.q
+++ b/ql/src/test/queries/clientpositive/union9.q
@@ -1,3 +1,4 @@
+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/8842dcaf/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 61917d7..984ce2e 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.explain.user=false;
 -- union10.q
 
  

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_aggregate_9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_aggregate_9.q 
b/ql/src/test/queries/clientpositive/vector_aggregate_9.q
index 85bcc5a..ce6f0ff 100644
--- a/ql/src/test/queries/clientpositive/vector_aggregate_9.q
+++ b/ql/src/test/queries/clientpositive/vector_aggregate_9.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 create table vectortab2k(

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_between_in.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_between_in.q 
b/ql/src/test/queries/clientpositive/vector_between_in.q
index 1bc6611..28df728 100644
--- a/ql/src/test/queries/clientpositive/vector_between_in.q
+++ b/ql/src/test/queries/clientpositive/vector_between_in.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 CREATE TABLE decimal_date_test STORED AS ORC AS SELECT cdouble, CAST 
(((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1, CAST (((cdouble*9.3)/13) 
AS DECIMAL(23,14)) AS cdecimal2, CAST(CAST((CAST(cint AS BIGINT) *ctinyint) AS 
TIMESTAMP) AS DATE) AS cdate FROM alltypesorc ORDER BY cdate;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_binary_join_groupby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_binary_join_groupby.q 
b/ql/src/test/queries/clientpositive/vector_binary_join_groupby.q
index 3bdfd8c..fd9bf6f 100644
--- a/ql/src/test/queries/clientpositive/vector_binary_join_groupby.q
+++ b/ql/src/test/queries/clientpositive/vector_binary_join_groupby.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.auto.convert.join=true;
 SET hive.auto.convert.join.noconditionaltask=true;
 SET hive.auto.convert.join.noconditionaltask.size=1000000000;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_bucket.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_bucket.q 
b/ql/src/test/queries/clientpositive/vector_bucket.q
index 19a09c4..9360ce0 100644
--- a/ql/src/test/queries/clientpositive/vector_bucket.q
+++ b/ql/src/test/queries/clientpositive/vector_bucket.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.support.concurrency=true;
 set hive.enforce.bucketing=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_cast_constant.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_cast_constant.q 
b/ql/src/test/queries/clientpositive/vector_cast_constant.q
index 890fcb4..d15e87b 100644
--- a/ql/src/test/queries/clientpositive/vector_cast_constant.q
+++ b/ql/src/test/queries/clientpositive/vector_cast_constant.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 -- JAVA_VERSION_SPECIFIC_OUTPUT

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_char_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_char_2.q 
b/ql/src/test/queries/clientpositive/vector_char_2.q
index 0828ca1..efa3154 100644
--- a/ql/src/test/queries/clientpositive/vector_char_2.q
+++ b/ql/src/test/queries/clientpositive/vector_char_2.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 drop table char_2;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_char_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_char_4.q 
b/ql/src/test/queries/clientpositive/vector_char_4.q
index c824456..06f1d2b 100644
--- a/ql/src/test/queries/clientpositive/vector_char_4.q
+++ b/ql/src/test/queries/clientpositive/vector_char_4.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 drop table if exists vectortab2k;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_char_mapjoin1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_char_mapjoin1.q 
b/ql/src/test/queries/clientpositive/vector_char_mapjoin1.q
index 76e9de8..a31e7b9 100644
--- a/ql/src/test/queries/clientpositive/vector_char_mapjoin1.q
+++ b/ql/src/test/queries/clientpositive/vector_char_mapjoin1.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=none;
 SET hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_char_simple.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_char_simple.q 
b/ql/src/test/queries/clientpositive/vector_char_simple.q
index 858fe16..a921140 100644
--- a/ql/src/test/queries/clientpositive/vector_char_simple.q
+++ b/ql/src/test/queries/clientpositive/vector_char_simple.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 drop table char_2;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_coalesce.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_coalesce.q 
b/ql/src/test/queries/clientpositive/vector_coalesce.q
index 052ab71..eea0f48 100644
--- a/ql/src/test/queries/clientpositive/vector_coalesce.q
+++ b/ql/src/test/queries/clientpositive/vector_coalesce.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 EXPLAIN SELECT cdouble, cstring1, cint, cfloat, csmallint, coalesce(cdouble, 
cstring1, cint, cfloat, csmallint) 
 FROM alltypesorc

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_coalesce_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_coalesce_2.q 
b/ql/src/test/queries/clientpositive/vector_coalesce_2.q
index b2c46dc..1dee7d4 100644
--- a/ql/src/test/queries/clientpositive/vector_coalesce_2.q
+++ b/ql/src/test/queries/clientpositive/vector_coalesce_2.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=false;
 set hive.fetch.task.conversion=none;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_count_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_count_distinct.q 
b/ql/src/test/queries/clientpositive/vector_count_distinct.q
index c1aae08..985c32e 100644
--- a/ql/src/test/queries/clientpositive/vector_count_distinct.q
+++ b/ql/src/test/queries/clientpositive/vector_count_distinct.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 create table web_sales_txt

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_data_types.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_data_types.q 
b/ql/src/test/queries/clientpositive/vector_data_types.q
index c7a9c4c..06a650c 100644
--- a/ql/src/test/queries/clientpositive/vector_data_types.q
+++ b/ql/src/test/queries/clientpositive/vector_data_types.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 
 DROP TABLE over1k;
 DROP TABLE over1korc;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_date_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_date_1.q 
b/ql/src/test/queries/clientpositive/vector_date_1.q
index 908c082..165f86a 100644
--- a/ql/src/test/queries/clientpositive/vector_date_1.q
+++ b/ql/src/test/queries/clientpositive/vector_date_1.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 
 set hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_decimal_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_1.q 
b/ql/src/test/queries/clientpositive/vector_decimal_1.q
index 9646094..f6578cd 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_1.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_1.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_decimal_10_0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_10_0.q 
b/ql/src/test/queries/clientpositive/vector_decimal_10_0.q
index e0d5b98..32898e6 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_10_0.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_10_0.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_decimal_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_2.q 
b/ql/src/test/queries/clientpositive/vector_decimal_2.q
index 9f29092..79d602a 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_2.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_2.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_decimal_aggregate.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_aggregate.q 
b/ql/src/test/queries/clientpositive/vector_decimal_aggregate.q
index ee83f5b..552a564 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_aggregate.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_aggregate.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 CREATE TABLE decimal_vgby STORED AS ORC AS 
     SELECT cdouble, CAST (((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1, 
     CAST (((cdouble*9.3)/13) AS DECIMAL(23,14)) AS cdecimal2,

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_decimal_cast.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_cast.q 
b/ql/src/test/queries/clientpositive/vector_decimal_cast.q
index ea7a5b8..eb0e75c 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_cast.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_cast.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 EXPLAIN SELECT cdouble, cint, cboolean1, ctimestamp1, CAST(cdouble AS 
DECIMAL(20,10)), CAST(cint AS DECIMAL(23,14)), CAST(cboolean1 AS DECIMAL(5,2)), 
CAST(ctimestamp1 AS DECIMAL(15,0)) FROM alltypesorc WHERE cdouble IS NOT NULL 
AND cint IS NOT NULL AND cboolean1 IS NOT NULL AND ctimestamp1 IS NOT NULL 
LIMIT 10;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_decimal_expressions.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_expressions.q 
b/ql/src/test/queries/clientpositive/vector_decimal_expressions.q
index a74b17b..5c232c8 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_expressions.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_expressions.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 CREATE TABLE decimal_test STORED AS ORC AS SELECT cdouble, CAST 
(((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1, CAST (((cdouble*9.3)/13) 
AS DECIMAL(23,14)) AS cdecimal2 FROM alltypesorc;
 SET hive.vectorized.execution.enabled=true;
 EXPLAIN SELECT cdecimal1 + cdecimal2, cdecimal1 - (2*cdecimal2), 
((cdecimal1+2.34)/cdecimal2), (cdecimal1 * (cdecimal2/3.4)), cdecimal1 % 10, 
CAST(cdecimal1 AS INT), CAST(cdecimal2 AS SMALLINT), CAST(cdecimal2 AS 
TINYINT), CAST(cdecimal1 AS BIGINT), CAST (cdecimal1 AS BOOLEAN), 
CAST(cdecimal2 AS DOUBLE), CAST(cdecimal1 AS FLOAT), CAST(cdecimal2 AS STRING), 
CAST(cdecimal1 AS TIMESTAMP) FROM decimal_test WHERE cdecimal1 > 0 AND 
cdecimal1 < 12345.5678 AND cdecimal2 != 0 AND cdecimal2 > 1000 AND cdouble IS 
NOT NULL LIMIT 10;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q 
b/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q
index 0c07b47..16c2ed0 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.auto.convert.join=true;
 SET hive.auto.convert.join.noconditionaltask=true;
 SET hive.auto.convert.join.noconditionaltask.size=1000000000;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_decimal_math_funcs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_math_funcs.q 
b/ql/src/test/queries/clientpositive/vector_decimal_math_funcs.q
index b8fa7cd..74c7490 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_math_funcs.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_math_funcs.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 CREATE TABLE decimal_test STORED AS ORC AS SELECT cbigint, cdouble, CAST 
(((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1, CAST (((cdouble*9.3)/13) 
AS DECIMAL(23,14)) AS cdecimal2 FROM alltypesorc;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_decimal_precision.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_precision.q 
b/ql/src/test/queries/clientpositive/vector_decimal_precision.q
index 586cd8a..c7f449a 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_precision.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_precision.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_decimal_round.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_round.q 
b/ql/src/test/queries/clientpositive/vector_decimal_round.q
index 2b7a005..7ebc75b 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_round.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_round.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_decimal_round_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_round_2.q 
b/ql/src/test/queries/clientpositive/vector_decimal_round_2.q
index e5f10d5..23be1fc 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_round_2.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_round_2.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_decimal_udf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_udf.q 
b/ql/src/test/queries/clientpositive/vector_decimal_udf.q
index 072abf2..a8ee2e8 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_udf.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_udf.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_decimal_udf2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_decimal_udf2.q 
b/ql/src/test/queries/clientpositive/vector_decimal_udf2.q
index 8fb0e15..0259626 100644
--- a/ql/src/test/queries/clientpositive/vector_decimal_udf2.q
+++ b/ql/src/test/queries/clientpositive/vector_decimal_udf2.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_distinct_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_distinct_2.q 
b/ql/src/test/queries/clientpositive/vector_distinct_2.q
index 1a577de..07945e3 100644
--- a/ql/src/test/queries/clientpositive/vector_distinct_2.q
+++ b/ql/src/test/queries/clientpositive/vector_distinct_2.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_elt.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_elt.q 
b/ql/src/test/queries/clientpositive/vector_elt.q
index 1430a17..e11b35f 100644
--- a/ql/src/test/queries/clientpositive/vector_elt.q
+++ b/ql/src/test/queries/clientpositive/vector_elt.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 EXPLAIN SELECT (ctinyint % 2) + 1, cstring1, cint, elt((ctinyint % 2) + 1, 
cstring1, cint) 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_groupby_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_groupby_3.q 
b/ql/src/test/queries/clientpositive/vector_groupby_3.q
index df0f74b..014f9e1 100644
--- a/ql/src/test/queries/clientpositive/vector_groupby_3.q
+++ b/ql/src/test/queries/clientpositive/vector_groupby_3.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_groupby_reduce.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_groupby_reduce.q 
b/ql/src/test/queries/clientpositive/vector_groupby_reduce.q
index 5da2089..a6b6b1b 100644
--- a/ql/src/test/queries/clientpositive/vector_groupby_reduce.q
+++ b/ql/src/test/queries/clientpositive/vector_groupby_reduce.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 create table store_sales_txt

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_grouping_sets.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_grouping_sets.q 
b/ql/src/test/queries/clientpositive/vector_grouping_sets.q
index 9449ec4..09ba6b6 100644
--- a/ql/src/test/queries/clientpositive/vector_grouping_sets.q
+++ b/ql/src/test/queries/clientpositive/vector_grouping_sets.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=none;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_if_expr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_if_expr.q 
b/ql/src/test/queries/clientpositive/vector_if_expr.q
index c8ab55e..2e704b7 100644
--- a/ql/src/test/queries/clientpositive/vector_if_expr.q
+++ b/ql/src/test/queries/clientpositive/vector_if_expr.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_inner_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_inner_join.q 
b/ql/src/test/queries/clientpositive/vector_inner_join.q
index 025b1a4..aa242a5 100644
--- a/ql/src/test/queries/clientpositive/vector_inner_join.q
+++ b/ql/src/test/queries/clientpositive/vector_inner_join.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_interval_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_interval_1.q 
b/ql/src/test/queries/clientpositive/vector_interval_1.q
index 1f3e620..ffa9e16 100644
--- a/ql/src/test/queries/clientpositive/vector_interval_1.q
+++ b/ql/src/test/queries/clientpositive/vector_interval_1.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 
 set hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_interval_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_interval_2.q 
b/ql/src/test/queries/clientpositive/vector_interval_2.q
index 467e5f2..d413f5a 100644
--- a/ql/src/test/queries/clientpositive/vector_interval_2.q
+++ b/ql/src/test/queries/clientpositive/vector_interval_2.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 set hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_interval_mapjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_interval_mapjoin.q 
b/ql/src/test/queries/clientpositive/vector_interval_mapjoin.q
index 9a58658..671aa2c 100644
--- a/ql/src/test/queries/clientpositive/vector_interval_mapjoin.q
+++ b/ql/src/test/queries/clientpositive/vector_interval_mapjoin.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_join30.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_join30.q 
b/ql/src/test/queries/clientpositive/vector_join30.q
index 2275804..1467cd3 100644
--- a/ql/src/test/queries/clientpositive/vector_join30.q
+++ b/ql/src/test/queries/clientpositive/vector_join30.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.vectorized.execution.mapjoin.native.enabled=true;
 set hive.fetch.task.conversion=none;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_left_outer_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_left_outer_join.q 
b/ql/src/test/queries/clientpositive/vector_left_outer_join.q
index 7c46c53..2fc5240 100644
--- a/ql/src/test/queries/clientpositive/vector_left_outer_join.q
+++ b/ql/src/test/queries/clientpositive/vector_left_outer_join.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 set hive.vectorized.execution.enabled=true;
 set hive.auto.convert.join=true;
 set hive.mapjoin.hybridgrace.hashtable=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_left_outer_join2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_left_outer_join2.q 
b/ql/src/test/queries/clientpositive/vector_left_outer_join2.q
index 62ad9ee..3ba67a2 100644
--- a/ql/src/test/queries/clientpositive/vector_left_outer_join2.q
+++ b/ql/src/test/queries/clientpositive/vector_left_outer_join2.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 set hive.fetch.task.conversion=none;
 set hive.auto.convert.join=true;
 set hive.auto.convert.join.noconditionaltask=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_leftsemi_mapjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_leftsemi_mapjoin.q 
b/ql/src/test/queries/clientpositive/vector_leftsemi_mapjoin.q
index 522ab12..680d2c9 100644
--- a/ql/src/test/queries/clientpositive/vector_leftsemi_mapjoin.q
+++ b/ql/src/test/queries/clientpositive/vector_leftsemi_mapjoin.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 set hive.fetch.task.conversion=none;
 set hive.auto.convert.join=true;
 set hive.auto.convert.join.noconditionaltask=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_mapjoin_reduce.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_mapjoin_reduce.q 
b/ql/src/test/queries/clientpositive/vector_mapjoin_reduce.q
index 99aff3b..a83d95f 100644
--- a/ql/src/test/queries/clientpositive/vector_mapjoin_reduce.q
+++ b/ql/src/test/queries/clientpositive/vector_mapjoin_reduce.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_mr_diff_schema_alias.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_mr_diff_schema_alias.q 
b/ql/src/test/queries/clientpositive/vector_mr_diff_schema_alias.q
index 23c6cf9..bb87344 100644
--- a/ql/src/test/queries/clientpositive/vector_mr_diff_schema_alias.q
+++ b/ql/src/test/queries/clientpositive/vector_mr_diff_schema_alias.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 create table date_dim

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_multi_insert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_multi_insert.q 
b/ql/src/test/queries/clientpositive/vector_multi_insert.q
index 9620f92..8c92cda 100644
--- a/ql/src/test/queries/clientpositive/vector_multi_insert.q
+++ b/ql/src/test/queries/clientpositive/vector_multi_insert.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_non_string_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_non_string_partition.q 
b/ql/src/test/queries/clientpositive/vector_non_string_partition.q
index fc1dc6d..7759796 100644
--- a/ql/src/test/queries/clientpositive/vector_non_string_partition.q
+++ b/ql/src/test/queries/clientpositive/vector_non_string_partition.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 CREATE TABLE non_string_part(cint INT, cstring1 STRING, cdouble DOUBLE, 
ctimestamp1 TIMESTAMP) PARTITIONED BY (ctinyint tinyint) STORED AS ORC;
 SET hive.exec.dynamic.partition.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_null_projection.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_null_projection.q 
b/ql/src/test/queries/clientpositive/vector_null_projection.q
index bab496e..66c0838 100644
--- a/ql/src/test/queries/clientpositive/vector_null_projection.q
+++ b/ql/src/test/queries/clientpositive/vector_null_projection.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=none;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_nullsafe_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_nullsafe_join.q 
b/ql/src/test/queries/clientpositive/vector_nullsafe_join.q
index 316b2a6..b316a54 100644
--- a/ql/src/test/queries/clientpositive/vector_nullsafe_join.q
+++ b/ql/src/test/queries/clientpositive/vector_nullsafe_join.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_orderby_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_orderby_5.q 
b/ql/src/test/queries/clientpositive/vector_orderby_5.q
index 571ecc9..2014ef7 100644
--- a/ql/src/test/queries/clientpositive/vector_orderby_5.q
+++ b/ql/src/test/queries/clientpositive/vector_orderby_5.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 create table vectortab2k(

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_outer_join0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_outer_join0.q 
b/ql/src/test/queries/clientpositive/vector_outer_join0.q
index 95bdc41..f8caa83 100644
--- a/ql/src/test/queries/clientpositive/vector_outer_join0.q
+++ b/ql/src/test/queries/clientpositive/vector_outer_join0.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_outer_join1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_outer_join1.q 
b/ql/src/test/queries/clientpositive/vector_outer_join1.q
index 566b67a..4a36452 100644
--- a/ql/src/test/queries/clientpositive/vector_outer_join1.q
+++ b/ql/src/test/queries/clientpositive/vector_outer_join1.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;
 SET hive.vectorized.execution.mapjoin.native.enabled=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_outer_join2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_outer_join2.q 
b/ql/src/test/queries/clientpositive/vector_outer_join2.q
index 468034e..d3b5805 100644
--- a/ql/src/test/queries/clientpositive/vector_outer_join2.q
+++ b/ql/src/test/queries/clientpositive/vector_outer_join2.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;
 SET hive.vectorized.execution.mapjoin.native.enabled=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_outer_join3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_outer_join3.q 
b/ql/src/test/queries/clientpositive/vector_outer_join3.q
index 30728c8..e5fc0a9 100644
--- a/ql/src/test/queries/clientpositive/vector_outer_join3.q
+++ b/ql/src/test/queries/clientpositive/vector_outer_join3.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;
 SET hive.vectorized.execution.mapjoin.native.enabled=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_outer_join4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_outer_join4.q 
b/ql/src/test/queries/clientpositive/vector_outer_join4.q
index 6976285..45461b5 100644
--- a/ql/src/test/queries/clientpositive/vector_outer_join4.q
+++ b/ql/src/test/queries/clientpositive/vector_outer_join4.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;
 SET hive.vectorized.execution.mapjoin.native.enabled=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_outer_join5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_outer_join5.q 
b/ql/src/test/queries/clientpositive/vector_outer_join5.q
index b7ee4a4..4b6b6d6 100644
--- a/ql/src/test/queries/clientpositive/vector_outer_join5.q
+++ b/ql/src/test/queries/clientpositive/vector_outer_join5.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.vectorized.execution.mapjoin.native.enabled=true;
 set hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_partition_diff_num_cols.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/vector_partition_diff_num_cols.q 
b/ql/src/test/queries/clientpositive/vector_partition_diff_num_cols.q
index 30ea590..f2335e4 100644
--- a/ql/src/test/queries/clientpositive/vector_partition_diff_num_cols.q
+++ b/ql/src/test/queries/clientpositive/vector_partition_diff_num_cols.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_partitioned_date_time.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_partitioned_date_time.q 
b/ql/src/test/queries/clientpositive/vector_partitioned_date_time.q
index 1aeec8c..c6480d2 100644
--- a/ql/src/test/queries/clientpositive/vector_partitioned_date_time.q
+++ b/ql/src/test/queries/clientpositive/vector_partitioned_date_time.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 set hive.fetch.task.conversion=minimal;
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_reduce_groupby_decimal.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_reduce_groupby_decimal.q 
b/ql/src/test/queries/clientpositive/vector_reduce_groupby_decimal.q
index a282518..4a50150 100644
--- a/ql/src/test/queries/clientpositive/vector_reduce_groupby_decimal.q
+++ b/ql/src/test/queries/clientpositive/vector_reduce_groupby_decimal.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 CREATE TABLE decimal_test STORED AS ORC AS SELECT cint, cdouble, CAST 
(((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1, CAST (((cdouble*9.3)/13) 
AS DECIMAL(23,14)) AS cdecimal2 FROM alltypesorc
 WHERE cint is not null and cdouble is not null;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_string_concat.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_string_concat.q 
b/ql/src/test/queries/clientpositive/vector_string_concat.q
index 36be0ec..06bd68e 100644
--- a/ql/src/test/queries/clientpositive/vector_string_concat.q
+++ b/ql/src/test/queries/clientpositive/vector_string_concat.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 DROP TABLE over1k;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_varchar_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_varchar_4.q 
b/ql/src/test/queries/clientpositive/vector_varchar_4.q
index c1e9c67..32a74a4 100644
--- a/ql/src/test/queries/clientpositive/vector_varchar_4.q
+++ b/ql/src/test/queries/clientpositive/vector_varchar_4.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 drop table if exists vectortab2k;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_varchar_mapjoin1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_varchar_mapjoin1.q 
b/ql/src/test/queries/clientpositive/vector_varchar_mapjoin1.q
index 2aade4e..c5c9048 100644
--- a/ql/src/test/queries/clientpositive/vector_varchar_mapjoin1.q
+++ b/ql/src/test/queries/clientpositive/vector_varchar_mapjoin1.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=none;
 SET hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vector_varchar_simple.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_varchar_simple.q 
b/ql/src/test/queries/clientpositive/vector_varchar_simple.q
index 1cd30ee..acd6598 100644
--- a/ql/src/test/queries/clientpositive/vector_varchar_simple.q
+++ b/ql/src/test/queries/clientpositive/vector_varchar_simple.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 drop table varchar_2;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorization_0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_0.q 
b/ql/src/test/queries/clientpositive/vectorization_0.q
index b3cd794..08aeff9 100644
--- a/ql/src/test/queries/clientpositive/vectorization_0.q
+++ b/ql/src/test/queries/clientpositive/vectorization_0.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 -- Use ORDER BY clauses to generate 2 stages.

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorization_13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_13.q 
b/ql/src/test/queries/clientpositive/vectorization_13.q
index 2103015..51dc058 100644
--- a/ql/src/test/queries/clientpositive/vectorization_13.q
+++ b/ql/src/test/queries/clientpositive/vectorization_13.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorization_14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_14.q 
b/ql/src/test/queries/clientpositive/vectorization_14.q
index e766d14..3354605 100644
--- a/ql/src/test/queries/clientpositive/vectorization_14.q
+++ b/ql/src/test/queries/clientpositive/vectorization_14.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 EXPLAIN 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorization_15.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_15.q 
b/ql/src/test/queries/clientpositive/vectorization_15.q
index 5ad2de7..4502ec0 100644
--- a/ql/src/test/queries/clientpositive/vectorization_15.q
+++ b/ql/src/test/queries/clientpositive/vectorization_15.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 EXPLAIN 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorization_16.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_16.q 
b/ql/src/test/queries/clientpositive/vectorization_16.q
index 422ac5a..84f1faa 100644
--- a/ql/src/test/queries/clientpositive/vectorization_16.q
+++ b/ql/src/test/queries/clientpositive/vectorization_16.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorization_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_7.q 
b/ql/src/test/queries/clientpositive/vectorization_7.q
index 7d5071f..7ef3e2e 100644
--- a/ql/src/test/queries/clientpositive/vectorization_7.q
+++ b/ql/src/test/queries/clientpositive/vectorization_7.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorization_8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_8.q 
b/ql/src/test/queries/clientpositive/vectorization_8.q
index 9cfe86f..f50b874 100644
--- a/ql/src/test/queries/clientpositive/vectorization_8.q
+++ b/ql/src/test/queries/clientpositive/vectorization_8.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorization_9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_9.q 
b/ql/src/test/queries/clientpositive/vectorization_9.q
index 2d927e5..5a05e63 100644
--- a/ql/src/test/queries/clientpositive/vectorization_9.q
+++ b/ql/src/test/queries/clientpositive/vectorization_9.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 EXPLAIN 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorization_decimal_date.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_decimal_date.q 
b/ql/src/test/queries/clientpositive/vectorization_decimal_date.q
index 2b82a5a..854ee20 100644
--- a/ql/src/test/queries/clientpositive/vectorization_decimal_date.q
+++ b/ql/src/test/queries/clientpositive/vectorization_decimal_date.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 CREATE TABLE date_decimal_test STORED AS ORC AS SELECT cint, cdouble, CAST 
(CAST (cint AS TIMESTAMP) AS DATE) AS cdate, CAST (((cdouble*22.1)/37) AS 
DECIMAL(20,10)) AS cdecimal FROM alltypesorc;
 SET hive.vectorized.execution.enabled=true;
 EXPLAIN SELECT cdate, cdecimal from date_decimal_test where cint IS NOT NULL 
AND cdouble IS NOT NULL LIMIT 10;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorization_div0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_div0.q 
b/ql/src/test/queries/clientpositive/vectorization_div0.q
index 26bd0f2..78f91f4 100644
--- a/ql/src/test/queries/clientpositive/vectorization_div0.q
+++ b/ql/src/test/queries/clientpositive/vectorization_div0.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled = true;
 
 -- TODO: add more stuff here after HIVE-5918 is fixed, such as cbigint and 
constants

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorization_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_limit.q 
b/ql/src/test/queries/clientpositive/vectorization_limit.q
index 094a8d2..8799087 100644
--- a/ql/src/test/queries/clientpositive/vectorization_limit.q
+++ b/ql/src/test/queries/clientpositive/vectorization_limit.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 explain SELECT cbigint, cdouble FROM alltypesorc WHERE cbigint < cdouble and 
cint > 0 limit 7;
 SELECT cbigint, cdouble FROM alltypesorc WHERE cbigint < cdouble and cint > 0 
limit 7;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorization_part_project.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_part_project.q 
b/ql/src/test/queries/clientpositive/vectorization_part_project.q
index e925ea8..a6abb86 100644
--- a/ql/src/test/queries/clientpositive/vectorization_part_project.q
+++ b/ql/src/test/queries/clientpositive/vectorization_part_project.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 CREATE TABLE alltypesorc_part(ctinyint tinyint, csmallint smallint, cint int, 
cbigint bigint, cfloat float, cdouble double, cstring1 string, cstring2 string, 
ctimestamp1 timestamp, ctimestamp2 timestamp, cboolean1 boolean, cboolean2 
boolean) partitioned by (ds string) STORED AS ORC;
 insert overwrite table alltypesorc_part partition (ds='2011') select * from 
alltypesorc order by ctinyint, cint, cbigint limit 100;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorization_pushdown.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_pushdown.q 
b/ql/src/test/queries/clientpositive/vectorization_pushdown.q
index bafe550..c54c529 100644
--- a/ql/src/test/queries/clientpositive/vectorization_pushdown.q
+++ b/ql/src/test/queries/clientpositive/vectorization_pushdown.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.optimize.index.filter=true;
 explain SELECT AVG(cbigint) FROM alltypesorc WHERE cbigint < cdouble;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorization_short_regress.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_short_regress.q 
b/ql/src/test/queries/clientpositive/vectorization_short_regress.q
index 404b799..ba6e89d 100644
--- a/ql/src/test/queries/clientpositive/vectorization_short_regress.q
+++ b/ql/src/test/queries/clientpositive/vectorization_short_regress.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=minimal;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorized_bucketmapjoin1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_bucketmapjoin1.q 
b/ql/src/test/queries/clientpositive/vectorized_bucketmapjoin1.q
index ef1b816..022ce2e 100644
--- a/ql/src/test/queries/clientpositive/vectorized_bucketmapjoin1.q
+++ b/ql/src/test/queries/clientpositive/vectorized_bucketmapjoin1.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 create table vsmb_bucket_1(key int, value string) 
   CLUSTERED BY (key) 
   SORTED BY (key) INTO 1 BUCKETS 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorized_case.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_case.q 
b/ql/src/test/queries/clientpositive/vectorized_case.q
index e448d51..8799fbb 100644
--- a/ql/src/test/queries/clientpositive/vectorized_case.q
+++ b/ql/src/test/queries/clientpositive/vectorized_case.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 set hive.vectorized.execution.enabled = true
 ;
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorized_casts.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_casts.q 
b/ql/src/test/queries/clientpositive/vectorized_casts.q
index 9147a6a..e0083eb 100644
--- a/ql/src/test/queries/clientpositive/vectorized_casts.q
+++ b/ql/src/test/queries/clientpositive/vectorized_casts.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled = true;
 
 -- Test type casting in vectorized mode to verify end-to-end functionality.

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorized_context.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_context.q 
b/ql/src/test/queries/clientpositive/vectorized_context.q
index 5706b3a..aeb1f2e 100644
--- a/ql/src/test/queries/clientpositive/vectorized_context.q
+++ b/ql/src/test/queries/clientpositive/vectorized_context.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 create table store(s_store_sk int, s_city string)
 stored as orc;
 insert overwrite table store

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorized_date_funcs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_date_funcs.q 
b/ql/src/test/queries/clientpositive/vectorized_date_funcs.q
index 1fb0dac..f3c07a2 100644
--- a/ql/src/test/queries/clientpositive/vectorized_date_funcs.q
+++ b/ql/src/test/queries/clientpositive/vectorized_date_funcs.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled = true;
 
 -- Test timestamp functions in vectorized mode to verify they run correctly 
end-to-end.

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorized_distinct_gby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_distinct_gby.q 
b/ql/src/test/queries/clientpositive/vectorized_distinct_gby.q
index 2553e9f..bad6baa 100644
--- a/ql/src/test/queries/clientpositive/vectorized_distinct_gby.q
+++ b/ql/src/test/queries/clientpositive/vectorized_distinct_gby.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 
 SET hive.map.groupby.sorted=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorized_dynamic_partition_pruning.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/vectorized_dynamic_partition_pruning.q 
b/ql/src/test/queries/clientpositive/vectorized_dynamic_partition_pruning.q
index 71971fe..69cdca9 100644
--- a/ql/src/test/queries/clientpositive/vectorized_dynamic_partition_pruning.q
+++ b/ql/src/test/queries/clientpositive/vectorized_dynamic_partition_pruning.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=true;
 set hive.tez.dynamic.partition.pruning=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorized_mapjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_mapjoin.q 
b/ql/src/test/queries/clientpositive/vectorized_mapjoin.q
index 10277e5..11004a8 100644
--- a/ql/src/test/queries/clientpositive/vectorized_mapjoin.q
+++ b/ql/src/test/queries/clientpositive/vectorized_mapjoin.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;
 SET hive.auto.convert.join.noconditionaltask=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorized_math_funcs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_math_funcs.q 
b/ql/src/test/queries/clientpositive/vectorized_math_funcs.q
index d6b0824..d79fcce 100644
--- a/ql/src/test/queries/clientpositive/vectorized_math_funcs.q
+++ b/ql/src/test/queries/clientpositive/vectorized_math_funcs.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled = true;
 
 -- Test math functions in vectorized mode to verify they run correctly 
end-to-end.

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q 
b/ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q
index ebf5902..849af18 100644
--- a/ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q
+++ b/ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;
 SET hive.auto.convert.join.noconditionaltask=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorized_parquet.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_parquet.q 
b/ql/src/test/queries/clientpositive/vectorized_parquet.q
index 4b14628..a49ca63 100644
--- a/ql/src/test/queries/clientpositive/vectorized_parquet.q
+++ b/ql/src/test/queries/clientpositive/vectorized_parquet.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 set hive.exec.submitviachild=true;
 set hive.exec.submit.local.task.via.child=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorized_shufflejoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_shufflejoin.q 
b/ql/src/test/queries/clientpositive/vectorized_shufflejoin.q
index c9851d2..92aae2c 100644
--- a/ql/src/test/queries/clientpositive/vectorized_shufflejoin.q
+++ b/ql/src/test/queries/clientpositive/vectorized_shufflejoin.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorized_string_funcs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_string_funcs.q 
b/ql/src/test/queries/clientpositive/vectorized_string_funcs.q
index 96fe53d..d04a3c3 100644
--- a/ql/src/test/queries/clientpositive/vectorized_string_funcs.q
+++ b/ql/src/test/queries/clientpositive/vectorized_string_funcs.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 SET hive.vectorized.execution.enabled = true;
 
 -- Test string functions in vectorized mode to verify end-to-end functionality.

http://git-wip-us.apache.org/repos/asf/hive/blob/8842dcaf/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q 
b/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q
index c27697a..119c1c7 100644
--- a/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q
+++ b/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q
@@ -1,3 +1,4 @@
+set hive.explain.user=false;
 -- Test timestamp functions in vectorized mode to verify they run correctly 
end-to-end.
 -- Turning on vectorization has been temporarily moved after filling the test 
table
 -- due to bug HIVE-8197.

Reply via email to