http://git-wip-us.apache.org/repos/asf/hive/blob/ad6ce078/ql/src/test/results/clientpositive/llap/vectorized_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_mapjoin.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_mapjoin.q.out
index a7c0d10..1bab6f7 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_mapjoin.q.out
@@ -1,19 +1,15 @@
 PREHOOK: query: -- SORT_QUERY_RESULTS
 
-EXPLAIN VECTORIZATION EXPRESSION  SELECT COUNT(t1.cint), MAX(t2.cint), 
MIN(t1.cint), AVG(t1.cint+t2.cint)
+EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint)
   FROM alltypesorc t1
   JOIN alltypesorc t2 ON t1.cint = t2.cint
 PREHOOK: type: QUERY
 POSTHOOK: query: -- SORT_QUERY_RESULTS
 
-EXPLAIN VECTORIZATION EXPRESSION  SELECT COUNT(t1.cint), MAX(t2.cint), 
MIN(t1.cint), AVG(t1.cint+t2.cint)
+EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint)
   FROM alltypesorc t1
   JOIN alltypesorc t2 ON t1.cint = t2.cint
 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
@@ -32,23 +28,12 @@ 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
                       Map Join Operator
                         condition map:
@@ -56,10 +41,6 @@ STAGE PLANS:
                         keys:
                           0 _col0 (type: int)
                           1 _col0 (type: int)
-                        Map Join Vectorization:
-                            className: VectorMapJoinInnerBigOnlyLongOperator
-                            native: true
-                            nativeConditionsMet: 
hive.vectorized.execution.mapjoin.native.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, One MapJoin Condition IS true, No nullsafe IS 
true, Supports Key Types IS true, Not empty key IS true, When Fast Hash Table, 
then requires no Hybrid Hash Join IS true, Small table vectorizes IS true
                         outputColumnNames: _col0, _col1
                         input vertices:
                           1 Map 3
@@ -67,21 +48,9 @@ STAGE PLANS:
                         Select Operator
                           expressions: _col0 (type: int), _col1 (type: int), 
(_col0 + _col1) (type: int)
                           outputColumnNames: _col0, _col1, _col2
-                          Select Vectorization:
-                              className: VectorSelectOperator
-                              native: true
-                              projectedOutputColumns: [2, 2, 12]
-                              selectExpressions: LongColAddLongColumn(col 2, 
col 2) -> 12:long
                           Statistics: Num rows: 19518 Data size: 156144 Basic 
stats: COMPLETE Column stats: COMPLETE
                           Group By Operator
                             aggregations: count(_col0), max(_col1), 
min(_col0), avg(_col2)
-                            Group By Vectorization:
-                                aggregators: VectorUDAFCount(col 2) -> bigint, 
VectorUDAFMaxLong(col 2) -> int, VectorUDAFMinLong(col 2) -> int, 
VectorUDAFAvgLong(col 12) -> struct<count:bigint,sum:double>
-                                className: VectorGroupByOperator
-                                vectorOutput: false
-                                native: false
-                                projectedOutputColumns: [0, 1, 2, 3]
-                                vectorOutputConditionsNotMet: Vector output of 
VectorUDAFAvgLong(col 12) -> struct<count:bigint,sum:double> output type STRUCT 
requires PRIMITIVE IS false
                             mode: hash
                             outputColumnNames: _col0, _col1, _col2, _col3
                             Statistics: Num rows: 1 Data size: 92 Basic stats: 
COMPLETE Column stats: COMPLETE
@@ -91,63 +60,27 @@ STAGE PLANS:
                               value expressions: _col0 (type: bigint), _col1 
(type: int), _col2 (type: int), _col3 (type: 
struct<count:bigint,sum:double,input:int>)
             Execution mode: vectorized, llap
             LLAP IO: all inputs
-            Map Vectorization:
-                enabled: true
-                enabledConditionsMet: 
hive.vectorized.use.vectorized.input.format IS true
-                groupByVectorOutput: false
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                allNative: false
-                usesVectorUDFAdaptor: false
-                vectorized: true
         Map 3 
             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 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)

http://git-wip-us.apache.org/repos/asf/hive/blob/ad6ce078/ql/src/test/results/clientpositive/llap/vectorized_math_funcs.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_math_funcs.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_math_funcs.q.out
index dbc2a78..0a81f62 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_math_funcs.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_math_funcs.q.out
@@ -1,6 +1,6 @@
 PREHOOK: query: -- Test math functions in vectorized mode to verify they run 
correctly end-to-end.
 
-explain vectorization expression
+explain 
 select
    cdouble
   ,Round(cdouble, 2)
@@ -54,7 +54,7 @@ and sin(cfloat) >= -1.0
 PREHOOK: type: QUERY
 POSTHOOK: query: -- Test math functions in vectorized mode to verify they run 
correctly end-to-end.
 
-explain vectorization expression
+explain 
 select
    cdouble
   ,Round(cdouble, 2)
@@ -106,69 +106,22 @@ where cbigint % 500 = 0
 -- test use of a math function in the WHERE clause
 and sin(cfloat) >= -1.0
 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: 293580 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: FilterExprAndExpr(children: 
FilterLongColEqualLongScalar(col 12, val 0)(children: 
LongColModuloLongScalar(col 3, val 500) -> 12:long) -> boolean, 
FilterDoubleColGreaterEqualDoubleScalar(col 13, val -1.0)(children: 
FuncSinDoubleToDouble(col 4) -> 13:double) -> boolean) -> boolean
-                    predicate: (((cbigint % 500) = 0) and (sin(cfloat) >= 
-1.0)) (type: boolean)
-                    Statistics: Num rows: 2048 Data size: 48960 Basic stats: 
COMPLETE Column stats: COMPLETE
-                    Select Operator
-                      expressions: cdouble (type: double), round(cdouble, 2) 
(type: double), floor(cdouble) (type: bigint), ceil(cdouble) (type: bigint), 
rand() (type: double), rand(98007) (type: double), exp(ln(cdouble)) (type: 
double), ln(cdouble) (type: double), ln(cfloat) (type: double), log10(cdouble) 
(type: double), log2(cdouble) (type: double), log2((cdouble - 15601.0)) (type: 
double), log2(cfloat) (type: double), log2(cbigint) (type: double), log2(cint) 
(type: double), log2(csmallint) (type: double), log2(ctinyint) (type: double), 
log(2, cdouble) (type: double), power(log2(cdouble), 2) (type: double), 
power(log2(cdouble), 2) (type: double), sqrt(cdouble) (type: double), 
sqrt(cbigint) (type: double), bin(cbigint) (type: string), hex(cdouble) (type: 
string), conv(cbigint, 10, 16) (type: string), abs(cdouble) (type: double), 
abs(ctinyint) (type: int), (cint pmod 3) (type: int), sin(cdouble) (type: 
double), asin(cdouble) (type: double), cos(cdouble) (type: double), 
acos(cdouble)
  (type: double), atan(cdouble) (type: double), degrees(cdouble) (type: 
double), radians(cdouble) (type: double), cdouble (type: double), cbigint 
(type: bigint), (- cdouble) (type: double), sign(cdouble) (type: double), 
sign(cbigint) (type: double), cos(((- sin(log(cdouble))) + 3.14159)) (type: 
double)
-                      outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, 
_col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col24, 
_col25, _col26, _col27, _col28, _col29, _col30, _col31, _col32, _col33, _col34, 
_col35, _col36, _col37, _col38, _col39, _col40
-                      Select Vectorization:
-                          className: VectorSelectOperator
-                          native: true
-                          projectedOutputColumns: [5, 13, 12, 14, 15, 16, 18, 
17, 19, 20, 21, 23, 22, 24, 25, 26, 27, 28, 30, 31, 29, 32, 33, 34, 35, 36, 37, 
38, 39, 40, 41, 42, 43, 44, 45, 5, 3, 46, 47, 48, 49]
-                          selectExpressions: 
RoundWithNumDigitsDoubleToDouble(col 5, decimalPlaces 2) -> 13:double, 
FuncFloorDoubleToLong(col 5) -> 12:long, FuncCeilDoubleToLong(col 5) -> 
14:long, FuncRandNoSeed -> 15:double, FuncRand -> 16:double, 
FuncExpDoubleToDouble(col 17)(children: FuncLnDoubleToDouble(col 5) -> 
17:double) -> 18:double, FuncLnDoubleToDouble(col 5) -> 17:double, 
FuncLnDoubleToDouble(col 4) -> 19:double, FuncLog10DoubleToDouble(col 5) -> 
20:double, FuncLog2DoubleToDouble(col 5) -> 21:double, 
FuncLog2DoubleToDouble(col 22)(children: DoubleColSubtractDoubleScalar(col 5, 
val 15601.0) -> 22:double) -> 23:double, FuncLog2DoubleToDouble(col 4) -> 
22:double, FuncLog2LongToDouble(col 3) -> 24:double, FuncLog2LongToDouble(col 
2) -> 25:double, FuncLog2LongToDouble(col 1) -> 26:double, 
FuncLog2LongToDouble(col 0) -> 27:double, VectorUDFAdaptor(log(2, cdouble)) -> 
28:Double, VectorUDFAdaptor(power(log2(cdouble), 2))(children: 
FuncLog2DoubleToDouble(col 5) -> 29:double) -> 3
 0:Double, VectorUDFAdaptor(power(log2(cdouble), 2))(children: 
FuncLog2DoubleToDouble(col 5) -> 29:double) -> 31:Double, 
FuncSqrtDoubleToDouble(col 5) -> 29:double, FuncSqrtLongToDouble(col 3) -> 
32:double, FuncBin(col 3) -> 33:String, VectorUDFAdaptor(hex(cdouble)) -> 
34:String, VectorUDFAdaptor(conv(cbigint, 10, 16)) -> 35:String, 
FuncAbsDoubleToDouble(col 5) -> 36:double, FuncAbsLongToLong(col 0) -> 37:long, 
PosModLongToLong(col 2, divisor 3) -> 38:long, FuncSinDoubleToDouble(col 5) -> 
39:double, FuncASinDoubleToDouble(col 5) -> 40:double, 
FuncCosDoubleToDouble(col 5) -> 41:double, FuncACosDoubleToDouble(col 5) -> 
42:double, FuncATanDoubleToDouble(col 5) -> 43:double, 
FuncDegreesDoubleToDouble(col 5) -> 44:double, FuncRadiansDoubleToDouble(col 5) 
-> 45:double, DoubleColUnaryMinus(col 5) -> 46:double, 
FuncSignDoubleToDouble(col 5) -> 47:double, FuncSignLongToDouble(col 3) -> 
48:double, FuncCosDoubleToDouble(col 50)(children: DoubleColAddDoubleScalar(col 
49, val 3.14159)(children: D
 oubleColUnaryMinus(col 50)(children: FuncSinDoubleToDouble(col 49)(children: 
FuncLnDoubleToDouble(col 5) -> 49:double) -> 50:double) -> 49:double) -> 
50:double) -> 49:double
-                      Statistics: Num rows: 2048 Data size: 1724272 Basic 
stats: COMPLETE Column stats: COMPLETE
-                      File Output Operator
-                        compressed: false
-                        File Sink Vectorization:
-                            className: VectorFileSinkOperator
-                            native: false
-                        Statistics: Num rows: 2048 Data size: 1724272 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: true
-                vectorized: true
-
   Stage: Stage-0
     Fetch Operator
       limit: -1
       Processor Tree:
-        ListSink
+        TableScan
+          alias: alltypesorc
+          Filter Operator
+            predicate: (((cbigint % 500) = 0) and (sin(cfloat) >= -1.0)) 
(type: boolean)
+            Select Operator
+              expressions: cdouble (type: double), round(cdouble, 2) (type: 
double), floor(cdouble) (type: bigint), ceil(cdouble) (type: bigint), rand() 
(type: double), rand(98007) (type: double), exp(ln(cdouble)) (type: double), 
ln(cdouble) (type: double), ln(cfloat) (type: double), log10(cdouble) (type: 
double), log2(cdouble) (type: double), log2((cdouble - 15601.0)) (type: 
double), log2(cfloat) (type: double), log2(cbigint) (type: double), log2(cint) 
(type: double), log2(csmallint) (type: double), log2(ctinyint) (type: double), 
log(2, cdouble) (type: double), power(log2(cdouble), 2) (type: double), 
power(log2(cdouble), 2) (type: double), sqrt(cdouble) (type: double), 
sqrt(cbigint) (type: double), bin(cbigint) (type: string), hex(cdouble) (type: 
string), conv(cbigint, 10, 16) (type: string), abs(cdouble) (type: double), 
abs(ctinyint) (type: int), (cint pmod 3) (type: int), sin(cdouble) (type: 
double), asin(cdouble) (type: double), cos(cdouble) (type: double), 
acos(cdouble) (type: 
 double), atan(cdouble) (type: double), degrees(cdouble) (type: double), 
radians(cdouble) (type: double), cdouble (type: double), cbigint (type: 
bigint), (- cdouble) (type: double), sign(cdouble) (type: double), 
sign(cbigint) (type: double), cos(((- sin(log(cdouble))) + 3.14159)) (type: 
double)
+              outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, 
_col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col24, _col25, 
_col26, _col27, _col28, _col29, _col30, _col31, _col32, _col33, _col34, _col35, 
_col36, _col37, _col38, _col39, _col40
+              ListSink
 
 PREHOOK: query: select
    cdouble

http://git-wip-us.apache.org/repos/asf/hive/blob/ad6ce078/ql/src/test/results/clientpositive/llap/vectorized_nested_mapjoin.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_nested_mapjoin.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_nested_mapjoin.q.out
index 93a68e9..800cbb6 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_nested_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_nested_mapjoin.q.out
@@ -1,15 +1,11 @@
 PREHOOK: query: -- SORT_QUERY_RESULTS
 
-explain vectorization select sum(t1.td) from (select  v1.csmallint as tsi, 
v1.cdouble as td from alltypesorc v1, alltypesorc v2 where 
v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint
+explain select sum(t1.td) from (select  v1.csmallint as tsi, v1.cdouble as td 
from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join 
alltypesorc v3 on t1.tsi=v3.csmallint
 PREHOOK: type: QUERY
 POSTHOOK: query: -- SORT_QUERY_RESULTS
 
-explain vectorization select sum(t1.td) from (select  v1.csmallint as tsi, 
v1.cdouble as td from alltypesorc v1, alltypesorc v2 where 
v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint
+explain select sum(t1.td) from (select  v1.csmallint as tsi, v1.cdouble as td 
from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join 
alltypesorc v3 on t1.tsi=v3.csmallint
 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
@@ -70,14 +66,6 @@ STAGE PLANS:
                                 value expressions: _col0 (type: double)
             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
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -98,14 +86,6 @@ STAGE PLANS:
                         value expressions: _col1 (type: smallint), _col2 
(type: double)
             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 4 
             Map Operator Tree:
                 TableScan
@@ -125,23 +105,8 @@ STAGE PLANS:
                         Statistics: Num rows: 9174 Data size: 27400 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: 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:
               Group By Operator
                 aggregations: sum(VALUE._col0)

http://git-wip-us.apache.org/repos/asf/hive/blob/ad6ce078/ql/src/test/results/clientpositive/llap/vectorized_parquet.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_parquet.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_parquet.q.out
index 6285c99..8345132 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_parquet.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_parquet.q.out
@@ -46,20 +46,16 @@ POSTHOOK: Lineage: alltypes_parquet.cint SIMPLE 
[(alltypesorc)alltypesorc.FieldS
 POSTHOOK: Lineage: alltypes_parquet.csmallint SIMPLE 
[(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, 
comment:null), ]
 POSTHOOK: Lineage: alltypes_parquet.cstring1 SIMPLE 
[(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, 
comment:null), ]
 POSTHOOK: Lineage: alltypes_parquet.ctinyint SIMPLE 
[(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, 
comment:null), ]
-PREHOOK: query: explain vectorization select * 
+PREHOOK: query: explain select * 
   from alltypes_parquet
   where cint = 528534767 
   limit 10
 PREHOOK: type: QUERY
-POSTHOOK: query: explain vectorization select * 
+POSTHOOK: query: explain select * 
   from alltypes_parquet
   where cint = 528534767 
   limit 10
 POSTHOOK: type: QUERY
-PLAN VECTORIZATION:
-  enabled: true
-  enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
-
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -103,7 +99,7 @@ POSTHOOK: Input: default@alltypes_parquet
 528534767      27      -7824   27.0    -7824.0 cvLH6Eat2yFsyy7p
 528534767      -11     -15431  -11.0   -15431.0        cvLH6Eat2yFsyy7p
 528534767      61      -15549  61.0    -15549.0        cvLH6Eat2yFsyy7p
-PREHOOK: query: explain vectorization select ctinyint, 
+PREHOOK: query: explain select ctinyint, 
   max(cint), 
   min(csmallint), 
   count(cstring1), 
@@ -112,7 +108,7 @@ PREHOOK: query: explain vectorization select ctinyint,
   from alltypes_parquet
   group by ctinyint
 PREHOOK: type: QUERY
-POSTHOOK: query: explain vectorization select ctinyint, 
+POSTHOOK: query: explain select ctinyint, 
   max(cint), 
   min(csmallint), 
   count(cstring1), 
@@ -121,10 +117,6 @@ POSTHOOK: query: explain vectorization select ctinyint,
   from alltypes_parquet
   group by ctinyint
 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
@@ -160,17 +152,8 @@ STAGE PLANS:
                         value expressions: _col1 (type: int), _col2 (type: 
smallint), _col3 (type: bigint), _col4 (type: 
struct<count:bigint,sum:double,input:float>), _col5 (type: 
struct<count:bigint,sum:double,variance:double>)
             Execution mode: llap
             LLAP IO: no inputs
-            Map Vectorization:
-                enabled: false
-                enabledConditionsNotMet: 
hive.vectorized.use.row.serde.deserialize IS false
-                inputFileFormats: 
org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat
         Reducer 2 
             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:float> of Column[VALUE._col3] not supported
-                vectorized: false
             Reduce Operator Tree:
               Group By Operator
                 aggregations: max(VALUE._col0), min(VALUE._col1), 
count(VALUE._col2), avg(VALUE._col3), stddev_pop(VALUE._col4)

http://git-wip-us.apache.org/repos/asf/hive/blob/ad6ce078/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out
index 3c977f1..b49d5dd 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out
@@ -118,12 +118,12 @@ POSTHOOK: Lineage: parquet_types.ctinyint SIMPLE 
[(parquet_types_staging)parquet
 POSTHOOK: Lineage: parquet_types.cvarchar SIMPLE 
[(parquet_types_staging)parquet_types_staging.FieldSchema(name:cvarchar, 
type:varchar(10), comment:null), ]
 POSTHOOK: Lineage: parquet_types.t SIMPLE 
[(parquet_types_staging)parquet_types_staging.FieldSchema(name:t, 
type:timestamp, comment:null), ]
 PREHOOK: query: -- select
-explain vectorization expression
+explain
 SELECT cint, ctinyint, csmallint, cfloat, cdouble, cstring1, t, cchar, 
cvarchar,
 hex(cbinary), cdecimal FROM parquet_types
 PREHOOK: type: QUERY
 POSTHOOK: query: -- select
-explain vectorization expression
+explain
 SELECT cint, ctinyint, csmallint, cfloat, cdouble, cstring1, t, cchar, 
cvarchar,
 hex(cbinary), cdecimal FROM parquet_types
 POSTHOOK: type: QUERY
@@ -169,10 +169,10 @@ POSTHOOK: Input: default@parquet_types
 119    2       5       1.4     5.7     fgh     2030-08-08 20:20:20.202020202   
vwxyz   abcdede 68692CCAC0BDE7  12.83
 120    3       1       1.0     6.0     ijk     2031-09-09 21:21:21.212121212   
wxyza   abcde   B4F3CAFDBEDD    73.04
 121    1       2       1.1     6.3     lmn     2032-10-10 22:22:22.222222222   
bcdef   abcde           90.33
-PREHOOK: query: explain vectorization expression
+PREHOOK: query: explain
 SELECT cchar, LENGTH(cchar), cvarchar, LENGTH(cvarchar), cdecimal, 
SIGN(cdecimal) FROM parquet_types
 PREHOOK: type: QUERY
-POSTHOOK: query: explain vectorization expression
+POSTHOOK: query: explain
 SELECT cchar, LENGTH(cchar), cvarchar, LENGTH(cvarchar), cdecimal, 
SIGN(cdecimal) FROM parquet_types
 POSTHOOK: type: QUERY
 Plan optimized by CBO.
@@ -215,7 +215,7 @@ uvwzy       5       abcdede 7       4.76    1
 vwxyz  5       abcdede 7       12.83   1
 wxyza  5       abcde   5       73.04   1
 bcdef  5       abcde   5       90.33   1
-PREHOOK: query: explain vectorization expression
+PREHOOK: query: explain
 SELECT ctinyint,
   MAX(cint),
   MIN(csmallint),
@@ -227,7 +227,7 @@ FROM parquet_types
 GROUP BY ctinyint
 ORDER BY ctinyint
 PREHOOK: type: QUERY
-POSTHOOK: query: explain vectorization expression
+POSTHOOK: query: explain
 SELECT ctinyint,
   MAX(cint),
   MIN(csmallint),

Reply via email to