http://git-wip-us.apache.org/repos/asf/hive/blob/aed21d0b/ql/src/test/results/clientpositive/llap/vectorized_ptf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_ptf.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_ptf.q.out
index 423fdbf..996b893 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_ptf.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_ptf.q.out
@@ -120,7 +120,7 @@ POSTHOOK: Lineage: part_orc.p_size SIMPLE 
[(part_staging)part_staging.FieldSchem
 POSTHOOK: Lineage: part_orc.p_type SIMPLE 
[(part_staging)part_staging.FieldSchema(name:p_type, type:string, 
comment:null), ]
 PREHOOK: query: --1. test1
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -132,7 +132,7 @@ from noop(on part_orc
 PREHOOK: type: QUERY
 POSTHOOK: query: --1. test1
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -142,10 +142,6 @@ from noop(on part_orc
   order by p_name
   )
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -176,14 +172,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: false
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -236,11 +224,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int), VALUE._col5 (type: 
double)
@@ -272,11 +255,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int), VALUE._col5 (type: 
double)
@@ -399,7 +377,7 @@ Manufacturer#5      almond aquamarine dodger light 
gainsboro        46      4       4       6208.18
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
7672.66
 PREHOOK: query: -- 2. testJoinWithNoop
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name,
 p_size, p_size - lag(p_size,1,p_size) over (partition by p_mfgr order by 
p_name) as deltaSz
 from noop (on (select p1.* from part_orc p1 join part_orc p2 on p1.p_partkey = 
p2.p_partkey) j
@@ -408,17 +386,13 @@ sort by j.p_name)
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 2. testJoinWithNoop
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name,
 p_size, p_size - lag(p_size,1,p_size) over (partition by p_mfgr order by 
p_name) as deltaSz
 from noop (on (select p1.* from part_orc p1 join part_orc p2 on p1.p_partkey = 
p2.p_partkey) j
 distribute by j.p_mfgr
 sort by j.p_name)
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -454,14 +428,6 @@ STAGE PLANS:
                       auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: true
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -531,14 +497,6 @@ STAGE PLANS:
                       auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: true
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -613,11 +571,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -649,11 +602,6 @@ STAGE PLANS:
         Reducer 4 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -759,7 +707,7 @@ Manufacturer#5      almond aquamarine dodger light 
gainsboro        46      44
 Manufacturer#5 almond azure blanched chiffon midnight  23      -23
 PREHOOK: query: -- 3. testOnlyPTF
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, p_size
 from noop(on part_orc
 partition by p_mfgr
@@ -767,16 +715,12 @@ order by p_name)
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 3. testOnlyPTF
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, p_size
 from noop(on part_orc
 partition by p_mfgr
 order by p_name)
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -806,14 +750,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: false
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -866,11 +802,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -965,7 +896,7 @@ Manufacturer#5      almond aquamarine dodger light 
gainsboro        46
 Manufacturer#5 almond azure blanched chiffon midnight  23
 PREHOOK: query: -- 4. testPTFAlias
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -977,7 +908,7 @@ from noop(on part_orc
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 4. testPTFAlias
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -987,10 +918,6 @@ from noop(on part_orc
   order by p_name
   ) abc
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1021,14 +948,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: false
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -1081,11 +1000,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int), VALUE._col5 (type: 
double)
@@ -1117,11 +1031,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int), VALUE._col5 (type: 
double)
@@ -1244,7 +1153,7 @@ Manufacturer#5    almond aquamarine dodger light 
gainsboro        46      4       4       6208.18
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
7672.66
 PREHOOK: query: -- 5. testPTFAndWhereWithWindowing
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -1256,7 +1165,7 @@ from noop(on part_orc
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 5. testPTFAndWhereWithWindowing
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -1266,10 +1175,6 @@ from noop(on part_orc
           order by p_name 
           )
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1300,14 +1205,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: false
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -1360,11 +1257,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -1396,11 +1288,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -1524,7 +1411,7 @@ Manufacturer#5    almond aquamarine dodger light 
gainsboro        46      4       4       46      44
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
23      -23
 PREHOOK: query: -- 6. testSWQAndPTFAndGBy
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -1537,7 +1424,7 @@ group by p_mfgr, p_name, p_size
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 6. testSWQAndPTFAndGBy
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -1548,10 +1435,6 @@ from noop(on part_orc
           ) 
 group by p_mfgr, p_name, p_size
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1582,14 +1465,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: false
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -1642,11 +1517,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -1686,11 +1556,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Group By Operator
                 keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: int)
@@ -1816,7 +1681,7 @@ Manufacturer#5    almond aquamarine dodger light 
gainsboro        46      4       4       46      44
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
23      -23
 PREHOOK: query: -- 7. testJoin
 
-explain vectorization extended
+explain extended
 select abc.* 
 from noop(on part_orc 
 partition by p_mfgr 
@@ -1825,17 +1690,13 @@ order by p_name
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 7. testJoin
 
-explain vectorization extended
+explain extended
 select abc.* 
 from noop(on part_orc 
 partition by p_mfgr 
 order by p_name 
 ) abc join part_orc p1 on abc.p_partkey = p1.p_partkey
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1866,14 +1727,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: false
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -1943,14 +1796,6 @@ STAGE PLANS:
                       auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: true
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -2003,11 +1848,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: int), KEY.reducesinkkey1 
(type: string), KEY.reducesinkkey0 (type: string), VALUE._col1 (type: string), 
VALUE._col2 (type: string), VALUE._col3 (type: int), VALUE._col4 (type: 
string), VALUE._col5 (type: double), VALUE._col6 (type: string)
@@ -2128,7 +1968,7 @@ POSTHOOK: Input: default@part_orc
 90681  almond antique chartreuse khaki white   Manufacturer#3  Brand#31        
MEDIUM BURNISHED TIN    17      SM CASE 1671.68 are slyly after the sl
 PREHOOK: query: -- 8. testJoinRight
 
-explain vectorization extended
+explain extended
 select abc.* 
 from part_orc p1 join noop(on part_orc 
 partition by p_mfgr 
@@ -2137,17 +1977,13 @@ order by p_name
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 8. testJoinRight
 
-explain vectorization extended
+explain extended
 select abc.* 
 from part_orc p1 join noop(on part_orc 
 partition by p_mfgr 
 order by p_name 
 ) abc on abc.p_partkey = p1.p_partkey
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2181,14 +2017,6 @@ STAGE PLANS:
                       auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: true
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -2255,14 +2083,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: false
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -2354,11 +2174,6 @@ STAGE PLANS:
         Reducer 4 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: int), KEY.reducesinkkey1 
(type: string), KEY.reducesinkkey0 (type: string), VALUE._col1 (type: string), 
VALUE._col2 (type: string), VALUE._col3 (type: int), VALUE._col4 (type: 
string), VALUE._col5 (type: double), VALUE._col6 (type: string)
@@ -2444,7 +2259,7 @@ POSTHOOK: Input: default@part_orc
 90681  almond antique chartreuse khaki white   Manufacturer#3  Brand#31        
MEDIUM BURNISHED TIN    17      SM CASE 1671.68 are slyly after the sl
 PREHOOK: query: -- 9. testNoopWithMap
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name, p_size desc) as r
 from noopwithmap(on part_orc
@@ -2453,17 +2268,13 @@ order by p_name, p_size desc)
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 9. testNoopWithMap
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name, p_size desc) as r
 from noopwithmap(on part_orc
 partition by p_mfgr
 order by p_name, p_size desc)
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2509,12 +2320,6 @@ STAGE PLANS:
                       auto parallelism: true
             Execution mode: llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -2567,11 +2372,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), KEY.reducesinkkey2 (type: int)
@@ -2603,11 +2403,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), KEY.reducesinkkey2 (type: int)
@@ -2711,7 +2506,7 @@ Manufacturer#5    almond aquamarine dodger light 
gainsboro        46      4
 Manufacturer#5 almond azure blanched chiffon midnight  23      5
 PREHOOK: query: -- 10. testNoopWithMapWithWindowing 
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -2722,7 +2517,7 @@ from noopwithmap(on part_orc
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 10. testNoopWithMapWithWindowing 
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -2731,10 +2526,6 @@ from noopwithmap(on part_orc
   partition by p_mfgr
   order by p_name)
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2781,12 +2572,6 @@ STAGE PLANS:
                       auto parallelism: true
             Execution mode: llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -2839,11 +2624,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int), VALUE._col5 (type: 
double)
@@ -2876,11 +2656,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int), VALUE._col5 (type: 
double)
@@ -3001,7 +2776,7 @@ Manufacturer#5    almond aquamarine dodger light 
gainsboro        46      4       4       6208.18
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
7672.66
 PREHOOK: query: -- 11. testHavingWithWindowingPTFNoGBY
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -3012,7 +2787,7 @@ order by p_name)
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 11. testHavingWithWindowingPTFNoGBY
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -3021,10 +2796,6 @@ from noop(on part_orc
 partition by p_mfgr
 order by p_name)
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -3055,14 +2826,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: false
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -3115,11 +2878,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int), VALUE._col5 (type: 
double)
@@ -3151,11 +2909,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int), VALUE._col5 (type: 
double)
@@ -3276,7 +3029,7 @@ Manufacturer#5    almond aquamarine dodger light 
gainsboro        46      4       4       6208.18
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
7672.66
 PREHOOK: query: -- 12. testFunctionChain
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -3288,7 +3041,7 @@ order by p_mfgr, p_name
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 12. testFunctionChain
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -3298,10 +3051,6 @@ partition by p_mfgr
 order by p_mfgr, p_name
 )))
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -3333,14 +3082,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: false
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -3393,11 +3134,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int), VALUE._col5 (type: 
double)
@@ -3452,11 +3188,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int), VALUE._col5 (type: 
double)
@@ -3496,11 +3227,6 @@ STAGE PLANS:
         Reducer 4 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int), VALUE._col5 (type: 
double)
@@ -3623,7 +3349,7 @@ Manufacturer#5    almond aquamarine dodger light 
gainsboro        46      4       4       6208.18
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
7672.66
 PREHOOK: query: -- 13. testPTFAndWindowingInSubQ
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, 
 sub1.cd, sub1.s1 
 from (select p_mfgr, p_name, 
@@ -3638,7 +3364,7 @@ window w1 as (partition by p_mfgr order by p_name rows 
between 2 preceding and 2
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 13. testPTFAndWindowingInSubQ
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name, 
 sub1.cd, sub1.s1 
 from (select p_mfgr, p_name, 
@@ -3651,10 +3377,6 @@ order by p_name)
 window w1 as (partition by p_mfgr order by p_name rows between 2 preceding and 
2 following) 
 ) sub1
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -3685,14 +3407,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: false
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -3745,11 +3459,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int), VALUE._col5 (type: 
double)
@@ -3781,11 +3490,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int), VALUE._col5 (type: 
double)
@@ -3906,7 +3610,7 @@ Manufacturer#5    almond aquamarine dodger light 
gainsboro        4       5882.970000000001
 Manufacturer#5 almond azure blanched chiffon midnight  5       
4271.3099999999995
 PREHOOK: query: -- 14. testPTFJoinWithWindowingWithCount
 
-explain vectorization extended
+explain extended
 select abc.p_mfgr, abc.p_name, 
 rank() over (distribute by abc.p_mfgr sort by abc.p_name) as r, 
 dense_rank() over (distribute by abc.p_mfgr sort by abc.p_name) as dr, 
@@ -3920,7 +3624,7 @@ order by p_name
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 14. testPTFJoinWithWindowingWithCount
 
-explain vectorization extended
+explain extended
 select abc.p_mfgr, abc.p_name, 
 rank() over (distribute by abc.p_mfgr sort by abc.p_name) as r, 
 dense_rank() over (distribute by abc.p_mfgr sort by abc.p_name) as dr, 
@@ -3932,10 +3636,6 @@ partition by p_mfgr
 order by p_name 
 ) abc join part_orc p1 on abc.p_partkey = p1.p_partkey
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -3967,14 +3667,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: false
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -4044,14 +3736,6 @@ STAGE PLANS:
                       auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: true
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -4104,11 +3788,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: int), KEY.reducesinkkey1 
(type: string), KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int), 
VALUE._col5 (type: double)
@@ -4166,11 +3845,6 @@ STAGE PLANS:
         Reducer 4 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int), VALUE._col5 (type: 
double)
@@ -4312,7 +3986,7 @@ Manufacturer#5    almond aquamarine dodger light 
gainsboro        4       4       4       1018.1  6208.18 46
 Manufacturer#5 almond azure blanched chiffon midnight  5       5       5       
1464.48 7672.66 23      -23
 PREHOOK: query: -- 15. testDistinctInSelectWithPTF
 
-explain vectorization extended
+explain extended
 select DISTINCT p_mfgr, p_name, p_size 
 from noop(on part_orc 
 partition by p_mfgr 
@@ -4320,16 +3994,12 @@ order by p_name)
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 15. testDistinctInSelectWithPTF
 
-explain vectorization extended
+explain extended
 select DISTINCT p_mfgr, p_name, p_size 
 from noop(on part_orc 
 partition by p_mfgr 
 order by p_name)
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -4360,14 +4030,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: false
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -4420,11 +4082,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -4464,13 +4121,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: vectorized, llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                groupByVectorOutput: true
-                allNative: false
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Reduce Operator Tree:
               Group By Operator
                 keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: int)
@@ -4565,7 +4215,7 @@ POSTHOOK: type: CREATEVIEW
 POSTHOOK: Input: default@part_orc
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@mfgr_price_view
-PREHOOK: query: explain vectorization extended
+PREHOOK: query: explain extended
 select p_mfgr, p_brand, s, 
 sum(s) over w1  as s1
 from noop(on mfgr_price_view 
@@ -4573,7 +4223,7 @@ partition by p_mfgr
 order by p_mfgr)  
 window w1 as ( partition by p_mfgr order by p_brand rows between 2 preceding 
and current row)
 PREHOOK: type: QUERY
-POSTHOOK: query: explain vectorization extended
+POSTHOOK: query: explain extended
 select p_mfgr, p_brand, s, 
 sum(s) over w1  as s1
 from noop(on mfgr_price_view 
@@ -4581,10 +4231,6 @@ partition by p_mfgr
 order by p_mfgr)  
 window w1 as ( partition by p_mfgr order by p_brand rows between 2 preceding 
and current row)
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -4625,14 +4271,6 @@ STAGE PLANS:
                         auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: false
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -4685,11 +4323,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Group By Operator
                 aggregations: sum(VALUE._col0)
@@ -4723,11 +4356,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: string), 
KEY.reducesinkkey1 (type: string), VALUE._col0 (type: double)
@@ -4868,7 +4496,7 @@ fv1 INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_5
-PREHOOK: query: explain vectorization extended
+PREHOOK: query: explain extended
 from noop(on part_orc 
 partition by p_mfgr 
 order by p_name) 
@@ -4884,7 +4512,7 @@ cume_dist() over (distribute by p_mfgr sort by p_mfgr, 
p_name) as cud,
 first_value(p_size, true) over w1  as fv1
 window w1 as (distribute by p_mfgr sort by p_mfgr, p_name rows between 2 
preceding and 2 following)
 PREHOOK: type: QUERY
-POSTHOOK: query: explain vectorization extended
+POSTHOOK: query: explain extended
 from noop(on part_orc 
 partition by p_mfgr 
 order by p_name) 
@@ -4900,10 +4528,6 @@ cume_dist() over (distribute by p_mfgr sort by p_mfgr, 
p_name) as cud,
 first_value(p_size, true) over w1  as fv1
 window w1 as (distribute by p_mfgr sort by p_mfgr, p_name rows between 2 
preceding and 2 following)
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2
@@ -4940,14 +4564,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: false
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -5000,11 +4616,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int), VALUE._col5 (type: 
double)
@@ -5045,11 +4656,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int), VALUE._col5 (type: 
double)
@@ -5127,11 +4733,6 @@ STAGE PLANS:
         Reducer 4 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col1 (type: string), KEY.reducesinkkey0 
(type: string), KEY.reducesinkkey1 (type: int)
@@ -5173,11 +4774,6 @@ STAGE PLANS:
         Reducer 5 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: bigint), KEY.reducesinkkey1 
(type: string), KEY.reducesinkkey0 (type: string), VALUE._col4 (type: int)
@@ -5445,7 +5041,7 @@ Manufacturer#5    almond aquamarine dodger light 
gainsboro        46      46      4       4       0.8     6
 Manufacturer#5 almond azure blanched chiffon midnight  23      23      5       
5       1.0     2
 PREHOOK: query: -- 18. testMulti2OperatorsFunctionChainWithMap
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name) as dr, 
@@ -5464,7 +5060,7 @@ from noop(on
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 18. testMulti2OperatorsFunctionChainWithMap
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name) as dr, 
@@ -5481,10 +5077,6 @@ from noop(on
         partition by p_mfgr,p_name  
         order by p_mfgr,p_name)
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -5516,14 +5108,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: true
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -5576,11 +5160,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col4 (type: int)
@@ -5642,11 +5221,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -5686,11 +5260,6 @@ STAGE PLANS:
         Reducer 4 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -5827,7 +5396,7 @@ Manufacturer#5    almond aquamarine dodger light 
gainsboro        1       1       46      46
 Manufacturer#5 almond azure blanched chiffon midnight  1       1       23      
23
 PREHOOK: query: -- 19. testMulti3OperatorsFunctionChain
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -5846,7 +5415,7 @@ from noop(on
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 19. testMulti3OperatorsFunctionChain
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -5863,10 +5432,6 @@ from noop(on
         partition by p_mfgr  
         order by p_mfgr )
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -5899,14 +5464,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: true
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -5959,11 +5516,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col4 (type: int)
@@ -6002,11 +5554,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -6038,11 +5585,6 @@ STAGE PLANS:
         Reducer 4 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col4 (type: int)
@@ -6074,11 +5616,6 @@ STAGE PLANS:
         Reducer 5 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -6215,7 +5752,7 @@ Manufacturer#5    almond aquamarine dodger light 
gainsboro        4       4       46      85
 Manufacturer#5 almond azure blanched chiffon midnight  5       5       23      
108
 PREHOOK: query: -- 20. testMultiOperatorChainWithNoWindowing
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -6232,7 +5769,7 @@ from noop(on
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 20. testMultiOperatorChainWithNoWindowing
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -6247,10 +5784,6 @@ from noop(on
           partition by p_mfgr 
           order by p_mfgr))
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -6282,14 +5815,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: true
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -6342,11 +5867,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -6385,11 +5905,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col4 (type: int)
@@ -6428,11 +5943,6 @@ STAGE PLANS:
         Reducer 4 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -6565,7 +6075,7 @@ Manufacturer#5    almond aquamarine dodger light 
gainsboro        4       4       46      85
 Manufacturer#5 almond azure blanched chiffon midnight  5       5       23      
108
 PREHOOK: query: -- 21. testMultiOperatorChainEndsWithNoopMap
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name) as dr, 
@@ -6584,7 +6094,7 @@ from noopwithmap(on
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 21. testMultiOperatorChainEndsWithNoopMap
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name) as dr, 
@@ -6601,10 +6111,6 @@ from noopwithmap(on
           partition by p_mfgr,p_name 
           order by p_mfgr,p_name)
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -6637,14 +6143,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: true
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -6697,11 +6195,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -6740,11 +6233,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col4 (type: int)
@@ -6792,11 +6280,6 @@ STAGE PLANS:
         Reducer 4 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -6829,11 +6312,6 @@ STAGE PLANS:
         Reducer 5 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -6970,7 +6448,7 @@ Manufacturer#5    almond aquamarine dodger light 
gainsboro        1       1       46      46
 Manufacturer#5 almond azure blanched chiffon midnight  1       1       23      
23
 PREHOOK: query: -- 22. testMultiOperatorChainWithDiffPartitionForWindow1
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name order by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name order by p_mfgr,p_name) as dr, 
@@ -6988,7 +6466,7 @@ from noop(on
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 22. testMultiOperatorChainWithDiffPartitionForWindow1
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name order by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name order by p_mfgr,p_name) as dr, 
@@ -7004,10 +6482,6 @@ from noop(on
           order by p_mfgr
           ))
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -7039,14 +6513,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: true
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -7099,11 +6565,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -7158,11 +6619,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col4 (type: int)
@@ -7202,11 +6658,6 @@ STAGE PLANS:
         Reducer 4 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -7341,7 +6792,7 @@ Manufacturer#5    almond aquamarine dodger light 
gainsboro        1       1       46      46      46
 Manufacturer#5 almond azure blanched chiffon midnight  1       1       23      
23      23
 PREHOOK: query: -- 23. testMultiOperatorChainWithDiffPartitionForWindow2
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -7357,7 +6808,7 @@ from noopwithmap(on
 PREHOOK: type: QUERY
 POSTHOOK: query: -- 23. testMultiOperatorChainWithDiffPartitionForWindow2
 
-explain vectorization extended
+explain extended
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -7371,10 +6822,6 @@ from noopwithmap(on
               order by p_mfgr, p_name) 
           ))
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -7406,14 +6853,6 @@ STAGE PLANS:
                     auto parallelism: true
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: true
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -7466,11 +6905,6 @@ STAGE PLANS:
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -7525,11 +6959,6 @@ STAGE PLANS:
         Reducer 3 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)
@@ -7562,11 +6991,6 @@ STAGE PLANS:
         Reducer 4 
             Execution mode: llap
             Needs Tagging: false
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF Operator (PTF) not supported
-                vectorized: false
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col3 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/aed21d0b/ql/src/test/results/clientpositive/llap/vectorized_shufflejoin.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_shufflejoin.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_shufflejoin.q.out
index 8cdb67d..e376ca1 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_shufflejoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_shufflejoin.q.out
@@ -1,19 +1,15 @@
 PREHOOK: query: -- SORT_QUERY_RESULTS
 
-EXPLAIN VECTORIZATION EXPRESSION  SELECT COUNT(t1.cint) AS CNT, MAX(t2.cint) , 
MIN(t1.cint), AVG(t1.cint+t2.cint)
+EXPLAIN SELECT COUNT(t1.cint) AS CNT, MAX(t2.cint) , MIN(t1.cint), 
AVG(t1.cint+t2.cint)
   FROM alltypesorc t1
   JOIN alltypesorc t2 ON t1.cint = t2.cint order by CNT
 PREHOOK: type: QUERY
 POSTHOOK: query: -- SORT_QUERY_RESULTS
 
-EXPLAIN VECTORIZATION EXPRESSION  SELECT COUNT(t1.cint) AS CNT, MAX(t2.cint) , 
MIN(t1.cint), AVG(t1.cint+t2.cint)
+EXPLAIN SELECT COUNT(t1.cint) AS CNT, MAX(t2.cint) , MIN(t1.cint), 
AVG(t1.cint+t2.cint)
   FROM alltypesorc t1
   JOIN alltypesorc t2 ON t1.cint = t2.cint order by CNT
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -33,85 +29,39 @@ STAGE PLANS:
                 TableScan
                   alias: t1
                   Statistics: Num rows: 12288 Data size: 36696 Basic stats: 
COMPLETE Column stats: COMPLETE
-                  TableScan Vectorization:
-                      native: true
-                      projectedOutputColumns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
10, 11]
                   Filter Operator
-                    Filter Vectorization:
-                        className: VectorFilterOperator
-                        native: true
-                        predicateExpression: SelectColumnIsNotNull(col 2) -> 
boolean
                     predicate: cint is not null (type: boolean)
                     Statistics: Num rows: 9173 Data size: 27396 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: cint (type: int)
                       outputColumnNames: _col0
-                      Select Vectorization:
-                          className: VectorSelectOperator
-                          native: true
-                          projectedOutputColumns: [2]
                       Statistics: Num rows: 9173 Data size: 27396 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: int)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: int)
-                        Reduce Sink Vectorization:
-                            className: VectorReduceSinkLongOperator
-                            native: true
-                            nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, Not ACID UPDATE or DELETE IS true, No buckets IS 
true, No TopN IS true, Uniform Hash IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
                         Statistics: Num rows: 9173 Data size: 27396 Basic 
stats: COMPLETE Column stats: COMPLETE
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: true
-                usesVectorUDFAdaptor: false
-                vectorized: true
         Map 5 
             Map Operator Tree:
                 TableScan
                   alias: t2
                   Statistics: Num rows: 12288 Data size: 36696 Basic stats: 
COMPLETE Column stats: COMPLETE
-                  TableScan Vectorization:
-                      native: true
-                      projectedOutputColumns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
10, 11]
                   Filter Operator
-                    Filter Vectorization:
-                        className: VectorFilterOperator
-                        native: true
-                        predicateExpression: SelectColumnIsNotNull(col 2) -> 
boolean
                     predicate: cint is not null (type: boolean)
                     Statistics: Num rows: 9173 Data size: 27396 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: cint (type: int)
                       outputColumnNames: _col0
-                      Select Vectorization:
-                          className: VectorSelectOperator
-                          native: true
-                          projectedOutputColumns: [2]
                       Statistics: Num rows: 9173 Data size: 27396 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: int)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: int)
-                        Reduce Sink Vectorization:
-                            className: VectorReduceSinkLongOperator
-                            native: true
-                            nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, Not ACID UPDATE or DELETE IS true, No buckets IS 
true, No TopN IS true, Uniform Hash IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
                         Statistics: Num rows: 9173 Data size: 27396 Basic 
stats: COMPLETE Column stats: COMPLETE
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: true
-                usesVectorUDFAdaptor: false
-                vectorized: true
         Reducer 2 
             Execution mode: llap
             Reduce Operator Tree:
@@ -138,11 +88,6 @@ STAGE PLANS:
                       value expressions: _col0 (type: bigint), _col1 (type: 
int), _col2 (type: int), _col3 (type: struct<count:bigint,sum:double,input:int>)
         Reducer 3 
             Execution mode: llap
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: Aggregation Function UDF avg parameter 
expression for GROUPBY operator: Data type 
struct<count:bigint,sum:double,input:int> of Column[VALUE._col3] not supported
-                vectorized: false
             Reduce Operator Tree:
               Group By Operator
                 aggregations: count(VALUE._col0), max(VALUE._col1), 
min(VALUE._col2), avg(VALUE._col3)
@@ -156,27 +101,13 @@ STAGE PLANS:
                   value expressions: _col1 (type: int), _col2 (type: int), 
_col3 (type: double)
         Reducer 4 
             Execution mode: vectorized, llap
-            Reduce Vectorization:
-                enabled: true
-                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                groupByVectorOutput: true
-                allNative: false
-                usesVectorUDFAdaptor: false
-                vectorized: true
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: bigint), VALUE._col0 
(type: int), VALUE._col1 (type: int), VALUE._col2 (type: double)
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Select Vectorization:
-                    className: VectorSelectOperator
-                    native: true
-                    projectedOutputColumns: [0, 1, 2, 3]
                 Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE 
Column stats: COMPLETE
                 File Output Operator
                   compressed: false
-                  File Sink Vectorization:
-                      className: VectorFileSinkOperator
-                      native: false
                   Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE 
Column stats: COMPLETE
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/aed21d0b/ql/src/test/results/clientpositive/llap/vectorized_string_funcs.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_string_funcs.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_string_funcs.q.out
index 84fdc16..bfac939 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_string_funcs.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_string_funcs.q.out
@@ -1,6 +1,6 @@
 PREHOOK: query: -- Test string functions in vectorized mode to verify 
end-to-end functionality.
 
-explain vectorization 
+explain 
 select 
    substr(cstring1, 1, 2)
   ,substr(cstring1, 2)
@@ -24,7 +24,7 @@ and cstring1 like '%'
 PREHOOK: type: QUERY
 POSTHOOK: query: -- Test string functions in vectorized mode to verify 
end-to-end functionality.
 
-explain vectorization 
+explain 
 select 
    substr(cstring1, 1, 2)
   ,substr(cstring1, 2)
@@ -46,54 +46,22 @@ where cbigint % 237 = 0
 and length(substr(cstring1, 1, 2)) <= 2
 and cstring1 like '%'
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
+  Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-1
-    Tez
-#### A masked pattern was here ####
-      Vertices:
-        Map 1 
-            Map Operator Tree:
-                TableScan
-                  alias: alltypesorc
-                  Statistics: Num rows: 12288 Data size: 1816546 Basic stats: 
COMPLETE Column stats: COMPLETE
-                  Filter Operator
-                    predicate: (((cbigint % 237) = 0) and 
(length(substr(cstring1, 1, 2)) <= 2) and (cstring1 like '%')) (type: boolean)
-                    Statistics: Num rows: 1024 Data size: 151470 Basic stats: 
COMPLETE Column stats: COMPLETE
-                    Select Operator
-                      expressions: substr(cstring1, 1, 2) (type: string), 
substr(cstring1, 2) (type: string), lower(cstring1) (type: string), 
upper(cstring1) (type: string), upper(cstring1) (type: string), 
length(cstring1) (type: int), trim(cstring1) (type: string), ltrim(cstring1) 
(type: string), rtrim(cstring1) (type: string), concat(cstring1, cstring2) 
(type: string), concat('>', cstring1) (type: string), concat(cstring1, '<') 
(type: string), concat(substr(cstring1, 1, 2), substr(cstring2, 1, 2)) (type: 
string)
-                      outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12
-                      Statistics: Num rows: 1024 Data size: 2265088 Basic 
stats: COMPLETE Column stats: COMPLETE
-                      File Output Operator
-                        compressed: false
-                        Statistics: Num rows: 1024 Data size: 2265088 Basic 
stats: COMPLETE Column stats: COMPLETE
-                        table:
-                            input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
-                            output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                            serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-            Execution mode: vectorized, llap
-            LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: true
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: false
-                usesVectorUDFAdaptor: false
-                vectorized: true
-
   Stage: Stage-0
     Fetch Operator
       limit: -1
       Processor Tree:
-        ListSink
+        TableScan
+          alias: alltypesorc
+          Filter Operator
+            predicate: (((cbigint % 237) = 0) and (length(substr(cstring1, 1, 
2)) <= 2) and (cstring1 like '%')) (type: boolean)
+            Select Operator
+              expressions: substr(cstring1, 1, 2) (type: string), 
substr(cstring1, 2) (type: string), lower(cstring1) (type: string), 
upper(cstring1) (type: string), upper(cstring1) (type: string), 
length(cstring1) (type: int), trim(cstring1) (type: string), ltrim(cstring1) 
(type: string), rtrim(cstring1) (type: string), concat(cstring1, cstring2) 
(type: string), concat('>', cstring1) (type: string), concat(cstring1, '<') 
(type: string), concat(substr(cstring1, 1, 2), substr(cstring2, 1, 2)) (type: 
string)
+              outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12
+              ListSink
 
 PREHOOK: query: select 
    substr(cstring1, 1, 2)

Reply via email to