http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_outer_reference_windowed.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_outer_reference_windowed.q.out 
b/ql/src/test/results/clientpositive/llap/vector_outer_reference_windowed.q.out
index 5e26637..0f40378 100644
--- 
a/ql/src/test/results/clientpositive/llap/vector_outer_reference_windowed.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vector_outer_reference_windowed.q.out
@@ -296,10 +296,9 @@ STAGE PLANS:
                         sort order: 
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkEmptyKeyOperator
-                            keyColumnNums: []
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [0]
+                            valueColumns: 0:decimal(25,2)
                         Statistics: Num rows: 1 Data size: 112 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col0 (type: decimal(25,2))
             Execution mode: vectorized, llap
@@ -353,11 +352,11 @@ STAGE PLANS:
                   Map-reduce partition columns: 0 (type: int)
                   Reduce Sink Vectorization:
                       className: VectorReduceSinkLongOperator
-                      keyColumnNums: [1]
+                      keyColumns: 1:int
                       keyExpressions: ConstantVectorExpression(val 0) -> 1:int
                       native: true
                       nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                      valueColumnNums: [0]
+                      valueColumns: 0:decimal(25,2)
                   Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE 
Column stats: COMPLETE
                   value expressions: _col0 (type: decimal(25,2))
         Reducer 3 
@@ -517,10 +516,10 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: 
decimal(15,2)), _col1 (type: decimal(15,2))
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkMultiKeyOperator
-                            keyColumnNums: [0, 1]
+                            keyColumns: 0:decimal(15,2), 1:decimal(15,2)
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [2]
+                            valueColumns: 2:decimal(25,2)
                         Statistics: Num rows: 2 Data size: 672 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col2 (type: decimal(25,2))
             Execution mode: vectorized, llap
@@ -576,11 +575,11 @@ STAGE PLANS:
                   Map-reduce partition columns: _col1 (type: decimal(15,2))
                   Reduce Sink Vectorization:
                       className: VectorReduceSinkObjectHashOperator
-                      keyColumnNums: [1, 0]
+                      keyColumns: 1:decimal(15,2), 0:decimal(15,2)
                       native: true
                       nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                      partitionColumnNums: [1]
-                      valueColumnNums: [2]
+                      partitionColumns: 1:decimal(15,2)
+                      valueColumns: 2:decimal(25,2)
                   Statistics: Num rows: 2 Data size: 672 Basic stats: COMPLETE 
Column stats: COMPLETE
                   value expressions: _col2 (type: decimal(25,2))
         Reducer 3 
@@ -747,10 +746,10 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: 
decimal(15,2))
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkMultiKeyOperator
-                            keyColumnNums: [0]
+                            keyColumns: 0:decimal(15,2)
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [1]
+                            valueColumns: 1:decimal(15,2)
                         Statistics: Num rows: 4 Data size: 896 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: decimal(15,2))
             Execution mode: vectorized, llap
@@ -800,10 +799,9 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: 
decimal(15,2))
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkMultiKeyOperator
-                            keyColumnNums: [0]
+                            keyColumns: 0:decimal(15,2)
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: []
                         Statistics: Num rows: 4 Data size: 448 Basic stats: 
COMPLETE Column stats: COMPLETE
             Execution mode: vectorized, llap
             LLAP IO: no inputs
@@ -845,6 +843,9 @@ STAGE PLANS:
                     Map-reduce partition columns: _col0 (type: decimal(15,2)), 
_col1 (type: decimal(15,2))
                     Statistics: Num rows: 2 Data size: 672 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col2 (type: decimal(25,2))
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 3 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -881,11 +882,11 @@ STAGE PLANS:
                   Map-reduce partition columns: _col1 (type: decimal(15,2))
                   Reduce Sink Vectorization:
                       className: VectorReduceSinkObjectHashOperator
-                      keyColumnNums: [1, 0]
+                      keyColumns: 1:decimal(15,2), 0:decimal(15,2)
                       native: true
                       nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                      partitionColumnNums: [1]
-                      valueColumnNums: [2]
+                      partitionColumns: 1:decimal(15,2)
+                      valueColumns: 2:decimal(25,2)
                   Statistics: Num rows: 2 Data size: 672 Basic stats: COMPLETE 
Column stats: COMPLETE
                   value expressions: _col2 (type: decimal(25,2))
         Reducer 4 
@@ -1056,10 +1057,9 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: 
decimal(15,2))
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkMultiKeyOperator
-                            keyColumnNums: [0]
+                            keyColumns: 0:decimal(15,2)
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: []
                         Statistics: Num rows: 4 Data size: 448 Basic stats: 
COMPLETE Column stats: COMPLETE
             Execution mode: vectorized, llap
             LLAP IO: no inputs
@@ -1108,10 +1108,10 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: 
decimal(15,2))
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkMultiKeyOperator
-                            keyColumnNums: [0]
+                            keyColumns: 0:decimal(15,2)
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [1]
+                            valueColumns: 1:decimal(15,2)
                         Statistics: Num rows: 4 Data size: 896 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: decimal(15,2))
             Execution mode: vectorized, llap
@@ -1154,6 +1154,9 @@ STAGE PLANS:
                     Map-reduce partition columns: _col0 (type: decimal(15,2)), 
_col1 (type: decimal(15,2))
                     Statistics: Num rows: 2 Data size: 672 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col2 (type: decimal(25,2))
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 3 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -1190,11 +1193,11 @@ STAGE PLANS:
                   Map-reduce partition columns: _col1 (type: decimal(15,2))
                   Reduce Sink Vectorization:
                       className: VectorReduceSinkObjectHashOperator
-                      keyColumnNums: [1, 0]
+                      keyColumns: 1:decimal(15,2), 0:decimal(15,2)
                       native: true
                       nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                      partitionColumnNums: [1]
-                      valueColumnNums: [2]
+                      partitionColumns: 1:decimal(15,2)
+                      valueColumns: 2:decimal(25,2)
                   Statistics: Num rows: 2 Data size: 672 Basic stats: COMPLETE 
Column stats: COMPLETE
                   value expressions: _col2 (type: decimal(25,2))
         Reducer 4 
@@ -1364,10 +1367,10 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: 
decimal(15,2))
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkMultiKeyOperator
-                            keyColumnNums: [0]
+                            keyColumns: 0:decimal(15,2)
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [1]
+                            valueColumns: 1:decimal(15,2)
                         Statistics: Num rows: 4 Data size: 896 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: decimal(15,2))
             Execution mode: vectorized, llap
@@ -1417,10 +1420,10 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: 
decimal(15,2))
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkMultiKeyOperator
-                            keyColumnNums: [0]
+                            keyColumns: 0:decimal(15,2)
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [1]
+                            valueColumns: 1:decimal(15,2)
                         Statistics: Num rows: 4 Data size: 896 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: decimal(15,2))
             Execution mode: vectorized, llap
@@ -1463,6 +1466,9 @@ STAGE PLANS:
                     Map-reduce partition columns: _col0 (type: decimal(15,2))
                     Statistics: Num rows: 2 Data size: 704 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col2 (type: 
struct<count:bigint,xavg:double,yavg:double,xvar:double,yvar:double,covar:double>)
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 3 
             Execution mode: llap
             Reduce Vectorization:
@@ -1594,10 +1600,9 @@ STAGE PLANS:
                         sort order: 
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkEmptyKeyOperator
-                            keyColumnNums: []
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [0]
+                            valueColumns: 0:decimal(17,2)
                         Statistics: Num rows: 1 Data size: 112 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col0 (type: decimal(17,2))
             Execution mode: vectorized, llap
@@ -1651,11 +1656,11 @@ STAGE PLANS:
                   Map-reduce partition columns: 0 (type: int)
                   Reduce Sink Vectorization:
                       className: VectorReduceSinkLongOperator
-                      keyColumnNums: [1]
+                      keyColumns: 1:int
                       keyExpressions: ConstantVectorExpression(val 0) -> 1:int
                       native: true
                       nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                      valueColumnNums: [0]
+                      valueColumns: 0:decimal(17,2)
                   Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE 
Column stats: COMPLETE
                   value expressions: _col0 (type: decimal(17,2))
         Reducer 3 
@@ -1815,10 +1820,10 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: 
decimal(7,2)), _col1 (type: decimal(7,2))
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkMultiKeyOperator
-                            keyColumnNums: [0, 1]
+                            keyColumns: 0:decimal(7,2), 1:decimal(7,2)
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [2]
+                            valueColumns: 2:decimal(17,2)
                         Statistics: Num rows: 2 Data size: 672 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col2 (type: decimal(17,2))
             Execution mode: vectorized, llap
@@ -1874,11 +1879,11 @@ STAGE PLANS:
                   Map-reduce partition columns: _col1 (type: decimal(7,2))
                   Reduce Sink Vectorization:
                       className: VectorReduceSinkObjectHashOperator
-                      keyColumnNums: [1, 0]
+                      keyColumns: 1:decimal(7,2), 0:decimal(7,2)
                       native: true
                       nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                      partitionColumnNums: [1]
-                      valueColumnNums: [2]
+                      partitionColumns: 1:decimal(7,2)
+                      valueColumns: 2:decimal(17,2)
                   Statistics: Num rows: 2 Data size: 672 Basic stats: COMPLETE 
Column stats: COMPLETE
                   value expressions: _col2 (type: decimal(17,2))
         Reducer 3 
@@ -2045,10 +2050,10 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: 
decimal(7,2))
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkMultiKeyOperator
-                            keyColumnNums: [0]
+                            keyColumns: 0:decimal(7,2)
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [1]
+                            valueColumns: 1:decimal(7,2)
                         Statistics: Num rows: 4 Data size: 896 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: decimal(7,2))
             Execution mode: vectorized, llap
@@ -2098,10 +2103,9 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: 
decimal(7,2))
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkMultiKeyOperator
-                            keyColumnNums: [0]
+                            keyColumns: 0:decimal(7,2)
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: []
                         Statistics: Num rows: 4 Data size: 448 Basic stats: 
COMPLETE Column stats: COMPLETE
             Execution mode: vectorized, llap
             LLAP IO: no inputs
@@ -2143,6 +2147,9 @@ STAGE PLANS:
                     Map-reduce partition columns: _col0 (type: decimal(7,2)), 
_col1 (type: decimal(7,2))
                     Statistics: Num rows: 2 Data size: 672 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col2 (type: decimal(17,2))
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 3 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -2179,11 +2186,11 @@ STAGE PLANS:
                   Map-reduce partition columns: _col1 (type: decimal(7,2))
                   Reduce Sink Vectorization:
                       className: VectorReduceSinkObjectHashOperator
-                      keyColumnNums: [1, 0]
+                      keyColumns: 1:decimal(7,2), 0:decimal(7,2)
                       native: true
                       nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                      partitionColumnNums: [1]
-                      valueColumnNums: [2]
+                      partitionColumns: 1:decimal(7,2)
+                      valueColumns: 2:decimal(17,2)
                   Statistics: Num rows: 2 Data size: 672 Basic stats: COMPLETE 
Column stats: COMPLETE
                   value expressions: _col2 (type: decimal(17,2))
         Reducer 4 
@@ -2354,10 +2361,9 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: 
decimal(7,2))
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkMultiKeyOperator
-                            keyColumnNums: [0]
+                            keyColumns: 0:decimal(7,2)
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: []
                         Statistics: Num rows: 4 Data size: 448 Basic stats: 
COMPLETE Column stats: COMPLETE
             Execution mode: vectorized, llap
             LLAP IO: no inputs
@@ -2406,10 +2412,10 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: 
decimal(7,2))
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkMultiKeyOperator
-                            keyColumnNums: [0]
+                            keyColumns: 0:decimal(7,2)
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [1]
+                            valueColumns: 1:decimal(7,2)
                         Statistics: Num rows: 4 Data size: 896 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: decimal(7,2))
             Execution mode: vectorized, llap
@@ -2452,6 +2458,9 @@ STAGE PLANS:
                     Map-reduce partition columns: _col0 (type: decimal(7,2)), 
_col1 (type: decimal(7,2))
                     Statistics: Num rows: 2 Data size: 672 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col2 (type: decimal(17,2))
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 3 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -2488,11 +2497,11 @@ STAGE PLANS:
                   Map-reduce partition columns: _col1 (type: decimal(7,2))
                   Reduce Sink Vectorization:
                       className: VectorReduceSinkObjectHashOperator
-                      keyColumnNums: [1, 0]
+                      keyColumns: 1:decimal(7,2), 0:decimal(7,2)
                       native: true
                       nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                      partitionColumnNums: [1]
-                      valueColumnNums: [2]
+                      partitionColumns: 1:decimal(7,2)
+                      valueColumns: 2:decimal(17,2)
                   Statistics: Num rows: 2 Data size: 672 Basic stats: COMPLETE 
Column stats: COMPLETE
                   value expressions: _col2 (type: decimal(17,2))
         Reducer 4 
@@ -2662,10 +2671,10 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: 
decimal(7,2))
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkMultiKeyOperator
-                            keyColumnNums: [0]
+                            keyColumns: 0:decimal(7,2)
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [1]
+                            valueColumns: 1:decimal(7,2)
                         Statistics: Num rows: 4 Data size: 896 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: decimal(7,2))
             Execution mode: vectorized, llap
@@ -2715,10 +2724,10 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: 
decimal(7,2))
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkMultiKeyOperator
-                            keyColumnNums: [0]
+                            keyColumns: 0:decimal(7,2)
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [1]
+                            valueColumns: 1:decimal(7,2)
                         Statistics: Num rows: 4 Data size: 896 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: decimal(7,2))
             Execution mode: vectorized, llap
@@ -2761,6 +2770,9 @@ STAGE PLANS:
                     Map-reduce partition columns: _col0 (type: decimal(7,2))
                     Statistics: Num rows: 2 Data size: 704 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col2 (type: 
struct<count:bigint,xavg:double,yavg:double,xvar:double,yvar:double,covar:double>)
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 3 
             Execution mode: llap
             Reduce Vectorization:

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_ptf_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_ptf_1.q.out 
b/ql/src/test/results/clientpositive/llap/vector_ptf_1.q.out
index ef4934e..8bec4aa 100644
--- a/ql/src/test/results/clientpositive/llap/vector_ptf_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_ptf_1.q.out
@@ -98,11 +98,11 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: string)
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkObjectHashOperator
-                            keyColumnNums: [0, 1]
+                            keyColumns: 0:string, 1:int
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            partitionColumnNums: [0]
-                            valueColumnNums: [2, 3]
+                            partitionColumns: 0:string
+                            valueColumns: 2:double, 3:bigint
                         Statistics: Num rows: 100 Data size: 18816 Basic 
stats: COMPLETE Column stats: NONE
                         value expressions: _col2 (type: double), _col3 (type: 
bigint)
             Execution mode: vectorized, llap

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_ptf_part_simple.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_ptf_part_simple.q.out 
b/ql/src/test/results/clientpositive/llap/vector_ptf_part_simple.q.out
index 3097322..9b1b34e 100644
--- a/ql/src/test/results/clientpositive/llap/vector_ptf_part_simple.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_ptf_part_simple.q.out
@@ -142,10 +142,10 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkStringOperator
-                        keyColumnNums: [0]
+                        keyColumns: 0:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumnNums: [1, 2]
+                        valueColumns: 1:string, 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_name (type: string), p_retailprice 
(type: double)
             Execution mode: vectorized, llap
@@ -402,10 +402,10 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkStringOperator
-                        keyColumnNums: [0]
+                        keyColumns: 0:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumnNums: [1, 2]
+                        valueColumns: 1:string, 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_name (type: string), p_retailprice 
(type: double)
             Execution mode: vectorized, llap
@@ -631,10 +631,10 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkStringOperator
-                        keyColumnNums: [0]
+                        keyColumns: 0:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumnNums: [1, 2]
+                        valueColumns: 1:string, 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_name (type: string), p_retailprice 
(type: double)
             Execution mode: vectorized, llap
@@ -860,11 +860,11 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
-                        keyColumnNums: [0, 1]
+                        keyColumns: 0:string, 1:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        partitionColumnNums: [0]
-                        valueColumnNums: [2]
+                        partitionColumns: 0:string
+                        valueColumns: 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_retailprice (type: double)
             Execution mode: vectorized, llap
@@ -1122,11 +1122,11 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
-                        keyColumnNums: [0, 1]
+                        keyColumns: 0:string, 1:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        partitionColumnNums: [0]
-                        valueColumnNums: [2]
+                        partitionColumns: 0:string
+                        valueColumns: 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_retailprice (type: double)
             Execution mode: vectorized, llap
@@ -1352,11 +1352,11 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
-                        keyColumnNums: [0, 1]
+                        keyColumns: 0:string, 1:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        partitionColumnNums: [0]
-                        valueColumnNums: [2]
+                        partitionColumns: 0:string
+                        valueColumns: 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_retailprice (type: double)
             Execution mode: vectorized, llap
@@ -1582,12 +1582,12 @@ STAGE PLANS:
                     Map-reduce partition columns: 0 (type: int)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
-                        keyColumnNums: [4, 1]
+                        keyColumns: 4:int, 1:string
                         keyExpressions: ConstantVectorExpression(val 0) -> 
4:int
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        partitionColumnNums: [5]
-                        valueColumnNums: [0, 2]
+                        partitionColumns: 5:int
+                        valueColumns: 0:string, 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_mfgr (type: string), p_retailprice 
(type: double)
             Execution mode: vectorized, llap
@@ -1845,12 +1845,12 @@ STAGE PLANS:
                     Map-reduce partition columns: 0 (type: int)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
-                        keyColumnNums: [4, 1]
+                        keyColumns: 4:int, 1:string
                         keyExpressions: ConstantVectorExpression(val 0) -> 
4:int
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        partitionColumnNums: [5]
-                        valueColumnNums: [0, 2]
+                        partitionColumns: 5:int
+                        valueColumns: 0:string, 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_mfgr (type: string), p_retailprice 
(type: double)
             Execution mode: vectorized, llap
@@ -2076,12 +2076,12 @@ STAGE PLANS:
                     Map-reduce partition columns: 0 (type: int)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
-                        keyColumnNums: [4, 1]
+                        keyColumns: 4:int, 1:string
                         keyExpressions: ConstantVectorExpression(val 0) -> 
4:int
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        partitionColumnNums: [5]
-                        valueColumnNums: [0, 2]
+                        partitionColumns: 5:int
+                        valueColumns: 0:string, 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_mfgr (type: string), p_retailprice 
(type: double)
             Execution mode: vectorized, llap
@@ -2301,10 +2301,10 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkStringOperator
-                        keyColumnNums: [0]
+                        keyColumns: 0:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumnNums: [1, 2]
+                        valueColumns: 1:string, 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_name (type: string), p_retailprice 
(type: double)
             Execution mode: vectorized, llap
@@ -2529,10 +2529,10 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkStringOperator
-                        keyColumnNums: [0]
+                        keyColumns: 0:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumnNums: [1, 2]
+                        valueColumns: 1:string, 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_name (type: string), p_retailprice 
(type: double)
             Execution mode: vectorized, llap
@@ -2757,10 +2757,10 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkStringOperator
-                        keyColumnNums: [0]
+                        keyColumns: 0:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumnNums: [1, 2]
+                        valueColumns: 1:string, 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_name (type: string), p_retailprice 
(type: double)
             Execution mode: vectorized, llap
@@ -2985,11 +2985,11 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
-                        keyColumnNums: [0, 1]
+                        keyColumns: 0:string, 1:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        partitionColumnNums: [0]
-                        valueColumnNums: [2]
+                        partitionColumns: 0:string
+                        valueColumns: 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_retailprice (type: double)
             Execution mode: vectorized, llap
@@ -3215,11 +3215,11 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
-                        keyColumnNums: [0, 1]
+                        keyColumns: 0:string, 1:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        partitionColumnNums: [0]
-                        valueColumnNums: [2]
+                        partitionColumns: 0:string
+                        valueColumns: 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_retailprice (type: double)
             Execution mode: vectorized, llap
@@ -3445,11 +3445,11 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
-                        keyColumnNums: [0, 1]
+                        keyColumns: 0:string, 1:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        partitionColumnNums: [0]
-                        valueColumnNums: [2]
+                        partitionColumns: 0:string
+                        valueColumns: 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_retailprice (type: double)
             Execution mode: vectorized, llap
@@ -3675,12 +3675,12 @@ STAGE PLANS:
                     Map-reduce partition columns: 0 (type: int)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
-                        keyColumnNums: [4, 1]
+                        keyColumns: 4:int, 1:string
                         keyExpressions: ConstantVectorExpression(val 0) -> 
4:int
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        partitionColumnNums: [5]
-                        valueColumnNums: [0, 2]
+                        partitionColumns: 5:int
+                        valueColumns: 0:string, 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_mfgr (type: string), p_retailprice 
(type: double)
             Execution mode: vectorized, llap
@@ -3906,12 +3906,12 @@ STAGE PLANS:
                     Map-reduce partition columns: 0 (type: int)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
-                        keyColumnNums: [4, 1]
+                        keyColumns: 4:int, 1:string
                         keyExpressions: ConstantVectorExpression(val 0) -> 
4:int
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        partitionColumnNums: [5]
-                        valueColumnNums: [0, 2]
+                        partitionColumns: 5:int
+                        valueColumns: 0:string, 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_mfgr (type: string), p_retailprice 
(type: double)
             Execution mode: vectorized, llap
@@ -4137,12 +4137,12 @@ STAGE PLANS:
                     Map-reduce partition columns: 0 (type: int)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
-                        keyColumnNums: [4, 1]
+                        keyColumns: 4:int, 1:string
                         keyExpressions: ConstantVectorExpression(val 0) -> 
4:int
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        partitionColumnNums: [5]
-                        valueColumnNums: [0, 2]
+                        partitionColumns: 5:int
+                        valueColumns: 0:string, 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_mfgr (type: string), p_retailprice 
(type: double)
             Execution mode: vectorized, llap
@@ -4410,10 +4410,10 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkStringOperator
-                        keyColumnNums: [0]
+                        keyColumns: 0:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumnNums: [1, 2]
+                        valueColumns: 1:string, 2:decimal(38,18)
                     Statistics: Num rows: 40 Data size: 12944 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_name (type: string), p_retailprice 
(type: decimal(38,18))
             Execution mode: vectorized, llap
@@ -4638,11 +4638,11 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
-                        keyColumnNums: [0, 1]
+                        keyColumns: 0:string, 1:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        partitionColumnNums: [0]
-                        valueColumnNums: [2]
+                        partitionColumns: 0:string
+                        valueColumns: 2:decimal(38,18)
                     Statistics: Num rows: 40 Data size: 12944 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_retailprice (type: decimal(38,18))
             Execution mode: vectorized, llap
@@ -4888,10 +4888,10 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkStringOperator
-                        keyColumnNums: [0]
+                        keyColumns: 0:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumnNums: [1, 2]
+                        valueColumns: 1:string, 2:bigint
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_name (type: string), p_bigint (type: 
bigint)
             Execution mode: vectorized, llap
@@ -5116,11 +5116,11 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
-                        keyColumnNums: [0, 1]
+                        keyColumns: 0:string, 1:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        partitionColumnNums: [0]
-                        valueColumnNums: [2]
+                        partitionColumns: 0:string
+                        valueColumns: 2:bigint
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_bigint (type: bigint)
             Execution mode: vectorized, llap
@@ -5340,10 +5340,10 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkStringOperator
-                        keyColumnNums: [0]
+                        keyColumns: 0:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumnNums: [2]
+                        valueColumns: 2:double
                     Statistics: Num rows: 40 Data size: 4216 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_retailprice (type: double)
             Execution mode: vectorized, llap
@@ -5539,11 +5539,11 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
-                        keyColumnNums: [0, 1]
+                        keyColumns: 0:string, 1:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        partitionColumnNums: [0]
-                        valueColumnNums: [2]
+                        partitionColumns: 0:string
+                        valueColumns: 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_retailprice (type: double)
             Execution mode: vectorized, llap
@@ -5740,11 +5740,11 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string), CASE 
WHEN ((p_mfgr = 'Manufacturer#2')) THEN (TIMESTAMP'2000-01-01 00:00:00') ELSE 
(CAST( null AS TIMESTAMP)) END (type: timestamp)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkMultiKeyOperator
-                        keyColumnNums: [0, 6]
+                        keyColumns: 0:string, 6:timestamp
                         keyExpressions: IfExprColumnNull(col 4:boolean, col 
5:timestamp, null)(children: StringGroupColEqualStringScalar(col 0:string, val 
Manufacturer#2) -> 4:boolean, ConstantVectorExpression(val 2000-01-01 00:00:00) 
-> 5:timestamp) -> 6:timestamp
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumnNums: [1, 2]
+                        valueColumns: 1:string, 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_name (type: string), p_retailprice 
(type: double)
             Execution mode: vectorized, llap
@@ -5940,12 +5940,12 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string), CASE 
WHEN ((p_mfgr = 'Manufacturer#2')) THEN (TIMESTAMP'2000-01-01 00:00:00') ELSE 
(CAST( null AS TIMESTAMP)) END (type: timestamp)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
-                        keyColumnNums: [0, 6, 1]
+                        keyColumns: 0:string, 6:timestamp, 1:string
                         keyExpressions: IfExprColumnNull(col 4:boolean, col 
5:timestamp, null)(children: StringGroupColEqualStringScalar(col 0:string, val 
Manufacturer#2) -> 4:boolean, ConstantVectorExpression(val 2000-01-01 00:00:00) 
-> 5:timestamp) -> 6:timestamp
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        partitionColumnNums: [0, 9]
-                        valueColumnNums: [2]
+                        partitionColumns: 0:string, 9:timestamp
+                        valueColumns: 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_retailprice (type: double)
             Execution mode: vectorized, llap
@@ -6272,10 +6272,10 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkStringOperator
-                        keyColumnNums: [0]
+                        keyColumns: 0:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumnNums: [2]
+                        valueColumns: 2:double
                     Statistics: Num rows: 40 Data size: 4216 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_retailprice (type: double)
             Execution mode: vectorized, llap
@@ -6471,11 +6471,11 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
-                        keyColumnNums: [0, 1]
+                        keyColumns: 0:string, 1:string
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        partitionColumnNums: [0]
-                        valueColumnNums: [2]
+                        partitionColumns: 0:string
+                        valueColumns: 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_retailprice (type: double)
             Execution mode: vectorized, llap
@@ -6672,12 +6672,12 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string), CASE 
WHEN ((p_mfgr = 'Manufacturer#2')) THEN (TIMESTAMP'2000-01-01 00:00:00') ELSE 
(CAST( null AS TIMESTAMP)) END (type: timestamp)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
-                        keyColumnNums: [0, 6, 1]
+                        keyColumns: 0:string, 6:timestamp, 1:string
                         keyExpressions: IfExprColumnNull(col 4:boolean, col 
5:timestamp, null)(children: StringGroupColEqualStringScalar(col 0:string, val 
Manufacturer#2) -> 4:boolean, ConstantVectorExpression(val 2000-01-01 00:00:00) 
-> 5:timestamp) -> 6:timestamp
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        partitionColumnNums: [0, 9]
-                        valueColumnNums: [2]
+                        partitionColumns: 0:string, 9:timestamp
+                        valueColumns: 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_retailprice (type: double)
             Execution mode: vectorized, llap
@@ -6874,11 +6874,11 @@ STAGE PLANS:
                     Map-reduce partition columns: p_mfgr (type: string), CASE 
WHEN ((p_mfgr = 'Manufacturer#2')) THEN (TIMESTAMP'2000-01-01 00:00:00') ELSE 
(CAST( null AS TIMESTAMP)) END (type: timestamp)
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkMultiKeyOperator
-                        keyColumnNums: [0, 6]
+                        keyColumns: 0:string, 6:timestamp
                         keyExpressions: IfExprColumnNull(col 4:boolean, col 
5:timestamp, null)(children: StringGroupColEqualStringScalar(col 0:string, val 
Manufacturer#2) -> 4:boolean, ConstantVectorExpression(val 2000-01-01 00:00:00) 
-> 5:timestamp) -> 6:timestamp
                         native: true
                         nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                        valueColumnNums: [1, 2]
+                        valueColumns: 1:string, 2:double
                     Statistics: Num rows: 40 Data size: 9096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: p_name (type: string), p_retailprice 
(type: double)
             Execution mode: vectorized, llap

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_reduce_groupby_duplicate_cols.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_reduce_groupby_duplicate_cols.q.out
 
b/ql/src/test/results/clientpositive/llap/vector_reduce_groupby_duplicate_cols.q.out
index 038300e..2f604bb 100644
--- 
a/ql/src/test/results/clientpositive/llap/vector_reduce_groupby_duplicate_cols.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vector_reduce_groupby_duplicate_cols.q.out
@@ -90,13 +90,15 @@ STAGE PLANS:
                         0 one (type: int), two (type: int)
                         1 1 (type: int), 2 (type: int)
                       Map Join Vectorization:
-                          bigTableKeyColumnNums: [0, 1]
-                          bigTableRetainedColumnNums: [0, 1]
-                          bigTableValueColumnNums: [0, 1]
+                          bigTableKeyColumns: 0:int, 1:int
+                          bigTableRetainColumnNums: [0, 1]
+                          bigTableValueColumns: 0:int, 1:int
                           className: VectorMapJoinInnerBigOnlyMultiKeyOperator
                           native: true
                           nativeConditionsMet: 
hive.mapjoin.optimized.hashtable IS true, 
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, Small table vectorizes IS true, Optimized Table and Supports Key Types IS 
true
-                          projectedOutputColumnNums: [0, 1]
+                          nonOuterSmallTableKeyMapping: []
+                          projectedOutput: 0:int, 1:int
+                          hashTableImplementationType: OPTIMIZED
                       outputColumnNames: _col0, _col1
                       input vertices:
                         1 Map 1

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_reuse_scratchcols.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_reuse_scratchcols.q.out 
b/ql/src/test/results/clientpositive/llap/vector_reuse_scratchcols.q.out
index 4a10b3b..0b82230 100644
--- a/ql/src/test/results/clientpositive/llap/vector_reuse_scratchcols.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_reuse_scratchcols.q.out
@@ -129,10 +129,9 @@ STAGE PLANS:
                           sort order: 
                           Reduce Sink Vectorization:
                               className: VectorReduceSinkEmptyKeyOperator
-                              keyColumnNums: []
                               native: true
                               nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                              valueColumnNums: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
10]
+                              valueColumns: 0:bigint, 1:bigint, 2:double, 
3:double, 4:double, 5:double, 6:double, 7:bigint, 8:double, 9:bigint, 10:tinyint
                           Statistics: Num rows: 1 Data size: 84 Basic stats: 
COMPLETE Column stats: COMPLETE
                           value expressions: _col0 (type: bigint), _col1 
(type: bigint), _col2 (type: double), _col3 (type: double), _col4 (type: 
double), _col5 (type: double), _col6 (type: double), _col7 (type: bigint), 
_col8 (type: double), _col9 (type: bigint), _col10 (type: tinyint)
             Execution mode: vectorized, llap
@@ -337,10 +336,9 @@ STAGE PLANS:
                           sort order: 
                           Reduce Sink Vectorization:
                               className: VectorReduceSinkEmptyKeyOperator
-                              keyColumnNums: []
                               native: true
                               nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                              valueColumnNums: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
10]
+                              valueColumns: 0:bigint, 1:bigint, 2:double, 
3:double, 4:double, 5:double, 6:double, 7:bigint, 8:double, 9:bigint, 10:tinyint
                           Statistics: Num rows: 1 Data size: 84 Basic stats: 
COMPLETE Column stats: COMPLETE
                           value expressions: _col0 (type: bigint), _col1 
(type: bigint), _col2 (type: double), _col3 (type: double), _col4 (type: 
double), _col5 (type: double), _col6 (type: double), _col7 (type: bigint), 
_col8 (type: double), _col9 (type: bigint), _col10 (type: tinyint)
             Execution mode: vectorized, llap

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_topnkey.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_topnkey.q.out 
b/ql/src/test/results/clientpositive/llap/vector_topnkey.q.out
index 3df3495..3d0793b 100644
--- a/ql/src/test/results/clientpositive/llap/vector_topnkey.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_topnkey.q.out
@@ -67,10 +67,10 @@ STAGE PLANS:
                           Map-reduce partition columns: _col0 (type: string)
                           Reduce Sink Vectorization:
                               className: VectorReduceSinkStringOperator
-                              keyColumnNums: [0]
+                              keyColumns: 0:string
                               native: true
                               nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                              valueColumnNums: [1]
+                              valueColumns: 1:bigint
                           Statistics: Num rows: 250 Data size: 23750 Basic 
stats: COMPLETE Column stats: COMPLETE
                           TopN Hash Memory Usage: 0.1
                           value expressions: _col1 (type: bigint)
@@ -126,10 +126,10 @@ STAGE PLANS:
                   sort order: +
                   Reduce Sink Vectorization:
                       className: VectorReduceSinkObjectHashOperator
-                      keyColumnNums: [0]
+                      keyColumns: 0:string
                       native: true
                       nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                      valueColumnNums: [1]
+                      valueColumns: 1:bigint
                   Statistics: Num rows: 250 Data size: 23750 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TopN Hash Memory Usage: 0.1
                   value expressions: _col1 (type: bigint)
@@ -259,10 +259,9 @@ STAGE PLANS:
                           Map-reduce partition columns: _col0 (type: string)
                           Reduce Sink Vectorization:
                               className: VectorReduceSinkStringOperator
-                              keyColumnNums: [0]
+                              keyColumns: 0:string
                               native: true
                               nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                              valueColumnNums: []
                           Statistics: Num rows: 250 Data size: 21750 Basic 
stats: COMPLETE Column stats: COMPLETE
                           TopN Hash Memory Usage: 0.1
             Execution mode: vectorized, llap
@@ -315,10 +314,9 @@ STAGE PLANS:
                   sort order: +
                   Reduce Sink Vectorization:
                       className: VectorReduceSinkObjectHashOperator
-                      keyColumnNums: [0]
+                      keyColumns: 0:string
                       native: true
                       nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                      valueColumnNums: []
                   Statistics: Num rows: 250 Data size: 21750 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TopN Hash Memory Usage: 0.1
         Reducer 3 
@@ -434,10 +432,9 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: string)
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkStringOperator
-                            keyColumnNums: [0]
+                            keyColumns: 0:string
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: []
                         Statistics: Num rows: 500 Data size: 43500 Basic 
stats: COMPLETE Column stats: COMPLETE
             Execution mode: vectorized, llap
             LLAP IO: no inputs
@@ -486,10 +483,10 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: string)
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkStringOperator
-                            keyColumnNums: [0]
+                            keyColumns: 0:string
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [1]
+                            valueColumns: 1:string
                         Statistics: Num rows: 500 Data size: 89000 Basic 
stats: COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: string)
             Execution mode: vectorized, llap
@@ -530,6 +527,9 @@ STAGE PLANS:
                     Statistics: Num rows: 791 Data size: 140798 Basic stats: 
COMPLETE Column stats: COMPLETE
                     TopN Hash Memory Usage: 0.1
                     value expressions: _col1 (type: string)
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 3 
             Execution mode: vectorized, llap
             Reduce Vectorization:

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_udf1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_udf1.q.out 
b/ql/src/test/results/clientpositive/llap/vector_udf1.q.out
index 5db37eb..26d695b 100644
--- a/ql/src/test/results/clientpositive/llap/vector_udf1.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_udf1.q.out
@@ -2800,10 +2800,9 @@ STAGE PLANS:
                         sort order: 
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkEmptyKeyOperator
-                            keyColumnNums: []
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [0, 1]
+                            valueColumns: 0:string, 1:varchar(20)
                         Statistics: Num rows: 1 Data size: 288 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col0 (type: string), _col1 (type: 
varchar(20))
             Execution mode: vectorized, llap
@@ -2943,10 +2942,9 @@ STAGE PLANS:
                         sort order: 
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkEmptyKeyOperator
-                            keyColumnNums: []
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [0, 1]
+                            valueColumns: 0:string, 1:varchar(20)
                         Statistics: Num rows: 1 Data size: 288 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col0 (type: string), _col1 (type: 
varchar(20))
             Execution mode: vectorized, llap

Reply via email to