http://git-wip-us.apache.org/repos/asf/hive/blob/13960aa9/ql/src/test/results/clientpositive/llap/vector_llap_text_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_llap_text_1.q.out 
b/ql/src/test/results/clientpositive/llap/vector_llap_text_1.q.out
index f7721b6..a35b816 100644
--- a/ql/src/test/results/clientpositive/llap/vector_llap_text_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_llap_text_1.q.out
@@ -233,7 +233,7 @@ STAGE PLANS:
                         outputColumnNames: _col0, _col1, _col3
                         input vertices:
                           0 Map 1
-                        Statistics: Num rows: 391 Data size: 72726 Basic 
stats: COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 399 Data size: 74214 Basic 
stats: COMPLETE Column stats: COMPLETE
                         Select Operator
                           expressions: _col0 (type: int), _col1 (type: 
string), _col3 (type: string)
                           outputColumnNames: _col0, _col1, _col2
@@ -241,7 +241,7 @@ STAGE PLANS:
                               className: VectorSelectOperator
                               native: true
                               projectedOutputColumnNums: [0, 4, 1]
-                          Statistics: Num rows: 391 Data size: 72726 Basic 
stats: COMPLETE Column stats: COMPLETE
+                          Statistics: Num rows: 399 Data size: 74214 Basic 
stats: COMPLETE Column stats: COMPLETE
                           Reduce Output Operator
                             key expressions: _col0 (type: int), _col1 (type: 
string), _col2 (type: string)
                             sort order: +++
@@ -251,7 +251,7 @@ STAGE PLANS:
                                 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: 391 Data size: 72726 Basic 
stats: COMPLETE Column stats: COMPLETE
+                            Statistics: Num rows: 399 Data size: 74214 Basic 
stats: COMPLETE Column stats: COMPLETE
                             TopN Hash Memory Usage: 0.1
             Execution mode: vectorized, llap
             LLAP IO: no inputs
@@ -295,7 +295,7 @@ STAGE PLANS:
                     className: VectorSelectOperator
                     native: true
                     projectedOutputColumnNums: [0, 1, 2]
-                Statistics: Num rows: 391 Data size: 72726 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 399 Data size: 74214 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Limit
                   Number of rows: 10
                   Limit Vectorization:

http://git-wip-us.apache.org/repos/asf/hive/blob/13960aa9/ql/src/test/results/clientpositive/llap/vectorization_0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_0.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_0.q.out
index 3d00bbe..1382503 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_0.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_0.q.out
@@ -30981,13 +30981,13 @@ STAGE PLANS:
                       keys: cstring1 (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 304 Data size: 23864 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      Statistics: Num rows: 300 Data size: 23550 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         null sort order: a
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 304 Data size: 23864 Basic 
stats: COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 300 Data size: 23550 Basic 
stats: COMPLETE Column stats: COMPLETE
                         tag: -1
                         value expressions: _col1 (type: bigint)
                         auto parallelism: true
@@ -31055,16 +31055,16 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 304 Data size: 23864 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 300 Data size: 23550 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: _col1 (type: bigint), _col0 (type: string)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 304 Data size: 23864 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 300 Data size: 23550 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col1 (type: string)
                     null sort order: a
                     sort order: +
-                    Statistics: Num rows: 304 Data size: 23864 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 300 Data size: 23550 Basic stats: 
COMPLETE Column stats: COMPLETE
                     tag: -1
                     value expressions: _col0 (type: bigint)
                     auto parallelism: false
@@ -31075,13 +31075,13 @@ STAGE PLANS:
               Select Operator
                 expressions: VALUE._col0 (type: bigint), KEY.reducesinkkey0 
(type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 304 Data size: 23864 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 300 Data size: 23550 Basic stats: 
COMPLETE Column stats: COMPLETE
                 File Output Operator
                   compressed: false
                   GlobalTableId: 0
 #### A masked pattern was here ####
                   NumFilesPerFileSink: 1
-                  Statistics: Num rows: 304 Data size: 23864 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 300 Data size: 23550 Basic stats: 
COMPLETE Column stats: COMPLETE
 #### A masked pattern was here ####
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/13960aa9/ql/src/test/results/clientpositive/llap/vectorization_div0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_div0.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_div0.q.out
index e00dcd9..61f1e26 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_div0.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_div0.q.out
@@ -687,7 +687,7 @@ STAGE PLANS:
                         native: true
                         predicateExpression: FilterExprOrExpr(children: 
FilterLongColGreaterLongScalar(col 2:int, val 500000000), 
FilterDoubleColGreaterDoubleScalar(col 5:double, val 1.0E9), 
FilterLongColEqualLongScalar(col 0:tinyint, val 0))
                     predicate: ((cdouble > 1.0E9D) or (cint > 500000000) or 
(ctinyint = 0Y)) (type: boolean)
-                    Statistics: Num rows: 4193 Data size: 75144 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 4191 Data size: 75120 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: cint (type: int), cbigint (type: bigint), 
ctinyint (type: tinyint), (UDFToDouble(cint) / UDFToDouble((cint - 528534767))) 
(type: double), (UDFToDouble(cbigint) / UDFToDouble((cbigint - 1018195815L))) 
(type: double), (UDFToDouble(ctinyint) / UDFToDouble(ctinyint)) (type: double), 
(cint % (cint - 528534767)) (type: int), (cbigint % (cbigint - 1018195815L)) 
(type: bigint), (ctinyint % ctinyint) (type: tinyint)
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8
@@ -696,7 +696,7 @@ STAGE PLANS:
                           native: true
                           projectedOutputColumnNums: [2, 3, 0, 16, 17, 18, 19, 
20, 14]
                           selectExpressions: DoubleColDivideDoubleColumn(col 
13:double, col 15:double)(children: CastLongToDouble(col 2:int) -> 13:double, 
CastLongToDouble(col 14:int)(children: LongColSubtractLongScalar(col 2:int, val 
528534767) -> 14:int) -> 15:double) -> 16:double, 
DoubleColDivideDoubleColumn(col 13:double, col 15:double)(children: 
CastLongToDouble(col 3:bigint) -> 13:double, CastLongToDouble(col 
14:bigint)(children: LongColSubtractLongScalar(col 3:bigint, val 1018195815) -> 
14:bigint) -> 15:double) -> 17:double, DoubleColDivideDoubleColumn(col 
13:double, col 15:double)(children: CastLongToDouble(col 0:tinyint) -> 
13:double, CastLongToDouble(col 0:tinyint) -> 15:double) -> 18:double, 
LongColModuloLongColumn(col 2:int, col 14:int)(children: 
LongColSubtractLongScalar(col 2:int, val 528534767) -> 14:int) -> 19:int, 
LongColModuloLongColumn(col 3:bigint, col 14:bigint)(children: 
LongColSubtractLongScalar(col 3:bigint, val 1018195815) -> 14:bigint) -> 
20:bigint, LongCol
 ModuloLongColumn(col 0:tinyint, col 0:tinyint) -> 14:tinyint
-                      Statistics: Num rows: 4193 Data size: 217816 Basic 
stats: COMPLETE Column stats: COMPLETE
+                      Statistics: Num rows: 4191 Data size: 217720 Basic 
stats: COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: int), _col1 (type: 
bigint), _col2 (type: tinyint), _col3 (type: double), _col4 (type: double), 
_col5 (type: double), _col6 (type: int), _col7 (type: bigint), _col8 (type: 
tinyint)
                         sort order: +++++++++
@@ -704,7 +704,7 @@ STAGE PLANS:
                             className: VectorReduceSinkObjectHashOperator
                             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
-                        Statistics: Num rows: 4193 Data size: 217816 Basic 
stats: COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 4191 Data size: 217720 Basic 
stats: COMPLETE Column stats: COMPLETE
                         TopN Hash Memory Usage: 0.1
             Execution mode: vectorized, llap
             LLAP IO: all inputs
@@ -733,7 +733,7 @@ STAGE PLANS:
                     className: VectorSelectOperator
                     native: true
                     projectedOutputColumnNums: [0, 1, 2, 3, 4, 5, 6, 7, 8]
-                Statistics: Num rows: 4193 Data size: 217816 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 4191 Data size: 217720 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Limit
                   Number of rows: 100
                   Limit Vectorization:

http://git-wip-us.apache.org/repos/asf/hive/blob/13960aa9/ql/src/test/results/clientpositive/llap/vectorization_input_format_excludes.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorization_input_format_excludes.q.out
 
b/ql/src/test/results/clientpositive/llap/vectorization_input_format_excludes.q.out
index fc4b032..becc03c 100644
--- 
a/ql/src/test/results/clientpositive/llap/vectorization_input_format_excludes.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vectorization_input_format_excludes.q.out
@@ -181,12 +181,12 @@ STAGE PLANS:
                       keys: _col0 (type: tinyint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8
-                      Statistics: Num rows: 128 Data size: 7556 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      Statistics: Num rows: 131 Data size: 7732 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: tinyint)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: tinyint)
-                        Statistics: Num rows: 128 Data size: 7556 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 131 Data size: 7732 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: int), _col2 (type: 
smallint), _col3 (type: bigint), _col4 (type: double), _col5 (type: bigint), 
_col6 (type: double), _col7 (type: double), _col8 (type: bigint)
             Execution mode: vectorized, llap
             LLAP IO: all inputs (cache only)
@@ -213,14 +213,14 @@ STAGE PLANS:
                 keys: KEY._col0 (type: tinyint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
-                Statistics: Num rows: 128 Data size: 7556 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 131 Data size: 7732 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: _col0 (type: tinyint), _col1 (type: int), _col2 
(type: smallint), _col3 (type: bigint), (_col4 / _col5) (type: double), 
power(((_col6 - ((_col7 * _col7) / _col8)) / _col8), 0.5) (type: double)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-                  Statistics: Num rows: 128 Data size: 4484 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 131 Data size: 4588 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 128 Data size: 4484 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 131 Data size: 4588 Basic stats: 
COMPLETE Column stats: COMPLETE
                     table:
                         input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -512,12 +512,12 @@ STAGE PLANS:
                       keys: _col0 (type: tinyint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8
-                      Statistics: Num rows: 128 Data size: 7556 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      Statistics: Num rows: 131 Data size: 7732 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: tinyint)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: tinyint)
-                        Statistics: Num rows: 128 Data size: 7556 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 131 Data size: 7732 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: int), _col2 (type: 
smallint), _col3 (type: bigint), _col4 (type: double), _col5 (type: bigint), 
_col6 (type: double), _col7 (type: double), _col8 (type: bigint)
             Execution mode: llap
             LLAP IO: all inputs (cache only)
@@ -539,14 +539,14 @@ STAGE PLANS:
                 keys: KEY._col0 (type: tinyint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
-                Statistics: Num rows: 128 Data size: 7556 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 131 Data size: 7732 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: _col0 (type: tinyint), _col1 (type: int), _col2 
(type: smallint), _col3 (type: bigint), (_col4 / _col5) (type: double), 
power(((_col6 - ((_col7 * _col7) / _col8)) / _col8), 0.5) (type: double)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-                  Statistics: Num rows: 128 Data size: 4484 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 131 Data size: 4588 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 128 Data size: 4484 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 131 Data size: 4588 Basic stats: 
COMPLETE Column stats: COMPLETE
                     table:
                         input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -843,12 +843,12 @@ STAGE PLANS:
                       keys: _col0 (type: tinyint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8
-                      Statistics: Num rows: 128 Data size: 7556 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      Statistics: Num rows: 131 Data size: 7732 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: tinyint)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: tinyint)
-                        Statistics: Num rows: 128 Data size: 7556 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 131 Data size: 7732 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: int), _col2 (type: 
smallint), _col3 (type: bigint), _col4 (type: double), _col5 (type: bigint), 
_col6 (type: double), _col7 (type: double), _col8 (type: bigint)
             Execution mode: vectorized, llap
             LLAP IO: all inputs (cache only)
@@ -875,14 +875,14 @@ STAGE PLANS:
                 keys: KEY._col0 (type: tinyint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
-                Statistics: Num rows: 128 Data size: 7556 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 131 Data size: 7732 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: _col0 (type: tinyint), _col1 (type: int), _col2 
(type: smallint), _col3 (type: bigint), (_col4 / _col5) (type: double), 
power(((_col6 - ((_col7 * _col7) / _col8)) / _col8), 0.5) (type: double)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-                  Statistics: Num rows: 128 Data size: 4484 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 131 Data size: 4588 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 128 Data size: 4484 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 131 Data size: 4588 Basic stats: 
COMPLETE Column stats: COMPLETE
                     table:
                         input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -1222,12 +1222,12 @@ STAGE PLANS:
                       keys: _col0 (type: tinyint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8
-                      Statistics: Num rows: 128 Data size: 7556 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      Statistics: Num rows: 131 Data size: 7732 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: tinyint)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: tinyint)
-                        Statistics: Num rows: 128 Data size: 7556 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 131 Data size: 7732 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: int), _col2 (type: 
smallint), _col3 (type: bigint), _col4 (type: double), _col5 (type: bigint), 
_col6 (type: double), _col7 (type: double), _col8 (type: bigint)
             Execution mode: llap
             LLAP IO: all inputs
@@ -1249,14 +1249,14 @@ STAGE PLANS:
                 keys: KEY._col0 (type: tinyint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
-                Statistics: Num rows: 128 Data size: 7556 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 131 Data size: 7732 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: _col0 (type: tinyint), _col1 (type: int), _col2 
(type: smallint), _col3 (type: bigint), (_col4 / _col5) (type: double), 
power(((_col6 - ((_col7 * _col7) / _col8)) / _col8), 0.5) (type: double)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-                  Statistics: Num rows: 128 Data size: 4484 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 131 Data size: 4588 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 128 Data size: 4484 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 131 Data size: 4588 Basic stats: 
COMPLETE Column stats: COMPLETE
                     table:
                         input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/13960aa9/ql/src/test/results/clientpositive/llap/vectorization_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorization_limit.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_limit.q.out
index c569e68..6ea5fb2 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_limit.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_limit.q.out
@@ -296,7 +296,7 @@ STAGE PLANS:
                       keys: _col0 (type: tinyint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
-                      Statistics: Num rows: 128 Data size: 2436 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      Statistics: Num rows: 131 Data size: 2492 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: tinyint)
                         sort order: +
@@ -307,7 +307,7 @@ STAGE PLANS:
                             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]
-                        Statistics: Num rows: 128 Data size: 2436 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 131 Data size: 2492 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: double), _col2 (type: 
bigint)
             Execution mode: vectorized, llap
             LLAP IO: all inputs
@@ -355,7 +355,7 @@ STAGE PLANS:
                 keys: KEY._col0 (type: tinyint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 128 Data size: 2436 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 131 Data size: 2492 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: _col0 (type: tinyint), (_col1 / _col2) (type: 
double)
                   outputColumnNames: _col0, _col1
@@ -364,7 +364,7 @@ STAGE PLANS:
                       native: true
                       projectedOutputColumnNums: [0, 3]
                       selectExpressions: DoubleColDivideLongColumn(col 
1:double, col 2:bigint) -> 3:double
-                  Statistics: Num rows: 128 Data size: 1412 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 131 Data size: 1444 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: tinyint), _col1 (type: 
double)
                     sort order: ++
@@ -374,7 +374,7 @@ STAGE PLANS:
                         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: 128 Data size: 1412 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 131 Data size: 1444 Basic stats: 
COMPLETE Column stats: COMPLETE
                     TopN Hash Memory Usage: 0.3
         Reducer 3 
             Execution mode: vectorized, llap
@@ -399,7 +399,7 @@ STAGE PLANS:
                     className: VectorSelectOperator
                     native: true
                     projectedOutputColumnNums: [0, 1]
-                Statistics: Num rows: 128 Data size: 1412 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 131 Data size: 1444 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Limit
                   Number of rows: 20
                   Limit Vectorization:
@@ -500,7 +500,7 @@ STAGE PLANS:
                       keys: ctinyint (type: tinyint)
                       mode: hash
                       outputColumnNames: _col0
-                      Statistics: Num rows: 128 Data size: 388 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      Statistics: Num rows: 131 Data size: 396 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: tinyint)
                         sort order: +
@@ -512,7 +512,7 @@ STAGE PLANS:
                             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: []
-                        Statistics: Num rows: 128 Data size: 388 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 131 Data size: 396 Basic stats: 
COMPLETE Column stats: COMPLETE
                         TopN Hash Memory Usage: 0.3
             Execution mode: vectorized, llap
             LLAP IO: all inputs
@@ -558,7 +558,7 @@ STAGE PLANS:
                 keys: KEY._col0 (type: tinyint)
                 mode: mergepartial
                 outputColumnNames: _col0
-                Statistics: Num rows: 128 Data size: 388 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 131 Data size: 396 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Limit
                   Number of rows: 20
                   Limit Vectorization:
@@ -731,7 +731,7 @@ STAGE PLANS:
                   keys: _col0 (type: tinyint)
                   mode: complete
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 128 Data size: 1412 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 131 Data size: 1444 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: tinyint), _col1 (type: 
bigint)
                     sort order: ++
@@ -741,7 +741,7 @@ STAGE PLANS:
                         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: 128 Data size: 1412 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 131 Data size: 1444 Basic stats: 
COMPLETE Column stats: COMPLETE
                     TopN Hash Memory Usage: 0.3
         Reducer 3 
             Execution mode: vectorized, llap
@@ -766,7 +766,7 @@ STAGE PLANS:
                     className: VectorSelectOperator
                     native: true
                     projectedOutputColumnNums: [0, 1]
-                Statistics: Num rows: 128 Data size: 1412 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 131 Data size: 1444 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Limit
                   Number of rows: 20
                   Limit Vectorization:
@@ -897,7 +897,7 @@ STAGE PLANS:
                       keys: cdouble (type: double)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 4157 Data size: 58088 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      Statistics: Num rows: 4127 Data size: 57672 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: double)
                         sort order: +
@@ -908,7 +908,7 @@ STAGE PLANS:
                             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]
-                        Statistics: Num rows: 4157 Data size: 58088 Basic 
stats: COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 4127 Data size: 57672 Basic 
stats: COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: bigint)
             Execution mode: vectorized, llap
             LLAP IO: all inputs
@@ -956,7 +956,7 @@ STAGE PLANS:
                 keys: KEY._col0 (type: double)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 4157 Data size: 58088 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 4127 Data size: 57672 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Reduce Output Operator
                   key expressions: _col1 (type: bigint), _col0 (type: double)
                   sort order: ++
@@ -966,7 +966,7 @@ STAGE PLANS:
                       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: 4157 Data size: 58088 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 4127 Data size: 57672 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TopN Hash Memory Usage: 0.3
         Reducer 3 
             Execution mode: vectorized, llap
@@ -991,7 +991,7 @@ STAGE PLANS:
                     className: VectorSelectOperator
                     native: true
                     projectedOutputColumnNums: [1, 0]
-                Statistics: Num rows: 4157 Data size: 58088 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 4127 Data size: 57672 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Limit
                   Number of rows: 20
                   Limit Vectorization:

http://git-wip-us.apache.org/repos/asf/hive/blob/13960aa9/ql/src/test/results/clientpositive/llap/vectorization_short_regress.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorization_short_regress.q.out 
b/ql/src/test/results/clientpositive/llap/vectorization_short_regress.q.out
index 06f9c39..0830d1c 100644
--- a/ql/src/test/results/clientpositive/llap/vectorization_short_regress.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorization_short_regress.q.out
@@ -2207,7 +2207,7 @@ STAGE PLANS:
                         keys: _col0 (type: smallint)
                         mode: hash
                         outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8
-                        Statistics: Num rows: 1140 Data size: 76368 Basic 
stats: COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 1156 Data size: 77440 Basic 
stats: COMPLETE Column stats: COMPLETE
                         Reduce Output Operator
                           key expressions: _col0 (type: smallint)
                           sort order: +
@@ -2216,7 +2216,7 @@ STAGE PLANS:
                               className: VectorReduceSinkLongOperator
                               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
-                          Statistics: Num rows: 1140 Data size: 76368 Basic 
stats: COMPLETE Column stats: COMPLETE
+                          Statistics: Num rows: 1156 Data size: 77440 Basic 
stats: COMPLETE Column stats: COMPLETE
                           value expressions: _col1 (type: double), _col2 
(type: double), _col3 (type: bigint), _col4 (type: bigint), _col5 (type: 
double), _col6 (type: double), _col7 (type: bigint), _col8 (type: bigint)
             Execution mode: vectorized, llap
             LLAP IO: all inputs
@@ -2251,7 +2251,7 @@ STAGE PLANS:
                 keys: KEY._col0 (type: smallint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
-                Statistics: Num rows: 1140 Data size: 76368 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 1156 Data size: 77440 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: _col0 (type: smallint), (UDFToInteger(_col0) % 
-75) (type: int), power(((_col1 - ((_col2 * _col2) / _col3)) / CASE WHEN 
((_col3 = 1L)) THEN (null) ELSE ((_col3 - 1)) END), 0.5) (type: double), 
(-1.389 / CAST( _col0 AS decimal(5,0))) (type: decimal(10,9)), _col4 (type: 
bigint), (UDFToDouble((UDFToInteger(_col0) % -75)) / UDFToDouble(_col4)) (type: 
double), (- (UDFToInteger(_col0) % -75)) (type: int), ((_col5 - ((_col6 * 
_col6) / _col7)) / _col7) (type: double), (- (- (UDFToInteger(_col0) % -75))) 
(type: int), _col8 (type: bigint), (_col8 - -89010L) (type: bigint)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10
@@ -2260,7 +2260,7 @@ STAGE PLANS:
                       native: true
                       projectedOutputColumnNums: [0, 9, 10, 16, 4, 18, 19, 17, 
14, 8, 20]
                       selectExpressions: LongColModuloLongScalar(col 0:int, 
val -75)(children: col 0:smallint) -> 9:int, FuncPowerDoubleToDouble(col 
11:double)(children: DoubleColDivideLongColumn(col 10:double, col 
14:bigint)(children: DoubleColSubtractDoubleColumn(col 1:double, col 
11:double)(children: DoubleColDivideLongColumn(col 10:double, col 
3:bigint)(children: DoubleColMultiplyDoubleColumn(col 2:double, col 2:double) 
-> 10:double) -> 11:double) -> 10:double, IfExprNullCondExpr(col 12:boolean, 
null, col 13:bigint)(children: LongColEqualLongScalar(col 3:bigint, val 1) -> 
12:boolean, LongColSubtractLongScalar(col 3:bigint, val 1) -> 13:bigint) -> 
14:bigint) -> 11:double) -> 10:double, DecimalScalarDivideDecimalColumn(val 
-1.389, col 15:decimal(5,0))(children: CastLongToDecimal(col 0:smallint) -> 
15:decimal(5,0)) -> 16:decimal(10,9), DoubleColDivideDoubleColumn(col 
11:double, col 17:double)(children: CastLongToDouble(col 14:int)(children: 
LongColModuloLongScalar(col 0:int, val -7
 5)(children: col 0:smallint) -> 14:int) -> 11:double, CastLongToDouble(col 
4:bigint) -> 17:double) -> 18:double, LongColUnaryMinus(col 14:int)(children: 
LongColModuloLongScalar(col 0:int, val -75)(children: col 0:smallint) -> 
14:int) -> 19:int, DoubleColDivideLongColumn(col 11:double, col 
7:bigint)(children: DoubleColSubtractDoubleColumn(col 5:double, col 
17:double)(children: DoubleColDivideLongColumn(col 11:double, col 
7:bigint)(children: DoubleColMultiplyDoubleColumn(col 6:double, col 6:double) 
-> 11:double) -> 17:double) -> 11:double) -> 17:double, LongColUnaryMinus(col 
20:int)(children: LongColUnaryMinus(col 14:int)(children: 
LongColModuloLongScalar(col 0:int, val -75)(children: col 0:smallint) -> 
14:int) -> 20:int) -> 14:int, LongColSubtractLongScalar(col 8:bigint, val 
-89010) -> 20:bigint
-                  Statistics: Num rows: 1140 Data size: 199488 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 1156 Data size: 202288 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: smallint), _col1 (type: 
int), _col2 (type: double), _col3 (type: decimal(10,9)), _col4 (type: bigint), 
_col5 (type: double), _col6 (type: int), _col7 (type: double), _col8 (type: 
int), _col9 (type: bigint), _col10 (type: bigint)
                     sort order: +++++++++++
@@ -2268,7 +2268,7 @@ STAGE PLANS:
                         className: VectorReduceSinkObjectHashOperator
                         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
-                    Statistics: Num rows: 1140 Data size: 199488 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 1156 Data size: 202288 Basic stats: 
COMPLETE Column stats: COMPLETE
                     TopN Hash Memory Usage: 0.1
         Reducer 3 
             Execution mode: vectorized, llap
@@ -2286,7 +2286,7 @@ STAGE PLANS:
                     className: VectorSelectOperator
                     native: true
                     projectedOutputColumnNums: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
10]
-                Statistics: Num rows: 1140 Data size: 199488 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 1156 Data size: 202288 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Limit
                   Number of rows: 20
                   Limit Vectorization:
@@ -2484,7 +2484,7 @@ STAGE PLANS:
                         keys: _col0 (type: double)
                         mode: hash
                         outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5
-                        Statistics: Num rows: 1135 Data size: 52192 Basic 
stats: COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 1127 Data size: 51824 Basic 
stats: COMPLETE Column stats: COMPLETE
                         Reduce Output Operator
                           key expressions: _col0 (type: double)
                           sort order: +
@@ -2493,7 +2493,7 @@ STAGE PLANS:
                               className: VectorReduceSinkMultiKeyOperator
                               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
-                          Statistics: Num rows: 1135 Data size: 52192 Basic 
stats: COMPLETE Column stats: COMPLETE
+                          Statistics: Num rows: 1127 Data size: 51824 Basic 
stats: COMPLETE Column stats: COMPLETE
                           value expressions: _col1 (type: double), _col2 
(type: double), _col3 (type: bigint), _col4 (type: bigint), _col5 (type: double)
             Execution mode: vectorized, llap
             LLAP IO: all inputs
@@ -2528,7 +2528,7 @@ STAGE PLANS:
                 keys: KEY._col0 (type: double)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-                Statistics: Num rows: 1135 Data size: 52192 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 1127 Data size: 51824 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: _col0 (type: double), ((_col1 - ((_col2 * 
_col2) / _col3)) / CASE WHEN ((_col3 = 1L)) THEN (null) ELSE ((_col3 - 1)) END) 
(type: double), (2563.58D * ((_col1 - ((_col2 * _col2) / _col3)) / CASE WHEN 
((_col3 = 1L)) THEN (null) ELSE ((_col3 - 1)) END)) (type: double), (- ((_col1 
- ((_col2 * _col2) / _col3)) / CASE WHEN ((_col3 = 1L)) THEN (null) ELSE 
((_col3 - 1)) END)) (type: double), _col4 (type: bigint), ((2563.58D * ((_col1 
- ((_col2 * _col2) / _col3)) / CASE WHEN ((_col3 = 1L)) THEN (null) ELSE 
((_col3 - 1)) END)) + -5638.15D) (type: double), ((- ((_col1 - ((_col2 * _col2) 
/ _col3)) / CASE WHEN ((_col3 = 1L)) THEN (null) ELSE ((_col3 - 1)) END)) * 
((2563.58D * ((_col1 - ((_col2 * _col2) / _col3)) / CASE WHEN ((_col3 = 1L)) 
THEN (null) ELSE ((_col3 - 1)) END)) + -5638.15D)) (type: double), _col5 (type: 
double), ((_col1 - ((_col2 * _col2) / _col3)) / _col3) (type: double), (_col0 - 
(- ((_col1 - ((_col2 * _col2) / _col3)) / CASE WHEN ((_col3 = 1L)) THE
 N (null) ELSE ((_col3 - 1)) END))) (type: double), power(((_col1 - ((_col2 * 
_col2) / _col3)) / _col3), 0.5) (type: double), (_col0 + ((_col1 - ((_col2 * 
_col2) / _col3)) / CASE WHEN ((_col3 = 1L)) THEN (null) ELSE ((_col3 - 1)) 
END)) (type: double), (_col0 * 762.0D) (type: double), _col2 (type: double), 
(-863.257D % (_col0 * 762.0D)) (type: double)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14
@@ -2537,7 +2537,7 @@ STAGE PLANS:
                       native: true
                       projectedOutputColumnNums: [0, 7, 6, 11, 4, 17, 20, 5, 
23, 26, 14, 29, 30, 2, 34]
                       selectExpressions: DoubleColDivideLongColumn(col 
6:double, col 10:bigint)(children: DoubleColSubtractDoubleColumn(col 1:double, 
col 7:double)(children: DoubleColDivideLongColumn(col 6:double, col 
3:bigint)(children: DoubleColMultiplyDoubleColumn(col 2:double, col 2:double) 
-> 6:double) -> 7:double) -> 6:double, IfExprNullCondExpr(col 8:boolean, null, 
col 9:bigint)(children: LongColEqualLongScalar(col 3:bigint, val 1) -> 
8:boolean, LongColSubtractLongScalar(col 3:bigint, val 1) -> 9:bigint) -> 
10:bigint) -> 7:double, DoubleScalarMultiplyDoubleColumn(val 2563.58, col 
11:double)(children: DoubleColDivideLongColumn(col 6:double, col 
13:bigint)(children: DoubleColSubtractDoubleColumn(col 1:double, col 
11:double)(children: DoubleColDivideLongColumn(col 6:double, col 
3:bigint)(children: DoubleColMultiplyDoubleColumn(col 2:double, col 2:double) 
-> 6:double) -> 11:double) -> 6:double, IfExprNullCondExpr(col 10:boolean, 
null, col 12:bigint)(children: LongColEqualLongScal
 ar(col 3:bigint, val 1) -> 10:boolean, LongColSubtractLongScalar(col 3:bigint, 
val 1) -> 12:bigint) -> 13:bigint) -> 11:double) -> 6:double, 
DoubleColUnaryMinus(col 14:double)(children: DoubleColDivideLongColumn(col 
11:double, col 16:bigint)(children: DoubleColSubtractDoubleColumn(col 1:double, 
col 14:double)(children: DoubleColDivideLongColumn(col 11:double, col 
3:bigint)(children: DoubleColMultiplyDoubleColumn(col 2:double, col 2:double) 
-> 11:double) -> 14:double) -> 11:double, IfExprNullCondExpr(col 13:boolean, 
null, col 15:bigint)(children: LongColEqualLongScalar(col 3:bigint, val 1) -> 
13:boolean, LongColSubtractLongScalar(col 3:bigint, val 1) -> 15:bigint) -> 
16:bigint) -> 14:double) -> 11:double, DoubleColAddDoubleScalar(col 14:double, 
val -5638.15)(children: DoubleScalarMultiplyDoubleColumn(val 2563.58, col 
17:double)(children: DoubleColDivideLongColumn(col 14:double, col 
19:bigint)(children: DoubleColSubtractDoubleColumn(col 1:double, col 
17:double)(children: DoubleColDivi
 deLongColumn(col 14:double, col 3:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 2:double, col 2:double) -> 14:double) -> 
17:double) -> 14:double, IfExprNullCondExpr(col 16:boolean, null, col 
18:bigint)(children: LongColEqualLongScalar(col 3:bigint, val 1) -> 16:boolean, 
LongColSubtractLongScalar(col 3:bigint, val 1) -> 18:bigint) -> 19:bigint) -> 
17:double) -> 14:double) -> 17:double, DoubleColMultiplyDoubleColumn(col 
14:double, col 23:double)(children: DoubleColUnaryMinus(col 
20:double)(children: DoubleColDivideLongColumn(col 14:double, col 
22:bigint)(children: DoubleColSubtractDoubleColumn(col 1:double, col 
20:double)(children: DoubleColDivideLongColumn(col 14:double, col 
3:bigint)(children: DoubleColMultiplyDoubleColumn(col 2:double, col 2:double) 
-> 14:double) -> 20:double) -> 14:double, IfExprNullCondExpr(col 19:boolean, 
null, col 21:bigint)(children: LongColEqualLongScalar(col 3:bigint, val 1) -> 
19:boolean, LongColSubtractLongScalar(col 3:bigint, val 1) -> 21:bigint) ->
  22:bigint) -> 20:double) -> 14:double, DoubleColAddDoubleScalar(col 
20:double, val -5638.15)(children: DoubleScalarMultiplyDoubleColumn(val 
2563.58, col 23:double)(children: DoubleColDivideLongColumn(col 20:double, col 
25:bigint)(children: DoubleColSubtractDoubleColumn(col 1:double, col 
23:double)(children: DoubleColDivideLongColumn(col 20:double, col 
3:bigint)(children: DoubleColMultiplyDoubleColumn(col 2:double, col 2:double) 
-> 20:double) -> 23:double) -> 20:double, IfExprNullCondExpr(col 22:boolean, 
null, col 24:bigint)(children: LongColEqualLongScalar(col 3:bigint, val 1) -> 
22:boolean, LongColSubtractLongScalar(col 3:bigint, val 1) -> 24:bigint) -> 
25:bigint) -> 23:double) -> 20:double) -> 23:double) -> 20:double, 
DoubleColDivideLongColumn(col 14:double, col 3:bigint)(children: 
DoubleColSubtractDoubleColumn(col 1:double, col 23:double)(children: 
DoubleColDivideLongColumn(col 14:double, col 3:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 2:double, col 2:double) -> 14:dou
 ble) -> 23:double) -> 14:double) -> 23:double, 
DoubleColSubtractDoubleColumn(col 0:double, col 14:double)(children: 
DoubleColUnaryMinus(col 26:double)(children: DoubleColDivideLongColumn(col 
14:double, col 28:bigint)(children: DoubleColSubtractDoubleColumn(col 1:double, 
col 26:double)(children: DoubleColDivideLongColumn(col 14:double, col 
3:bigint)(children: DoubleColMultiplyDoubleColumn(col 2:double, col 2:double) 
-> 14:double) -> 26:double) -> 14:double, IfExprNullCondExpr(col 25:boolean, 
null, col 27:bigint)(children: LongColEqualLongScalar(col 3:bigint, val 1) -> 
25:boolean, LongColSubtractLongScalar(col 3:bigint, val 1) -> 27:bigint) -> 
28:bigint) -> 26:double) -> 14:double) -> 26:double, 
FuncPowerDoubleToDouble(col 29:double)(children: DoubleColDivideLongColumn(col 
14:double, col 3:bigint)(children: DoubleColSubtractDoubleColumn(col 1:double, 
col 29:double)(children: DoubleColDivideLongColumn(col 14:double, col 
3:bigint)(children: DoubleColMultiplyDoubleColumn(col 2:double, co
 l 2:double) -> 14:double) -> 29:double) -> 14:double) -> 29:double) -> 
14:double, DoubleColAddDoubleColumn(col 0:double, col 30:double)(children: 
DoubleColDivideLongColumn(col 29:double, col 32:bigint)(children: 
DoubleColSubtractDoubleColumn(col 1:double, col 30:double)(children: 
DoubleColDivideLongColumn(col 29:double, col 3:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 2:double, col 2:double) -> 29:double) -> 
30:double) -> 29:double, IfExprNullCondExpr(col 28:boolean, null, col 
31:bigint)(children: LongColEqualLongScalar(col 3:bigint, val 1) -> 28:boolean, 
LongColSubtractLongScalar(col 3:bigint, val 1) -> 31:bigint) -> 32:bigint) -> 
30:double) -> 29:double, DoubleColMultiplyDoubleScalar(col 0:double, val 762.0) 
-> 30:double, DoubleScalarModuloDoubleColumn(val -863.257, col 
33:double)(children: DoubleColMultiplyDoubleScalar(col 0:double, val 762.0) -> 
33:double) -> 34:double
-                  Statistics: Num rows: 1135 Data size: 142992 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 1127 Data size: 141984 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: double)
                     sort order: +
@@ -2545,7 +2545,7 @@ STAGE PLANS:
                         className: VectorReduceSinkObjectHashOperator
                         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
-                    Statistics: Num rows: 1135 Data size: 142992 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 1127 Data size: 141984 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col1 (type: double), _col2 (type: 
double), _col3 (type: double), _col4 (type: bigint), _col5 (type: double), 
_col6 (type: double), _col7 (type: double), _col8 (type: double), _col9 (type: 
double), _col10 (type: double), _col11 (type: double), _col12 (type: double), 
_col13 (type: double), _col14 (type: double)
         Reducer 3 
             Execution mode: vectorized, llap
@@ -2563,13 +2563,13 @@ STAGE PLANS:
                     className: VectorSelectOperator
                     native: true
                     projectedOutputColumnNums: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
10, 11, 12, 13, 14, 13]
-                Statistics: Num rows: 1135 Data size: 142992 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 1127 Data size: 141984 Basic stats: 
COMPLETE Column stats: COMPLETE
                 File Output Operator
                   compressed: false
                   File Sink Vectorization:
                       className: VectorFileSinkOperator
                       native: false
-                  Statistics: Num rows: 1135 Data size: 142992 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 1127 Data size: 141984 Basic stats: 
COMPLETE Column stats: COMPLETE
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/13960aa9/ql/src/test/results/clientpositive/llap/vectorized_context.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_context.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_context.q.out
index bc1a203..3edc12b 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_context.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_context.q.out
@@ -133,7 +133,7 @@ STAGE PLANS:
                         outputColumnNames: _col0, _col2
                         input vertices:
                           1 Map 2
-                        Statistics: Num rows: 6126 Data size: 49056 Basic 
stats: COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 6062 Data size: 48288 Basic 
stats: COMPLETE Column stats: COMPLETE
                         Map Join Operator
                           condition map:
                                Inner Join 0 to 1
@@ -143,17 +143,17 @@ STAGE PLANS:
                           outputColumnNames: _col2, _col5
                           input vertices:
                             1 Map 3
-                          Statistics: Num rows: 6177 Data size: 626386 Basic 
stats: COMPLETE Column stats: COMPLETE
+                          Statistics: Num rows: 6049 Data size: 612818 Basic 
stats: COMPLETE Column stats: COMPLETE
                           Select Operator
                             expressions: _col5 (type: string), _col2 (type: 
double)
                             outputColumnNames: _col0, _col1
-                            Statistics: Num rows: 6177 Data size: 626386 Basic 
stats: COMPLETE Column stats: COMPLETE
+                            Statistics: Num rows: 6049 Data size: 612818 Basic 
stats: COMPLETE Column stats: COMPLETE
                             Limit
                               Number of rows: 100
-                              Statistics: Num rows: 100 Data size: 10208 Basic 
stats: COMPLETE Column stats: COMPLETE
+                              Statistics: Num rows: 100 Data size: 10200 Basic 
stats: COMPLETE Column stats: COMPLETE
                               File Output Operator
                                 compressed: false
-                                Statistics: Num rows: 100 Data size: 10208 
Basic stats: COMPLETE Column stats: COMPLETE
+                                Statistics: Num rows: 100 Data size: 10200 
Basic stats: COMPLETE Column stats: COMPLETE
                                 table:
                                     input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                                     output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/13960aa9/ql/src/test/results/clientpositive/llap/vectorized_distinct_gby.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_distinct_gby.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_distinct_gby.q.out
index 05bf12c..de3c6e6 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_distinct_gby.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_distinct_gby.q.out
@@ -209,7 +209,7 @@ STAGE PLANS:
                       keys: cint (type: int)
                       mode: hash
                       outputColumnNames: _col0
-                      Statistics: Num rows: 6027 Data size: 18000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      Statistics: Num rows: 6105 Data size: 18232 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: int)
                         sort order: +
@@ -220,7 +220,7 @@ STAGE PLANS:
                             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: 6027 Data size: 18000 Basic 
stats: COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 6105 Data size: 18232 Basic 
stats: COMPLETE Column stats: COMPLETE
             Execution mode: vectorized, llap
             LLAP IO: all inputs
             Map Vectorization:
@@ -265,7 +265,7 @@ STAGE PLANS:
                 keys: KEY._col0 (type: int)
                 mode: mergepartial
                 outputColumnNames: _col0
-                Statistics: Num rows: 6027 Data size: 18000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 6105 Data size: 18232 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: _col0 (type: int), UDFToDouble(_col0) (type: 
double), (UDFToDouble(_col0) * UDFToDouble(_col0)) (type: double)
                   outputColumnNames: _col0, _col1, _col2
@@ -274,7 +274,7 @@ STAGE PLANS:
                       native: true
                       projectedOutputColumnNums: [0, 1, 4]
                       selectExpressions: CastLongToDouble(col 0:int) -> 
1:double, DoubleColMultiplyDoubleColumn(col 2:double, col 3:double)(children: 
CastLongToDouble(col 0:int) -> 2:double, CastLongToDouble(col 0:int) -> 
3:double) -> 4:double
-                  Statistics: Num rows: 6027 Data size: 18000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 6105 Data size: 18232 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Group By Operator
                     aggregations: sum(_col0), count(_col0), sum(_col2), 
sum(_col1)
                     Group By Vectorization:

http://git-wip-us.apache.org/repos/asf/hive/blob/13960aa9/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 7bacad8..b30fbf3 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_mapjoin.q.out
@@ -58,7 +58,7 @@ STAGE PLANS:
                         outputColumnNames: _col0, _col1
                         input vertices:
                           1 Map 3
-                        Statistics: Num rows: 18702 Data size: 131024 Basic 
stats: COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 18464 Data size: 129120 Basic 
stats: COMPLETE Column stats: COMPLETE
                         Select Operator
                           expressions: _col0 (type: int), _col1 (type: int), 
(_col0 + _col1) (type: int)
                           outputColumnNames: _col0, _col1, _col2
@@ -67,7 +67,7 @@ STAGE PLANS:
                               native: true
                               projectedOutputColumnNums: [2, 2, 13]
                               selectExpressions: LongColAddLongColumn(col 
2:int, col 2:int) -> 13:int
-                          Statistics: Num rows: 18702 Data size: 131024 Basic 
stats: COMPLETE Column stats: COMPLETE
+                          Statistics: Num rows: 18464 Data size: 129120 Basic 
stats: COMPLETE Column stats: COMPLETE
                           Group By Operator
                             aggregations: count(_col0), max(_col1), 
min(_col0), sum(_col2), count(_col2)
                             Group By Vectorization:

http://git-wip-us.apache.org/repos/asf/hive/blob/13960aa9/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 8e3323b..d27a123 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
@@ -40,11 +40,11 @@ STAGE PLANS:
                         outputColumnNames: _col2, _col3
                         input vertices:
                           1 Map 3
-                        Statistics: Num rows: 661228 Data size: 7913928 Basic 
stats: COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 640986 Data size: 7671024 Basic 
stats: COMPLETE Column stats: COMPLETE
                         Select Operator
                           expressions: _col2 (type: smallint), _col3 (type: 
double)
                           outputColumnNames: _col0, _col1
-                          Statistics: Num rows: 661228 Data size: 7913928 
Basic stats: COMPLETE Column stats: COMPLETE
+                          Statistics: Num rows: 640986 Data size: 7671024 
Basic stats: COMPLETE Column stats: COMPLETE
                           Map Join Operator
                             condition map:
                                  Inner Join 0 to 1
@@ -54,7 +54,7 @@ STAGE PLANS:
                             outputColumnNames: _col1
                             input vertices:
                               1 Map 4
-                            Statistics: Num rows: 1452959 Data size: 11609800 
Basic stats: COMPLETE Column stats: COMPLETE
+                            Statistics: Num rows: 1389838 Data size: 11104832 
Basic stats: COMPLETE Column stats: COMPLETE
                             Group By Operator
                               aggregations: sum(_col1)
                               mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/13960aa9/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 ab30d6e..59adda0 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_parquet.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_parquet.q.out
@@ -151,12 +151,12 @@ STAGE PLANS:
                       keys: _col0 (type: tinyint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8
-                      Statistics: Num rows: 128 Data size: 7556 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      Statistics: Num rows: 131 Data size: 7732 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: tinyint)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: tinyint)
-                        Statistics: Num rows: 128 Data size: 7556 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 131 Data size: 7732 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: int), _col2 (type: 
smallint), _col3 (type: bigint), _col4 (type: double), _col5 (type: bigint), 
_col6 (type: double), _col7 (type: double), _col8 (type: bigint)
             Execution mode: vectorized, llap
             LLAP IO: all inputs (cache only)
@@ -183,14 +183,14 @@ STAGE PLANS:
                 keys: KEY._col0 (type: tinyint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
-                Statistics: Num rows: 128 Data size: 7556 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 131 Data size: 7732 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: _col0 (type: tinyint), _col1 (type: int), _col2 
(type: smallint), _col3 (type: bigint), (_col4 / _col5) (type: double), 
power(((_col6 - ((_col7 * _col7) / _col8)) / _col8), 0.5) (type: double)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-                  Statistics: Num rows: 128 Data size: 4484 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 131 Data size: 4588 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 128 Data size: 4484 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 131 Data size: 4588 Basic stats: 
COMPLETE Column stats: COMPLETE
                     table:
                         input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/13960aa9/ql/src/test/results/clientpositive/llap/vectorized_shufflejoin.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_shufflejoin.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_shufflejoin.q.out
index 776e86c..690f0ae 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_shufflejoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_shufflejoin.q.out
@@ -118,11 +118,11 @@ STAGE PLANS:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 18702 Data size: 131024 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 18464 Data size: 129120 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: _col0 (type: int), _col1 (type: int), (_col0 + 
_col1) (type: int)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 18702 Data size: 131024 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 18464 Data size: 129120 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Group By Operator
                     aggregations: count(_col0), max(_col1), min(_col0), 
sum(_col2), count(_col2)
                     mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/13960aa9/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out 
b/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
index 74f52f5..a696961 100644
--- a/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
@@ -536,24 +536,24 @@ STAGE PLANS:
   Stage: Stage-9
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_1:src 
+        $hdt$_1:src1 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_1:src 
+        $hdt$_1:src1 
           TableScan
-            alias: src
+            alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: value is not null (type: boolean)
+              predicate: key is not null (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: value (type: string)
+                expressions: key (type: string)
                 outputColumnNames: _col0
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 HashTable Sink Operator
                   keys:
-                    0 _col1 (type: string)
+                    0 _col0 (type: string)
                     1 _col0 (type: string)
 
   Stage: Stage-7
@@ -573,9 +573,9 @@ STAGE PLANS:
                   condition map:
                        Inner Join 0 to 1
                   keys:
-                    0 _col1 (type: string)
+                    0 _col0 (type: string)
                     1 _col0 (type: string)
-                  outputColumnNames: _col0, _col2
+                  outputColumnNames: _col1, _col2
                   Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator
                     compressed: false
@@ -590,24 +590,24 @@ STAGE PLANS:
   Stage: Stage-8
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_2:src1 
+        $hdt$_2:src 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_2:src1 
+        $hdt$_2:src 
           TableScan
-            alias: src1
+            alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: key is not null (type: boolean)
+              predicate: value is not null (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: key (type: string)
+                expressions: value (type: string)
                 outputColumnNames: _col0
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 HashTable Sink Operator
                   keys:
-                    0 _col0 (type: string)
+                    0 _col1 (type: string)
                     1 _col0 (type: string)
 
   Stage: Stage-3
@@ -618,7 +618,7 @@ STAGE PLANS:
               condition map:
                    Inner Join 0 to 1
               keys:
-                0 _col0 (type: string)
+                0 _col1 (type: string)
                 1 _col0 (type: string)
               outputColumnNames: _col2
               Statistics: Num rows: 2420 Data size: 25709 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/13960aa9/ql/src/test/results/clientpositive/spark/bucket_map_join_tez1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/bucket_map_join_tez1.q.out 
b/ql/src/test/results/clientpositive/spark/bucket_map_join_tez1.q.out
index cb1c69f..8b47d7f 100644
--- a/ql/src/test/results/clientpositive/spark/bucket_map_join_tez1.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_tez1.q.out
@@ -4335,38 +4335,38 @@ STAGE PLANS:
         Map 2 
             Map Operator Tree:
                 TableScan
-                  alias: c
+                  alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: key is not null (type: boolean)
+                    predicate: value is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: key (type: int)
-                      outputColumnNames: _col0
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                       Spark HashTable Sink Operator
                         keys:
-                          0 _col0 (type: int)
-                          1 _col0 (type: int)
+                          0 _col1 (type: string)
+                          1 _col1 (type: string)
             Execution mode: vectorized
             Local Work:
               Map Reduce Local Work
         Map 3 
             Map Operator Tree:
                 TableScan
-                  alias: b
+                  alias: c
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: value is not null (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: key (type: int), value (type: string)
-                      outputColumnNames: _col0, _col1
+                      expressions: key (type: int)
+                      outputColumnNames: _col0
                       Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                       Spark HashTable Sink Operator
                         keys:
-                          0 _col1 (type: string)
-                          1 _col1 (type: string)
+                          0 _col0 (type: int)
+                          1 _col0 (type: int)
             Execution mode: vectorized
             Local Work:
               Map Reduce Local Work
@@ -4391,9 +4391,9 @@ STAGE PLANS:
                         condition map:
                              Inner Join 0 to 1
                         keys:
-                          0 _col0 (type: int)
-                          1 _col0 (type: int)
-                        outputColumnNames: _col0, _col1
+                          0 _col1 (type: string)
+                          1 _col1 (type: string)
+                        outputColumnNames: _col0, _col2
                         input vertices:
                           1 Map 2
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: 
COMPLETE Column stats: NONE
@@ -4401,14 +4401,14 @@ STAGE PLANS:
                           condition map:
                                Inner Join 0 to 1
                           keys:
-                            0 _col1 (type: string)
-                            1 _col1 (type: string)
-                          outputColumnNames: _col0, _col3
+                            0 _col0 (type: int)
+                            1 _col0 (type: int)
+                          outputColumnNames: _col0, _col2
                           input vertices:
                             1 Map 3
                           Statistics: Num rows: 605 Data size: 6427 Basic 
stats: COMPLETE Column stats: NONE
                           Select Operator
-                            expressions: _col0 (type: int), _col3 (type: int)
+                            expressions: _col0 (type: int), _col2 (type: int)
                             outputColumnNames: _col0, _col1
                             Statistics: Num rows: 605 Data size: 6427 Basic 
stats: COMPLETE Column stats: NONE
                             File Output Operator
@@ -4445,38 +4445,38 @@ STAGE PLANS:
         Map 2 
             Map Operator Tree:
                 TableScan
-                  alias: c
+                  alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: key is not null (type: boolean)
+                    predicate: value is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: key (type: int)
-                      outputColumnNames: _col0
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                       Spark HashTable Sink Operator
                         keys:
-                          0 _col0 (type: int)
-                          1 _col0 (type: int)
+                          0 _col1 (type: string)
+                          1 _col1 (type: string)
             Execution mode: vectorized
             Local Work:
               Map Reduce Local Work
         Map 3 
             Map Operator Tree:
                 TableScan
-                  alias: b
+                  alias: c
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: value is not null (type: boolean)
+                    predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: key (type: int), value (type: string)
-                      outputColumnNames: _col0, _col1
+                      expressions: key (type: int)
+                      outputColumnNames: _col0
                       Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                       Spark HashTable Sink Operator
                         keys:
-                          0 _col1 (type: string)
-                          1 _col1 (type: string)
+                          0 _col0 (type: int)
+                          1 _col0 (type: int)
             Execution mode: vectorized
             Local Work:
               Map Reduce Local Work
@@ -4501,9 +4501,9 @@ STAGE PLANS:
                         condition map:
                              Inner Join 0 to 1
                         keys:
-                          0 _col0 (type: int)
-                          1 _col0 (type: int)
-                        outputColumnNames: _col0, _col1
+                          0 _col1 (type: string)
+                          1 _col1 (type: string)
+                        outputColumnNames: _col0, _col2
                         input vertices:
                           1 Map 2
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: 
COMPLETE Column stats: NONE
@@ -4511,14 +4511,14 @@ STAGE PLANS:
                           condition map:
                                Inner Join 0 to 1
                           keys:
-                            0 _col1 (type: string)
-                            1 _col1 (type: string)
-                          outputColumnNames: _col0, _col3
+                            0 _col0 (type: int)
+                            1 _col0 (type: int)
+                          outputColumnNames: _col0, _col2
                           input vertices:
                             1 Map 3
                           Statistics: Num rows: 605 Data size: 6427 Basic 
stats: COMPLETE Column stats: NONE
                           Select Operator
-                            expressions: _col0 (type: int), _col3 (type: int)
+                            expressions: _col0 (type: int), _col2 (type: int)
                             outputColumnNames: _col0, _col1
                             Statistics: Num rows: 605 Data size: 6427 Basic 
stats: COMPLETE Column stats: NONE
                             File Output Operator

Reply via email to