hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmccl...@apache.org
Subject [41/51] [partial] hive git commit: HIVE-11394: Enhance EXPLAIN display for vectorization (Matt McCline, reviewed by Gopal Vijayaraghavan)
Date Fri, 03 Feb 2017 20:04:06 GMT
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vector_outer_join6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_outer_join6.q b/ql/src/test/queries/clientpositive/vector_outer_join6.q
index 06fa385..b39e8ed 100644
--- a/ql/src/test/queries/clientpositive/vector_outer_join6.q
+++ b/ql/src/test/queries/clientpositive/vector_outer_join6.q
@@ -3,6 +3,7 @@ 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;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 
@@ -28,14 +29,14 @@ create table TJOIN2 stored as orc AS SELECT * FROM TJOIN2_txt;
 create table TJOIN3 stored as orc AS SELECT * FROM TJOIN3_txt;
 create table TJOIN4 stored as orc AS SELECT * FROM TJOIN4_txt;
 
-explain
+explain vectorization detail formatted
 select tj1rnum, tj2rnum, tjoin3.rnum as rnumt3 from
    (select tjoin1.rnum tj1rnum, tjoin2.rnum tj2rnum, tjoin2.c1 tj2c1 from tjoin1 left outer join tjoin2 on tjoin1.c1 = tjoin2.c1 ) tj left outer join tjoin3 on tj2c1 = tjoin3.c1;
 
 select tj1rnum, tj2rnum, tjoin3.rnum as rnumt3 from
    (select tjoin1.rnum tj1rnum, tjoin2.rnum tj2rnum, tjoin2.c1 tj2c1 from tjoin1 left outer join tjoin2 on tjoin1.c1 = tjoin2.c1 ) tj left outer join tjoin3 on tj2c1 = tjoin3.c1;
 
-explain
+explain vectorization detail formatted
 select tj1rnum, tj2rnum as rnumt3 from
    (select tjoin1.rnum tj1rnum, tjoin2.rnum tj2rnum, tjoin2.c1 tj2c1 from tjoin1 left outer join tjoin2 on tjoin1.c1 = tjoin2.c1 ) tj left outer join tjoin3 on tj2c1 = tjoin3.c1;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 f25374d..b825fb3 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,7 +1,7 @@
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
-set hive.fetch.task.conversion=minimal;
+set hive.fetch.task.conversion=none;
 
 create table inventory_txt
 (
@@ -27,7 +27,7 @@ partitioned by (par string) stored as orc;
 insert into table inventory_part_0 partition(par='1') select * from inventory_txt;
 insert into table inventory_part_0 partition(par='2') select * from inventory_txt;
 
-explain
+explain vectorization expression
 select sum(inv_quantity_on_hand) from inventory_part_0;
 
 select sum(inv_quantity_on_hand) from inventory_part_0;
@@ -47,7 +47,7 @@ alter table inventory_part_1 add columns (fifthcol string);
 
 insert into table inventory_part_1 partition(par='5cols') select *, '5th' as fifthcol from inventory_txt;
 
-explain
+explain vectorization expression
 select sum(inv_quantity_on_hand) from inventory_part_1;
 
 select sum(inv_quantity_on_hand) from inventory_part_1;
@@ -66,7 +66,7 @@ insert into table inventory_part_2a partition(par='1') select * from inventory_t
 insert into table inventory_part_2a partition(par='2') select * from inventory_txt;
 alter table inventory_part_2a partition (par='2') change inv_item_sk other_name int;
 
-explain
+explain vectorization expression
 select sum(inv_quantity_on_hand) from inventory_part_2a;
 
 create table inventory_part_2b(
@@ -80,7 +80,7 @@ insert into table inventory_part_2b partition(par1='1',par2=4) select * from inv
 insert into table inventory_part_2b partition(par1='2',par2=3) select * from inventory_txt;
 alter table inventory_part_2b partition (par1='2',par2=3) change inv_quantity_on_hand other_name int;
 
-explain
+explain vectorization expression
 select sum(inv_quantity_on_hand) from inventory_part_2b;
 
 -- Verify we do not vectorize when a partition column type is different.
@@ -97,5 +97,5 @@ insert into table inventory_part_3 partition(par='1') select * from inventory_tx
 insert into table inventory_part_3 partition(par='2') select * from inventory_txt;
 alter table inventory_part_3 partition (par='2') change inv_warehouse_sk inv_warehouse_sk bigint;
 
-explain
+explain vectorization expression
 select sum(inv_quantity_on_hand) from inventory_part_3;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 f53d8c0..ee22c01 100644
--- a/ql/src/test/queries/clientpositive/vector_partitioned_date_time.q
+++ b/ql/src/test/queries/clientpositive/vector_partitioned_date_time.q
@@ -1,6 +1,6 @@
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
-set hive.fetch.task.conversion=minimal;
+set hive.fetch.task.conversion=none;
 
 -- Exclude test on Windows due to space character being escaped in Hive paths on Windows.
 -- EXCLUDE_OS_WINDOWS
@@ -32,12 +32,12 @@ select fl_date, count(*) from flights_tiny_orc group by fl_date;
 
 SET hive.vectorized.execution.enabled=true;
 
-explain
+explain vectorization expression
 select * from flights_tiny_orc sort by fl_num, fl_date limit 25;
 
 select * from flights_tiny_orc sort by fl_num, fl_date limit 25;
 
-explain
+explain vectorization expression
 select fl_date, count(*) from flights_tiny_orc group by fl_date;
 
 select fl_date, count(*) from flights_tiny_orc group by fl_date;
@@ -71,17 +71,17 @@ select fl_date, count(*) from flights_tiny_orc_partitioned_date group by fl_date
 
 SET hive.vectorized.execution.enabled=true;
 
-explain
+explain vectorization expression
 select * from flights_tiny_orc_partitioned_date;
 
 select * from flights_tiny_orc_partitioned_date;
 
-explain
+explain vectorization expression
 select * from flights_tiny_orc_partitioned_date sort by fl_num, fl_date limit 25;
 
 select * from flights_tiny_orc_partitioned_date sort by fl_num, fl_date limit 25;
 
-explain
+explain vectorization expression
 select fl_date, count(*) from flights_tiny_orc_partitioned_date group by fl_date;
 
 select fl_date, count(*) from flights_tiny_orc_partitioned_date group by fl_date;
@@ -115,17 +115,17 @@ select fl_time, count(*) from flights_tiny_orc_partitioned_timestamp group by fl
 
 SET hive.vectorized.execution.enabled=true;
 
-explain
+explain vectorization expression
 select * from flights_tiny_orc_partitioned_timestamp;
 
 select * from flights_tiny_orc_partitioned_timestamp;
 
-explain
+explain vectorization expression
 select * from flights_tiny_orc_partitioned_timestamp sort by fl_num, fl_time limit 25;
 
 select * from flights_tiny_orc_partitioned_timestamp sort by fl_num, fl_time limit 25;
 
-explain
+explain vectorization expression
 select fl_time, count(*) from flights_tiny_orc_partitioned_timestamp group by fl_time;
 
 select fl_time, count(*) from flights_tiny_orc_partitioned_timestamp group by fl_time;

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vector_partitioned_date_time_win.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_partitioned_date_time_win.q b/ql/src/test/queries/clientpositive/vector_partitioned_date_time_win.q
index c157df1..bd4931c 100644
--- a/ql/src/test/queries/clientpositive/vector_partitioned_date_time_win.q
+++ b/ql/src/test/queries/clientpositive/vector_partitioned_date_time_win.q
@@ -30,12 +30,12 @@ select fl_date, count(*) from flights_tiny_orc group by fl_date;
 
 SET hive.vectorized.execution.enabled=true;
 
-explain
+explain vectorization expression
 select * from flights_tiny_orc sort by fl_num, fl_date limit 25;
 
 select * from flights_tiny_orc sort by fl_num, fl_date limit 25;
 
-explain
+explain vectorization expression
 select fl_date, count(*) from flights_tiny_orc group by fl_date;
 
 select fl_date, count(*) from flights_tiny_orc group by fl_date;
@@ -69,17 +69,17 @@ select fl_date, count(*) from flights_tiny_orc_partitioned_date group by fl_date
 
 SET hive.vectorized.execution.enabled=true;
 
-explain
+explain vectorization expression
 select * from flights_tiny_orc_partitioned_date;
 
 select * from flights_tiny_orc_partitioned_date;
 
-explain
+explain vectorization expression
 select * from flights_tiny_orc_partitioned_date sort by fl_num, fl_date limit 25;
 
 select * from flights_tiny_orc_partitioned_date sort by fl_num, fl_date limit 25;
 
-explain
+explain vectorization expression
 select fl_date, count(*) from flights_tiny_orc_partitioned_date group by fl_date;
 
 select fl_date, count(*) from flights_tiny_orc_partitioned_date group by fl_date;
@@ -113,17 +113,17 @@ select fl_time, count(*) from flights_tiny_orc_partitioned_timestamp group by fl
 
 SET hive.vectorized.execution.enabled=true;
 
-explain
+explain vectorization expression
 select * from flights_tiny_orc_partitioned_timestamp;
 
 select * from flights_tiny_orc_partitioned_timestamp;
 
-explain
+explain vectorization expression
 select * from flights_tiny_orc_partitioned_timestamp sort by fl_num, fl_time limit 25;
 
 select * from flights_tiny_orc_partitioned_timestamp sort by fl_num, fl_time limit 25;
 
-explain
+explain vectorization expression
 select fl_time, count(*) from flights_tiny_orc_partitioned_timestamp group by fl_time;
 
 select fl_time, count(*) from flights_tiny_orc_partitioned_timestamp group by fl_time;

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vector_reduce1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_reduce1.q b/ql/src/test/queries/clientpositive/vector_reduce1.q
index cfd803f..ce90491 100644
--- a/ql/src/test/queries/clientpositive/vector_reduce1.q
+++ b/ql/src/test/queries/clientpositive/vector_reduce1.q
@@ -2,6 +2,7 @@ set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.vectorized.execution.reducesink.new.enabled=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 
@@ -42,7 +43,7 @@ STORED AS ORC;
 
 INSERT INTO TABLE vectortab2korc SELECT * FROM vectortab2k;
 
-explain
+explain vectorization expression
 select b from vectortab2korc order by b;
 
 select b from vectortab2korc order by b;

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vector_reduce2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_reduce2.q b/ql/src/test/queries/clientpositive/vector_reduce2.q
index ab67132..80ad196 100644
--- a/ql/src/test/queries/clientpositive/vector_reduce2.q
+++ b/ql/src/test/queries/clientpositive/vector_reduce2.q
@@ -2,6 +2,7 @@ set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.vectorized.execution.reducesink.new.enabled=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 
@@ -42,7 +43,7 @@ STORED AS ORC;
 
 INSERT INTO TABLE vectortab2korc SELECT * FROM vectortab2k;
 
-explain
+explain vectorization expression
 select s, i, s2 from vectortab2korc order by s, i, s2;
 
 select s, i, s2 from vectortab2korc order by s, i, s2;

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vector_reduce3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_reduce3.q b/ql/src/test/queries/clientpositive/vector_reduce3.q
index bf8206f..e01ed26 100644
--- a/ql/src/test/queries/clientpositive/vector_reduce3.q
+++ b/ql/src/test/queries/clientpositive/vector_reduce3.q
@@ -2,6 +2,7 @@ set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 SET hive.vectorized.execution.reducesink.new.enabled=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 
@@ -42,7 +43,7 @@ STORED AS ORC;
 
 INSERT INTO TABLE vectortab2korc SELECT * FROM vectortab2k;
 
-explain
+explain vectorization expression
 select s from vectortab2korc order by s;
 
 select s from vectortab2korc order by s;

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 4a50150..bbd25ae 100644
--- a/ql/src/test/queries/clientpositive/vector_reduce_groupby_decimal.q
+++ b/ql/src/test/queries/clientpositive/vector_reduce_groupby_decimal.q
@@ -1,10 +1,12 @@
 set hive.explain.user=false;
+set hive.fetch.task.conversion=none;
+
 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;
 
 SET hive.vectorized.execution.enabled=true;
 
-EXPLAIN
+EXPLAIN VECTORIZATION EXPRESSION
 SELECT cint, cdouble, cdecimal1, cdecimal2, min(cdecimal1) as min_decimal1 FROM decimal_test
 WHERE cdecimal1 is not null and cdecimal2 is not null
 GROUP BY cint, cdouble, cdecimal1, cdecimal2

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 f3a5965..b03c2a4 100644
--- a/ql/src/test/queries/clientpositive/vector_string_concat.q
+++ b/ql/src/test/queries/clientpositive/vector_string_concat.q
@@ -1,6 +1,7 @@
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
 
 DROP TABLE over1k;
 DROP TABLE over1korc;
@@ -37,7 +38,7 @@ STORED AS ORC;
 
 INSERT INTO TABLE over1korc SELECT * FROM over1k;
 
-EXPLAIN SELECT s AS `string`,
+EXPLAIN VECTORIZATION EXPRESSION SELECT s AS `string`,
        CONCAT(CONCAT('      ',s),'      ') AS `none_padded_str`,
        CONCAT(CONCAT('|',RTRIM(CONCAT(CONCAT('      ',s),'      '))),'|') AS `none_z_rtrim_str`
        FROM over1korc LIMIT 20;
@@ -86,7 +87,7 @@ STORED AS ORC;
 
 INSERT INTO TABLE vectortab2korc SELECT * FROM vectortab2k;
 
-EXPLAIN
+EXPLAIN VECTORIZATION EXPRESSION
 SELECT CONCAT(CONCAT(CONCAT('Quarter ',CAST(CAST((MONTH(dt) - 1) / 3 + 1 AS INT) AS STRING)),'-'),CAST(YEAR(dt) AS STRING)) AS `field`
     FROM vectortab2korc 
     GROUP BY CONCAT(CONCAT(CONCAT('Quarter ',CAST(CAST((MONTH(dt) - 1) / 3 + 1 AS INT) AS STRING)),'-'),CAST(YEAR(dt) AS STRING))

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vector_string_decimal.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_string_decimal.q b/ql/src/test/queries/clientpositive/vector_string_decimal.q
index e69cd77..186e339 100644
--- a/ql/src/test/queries/clientpositive/vector_string_decimal.q
+++ b/ql/src/test/queries/clientpositive/vector_string_decimal.q
@@ -13,7 +13,7 @@ insert overwrite table orc_decimal select id from staging;
 
 set hive.vectorized.execution.enabled=true;
 
-explain
+explain vectorization expression
 select * from orc_decimal where id in ('100000000', '200000000');
 select * from orc_decimal where id in ('100000000', '200000000');
 

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vector_struct_in.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_struct_in.q b/ql/src/test/queries/clientpositive/vector_struct_in.q
index 50487db..207be37 100644
--- a/ql/src/test/queries/clientpositive/vector_struct_in.q
+++ b/ql/src/test/queries/clientpositive/vector_struct_in.q
@@ -1,8 +1,9 @@
 set hive.cbo.enable=false;
-set hive.explain.user=true;
+set hive.explain.user=false;
 set hive.tez.dynamic.partition.pruning=false;
 set hive.vectorized.execution.enabled=true;
 SET hive.auto.convert.join=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 
@@ -11,7 +12,7 @@ create table test_1 (`id` string, `lineid` string) stored as orc;
 
 insert into table test_1 values ('one','1'), ('seven','1');
 
-explain
+explain vectorization expression
 select * from test_1 where struct(`id`, `lineid`)
 IN (
 struct('two','3'),
@@ -38,7 +39,7 @@ struct('nine','1'),
 struct('ten','1')
 );
 
-explain
+explain vectorization expression
 select `id`, `lineid`, struct(`id`, `lineid`)
 IN (
 struct('two','3'),
@@ -71,7 +72,7 @@ create table test_2 (`id` int, `lineid` int) stored as orc;
 
 insert into table test_2 values (1,1), (7,1);
 
-explain
+explain vectorization expression
 select * from test_2 where struct(`id`, `lineid`)
 IN (
 struct(2,3),
@@ -98,7 +99,7 @@ struct(9,1),
 struct(10,1)
 );
 
-explain
+explain vectorization expression
 select `id`, `lineid`, struct(`id`, `lineid`)
 IN (
 struct(2,3),
@@ -130,7 +131,7 @@ create table test_3 (`id` string, `lineid` int) stored as orc;
 
 insert into table test_3 values ('one',1), ('seven',1);
 
-explain
+explain vectorization expression
 select * from test_3 where struct(`id`, `lineid`)
 IN (
 struct('two',3),
@@ -157,7 +158,7 @@ struct('nine',1),
 struct('ten',1)
 );
 
-explain
+explain vectorization expression
 select `id`, `lineid`, struct(`id`, `lineid`)
 IN (
 struct('two',3),
@@ -189,7 +190,7 @@ create table test_4 (`my_bigint` bigint, `my_string` string, `my_double` double)
 
 insert into table test_4 values (1, "b", 1.5), (1, "a", 0.5), (2, "b", 1.5);
 
-explain
+explain vectorization expression
 select * from test_4 where struct(`my_bigint`, `my_string`, `my_double`)
 IN (
 struct(1L, "a", 1.5D),
@@ -218,7 +219,7 @@ struct(1L, "a", 0.5D),
 struct(3L, "b", 1.5D)
 );
 
-explain
+explain vectorization expression
 select `my_bigint`, `my_string`, `my_double`, struct(`my_bigint`, `my_string`, `my_double`)
 IN (
 struct(1L, "a", 1.5D),

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vector_tablesample_rows.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_tablesample_rows.q b/ql/src/test/queries/clientpositive/vector_tablesample_rows.q
index 4deb1c8..94b2f5b 100644
--- a/ql/src/test/queries/clientpositive/vector_tablesample_rows.q
+++ b/ql/src/test/queries/clientpositive/vector_tablesample_rows.q
@@ -4,7 +4,7 @@ SET hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=none;
 set hive.mapred.mode=nonstrict;
 
-explain
+explain vectorization expression
 select 'key1', 'value1' from alltypesorc tablesample (1 rows);
 
 select 'key1', 'value1' from alltypesorc tablesample (1 rows);
@@ -12,7 +12,7 @@ select 'key1', 'value1' from alltypesorc tablesample (1 rows);
 
 create table decimal_2 (t decimal(18,9)) stored as orc;
 
-explain
+explain vectorization expression
 insert overwrite table decimal_2
   select cast('17.29' as decimal(4,2)) from alltypesorc tablesample (1 rows);
 
@@ -25,12 +25,12 @@ drop table decimal_2;
 
 
 -- Dummy tables HIVE-13190
-explain
+explain vectorization expression
 select count(1) from (select * from (Select 1 a) x order by x.a) y;
 
 select count(1) from (select * from (Select 1 a) x order by x.a) y;
 
-explain
+explain vectorization expression
 create temporary table dual as select 1;
 
 create temporary table dual as select 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vector_udf2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_udf2.q b/ql/src/test/queries/clientpositive/vector_udf2.q
index b926c4f..e62af6a 100644
--- a/ql/src/test/queries/clientpositive/vector_udf2.q
+++ b/ql/src/test/queries/clientpositive/vector_udf2.q
@@ -7,7 +7,7 @@ create table varchar_udf_2 (c1 string, c2 string, c3 varchar(10), c4 varchar(20)
 insert overwrite table varchar_udf_2
   select key, value, key, value from src where key = '238' limit 1;
 
-explain
+explain vectorization expression
 select 
   c1 LIKE '%38%',
   c2 LIKE 'val_%',

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vector_udf3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_udf3.q b/ql/src/test/queries/clientpositive/vector_udf3.q
index 8a4df79..bc3a5e1 100644
--- a/ql/src/test/queries/clientpositive/vector_udf3.q
+++ b/ql/src/test/queries/clientpositive/vector_udf3.q
@@ -1,10 +1,11 @@
 ADD JAR ivy://org.apache.hive.hive-it-custom-udfs:udf-vectorized-badexample:+;
+set hive.fetch.task.conversion=none;
 
 CREATE TEMPORARY FUNCTION rot13 as 'hive.it.custom.udfs.GenericUDFRot13';
 
 set hive.vectorized.execution.enabled=true;
 
-EXPLAIN SELECT rot13(cstring1) from alltypesorc;
+EXPLAIN VECTORIZATION EXPRESSION  SELECT rot13(cstring1) from alltypesorc;
 
 SELECT cstring1, rot13(cstring1) from alltypesorc order by cstring1 desc limit 10;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 32a74a4..80f84d8 100644
--- a/ql/src/test/queries/clientpositive/vector_varchar_4.q
+++ b/ql/src/test/queries/clientpositive/vector_varchar_4.q
@@ -1,5 +1,6 @@
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
 
 drop table if exists vectortab2k;
 drop table if exists vectortab2korc;
@@ -44,7 +45,7 @@ INSERT INTO TABLE vectortab2korc SELECT * FROM vectortab2k;
 drop table if exists varchar_lazy_binary_columnar; 
 create table varchar_lazy_binary_columnar(vt varchar(10), vsi varchar(10), vi varchar(20), vb varchar(30), vf varchar(20),vd varchar(20),vs varchar(50)) row format serde 'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe' stored as rcfile;
 
-explain
+explain vectorization expression
 insert overwrite table varchar_lazy_binary_columnar select t, si, i, b, f, d, s from vectortab2korc;
 
 -- insert overwrite table varchar_lazy_binary_columnar select t, si, i, b, f, d, s from vectortab2korc;

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 ac0570e..285d2ac 100644
--- a/ql/src/test/queries/clientpositive/vector_varchar_mapjoin1.q
+++ b/ql/src/test/queries/clientpositive/vector_varchar_mapjoin1.q
@@ -37,15 +37,15 @@ create table varchar_join1_vc2_orc stored as orc as select * from varchar_join1_
 create table varchar_join1_str_orc stored as orc as select * from varchar_join1_str;
 
 -- Join varchar with same length varchar
-explain select * from varchar_join1_vc1_orc a join varchar_join1_vc1_orc b on (a.c2 = b.c2) order by a.c1;
+explain vectorization select * from varchar_join1_vc1_orc a join varchar_join1_vc1_orc b on (a.c2 = b.c2) order by a.c1;
 select * from varchar_join1_vc1_orc a join varchar_join1_vc1_orc b on (a.c2 = b.c2) order by a.c1;
 
 -- Join varchar with different length varchar
-explain select * from varchar_join1_vc1_orc a join varchar_join1_vc2_orc b on (a.c2 = b.c2) order by a.c1;
+explain vectorization select * from varchar_join1_vc1_orc a join varchar_join1_vc2_orc b on (a.c2 = b.c2) order by a.c1;
 select * from varchar_join1_vc1_orc a join varchar_join1_vc2_orc b on (a.c2 = b.c2) order by a.c1;
 
 -- Join varchar with string
-explain select * from varchar_join1_vc1_orc a join varchar_join1_str_orc b on (a.c2 = b.c2) order by a.c1;
+explain vectorization select * from varchar_join1_vc1_orc a join varchar_join1_str_orc b on (a.c2 = b.c2) order by a.c1;
 select * from varchar_join1_vc1_orc a join varchar_join1_str_orc b on (a.c2 = b.c2) order by a.c1;
 
 drop table varchar_join1_vc1;

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 acd6598..6f753a7 100644
--- a/ql/src/test/queries/clientpositive/vector_varchar_simple.q
+++ b/ql/src/test/queries/clientpositive/vector_varchar_simple.q
@@ -1,5 +1,7 @@
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
+
 drop table varchar_2;
 
 create table varchar_2 (
@@ -14,7 +16,7 @@ from src
 order by key asc
 limit 5;
 
-explain select key, value
+explain vectorization select key, value
 from varchar_2
 order by key asc
 limit 5;
@@ -30,7 +32,7 @@ from src
 order by key desc
 limit 5;
 
-explain select key, value
+explain vectorization select key, value
 from varchar_2
 order by key desc
 limit 5;
@@ -48,7 +50,7 @@ create table varchar_3 (
   field varchar(25)
 ) stored as orc;
 
-explain
+explain vectorization expression
 insert into table varchar_3 select cint from alltypesorc limit 10;
 
 insert into table varchar_3 select cint from alltypesorc limit 10;

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vector_when_case_null.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vector_when_case_null.q b/ql/src/test/queries/clientpositive/vector_when_case_null.q
index a423b60..4acd6dc 100644
--- a/ql/src/test/queries/clientpositive/vector_when_case_null.q
+++ b/ql/src/test/queries/clientpositive/vector_when_case_null.q
@@ -8,7 +8,7 @@ set hive.fetch.task.conversion=none;
 create table count_case_groupby (key string, bool boolean) STORED AS orc;
 insert into table count_case_groupby values ('key1', true),('key2', false),('key3', NULL),('key4', false),('key5',NULL);
 
-explain
+explain vectorization expression
 SELECT key, COUNT(CASE WHEN bool THEN 1 WHEN NOT bool THEN 0 ELSE NULL END) AS cnt_bool0_ok FROM count_case_groupby GROUP BY key;
 
 SELECT key, COUNT(CASE WHEN bool THEN 1 WHEN NOT bool THEN 0 ELSE NULL END) AS cnt_bool0_ok FROM count_case_groupby GROUP BY key;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 f4cf8c4..c97cd9f 100644
--- a/ql/src/test/queries/clientpositive/vectorization_0.q
+++ b/ql/src/test/queries/clientpositive/vectorization_0.q
@@ -1,11 +1,12 @@
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 
 -- Use ORDER BY clauses to generate 2 stages.
-EXPLAIN
+EXPLAIN VECTORIZATION EXPRESSION
 SELECT MIN(ctinyint) as c1,
        MAX(ctinyint),
        COUNT(ctinyint),
@@ -20,7 +21,7 @@ SELECT MIN(ctinyint) as c1,
 FROM   alltypesorc
 ORDER BY c1;
 
-EXPLAIN
+EXPLAIN VECTORIZATION EXPRESSION
 SELECT SUM(ctinyint) as c1
 FROM   alltypesorc
 ORDER BY c1;
@@ -29,7 +30,7 @@ SELECT SUM(ctinyint) as c1
 FROM   alltypesorc
 ORDER BY c1;
 
-EXPLAIN 
+EXPLAIN VECTORIZATION 
 SELECT
   avg(ctinyint) as c1,
   variance(ctinyint),
@@ -54,7 +55,7 @@ SELECT
 FROM alltypesorc
 ORDER BY c1;
 
-EXPLAIN
+EXPLAIN VECTORIZATION EXPRESSION
 SELECT MIN(cbigint) as c1,
        MAX(cbigint),
        COUNT(cbigint),
@@ -69,7 +70,7 @@ SELECT MIN(cbigint) as c1,
 FROM   alltypesorc
 ORDER BY c1;
 
-EXPLAIN
+EXPLAIN VECTORIZATION EXPRESSION
 SELECT SUM(cbigint) as c1
 FROM   alltypesorc
 ORDER BY c1;
@@ -78,7 +79,7 @@ SELECT SUM(cbigint) as c1
 FROM   alltypesorc
 ORDER BY c1;
 
-EXPLAIN 
+EXPLAIN VECTORIZATION 
 SELECT
   avg(cbigint) as c1,
   variance(cbigint),
@@ -103,7 +104,7 @@ SELECT
 FROM alltypesorc
 ORDER BY c1;
 
-EXPLAIN
+EXPLAIN VECTORIZATION EXPRESSION
 SELECT MIN(cfloat) as c1,
        MAX(cfloat),
        COUNT(cfloat),
@@ -118,7 +119,7 @@ SELECT MIN(cfloat) as c1,
 FROM   alltypesorc
 ORDER BY c1;
 
-EXPLAIN
+EXPLAIN VECTORIZATION EXPRESSION
 SELECT SUM(cfloat) as c1
 FROM   alltypesorc
 ORDER BY c1;
@@ -127,7 +128,7 @@ SELECT SUM(cfloat) as c1
 FROM   alltypesorc
 ORDER BY c1;
 
-EXPLAIN 
+EXPLAIN VECTORIZATION 
 SELECT
   avg(cfloat) as c1,
   variance(cfloat),
@@ -152,7 +153,7 @@ SELECT
 FROM alltypesorc
 ORDER BY c1;
 
-EXPLAIN
+EXPLAIN VECTORIZATION EXPRESSION
 SELECT AVG(cbigint),
        (-(AVG(cbigint))),
        (-6432 + AVG(cbigint)),

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vectorization_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_1.q b/ql/src/test/queries/clientpositive/vectorization_1.q
index 8fdcb27..f71218f 100644
--- a/ql/src/test/queries/clientpositive/vectorization_1.q
+++ b/ql/src/test/queries/clientpositive/vectorization_1.q
@@ -1,4 +1,5 @@
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vectorization_10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_10.q b/ql/src/test/queries/clientpositive/vectorization_10.q
index 778250a..c5f4d43 100644
--- a/ql/src/test/queries/clientpositive/vectorization_10.q
+++ b/ql/src/test/queries/clientpositive/vectorization_10.q
@@ -1,4 +1,5 @@
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vectorization_11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_11.q b/ql/src/test/queries/clientpositive/vectorization_11.q
index 4ac42ac..3830ea9 100644
--- a/ql/src/test/queries/clientpositive/vectorization_11.q
+++ b/ql/src/test/queries/clientpositive/vectorization_11.q
@@ -1,4 +1,5 @@
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vectorization_12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_12.q b/ql/src/test/queries/clientpositive/vectorization_12.q
index bc31f3c..0728ba9 100644
--- a/ql/src/test/queries/clientpositive/vectorization_12.q
+++ b/ql/src/test/queries/clientpositive/vectorization_12.q
@@ -1,5 +1,6 @@
 set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 005808b..84ae994 100644
--- a/ql/src/test/queries/clientpositive/vectorization_13.q
+++ b/ql/src/test/queries/clientpositive/vectorization_13.q
@@ -1,11 +1,11 @@
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
-set hive.fetch.task.conversion=minimal;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 
-EXPLAIN
+EXPLAIN VECTORIZATION EXPRESSION
 SELECT   cboolean1,
          ctinyint,
          ctimestamp1,
@@ -71,7 +71,7 @@ ORDER BY cboolean1, ctinyint, ctimestamp1, cfloat, cstring1, c1, c2, c3, c4, c5,
 LIMIT 40;
 
 -- double compare timestamp
-EXPLAIN
+EXPLAIN VECTORIZATION EXPRESSION
 SELECT   cboolean1,
          ctinyint,
          ctimestamp1,

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 4796c18..825fd63 100644
--- a/ql/src/test/queries/clientpositive/vectorization_14.q
+++ b/ql/src/test/queries/clientpositive/vectorization_14.q
@@ -1,10 +1,11 @@
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 
-EXPLAIN 
+EXPLAIN VECTORIZATION 
 SELECT   ctimestamp1,
          cfloat,
          cstring1,

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 21ba8c8..5c48c58 100644
--- a/ql/src/test/queries/clientpositive/vectorization_15.q
+++ b/ql/src/test/queries/clientpositive/vectorization_15.q
@@ -1,10 +1,11 @@
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 
-EXPLAIN 
+EXPLAIN VECTORIZATION 
 SELECT   cfloat,
          cboolean1,
          cdouble,

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 11b709f..822c824 100644
--- a/ql/src/test/queries/clientpositive/vectorization_16.q
+++ b/ql/src/test/queries/clientpositive/vectorization_16.q
@@ -1,10 +1,11 @@
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 
-EXPLAIN 
+EXPLAIN VECTORIZATION 
 SELECT   cstring1,
          cdouble,
          ctimestamp1,

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vectorization_17.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_17.q b/ql/src/test/queries/clientpositive/vectorization_17.q
index 1306f6b..57cdc41 100644
--- a/ql/src/test/queries/clientpositive/vectorization_17.q
+++ b/ql/src/test/queries/clientpositive/vectorization_17.q
@@ -1,10 +1,11 @@
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 
-EXPLAIN 
+EXPLAIN VECTORIZATION 
 SELECT   cfloat,
          cstring1,
          cint,

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vectorization_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_2.q b/ql/src/test/queries/clientpositive/vectorization_2.q
index f232815..4941d1e 100644
--- a/ql/src/test/queries/clientpositive/vectorization_2.q
+++ b/ql/src/test/queries/clientpositive/vectorization_2.q
@@ -1,4 +1,5 @@
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vectorization_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_3.q b/ql/src/test/queries/clientpositive/vectorization_3.q
index d6e6580..2e0350a 100644
--- a/ql/src/test/queries/clientpositive/vectorization_3.q
+++ b/ql/src/test/queries/clientpositive/vectorization_3.q
@@ -1,5 +1,6 @@
 set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vectorization_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_4.q b/ql/src/test/queries/clientpositive/vectorization_4.q
index 3151cf0..ba603c8 100644
--- a/ql/src/test/queries/clientpositive/vectorization_4.q
+++ b/ql/src/test/queries/clientpositive/vectorization_4.q
@@ -1,4 +1,5 @@
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vectorization_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_5.q b/ql/src/test/queries/clientpositive/vectorization_5.q
index 773f4b3..e2d4d0a 100644
--- a/ql/src/test/queries/clientpositive/vectorization_5.q
+++ b/ql/src/test/queries/clientpositive/vectorization_5.q
@@ -1,4 +1,5 @@
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vectorization_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_6.q b/ql/src/test/queries/clientpositive/vectorization_6.q
index 803f592..f55a2fb 100644
--- a/ql/src/test/queries/clientpositive/vectorization_6.q
+++ b/ql/src/test/queries/clientpositive/vectorization_6.q
@@ -1,4 +1,5 @@
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 131f570..bf3a1c2 100644
--- a/ql/src/test/queries/clientpositive/vectorization_7.q
+++ b/ql/src/test/queries/clientpositive/vectorization_7.q
@@ -1,11 +1,11 @@
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
-set hive.fetch.task.conversion=minimal;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 
-EXPLAIN
+EXPLAIN VECTORIZATION EXPRESSION
 SELECT cboolean1,
        cbigint,
        csmallint,
@@ -60,7 +60,7 @@ LIMIT 25;
 
 
 -- double compare timestamp
-EXPLAIN
+EXPLAIN VECTORIZATION EXPRESSION
 SELECT cboolean1,
        cbigint,
        csmallint,

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 2d357f1..d43db26 100644
--- a/ql/src/test/queries/clientpositive/vectorization_8.q
+++ b/ql/src/test/queries/clientpositive/vectorization_8.q
@@ -1,11 +1,11 @@
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
-set hive.fetch.task.conversion=minimal;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 
-EXPLAIN
+EXPLAIN VECTORIZATION EXPRESSION
 SELECT ctimestamp1,
        cdouble,
        cboolean1,
@@ -56,7 +56,7 @@ LIMIT 20;
 
 
 -- double compare timestamp
-EXPLAIN
+EXPLAIN VECTORIZATION EXPRESSION
 SELECT ctimestamp1,
        cdouble,
        cboolean1,

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 11b709f..822c824 100644
--- a/ql/src/test/queries/clientpositive/vectorization_9.q
+++ b/ql/src/test/queries/clientpositive/vectorization_9.q
@@ -1,10 +1,11 @@
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 
-EXPLAIN 
+EXPLAIN VECTORIZATION 
 SELECT   cstring1,
          cdouble,
          ctimestamp1,

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 854ee20..29c025c 100644
--- a/ql/src/test/queries/clientpositive/vectorization_decimal_date.q
+++ b/ql/src/test/queries/clientpositive/vectorization_decimal_date.q
@@ -1,5 +1,7 @@
 set hive.explain.user=false;
+set hive.fetch.task.conversion=none;
+
 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;
+EXPLAIN VECTORIZATION EXPRESSION  SELECT cdate, cdecimal from date_decimal_test where cint IS NOT NULL AND cdouble IS NOT NULL LIMIT 10;
 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/fcb57100/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 05d81d0..025d457 100644
--- a/ql/src/test/queries/clientpositive/vectorization_div0.q
+++ b/ql/src/test/queries/clientpositive/vectorization_div0.q
@@ -1,16 +1,17 @@
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled = true;
+set hive.fetch.task.conversion=none;
 
 -- TODO: add more stuff here after HIVE-5918 is fixed, such as cbigint and constants
-explain
+explain vectorization expression
 select cdouble / 0.0 from alltypesorc limit 100;
 select cdouble / 0.0 from alltypesorc limit 100;
 
 -- There are no zeros in the table, but there is 988888, so use it as zero
 
 -- TODO: add more stuff here after HIVE-5918 is fixed, such as cbigint and constants as numerators
-explain
+explain vectorization expression
 select (cbigint - 988888L) as s1, cdouble / (cbigint - 988888L) as s2, 1.2 / (cbigint - 988888L) 
 from alltypesorc where cbigint > 0 and cbigint < 100000000 order by s1, s2 limit 100;
 select (cbigint - 988888L) as s1, cdouble / (cbigint - 988888L) as s2, 1.2 / (cbigint - 988888L) 
@@ -18,7 +19,7 @@ from alltypesorc where cbigint > 0 and cbigint < 100000000 order by s1, s2 limit
 
 -- There are no zeros in the table, but there is -200.0, so use it as zero
 
-explain
+explain vectorization expression
 select (cdouble + 200.0) as s1, cbigint / (cdouble + 200.0) as s2, (cdouble + 200.0) / (cdouble + 200.0), cbigint / (cdouble + 200.0), 3 / (cdouble + 200.0), 1.2 / (cdouble + 200.0) 
 from alltypesorc where cdouble >= -500 and cdouble < -199 order by s1, s2 limit 100;
 select (cdouble + 200.0) as s1, cbigint / (cdouble + 200.0) as s2, (cdouble + 200.0) / (cdouble + 200.0), cbigint / (cdouble + 200.0), 3 / (cdouble + 200.0), 1.2 / (cdouble + 200.0) 

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 707f1ed..a4c54f2 100644
--- a/ql/src/test/queries/clientpositive/vectorization_limit.q
+++ b/ql/src/test/queries/clientpositive/vectorization_limit.q
@@ -1,7 +1,9 @@
 set hive.mapred.mode=nonstrict;
 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;
+set hive.fetch.task.conversion=none;
+
+explain vectorization 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;
 
 set hive.optimize.reducededuplication.min.reducer=1;
@@ -9,31 +11,31 @@ set hive.limit.pushdown.memory.usage=0.3f;
 
 -- HIVE-3562 Some limit can be pushed down to map stage - c/p parts from limit_pushdown
 
-explain
+explain vectorization expression
 select ctinyint,cdouble,csmallint from alltypesorc where ctinyint is not null order by ctinyint,cdouble limit 20;
 select ctinyint,cdouble,csmallint from alltypesorc where ctinyint is not null order by ctinyint,cdouble limit 20;
 
 -- deduped RS
-explain
+explain vectorization expression
 select ctinyint,avg(cdouble + 1) from alltypesorc group by ctinyint order by ctinyint limit 20;
 select ctinyint,avg(cdouble + 1) from alltypesorc group by ctinyint order by ctinyint limit 20;
 
 -- distincts
-explain
+explain vectorization expression
 select distinct(ctinyint) from alltypesorc limit 20;
 select distinct(ctinyint) from alltypesorc limit 20;
 
-explain
+explain vectorization expression
 select ctinyint, count(distinct(cdouble)) from alltypesorc group by ctinyint order by ctinyint limit 20;
 select ctinyint, count(distinct(cdouble)) from alltypesorc group by ctinyint order by ctinyint limit 20;
 
 -- limit zero
-explain
+explain vectorization expression
 select ctinyint,cdouble from alltypesorc order by ctinyint limit 0;
 select ctinyint,cdouble from alltypesorc order by ctinyint limit 0;
 
 -- 2MR (applied to last RS)
-explain
+explain vectorization expression
 select cdouble, sum(ctinyint) as sum from alltypesorc where ctinyint is not null group by cdouble order by sum, cdouble limit 20;
 select cdouble, sum(ctinyint) as sum from alltypesorc where ctinyint is not null group by cdouble order by sum, cdouble limit 20;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vectorization_nested_udf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_nested_udf.q b/ql/src/test/queries/clientpositive/vectorization_nested_udf.q
index bb50f9b..da8f99c 100644
--- a/ql/src/test/queries/clientpositive/vectorization_nested_udf.q
+++ b/ql/src/test/queries/clientpositive/vectorization_nested_udf.q
@@ -1,3 +1,5 @@
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
+
 SELECT SUM(abs(ctinyint)) from alltypesorc;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vectorization_not.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_not.q b/ql/src/test/queries/clientpositive/vectorization_not.q
index 7ac507b..aa691ab 100644
--- a/ql/src/test/queries/clientpositive/vectorization_not.q
+++ b/ql/src/test/queries/clientpositive/vectorization_not.q
@@ -1,5 +1,7 @@
 set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
+
 SELECT AVG(cbigint),
        (-(AVG(cbigint))),
        (-6432 + AVG(cbigint)),

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vectorization_offset_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_offset_limit.q b/ql/src/test/queries/clientpositive/vectorization_offset_limit.q
index 3d01154..97e1a05 100644
--- a/ql/src/test/queries/clientpositive/vectorization_offset_limit.q
+++ b/ql/src/test/queries/clientpositive/vectorization_offset_limit.q
@@ -1,10 +1,11 @@
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
 set hive.mapred.mode=nonstrict;
+set hive.fetch.task.conversion=none;
 
-explain SELECT cbigint, cdouble FROM alltypesorc WHERE cbigint < cdouble and cint > 0 limit 3,2;
+explain vectorization SELECT cbigint, cdouble FROM alltypesorc WHERE cbigint < cdouble and cint > 0 limit 3,2;
 SELECT cbigint, cdouble FROM alltypesorc WHERE cbigint < cdouble and cint > 0 limit 3,2;
 
-explain
+explain vectorization expression
 select ctinyint,cdouble,csmallint from alltypesorc where ctinyint is not null order by ctinyint,cdouble limit 10,3;
 select ctinyint,cdouble,csmallint from alltypesorc where ctinyint is not null order by ctinyint,cdouble limit 10,3;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vectorization_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_part.q b/ql/src/test/queries/clientpositive/vectorization_part.q
index 8d677db..9f4fc6e 100644
--- a/ql/src/test/queries/clientpositive/vectorization_part.q
+++ b/ql/src/test/queries/clientpositive/vectorization_part.q
@@ -1,5 +1,7 @@
 set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
+
 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 limit 100;
 insert overwrite table alltypesorc_part partition (ds='2012') select * from alltypesorc limit 100;

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 3a48f20..d0dcb6f 100644
--- a/ql/src/test/queries/clientpositive/vectorization_part_project.q
+++ b/ql/src/test/queries/clientpositive/vectorization_part_project.q
@@ -1,9 +1,11 @@
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
+
 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;
 insert overwrite table alltypesorc_part partition (ds='2012') select * from alltypesorc order by ctinyint, cint, cbigint limit 100;
 
-explain select (cdouble+2) c1 from alltypesorc_part order by c1 limit 10;
+explain vectorization select (cdouble+2) c1 from alltypesorc_part order by c1 limit 10;
 select (cdouble+2) c1 from alltypesorc_part order by c1 limit 10;

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/test/queries/clientpositive/vectorization_part_varchar.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/vectorization_part_varchar.q b/ql/src/test/queries/clientpositive/vectorization_part_varchar.q
index d371de8..28646b9 100644
--- a/ql/src/test/queries/clientpositive/vectorization_part_varchar.q
+++ b/ql/src/test/queries/clientpositive/vectorization_part_varchar.q
@@ -1,5 +1,7 @@
 set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
+
 CREATE TABLE alltypesorc_part_varchar(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 varchar(4)) STORED AS ORC;
 insert overwrite table alltypesorc_part_varchar partition (ds='2011') select * from alltypesorc limit 100;
 insert overwrite table alltypesorc_part_varchar partition (ds='2012') select * from alltypesorc limit 100;

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 b33cfa7..8acb193 100644
--- a/ql/src/test/queries/clientpositive/vectorization_pushdown.q
+++ b/ql/src/test/queries/clientpositive/vectorization_pushdown.q
@@ -2,5 +2,7 @@ set hive.mapred.mode=nonstrict;
 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;
+set hive.fetch.task.conversion=none;
+
+explain vectorization SELECT AVG(cbigint) FROM alltypesorc WHERE cbigint < cdouble;
 SELECT AVG(cbigint) FROM alltypesorc WHERE cbigint < cdouble;

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 114a3e2..03e4bbc 100644
--- a/ql/src/test/queries/clientpositive/vectorization_short_regress.q
+++ b/ql/src/test/queries/clientpositive/vectorization_short_regress.q
@@ -2,7 +2,7 @@ set hive.compute.query.using.stats=false;
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
-set hive.fetch.task.conversion=minimal;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 
@@ -36,7 +36,8 @@ set hive.fetch.task.conversion=minimal;
 -- ArithmeticOps: Add, Multiply, Subtract, Divide
 -- FilterOps: Equal, NotEqual, GreaterThan, LessThan, LessThanOrEqual
 -- GroupBy: NoGroupByProjectAggs
-EXPLAIN SELECT AVG(cint),
+EXPLAIN VECTORIZATION EXPRESSION
+SELECT AVG(cint),
        (AVG(cint) + -3728),
        (-((AVG(cint) + -3728))),
        (-((-((AVG(cint) + -3728))))),
@@ -112,7 +113,8 @@ WHERE  ((762 = cbigint)
 -- ArithmeticOps: Divide, Multiply, Remainder, Subtract
 -- FilterOps: LessThan, LessThanOrEqual, GreaterThan, GreaterThanOrEqual, Like, RLike
 -- GroupBy: NoGroupByProjectAggs
-EXPLAIN SELECT MAX(cint),
+EXPLAIN VECTORIZATION EXPRESSION
+SELECT MAX(cint),
        (MAX(cint) / -3728),
        (MAX(cint) * -3728),
        VAR_POP(cbigint),
@@ -182,7 +184,8 @@ WHERE  (((cbigint <= 197)
 -- ArithmeticOps: Subtract, Remainder, Multiply, Add
 -- FilterOps: Equal, LessThanOrEqual, GreaterThan, Like, LessThan
 -- GroupBy: NoGroupByProjectAggs
-EXPLAIN SELECT VAR_POP(cbigint),
+EXPLAIN VECTORIZATION EXPRESSION
+SELECT VAR_POP(cbigint),
        (-(VAR_POP(cbigint))),
        (VAR_POP(cbigint) - (-(VAR_POP(cbigint)))),
        COUNT(*),
@@ -250,7 +253,8 @@ WHERE  ((ctimestamp1 = ctimestamp2)
 -- ArithmeticOps: Add, Divide, Remainder, Multiply
 -- FilterOps: LessThanOrEqual, NotEqual, GreaterThanOrEqual, LessThan, Equal
 -- GroupBy: NoGroupByProjectAggs
-EXPLAIN SELECT AVG(ctinyint),
+EXPLAIN VECTORIZATION EXPRESSION
+SELECT AVG(ctinyint),
        (AVG(ctinyint) + 6981),
        ((AVG(ctinyint) + 6981) + AVG(ctinyint)),
        MAX(cbigint),
@@ -298,7 +302,8 @@ WHERE  (((ctimestamp2 <= ctimestamp1)
 -- ArithmeticOps: Multiply, Subtract, Add, Divide
 -- FilterOps: Like, NotEqual, LessThan, GreaterThanOrEqual, GreaterThan, RLike
 -- GroupBy: NoGroupByProjectColumns
-EXPLAIN SELECT cint,
+EXPLAIN VECTORIZATION EXPRESSION
+SELECT cint,
        cdouble,
        ctimestamp2,
        cstring1,
@@ -376,7 +381,8 @@ LIMIT 50;
 -- ArithmeticOps: Divide, Remainder, Subtract, Multiply
 -- FilterOps: Equal, LessThanOrEqual, LessThan, Like, GreaterThanOrEqual, NotEqual, GreaterThan
 -- GroupBy: NoGroupByProjectColumns
-EXPLAIN SELECT cint,
+EXPLAIN VECTORIZATION EXPRESSION
+SELECT cint,
        cbigint,
        cstring1,
        cboolean1,
@@ -451,7 +457,8 @@ LIMIT 25;
 -- ArithmeticOps: Add, Subtract, Divide, Multiply, Remainder
 -- FilterOps: NotEqual, GreaterThanOrEqual, Like, LessThanOrEqual, Equal, GreaterThan
 -- GroupBy: NoGroupByProjectColumns
-EXPLAIN SELECT   cint,
+EXPLAIN VECTORIZATION EXPRESSION
+SELECT   cint,
          cstring1,
          cboolean2,
          ctimestamp2,
@@ -524,7 +531,8 @@ LIMIT 75;
 -- ArithmeticOps: Divide, Subtract, Multiply, Remainder
 -- FilterOps: GreaterThan, LessThan, LessThanOrEqual, GreaterThanOrEqual, Like
 -- GroupBy: NoGroupByProjectColumns
-EXPLAIN SELECT   ctimestamp1,
+EXPLAIN VECTORIZATION EXPRESSION
+SELECT   ctimestamp1,
          cstring2,
          cdouble,
          cfloat,
@@ -583,7 +591,8 @@ LIMIT 45;
 -- ArithmeticOps: Remainder, Divide, Subtract
 -- FilterOps: GreaterThanOrEqual, Equal, LessThanOrEqual
 -- GroupBy: GroupBy
-EXPLAIN SELECT   csmallint,
+EXPLAIN VECTORIZATION EXPRESSION
+SELECT   csmallint,
          (csmallint % -75) as c1,
          STDDEV_SAMP(csmallint) as c2,
          (-1.389 / csmallint) as c3,
@@ -628,7 +637,8 @@ LIMIT 20;
 -- ArithmeticOps: Multiply, Add, Subtract, Remainder
 -- FilterOps: GreaterThan, LessThan, Equal, LessThanOrEqual, GreaterThanOrEqual
 -- GroupBy: GroupBy
-EXPLAIN SELECT   cdouble,
+EXPLAIN VECTORIZATION EXPRESSION
+SELECT   cdouble,
          VAR_SAMP(cdouble),
          (2563.58 * VAR_SAMP(cdouble)),
          (-(VAR_SAMP(cdouble))),
@@ -686,7 +696,8 @@ ORDER BY cdouble;
 -- ArithmeticOps: Multiply, Subtract, Add, Divide, Remainder
 -- FilterOps: NotEqual, LessThan, Like, Equal, RLike
 -- GroupBy: GroupBy
-EXPLAIN SELECT   ctimestamp1,
+EXPLAIN VECTORIZATION EXPRESSION
+SELECT   ctimestamp1,
          cstring1,
          STDDEV_POP(cint) as c1,
          (STDDEV_POP(cint) * 10.175) as c2,
@@ -801,7 +812,8 @@ LIMIT 50;
 -- ArithmeticOps: Divide, Subtract, Remainder, Add, Multiply
 -- FilterOps: GreaterThan, LessThanOrEqual, Equal, LessThan, GreaterThanOrEqual, NotEqual, Like, RLike
 -- GroupBy: GroupBy
-EXPLAIN SELECT   cboolean1,
+EXPLAIN VECTORIZATION EXPRESSION
+SELECT   cboolean1,
          MAX(cfloat),
          (-(MAX(cfloat))),
          (-26.28 / MAX(cfloat)),
@@ -883,12 +895,12 @@ ORDER BY cboolean1;
 -- These tests verify COUNT on empty or null colulmns work correctly.
 create table test_count(i int) stored as orc;
 
-explain
+explain vectorization expression
 select count(*) from test_count;
 
 select count(*) from test_count;
 
-explain
+explain vectorization expression
 select count(i) from test_count;
 
 select count(i) from test_count;
@@ -911,32 +923,32 @@ insert into table alltypesnull select null, null, null, null, null, null, null,
 
 create table alltypesnullorc stored as orc as select * from alltypesnull;
 
-explain
+explain vectorization expression
 select count(*) from alltypesnullorc;
 
 select count(*) from alltypesnullorc;
 
-explain
+explain vectorization expression
 select count(ctinyint) from alltypesnullorc;
 
 select count(ctinyint) from alltypesnullorc;
 
-explain
+explain vectorization expression
 select count(cint) from alltypesnullorc;
 
 select count(cint) from alltypesnullorc;
 
-explain
+explain vectorization expression
 select count(cfloat) from alltypesnullorc;
 
 select count(cfloat) from alltypesnullorc;
 
-explain
+explain vectorization expression
 select count(cstring1) from alltypesnullorc;
 
 select count(cstring1) from alltypesnullorc;
 
-explain
+explain vectorization expression
 select count(cboolean1) from alltypesnullorc;
 
 select count(cboolean1) from alltypesnullorc;

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 022ce2e..191d8c6 100644
--- a/ql/src/test/queries/clientpositive/vectorized_bucketmapjoin1.q
+++ b/ql/src/test/queries/clientpositive/vectorized_bucketmapjoin1.q
@@ -1,4 +1,6 @@
 set hive.explain.user=false;
+set hive.fetch.task.conversion=none;
+
 create table vsmb_bucket_1(key int, value string) 
   CLUSTERED BY (key) 
   SORTED BY (key) INTO 1 BUCKETS 
@@ -28,11 +30,11 @@ set hive.optimize.bucketmapjoin = true;
 set hive.optimize.bucketmapjoin.sortedmerge = true;
 set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;
 
-explain
+explain vectorization expression
 select /*+MAPJOIN(a)*/ * from vsmb_bucket_1 a join vsmb_bucket_2 b on a.key = b.key;
 select /*+MAPJOIN(a)*/ * from vsmb_bucket_1 a join vsmb_bucket_2 b on a.key = b.key;
 
-explain
+explain vectorization expression
 select /*+MAPJOIN(b)*/ * from vsmb_bucket_1 a join vsmb_bucket_RC b on a.key = b.key;
 select /*+MAPJOIN(b)*/ * from vsmb_bucket_1 a join vsmb_bucket_RC b on a.key = b.key;
 
@@ -41,6 +43,6 @@ select /*+MAPJOIN(b)*/ * from vsmb_bucket_1 a join vsmb_bucket_RC b on a.key = b
 -- select /*+MAPJOIN(b)*/ * from vsmb_bucket_RC a join vsmb_bucket_2 b on a.key = b.key;
 -- select /*+MAPJOIN(b)*/ * from vsmb_bucket_RC a join vsmb_bucket_2 b on a.key = b.key;
 
-explain
+explain vectorization expression
 select /*+MAPJOIN(b)*/ * from vsmb_bucket_1 a join vsmb_bucket_TXT b on a.key = b.key;
 select /*+MAPJOIN(b)*/ * from vsmb_bucket_1 a join vsmb_bucket_TXT b on a.key = b.key;

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 e74bf82..2efacb4 100644
--- a/ql/src/test/queries/clientpositive/vectorized_case.q
+++ b/ql/src/test/queries/clientpositive/vectorized_case.q
@@ -2,7 +2,7 @@ set hive.explain.user=false;
 set hive.fetch.task.conversion=none;
 set hive.vectorized.execution.enabled = true
 ;
-explain
+explain vectorization expression
 select 
   csmallint,
   case 
@@ -37,7 +37,7 @@ where csmallint = 418
 or csmallint = 12205
 or csmallint = 10583
 ;
-explain
+explain vectorization expression
 select 
   csmallint,
   case 

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 0880e29..a32c150 100644
--- a/ql/src/test/queries/clientpositive/vectorized_casts.q
+++ b/ql/src/test/queries/clientpositive/vectorized_casts.q
@@ -8,7 +8,7 @@ SET hive.vectorized.execution.enabled = true;
 -- Currently, vectorization is not supported in fetch task (hive.fetch.task.conversion=none)
 -- Test type casting in vectorized mode to verify end-to-end functionality.
 
-explain 
+explain vectorization 
 select 
 -- to boolean
    cast (ctinyint as boolean)

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 657270e..0558bc0 100644
--- a/ql/src/test/queries/clientpositive/vectorized_context.q
+++ b/ql/src/test/queries/clientpositive/vectorized_context.q
@@ -1,5 +1,7 @@
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
+set hive.fetch.task.conversion=none;
+
 create table store(s_store_sk int, s_city string)
 stored as orc;
 insert overwrite table store
@@ -26,7 +28,7 @@ set hive.vectorized.execution.enabled=true;
 
 set hive.mapjoin.hybridgrace.hashtable=false;
 
-explain 
+explain vectorization 
 select store.s_city, ss_net_profit
 from store_sales
 JOIN store ON store_sales.ss_store_sk = store.s_store_sk

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 899e922..4d56198 100644
--- a/ql/src/test/queries/clientpositive/vectorized_date_funcs.q
+++ b/ql/src/test/queries/clientpositive/vectorized_date_funcs.q
@@ -2,6 +2,7 @@ set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled = true;
 set hive.cli.print.header=true;
+set hive.fetch.task.conversion=none;
 
 -- SORT_QUERY_RESULTS
 
@@ -25,7 +26,7 @@ INSERT INTO TABLE date_udf_flight_orc SELECT fl_date, to_utc_timestamp(fl_date,
 
 SELECT * FROM date_udf_flight_orc;
 
-EXPLAIN SELECT
+EXPLAIN VECTORIZATION EXPRESSION  SELECT
   fl_time,
   to_unix_timestamp(fl_time),
   year(fl_time),
@@ -71,7 +72,7 @@ SELECT
   datediff(fl_time, timestamp "2007-03-14 08:21:59")
 FROM date_udf_flight_orc;
 
-EXPLAIN SELECT
+EXPLAIN VECTORIZATION EXPRESSION  SELECT
   fl_date,
   to_unix_timestamp(fl_date),
   year(fl_date),
@@ -117,7 +118,7 @@ SELECT
   datediff(fl_date, timestamp "2007-03-14 08:21:59")
 FROM date_udf_flight_orc;
 
-EXPLAIN SELECT
+EXPLAIN VECTORIZATION EXPRESSION  SELECT
   fl_time,
   fl_date,
   year(fl_time) = year(fl_date),
@@ -168,7 +169,7 @@ SELECT
   datediff(fl_date, "2007-03-14") = datediff(fl_date, date "2007-03-14")
 FROM date_udf_flight_orc;
 
-EXPLAIN SELECT 
+EXPLAIN VECTORIZATION EXPRESSION  SELECT 
   fl_date, 
   to_date(date_add(fl_date, 2)), 
   to_date(date_sub(fl_date, 2)),
@@ -189,7 +190,7 @@ FROM date_udf_flight_orc LIMIT 10;
 -- Test extracting the date part of expression that includes time
 SELECT to_date('2009-07-30 04:17:52') FROM date_udf_flight_orc LIMIT 1;
 
-EXPLAIN SELECT
+EXPLAIN VECTORIZATION EXPRESSION  SELECT
   min(fl_date) AS c1,
   max(fl_date),
   count(fl_date),

http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/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 6900dc0..4339a5f 100644
--- a/ql/src/test/queries/clientpositive/vectorized_distinct_gby.q
+++ b/ql/src/test/queries/clientpositive/vectorized_distinct_gby.q
@@ -1,14 +1,15 @@
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 SET hive.vectorized.execution.enabled=true;
+set hive.fetch.task.conversion=none;
 
 SET hive.map.groupby.sorted=true;
 
 create table dtest(a int, b int) clustered by (a) sorted by (a) into 1 buckets stored as orc;
 insert into table dtest select c,b from (select array(300,300,300,300,300) as a, 1 as b from src order by a limit 1) y lateral view  explode(a) t1 as c;
 
-explain select sum(distinct a), count(distinct a) from dtest;
+explain vectorization select sum(distinct a), count(distinct a) from dtest;
 select sum(distinct a), count(distinct a) from dtest;
 
-explain select sum(distinct cint), count(distinct cint), avg(distinct cint), std(distinct cint) from alltypesorc;
+explain vectorization select sum(distinct cint), count(distinct cint), avg(distinct cint), std(distinct cint) from alltypesorc;
 select sum(distinct cint), count(distinct cint), avg(distinct cint), std(distinct cint) from alltypesorc;


Mime
View raw message