Repository: hive
Updated Branches:
  refs/heads/master 218342487 -> 83e53972c


http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_llap_io.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_llap_io.q.out
 
b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_llap_io.q.out
index 97a964f..f5f4ba5 100644
--- 
a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_llap_io.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_llap_io.q.out
@@ -552,8 +552,8 @@ POSTHOOK: Lineage: part_change_string_group_double 
PARTITION(part=1).b SIMPLE []
 POSTHOOK: Lineage: part_change_string_group_double PARTITION(part=1).c1 SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:double1, 
type:double, comment:null), ]
 POSTHOOK: Lineage: part_change_string_group_double PARTITION(part=1).c2 SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:double1, 
type:double, comment:null), ]
 POSTHOOK: Lineage: part_change_string_group_double PARTITION(part=1).c3 SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:double1, 
type:double, comment:null), ]
-POSTHOOK: Lineage: part_change_string_group_double 
PARTITION(part=1).insert_num SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:insert_num,
 type:int, comment:null), ]
-insert_num     double1 double1 double1 _c4
+POSTHOOK: Lineage: part_change_string_group_double 
PARTITION(part=1).insert_num SIMPLE []
+insert_num     double1 double1_1       double1_2       _c4
 PREHOOK: query: explain vectorization detail
 select insert_num,part,c1,c2,c3,b from part_change_string_group_double
 PREHOOK: type: QUERY
@@ -640,7 +640,7 @@ POSTHOOK: Lineage: 
part_change_date_group_string_group_date_timestamp PARTITION(
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp 
PARTITION(part=1).c8 SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:timestamp1,
 type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp 
PARTITION(part=1).c9 SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:timestamp1,
 type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp 
PARTITION(part=1).insert_num SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:insert_num,
 type:int, comment:null), ]
-insert_num     date1   date1   date1   date1   date1   timestamp1      
timestamp1      timestamp1      timestamp1      timestamp1      _c11
+insert_num     date1   date1_1 date1_2 date1_3 date1_4 timestamp1      
timestamp1_1    timestamp1_2    timestamp1_3    timestamp1_4    _c11
 PREHOOK: query: explain vectorization detail
 select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,b from 
part_change_date_group_string_group_date_timestamp
 PREHOOK: type: QUERY
@@ -869,7 +869,7 @@ POSTHOOK: Lineage: 
part_change_numeric_group_string_group_multi_ints_string_grou
 POSTHOOK: Lineage: 
part_change_numeric_group_string_group_multi_ints_string_group 
PARTITION(part=1).c8 SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:bigint1, 
type:bigint, comment:null), ]
 POSTHOOK: Lineage: 
part_change_numeric_group_string_group_multi_ints_string_group 
PARTITION(part=1).c9 SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:tinyint1, 
type:tinyint, comment:null), ]
 POSTHOOK: Lineage: 
part_change_numeric_group_string_group_multi_ints_string_group 
PARTITION(part=1).insert_num SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:insert_num,
 type:int, comment:null), ]
-insert_num     tinyint1        smallint1       int1    bigint1 tinyint1        
smallint1       int1    bigint1 tinyint1        smallint1       int1    bigint1 
tinyint1        smallint1       int1    bigint1 tinyint1        smallint1       
int1    bigint1 _c21
+insert_num     tinyint1        smallint1       int1    bigint1 tinyint1_1      
smallint1_1     int1_1  bigint1_1       tinyint1_2      smallint1_2     int1_2  
bigint1_2       tinyint1_3      smallint1_3     int1_3  bigint1_3       
tinyint1_4      smallint1_4     int1_4  bigint1_4       _c21
 PREHOOK: query: explain vectorization detail
 select 
insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b
 from part_change_numeric_group_string_group_multi_ints_string_group
 PREHOOK: type: QUERY
@@ -1119,7 +1119,7 @@ POSTHOOK: Lineage: 
part_change_numeric_group_string_group_floating_string_group
 POSTHOOK: Lineage: 
part_change_numeric_group_string_group_floating_string_group 
PARTITION(part=1).c8 SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:float1, 
type:float, comment:null), ]
 POSTHOOK: Lineage: 
part_change_numeric_group_string_group_floating_string_group 
PARTITION(part=1).c9 SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:double1, 
type:double, comment:null), ]
 POSTHOOK: Lineage: 
part_change_numeric_group_string_group_floating_string_group 
PARTITION(part=1).insert_num SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:insert_num,
 type:int, comment:null), ]
-insert_num     decimal1        float1  double1 decimal1        float1  double1 
decimal1        float1  double1 decimal1        float1  double1 decimal1        
float1  double1 _c16
+insert_num     decimal1        float1  double1 decimal1_1      float1_1        
double1_1       decimal1_2      float1_2        double1_2       decimal1_3      
float1_3        double1_3       decimal1_4      float1_4        double1_4       
_c16
 PREHOOK: query: explain vectorization detail
 select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b 
from part_change_numeric_group_string_group_floating_string_group
 PREHOOK: type: QUERY
@@ -1602,7 +1602,7 @@ POSTHOOK: Lineage: 
part_change_lower_to_higher_numeric_group_tinyint_to_bigint P
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint 
PARTITION(part=1).c8 SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:smallint1, 
type:smallint, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint 
PARTITION(part=1).c9 SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:smallint1, 
type:smallint, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint 
PARTITION(part=1).insert_num SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:insert_num,
 type:int, comment:null), ]
-insert_num     tinyint1        tinyint1        tinyint1        tinyint1        
tinyint1        tinyint1        smallint1       smallint1       smallint1       
smallint1       smallint1       int1    int1    int1    int1    bigint1 bigint1 
bigint1 _c19
+insert_num     tinyint1        tinyint1_1      tinyint1_2      tinyint1_3      
tinyint1_4      tinyint1_5      smallint1       smallint1_1     smallint1_2     
smallint1_3     smallint1_4     int1    int1_1  int1_2  int1_3  bigint1 
bigint1_1       bigint1_2       _c19
 PREHOOK: query: explain vectorization detail
 select 
insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b
 from part_change_lower_to_higher_numeric_group_tinyint_to_bigint
 PREHOOK: type: QUERY
@@ -1838,7 +1838,7 @@ POSTHOOK: Lineage: 
part_change_lower_to_higher_numeric_group_decimal_to_float PA
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float 
PARTITION(part=1).c2 SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:decimal1, 
type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float 
PARTITION(part=1).c3 SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:float1, 
type:float, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float 
PARTITION(part=1).insert_num SIMPLE 
[(schema_evolution_data_n0)schema_evolution_data_n0.FieldSchema(name:insert_num,
 type:int, comment:null), ]
-insert_num     decimal1        decimal1        float1  _c4
+insert_num     decimal1        decimal1_1      float1  _c4
 PREHOOK: query: explain vectorization detail
 select insert_num,part,c1,c2,c3,b from 
part_change_lower_to_higher_numeric_group_decimal_to_float
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table.q.out 
b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table.q.out
index a2c26b2..b5362fa 100644
--- 
a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table.q.out
@@ -567,7 +567,7 @@ POSTHOOK: Lineage: 
table_change_date_group_string_group_date_group_n8.c7 SIMPLE
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n8.c8 
SIMPLE 
[(schema_evolution_data_n24)schema_evolution_data_n24.FieldSchema(name:timestamp1,
 type:timestamp, comment:null), ]
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n8.c9 
SIMPLE 
[(schema_evolution_data_n24)schema_evolution_data_n24.FieldSchema(name:timestamp1,
 type:timestamp, comment:null), ]
 POSTHOOK: Lineage: 
table_change_date_group_string_group_date_group_n8.insert_num SIMPLE 
[(schema_evolution_data_n24)schema_evolution_data_n24.FieldSchema(name:insert_num,
 type:int, comment:null), ]
-insert_num     date1   date1   date1   date1   date1   timestamp1      
timestamp1      timestamp1      timestamp1      timestamp1      _c11
+insert_num     date1   date1_1 date1_2 date1_3 date1_4 timestamp1      
timestamp1_1    timestamp1_2    timestamp1_3    timestamp1_4    _c11
 PREHOOK: query: alter table table_change_date_group_string_group_date_group_n8 
replace columns(insert_num int, c1 STRING, c2 CHAR(50), c3 CHAR(15), c4 
VARCHAR(50), c5 VARCHAR(15), c6 STRING, c7 CHAR(50), c8 CHAR(15), c9 
VARCHAR(50), c10 VARCHAR(15), b STRING)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@table_change_date_group_string_group_date_group_n8
@@ -674,7 +674,7 @@ POSTHOOK: Lineage: 
table_change_numeric_group_string_group_multi_ints_string_gro
 POSTHOOK: Lineage: 
table_change_numeric_group_string_group_multi_ints_string_group_n8.c8 SIMPLE 
[(schema_evolution_data_n24)schema_evolution_data_n24.FieldSchema(name:bigint1, 
type:bigint, comment:null), ]
 POSTHOOK: Lineage: 
table_change_numeric_group_string_group_multi_ints_string_group_n8.c9 SIMPLE 
[(schema_evolution_data_n24)schema_evolution_data_n24.FieldSchema(name:tinyint1,
 type:tinyint, comment:null), ]
 POSTHOOK: Lineage: 
table_change_numeric_group_string_group_multi_ints_string_group_n8.insert_num 
SIMPLE 
[(schema_evolution_data_n24)schema_evolution_data_n24.FieldSchema(name:insert_num,
 type:int, comment:null), ]
-insert_num     tinyint1        smallint1       int1    bigint1 tinyint1        
smallint1       int1    bigint1 tinyint1        smallint1       int1    bigint1 
tinyint1        smallint1       int1    bigint1 tinyint1        smallint1       
int1    bigint1 _c21
+insert_num     tinyint1        smallint1       int1    bigint1 tinyint1_1      
smallint1_1     int1_1  bigint1_1       tinyint1_2      smallint1_2     int1_2  
bigint1_2       tinyint1_3      smallint1_3     int1_3  bigint1_3       
tinyint1_4      smallint1_4     int1_4  bigint1_4       _c21
 PREHOOK: query: select 
insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b
 from table_change_numeric_group_string_group_multi_ints_string_group_n8
 PREHOOK: type: QUERY
 PREHOOK: Input: 
default@table_change_numeric_group_string_group_multi_ints_string_group_n8
@@ -885,7 +885,7 @@ POSTHOOK: Lineage: 
table_change_numeric_group_string_group_floating_string_group
 POSTHOOK: Lineage: 
table_change_numeric_group_string_group_floating_string_group_n8.c8 SIMPLE 
[(schema_evolution_data_n24)schema_evolution_data_n24.FieldSchema(name:float1, 
type:float, comment:null), ]
 POSTHOOK: Lineage: 
table_change_numeric_group_string_group_floating_string_group_n8.c9 SIMPLE 
[(schema_evolution_data_n24)schema_evolution_data_n24.FieldSchema(name:double1, 
type:double, comment:null), ]
 POSTHOOK: Lineage: 
table_change_numeric_group_string_group_floating_string_group_n8.insert_num 
SIMPLE 
[(schema_evolution_data_n24)schema_evolution_data_n24.FieldSchema(name:insert_num,
 type:int, comment:null), ]
-insert_num     decimal1        float1  double1 decimal1        float1  double1 
decimal1        float1  double1 decimal1        float1  double1 decimal1        
float1  double1 _c16
+insert_num     decimal1        float1  double1 decimal1_1      float1_1        
double1_1       decimal1_2      float1_2        double1_2       decimal1_3      
float1_3        double1_3       decimal1_4      float1_4        double1_4       
_c16
 PREHOOK: query: select 
insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from 
table_change_numeric_group_string_group_floating_string_group_n8
 PREHOOK: type: QUERY
 PREHOOK: Input: 
default@table_change_numeric_group_string_group_floating_string_group_n8
@@ -1221,7 +1221,7 @@ POSTHOOK: Lineage: 
table_change_lower_to_higher_numeric_group_tinyint_to_bigint_
 POSTHOOK: Lineage: 
table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n8.c8 SIMPLE 
[(schema_evolution_data_n24)schema_evolution_data_n24.FieldSchema(name:smallint1,
 type:smallint, comment:null), ]
 POSTHOOK: Lineage: 
table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n8.c9 SIMPLE 
[(schema_evolution_data_n24)schema_evolution_data_n24.FieldSchema(name:smallint1,
 type:smallint, comment:null), ]
 POSTHOOK: Lineage: 
table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n8.insert_num 
SIMPLE 
[(schema_evolution_data_n24)schema_evolution_data_n24.FieldSchema(name:insert_num,
 type:int, comment:null), ]
-insert_num     tinyint1        tinyint1        tinyint1        tinyint1        
tinyint1        tinyint1        smallint1       smallint1       smallint1       
smallint1       smallint1       int1    int1    int1    int1    bigint1 bigint1 
bigint1 _c19
+insert_num     tinyint1        tinyint1_1      tinyint1_2      tinyint1_3      
tinyint1_4      tinyint1_5      smallint1       smallint1_1     smallint1_2     
smallint1_3     smallint1_4     int1    int1_1  int1_2  int1_3  bigint1 
bigint1_1       bigint1_2       _c19
 PREHOOK: query: select 
insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b 
from table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n8
 PREHOOK: type: QUERY
 PREHOOK: Input: 
default@table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n8
@@ -1349,7 +1349,7 @@ POSTHOOK: Lineage: 
table_change_lower_to_higher_numeric_group_decimal_to_float_n
 POSTHOOK: Lineage: 
table_change_lower_to_higher_numeric_group_decimal_to_float_n8.c2 SIMPLE 
[(schema_evolution_data_n24)schema_evolution_data_n24.FieldSchema(name:decimal1,
 type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: 
table_change_lower_to_higher_numeric_group_decimal_to_float_n8.c3 SIMPLE 
[(schema_evolution_data_n24)schema_evolution_data_n24.FieldSchema(name:float1, 
type:float, comment:null), ]
 POSTHOOK: Lineage: 
table_change_lower_to_higher_numeric_group_decimal_to_float_n8.insert_num 
SIMPLE 
[(schema_evolution_data_n24)schema_evolution_data_n24.FieldSchema(name:insert_num,
 type:int, comment:null), ]
-insert_num     decimal1        decimal1        float1  _c4
+insert_num     decimal1        decimal1_1      float1  _c4
 PREHOOK: query: select insert_num,c1,c2,c3,b from 
table_change_lower_to_higher_numeric_group_decimal_to_float_n8
 PREHOOK: type: QUERY
 PREHOOK: Input: 
default@table_change_lower_to_higher_numeric_group_decimal_to_float_n8

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table_llap_io.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table_llap_io.q.out
 
b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table_llap_io.q.out
index 2c25fef..7b9fe43 100644
--- 
a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table_llap_io.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table_llap_io.q.out
@@ -657,7 +657,7 @@ POSTHOOK: Lineage: 
table_change_date_group_string_group_date_group_n11.c7 SIMPLE
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n11.c8 
SIMPLE 
[(schema_evolution_data_n37)schema_evolution_data_n37.FieldSchema(name:timestamp1,
 type:timestamp, comment:null), ]
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n11.c9 
SIMPLE 
[(schema_evolution_data_n37)schema_evolution_data_n37.FieldSchema(name:timestamp1,
 type:timestamp, comment:null), ]
 POSTHOOK: Lineage: 
table_change_date_group_string_group_date_group_n11.insert_num SIMPLE 
[(schema_evolution_data_n37)schema_evolution_data_n37.FieldSchema(name:insert_num,
 type:int, comment:null), ]
-insert_num     date1   date1   date1   date1   date1   timestamp1      
timestamp1      timestamp1      timestamp1      timestamp1      _c11
+insert_num     date1   date1_1 date1_2 date1_3 date1_4 timestamp1      
timestamp1_1    timestamp1_2    timestamp1_3    timestamp1_4    _c11
 PREHOOK: query: explain vectorization detail
 select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,b from 
table_change_date_group_string_group_date_group_n11
 PREHOOK: type: QUERY
@@ -903,7 +903,7 @@ POSTHOOK: Lineage: 
table_change_numeric_group_string_group_multi_ints_string_gro
 POSTHOOK: Lineage: 
table_change_numeric_group_string_group_multi_ints_string_group_n11.c8 SIMPLE 
[(schema_evolution_data_n37)schema_evolution_data_n37.FieldSchema(name:bigint1, 
type:bigint, comment:null), ]
 POSTHOOK: Lineage: 
table_change_numeric_group_string_group_multi_ints_string_group_n11.c9 SIMPLE 
[(schema_evolution_data_n37)schema_evolution_data_n37.FieldSchema(name:tinyint1,
 type:tinyint, comment:null), ]
 POSTHOOK: Lineage: 
table_change_numeric_group_string_group_multi_ints_string_group_n11.insert_num 
SIMPLE 
[(schema_evolution_data_n37)schema_evolution_data_n37.FieldSchema(name:insert_num,
 type:int, comment:null), ]
-insert_num     tinyint1        smallint1       int1    bigint1 tinyint1        
smallint1       int1    bigint1 tinyint1        smallint1       int1    bigint1 
tinyint1        smallint1       int1    bigint1 tinyint1        smallint1       
int1    bigint1 _c21
+insert_num     tinyint1        smallint1       int1    bigint1 tinyint1_1      
smallint1_1     int1_1  bigint1_1       tinyint1_2      smallint1_2     int1_2  
bigint1_2       tinyint1_3      smallint1_3     int1_3  bigint1_3       
tinyint1_4      smallint1_4     int1_4  bigint1_4       _c21
 PREHOOK: query: explain vectorization detail
 select 
insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b
 from table_change_numeric_group_string_group_multi_ints_string_group_n11
 PREHOOK: type: QUERY
@@ -1170,7 +1170,7 @@ POSTHOOK: Lineage: 
table_change_numeric_group_string_group_floating_string_group
 POSTHOOK: Lineage: 
table_change_numeric_group_string_group_floating_string_group_n11.c8 SIMPLE 
[(schema_evolution_data_n37)schema_evolution_data_n37.FieldSchema(name:float1, 
type:float, comment:null), ]
 POSTHOOK: Lineage: 
table_change_numeric_group_string_group_floating_string_group_n11.c9 SIMPLE 
[(schema_evolution_data_n37)schema_evolution_data_n37.FieldSchema(name:double1, 
type:double, comment:null), ]
 POSTHOOK: Lineage: 
table_change_numeric_group_string_group_floating_string_group_n11.insert_num 
SIMPLE 
[(schema_evolution_data_n37)schema_evolution_data_n37.FieldSchema(name:insert_num,
 type:int, comment:null), ]
-insert_num     decimal1        float1  double1 decimal1        float1  double1 
decimal1        float1  double1 decimal1        float1  double1 decimal1        
float1  double1 _c16
+insert_num     decimal1        float1  double1 decimal1_1      float1_1        
double1_1       decimal1_2      float1_2        double1_2       decimal1_3      
float1_3        double1_3       decimal1_4      float1_4        double1_4       
_c16
 PREHOOK: query: explain vectorization detail
 select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from 
table_change_numeric_group_string_group_floating_string_group_n11
 PREHOOK: type: QUERY
@@ -1617,7 +1617,7 @@ POSTHOOK: Lineage: 
table_change_lower_to_higher_numeric_group_tinyint_to_bigint_
 POSTHOOK: Lineage: 
table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n11.c8 SIMPLE 
[(schema_evolution_data_n37)schema_evolution_data_n37.FieldSchema(name:smallint1,
 type:smallint, comment:null), ]
 POSTHOOK: Lineage: 
table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n11.c9 SIMPLE 
[(schema_evolution_data_n37)schema_evolution_data_n37.FieldSchema(name:smallint1,
 type:smallint, comment:null), ]
 POSTHOOK: Lineage: 
table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n11.insert_num 
SIMPLE 
[(schema_evolution_data_n37)schema_evolution_data_n37.FieldSchema(name:insert_num,
 type:int, comment:null), ]
-insert_num     tinyint1        tinyint1        tinyint1        tinyint1        
tinyint1        tinyint1        smallint1       smallint1       smallint1       
smallint1       smallint1       int1    int1    int1    int1    bigint1 bigint1 
bigint1 _c19
+insert_num     tinyint1        tinyint1_1      tinyint1_2      tinyint1_3      
tinyint1_4      tinyint1_5      smallint1       smallint1_1     smallint1_2     
smallint1_3     smallint1_4     int1    int1_1  int1_2  int1_3  bigint1 
bigint1_1       bigint1_2       _c19
 PREHOOK: query: explain vectorization detail
 select 
insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b 
from table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n11
 PREHOOK: type: QUERY
@@ -1800,7 +1800,7 @@ POSTHOOK: Lineage: 
table_change_lower_to_higher_numeric_group_decimal_to_float_n
 POSTHOOK: Lineage: 
table_change_lower_to_higher_numeric_group_decimal_to_float_n11.c2 SIMPLE 
[(schema_evolution_data_n37)schema_evolution_data_n37.FieldSchema(name:decimal1,
 type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: 
table_change_lower_to_higher_numeric_group_decimal_to_float_n11.c3 SIMPLE 
[(schema_evolution_data_n37)schema_evolution_data_n37.FieldSchema(name:float1, 
type:float, comment:null), ]
 POSTHOOK: Lineage: 
table_change_lower_to_higher_numeric_group_decimal_to_float_n11.insert_num 
SIMPLE 
[(schema_evolution_data_n37)schema_evolution_data_n37.FieldSchema(name:insert_num,
 type:int, comment:null), ]
-insert_num     decimal1        decimal1        float1  _c4
+insert_num     decimal1        decimal1_1      float1  _c4
 PREHOOK: query: explain vectorization detail
 select insert_num,c1,c2,c3,b from 
table_change_lower_to_higher_numeric_group_decimal_to_float_n11
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/varchar_udf1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/varchar_udf1.q.out 
b/ql/src/test/results/clientpositive/llap/varchar_udf1.q.out
index fe20d54..af8ff61 100644
--- a/ql/src/test/results/clientpositive/llap/varchar_udf1.q.out
+++ b/ql/src/test/results/clientpositive/llap/varchar_udf1.q.out
@@ -20,9 +20,9 @@ POSTHOOK: query: insert overwrite table varchar_udf_1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@varchar_udf_1
-POSTHOOK: Lineage: varchar_udf_1.c1 SIMPLE [(src)src.FieldSchema(name:key, 
type:string, comment:default), ]
+POSTHOOK: Lineage: varchar_udf_1.c1 SIMPLE []
 POSTHOOK: Lineage: varchar_udf_1.c2 SIMPLE [(src)src.FieldSchema(name:value, 
type:string, comment:default), ]
-POSTHOOK: Lineage: varchar_udf_1.c3 EXPRESSION [(src)src.FieldSchema(name:key, 
type:string, comment:default), ]
+POSTHOOK: Lineage: varchar_udf_1.c3 EXPRESSION []
 POSTHOOK: Lineage: varchar_udf_1.c4 EXPRESSION 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: select 
   concat(c1, c2),

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/vector_adaptor_usage_mode.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_adaptor_usage_mode.q.out 
b/ql/src/test/results/clientpositive/llap/vector_adaptor_usage_mode.q.out
index 1846354..7e3998d 100644
--- a/ql/src/test/results/clientpositive/llap/vector_adaptor_usage_mode.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_adaptor_usage_mode.q.out
@@ -20,9 +20,9 @@ POSTHOOK: query: insert overwrite table varchar_udf_1_n0
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@varchar_udf_1_n0
-POSTHOOK: Lineage: varchar_udf_1_n0.c1 SIMPLE [(src)src.FieldSchema(name:key, 
type:string, comment:default), ]
+POSTHOOK: Lineage: varchar_udf_1_n0.c1 SIMPLE []
 POSTHOOK: Lineage: varchar_udf_1_n0.c2 SIMPLE 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: varchar_udf_1_n0.c3 EXPRESSION 
[(src)src.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: varchar_udf_1_n0.c3 EXPRESSION []
 POSTHOOK: Lineage: varchar_udf_1_n0.c4 EXPRESSION 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: insert into varchar_udf_1_n0 values (NULL, NULL, NULL, NULL)
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/vector_case_when_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_case_when_2.q.out 
b/ql/src/test/results/clientpositive/llap/vector_case_when_2.q.out
index 966f6c5..85a8056 100644
--- a/ql/src/test/results/clientpositive/llap/vector_case_when_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_case_when_2.q.out
@@ -36,7 +36,7 @@ POSTHOOK: Lineage: timestamps.cdate EXPRESSION 
[(timestamps_txt)timestamps_txt.F
 POSTHOOK: Lineage: timestamps.ctimestamp1 SIMPLE 
[(timestamps_txt)timestamps_txt.FieldSchema(name:tsval, type:timestamp, 
comment:null), ]
 POSTHOOK: Lineage: timestamps.ctimestamp2 EXPRESSION 
[(timestamps_txt)timestamps_txt.FieldSchema(name:tsval, type:timestamp, 
comment:null), ]
 POSTHOOK: Lineage: timestamps.stimestamp1 EXPRESSION 
[(timestamps_txt)timestamps_txt.FieldSchema(name:tsval, type:timestamp, 
comment:null), ]
-tsval  tsval   _c2     _c3
+tsval  tsval_1 _c2     _c3
 PREHOOK: query: INSERT INTO TABLE timestamps VALUES (NULL,NULL,NULL,NULL)
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/vector_interval_arithmetic.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_interval_arithmetic.q.out 
b/ql/src/test/results/clientpositive/llap/vector_interval_arithmetic.q.out
index 2fadf29..9e59594 100644
--- a/ql/src/test/results/clientpositive/llap/vector_interval_arithmetic.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_interval_arithmetic.q.out
@@ -34,7 +34,7 @@ POSTHOOK: Input: default@unique_timestamps
 POSTHOOK: Output: default@interval_arithmetic_1
 POSTHOOK: Lineage: interval_arithmetic_1.dateval EXPRESSION 
[(unique_timestamps)unique_timestamps.FieldSchema(name:tsval, type:timestamp, 
comment:null), ]
 POSTHOOK: Lineage: interval_arithmetic_1.tsval SIMPLE 
[(unique_timestamps)unique_timestamps.FieldSchema(name:tsval, type:timestamp, 
comment:null), ]
-tsval  tsval
+tsval  tsval_1
 PREHOOK: query: explain vectorization expression
 select
   dateval,

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/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 16b5948..2d043e7 100644
--- a/ql/src/test/results/clientpositive/llap/vector_udf1.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_udf1.q.out
@@ -22,9 +22,9 @@ POSTHOOK: query: insert overwrite table varchar_udf_1_n2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@varchar_udf_1_n2
-POSTHOOK: Lineage: varchar_udf_1_n2.c1 SIMPLE [(src)src.FieldSchema(name:key, 
type:string, comment:default), ]
+POSTHOOK: Lineage: varchar_udf_1_n2.c1 SIMPLE []
 POSTHOOK: Lineage: varchar_udf_1_n2.c2 SIMPLE 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: varchar_udf_1_n2.c3 EXPRESSION 
[(src)src.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: varchar_udf_1_n2.c3 EXPRESSION []
 POSTHOOK: Lineage: varchar_udf_1_n2.c4 EXPRESSION 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: varchar_udf_1_n2.d1 SIMPLE []
 POSTHOOK: Lineage: varchar_udf_1_n2.d2 SIMPLE []

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/vector_udf2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_udf2.q.out 
b/ql/src/test/results/clientpositive/llap/vector_udf2.q.out
index a33c6be..d1f0912 100644
--- a/ql/src/test/results/clientpositive/llap/vector_udf2.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_udf2.q.out
@@ -20,9 +20,9 @@ POSTHOOK: query: insert overwrite table varchar_udf_2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@varchar_udf_2
-POSTHOOK: Lineage: varchar_udf_2.c1 SIMPLE [(src)src.FieldSchema(name:key, 
type:string, comment:default), ]
+POSTHOOK: Lineage: varchar_udf_2.c1 SIMPLE []
 POSTHOOK: Lineage: varchar_udf_2.c2 SIMPLE [(src)src.FieldSchema(name:value, 
type:string, comment:default), ]
-POSTHOOK: Lineage: varchar_udf_2.c3 EXPRESSION [(src)src.FieldSchema(name:key, 
type:string, comment:default), ]
+POSTHOOK: Lineage: varchar_udf_2.c3 EXPRESSION []
 POSTHOOK: Lineage: varchar_udf_2.c4 EXPRESSION 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: explain vectorization expression
 select 

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/vector_windowing.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_windowing.q.out 
b/ql/src/test/results/clientpositive/llap/vector_windowing.q.out
index 2d49bca..6a132b8 100644
--- a/ql/src/test/results/clientpositive/llap/vector_windowing.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_windowing.q.out
@@ -207,6 +207,7 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Edges:
         Reducer 2 <- Map 1 (SIMPLE_EDGE)
+        Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -231,24 +232,24 @@ STAGE PLANS:
                           aggregators: VectorUDAFMinDouble(col 7:double) -> 
double
                           className: VectorGroupByOperator
                           groupByMode: HASH
-                          keyExpressions: col 2:string, col 1:string, col 5:int
+                          keyExpressions: col 1:string, col 2:string, col 5:int
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: p_mfgr (type: string), p_name (type: string), 
p_size (type: int)
+                      keys: p_name (type: string), p_mfgr (type: string), 
p_size (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 13 Data size: 3003 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: int)
                         sort order: +++
-                        Map-reduce partition columns: _col0 (type: string)
+                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: int)
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkObjectHashOperator
                             keyColumnNums: [0, 1, 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: [0]
+                            partitionColumnNums: [0, 1, 2]
                             valueColumnNums: [3]
                         Statistics: Num rows: 13 Data size: 3003 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col3 (type: double)
@@ -270,19 +271,60 @@ STAGE PLANS:
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
-            Execution mode: llap
+            Execution mode: vectorized, llap
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF operator: Only PTF directly under 
reduce-shuffle is supported
-                vectorized: false
+                reduceColumnNullOrder: aaa
+                reduceColumnSortOrder: +++
+                allNative: false
+                usesVectorUDFAdaptor: false
+                vectorized: true
+                rowBatchContext:
+                    dataColumnCount: 4
+                    dataColumns: KEY._col0:string, KEY._col1:string, 
KEY._col2:int, VALUE._col0:double
+                    partitionColumnCount: 0
+                    scratchColumnTypeNames: []
             Reduce Operator Tree:
               Group By Operator
                 aggregations: min(VALUE._col0)
+                Group By Vectorization:
+                    aggregators: VectorUDAFMinDouble(col 3:double) -> double
+                    className: VectorGroupByOperator
+                    groupByMode: MERGEPARTIAL
+                    keyExpressions: col 0:string, col 1:string, col 2:int
+                    native: false
+                    vectorProcessingMode: MERGE_PARTIAL
+                    projectedOutputColumnNums: [0]
                 keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: int)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 13 Data size: 3003 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Reduce Output Operator
+                  key expressions: _col1 (type: string), _col0 (type: string)
+                  sort order: ++
+                  Map-reduce partition columns: _col1 (type: string)
+                  Reduce Sink Vectorization:
+                      className: VectorReduceSinkObjectHashOperator
+                      keyColumnNums: [1, 0]
+                      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, 3]
+                  Statistics: Num rows: 13 Data size: 3003 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  value expressions: _col2 (type: int), _col3 (type: double)
+        Reducer 3 
+            Execution mode: llap
+            Reduce Vectorization:
+                enabled: true
+                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
+                notVectorizedReason: PTF operator: lag not in supported 
functions [avg, count, dense_rank, first_value, last_value, max, min, rank, 
row_number, sum]
+                vectorized: false
+            Reduce Operator Tree:
+              Select Operator
+                expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col0 (type: int), VALUE._col1 (type: 
double)
+                outputColumnNames: _col0, _col1, _col2, _col3
+                Statistics: Num rows: 13 Data size: 3003 Basic stats: COMPLETE 
Column stats: COMPLETE
                 PTF Operator
                   Function definitions:
                       Input definition
@@ -292,20 +334,20 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: _col1 ASC NULLS FIRST
-                        partition by: _col0
+                        order by: _col0 ASC NULLS FIRST
+                        partition by: _col1
                         raw input shape:
                         window functions:
                             window function definition
                               alias: rank_window_0
-                              arguments: _col1
+                              arguments: _col0
                               name: rank
                               window function: GenericUDAFRankEvaluator
                               window frame: ROWS PRECEDING(MAX)~FOLLOWING(MAX)
                               isPivotResult: true
                             window function definition
                               alias: dense_rank_window_1
-                              arguments: _col1
+                              arguments: _col0
                               name: dense_rank
                               window function: GenericUDAFDenseRankEvaluator
                               window frame: ROWS PRECEDING(MAX)~FOLLOWING(MAX)
@@ -319,7 +361,7 @@ STAGE PLANS:
                               isPivotResult: true
                   Statistics: Num rows: 13 Data size: 3003 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: int), _col3 (type: double), rank_window_0 (type: int), 
dense_rank_window_1 (type: int), _col2 (type: int), (_col2 - lag_window_2) 
(type: int)
+                    expressions: _col1 (type: string), _col0 (type: string), 
_col2 (type: int), _col3 (type: double), rank_window_0 (type: int), 
dense_rank_window_1 (type: int), _col2 (type: int), (_col2 - lag_window_2) 
(type: int)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7
                     Statistics: Num rows: 13 Data size: 3211 Basic stats: 
COMPLETE Column stats: COMPLETE
                     File Output Operator
@@ -356,7 +398,7 @@ group by p_mfgr, p_name, p_size
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
-p_mfgr p_name  p_size  _c3     r       dr      p_size  deltasz
+p_mfgr p_name  p_size  _c3     r       dr      p_size_1        deltasz
 Manufacturer#1 almond antique burnished rose metallic  2       1173.15 1       
1       2       0
 Manufacturer#1 almond antique chartreuse lavender yellow       34      1753.76 
2       2       34      32
 Manufacturer#1 almond antique salmon chartreuse burlywood      6       1602.59 
3       3       6       -28
@@ -415,6 +457,7 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Edges:
         Reducer 2 <- Map 1 (SIMPLE_EDGE)
+        Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -439,24 +482,24 @@ STAGE PLANS:
                           aggregators: VectorUDAFMinDouble(col 7:double) -> 
double
                           className: VectorGroupByOperator
                           groupByMode: HASH
-                          keyExpressions: col 2:string, col 1:string, col 5:int
+                          keyExpressions: col 1:string, col 2:string, col 5:int
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: p_mfgr (type: string), p_name (type: string), 
p_size (type: int)
+                      keys: p_name (type: string), p_mfgr (type: string), 
p_size (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 13 Data size: 3003 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: int)
                         sort order: +++
-                        Map-reduce partition columns: _col0 (type: string)
+                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: int)
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkObjectHashOperator
                             keyColumnNums: [0, 1, 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: [0]
+                            partitionColumnNums: [0, 1, 2]
                             valueColumnNums: [3]
                         Statistics: Num rows: 13 Data size: 3003 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col3 (type: double)
@@ -478,19 +521,60 @@ STAGE PLANS:
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
-            Execution mode: llap
+            Execution mode: vectorized, llap
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF operator: Only PTF directly under 
reduce-shuffle is supported
-                vectorized: false
+                reduceColumnNullOrder: aaa
+                reduceColumnSortOrder: +++
+                allNative: false
+                usesVectorUDFAdaptor: false
+                vectorized: true
+                rowBatchContext:
+                    dataColumnCount: 4
+                    dataColumns: KEY._col0:string, KEY._col1:string, 
KEY._col2:int, VALUE._col0:double
+                    partitionColumnCount: 0
+                    scratchColumnTypeNames: []
             Reduce Operator Tree:
               Group By Operator
                 aggregations: min(VALUE._col0)
+                Group By Vectorization:
+                    aggregators: VectorUDAFMinDouble(col 3:double) -> double
+                    className: VectorGroupByOperator
+                    groupByMode: MERGEPARTIAL
+                    keyExpressions: col 0:string, col 1:string, col 2:int
+                    native: false
+                    vectorProcessingMode: MERGE_PARTIAL
+                    projectedOutputColumnNums: [0]
                 keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: int)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 13 Data size: 3003 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Reduce Output Operator
+                  key expressions: _col1 (type: string), _col0 (type: string)
+                  sort order: ++
+                  Map-reduce partition columns: _col1 (type: string)
+                  Reduce Sink Vectorization:
+                      className: VectorReduceSinkObjectHashOperator
+                      keyColumnNums: [1, 0]
+                      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, 3]
+                  Statistics: Num rows: 13 Data size: 3003 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  value expressions: _col2 (type: int), _col3 (type: double)
+        Reducer 3 
+            Execution mode: llap
+            Reduce Vectorization:
+                enabled: true
+                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
+                notVectorizedReason: PTF operator: lag not in supported 
functions [avg, count, dense_rank, first_value, last_value, max, min, rank, 
row_number, sum]
+                vectorized: false
+            Reduce Operator Tree:
+              Select Operator
+                expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col0 (type: int), VALUE._col1 (type: 
double)
+                outputColumnNames: _col0, _col1, _col2, _col3
+                Statistics: Num rows: 13 Data size: 3003 Basic stats: COMPLETE 
Column stats: COMPLETE
                 PTF Operator
                   Function definitions:
                       Input definition
@@ -500,20 +584,20 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: _col1 ASC NULLS FIRST
-                        partition by: _col0
+                        order by: _col0 ASC NULLS FIRST
+                        partition by: _col1
                         raw input shape:
                         window functions:
                             window function definition
                               alias: rank_window_0
-                              arguments: _col1
+                              arguments: _col0
                               name: rank
                               window function: GenericUDAFRankEvaluator
                               window frame: ROWS PRECEDING(MAX)~FOLLOWING(MAX)
                               isPivotResult: true
                             window function definition
                               alias: dense_rank_window_1
-                              arguments: _col1
+                              arguments: _col0
                               name: dense_rank
                               window function: GenericUDAFDenseRankEvaluator
                               window frame: ROWS PRECEDING(MAX)~FOLLOWING(MAX)
@@ -527,7 +611,7 @@ STAGE PLANS:
                               isPivotResult: true
                   Statistics: Num rows: 13 Data size: 3003 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: int), _col3 (type: double), rank_window_0 (type: int), 
dense_rank_window_1 (type: int), _col2 (type: int), (_col2 - lag_window_2) 
(type: int)
+                    expressions: _col1 (type: string), _col0 (type: string), 
_col2 (type: int), _col3 (type: double), rank_window_0 (type: int), 
dense_rank_window_1 (type: int), _col2 (type: int), (_col2 - lag_window_2) 
(type: int)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7
                     Statistics: Num rows: 13 Data size: 3211 Basic stats: 
COMPLETE Column stats: COMPLETE
                     File Output Operator
@@ -564,7 +648,7 @@ having p_size > 0
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
-p_mfgr p_name  p_size  _c3     r       dr      p_size  deltasz
+p_mfgr p_name  p_size  _c3     r       dr      p_size_1        deltasz
 Manufacturer#1 almond antique burnished rose metallic  2       1173.15 1       
1       2       0
 Manufacturer#1 almond antique chartreuse lavender yellow       34      1753.76 
2       2       34      32
 Manufacturer#1 almond antique salmon chartreuse burlywood      6       1602.59 
3       3       6       -28
@@ -6008,6 +6092,7 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Edges:
         Reducer 2 <- Map 1 (SIMPLE_EDGE)
+        Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -6032,24 +6117,24 @@ STAGE PLANS:
                           aggregators: VectorUDAFMinDouble(col 7:double) -> 
double
                           className: VectorGroupByOperator
                           groupByMode: HASH
-                          keyExpressions: col 2:string, col 1:string, col 5:int
+                          keyExpressions: col 1:string, col 2:string, col 5:int
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: p_mfgr (type: string), p_name (type: string), 
p_size (type: int)
+                      keys: p_name (type: string), p_mfgr (type: string), 
p_size (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 13 Data size: 3003 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: int)
                         sort order: +++
-                        Map-reduce partition columns: _col0 (type: string)
+                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: int)
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkObjectHashOperator
                             keyColumnNums: [0, 1, 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: [0]
+                            partitionColumnNums: [0, 1, 2]
                             valueColumnNums: [3]
                         Statistics: Num rows: 13 Data size: 3003 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col3 (type: double)
@@ -6071,19 +6156,60 @@ STAGE PLANS:
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
         Reducer 2 
-            Execution mode: llap
+            Execution mode: vectorized, llap
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                notVectorizedReason: PTF operator: Only PTF directly under 
reduce-shuffle is supported
-                vectorized: false
+                reduceColumnNullOrder: aaa
+                reduceColumnSortOrder: +++
+                allNative: false
+                usesVectorUDFAdaptor: false
+                vectorized: true
+                rowBatchContext:
+                    dataColumnCount: 4
+                    dataColumns: KEY._col0:string, KEY._col1:string, 
KEY._col2:int, VALUE._col0:double
+                    partitionColumnCount: 0
+                    scratchColumnTypeNames: []
             Reduce Operator Tree:
               Group By Operator
                 aggregations: min(VALUE._col0)
+                Group By Vectorization:
+                    aggregators: VectorUDAFMinDouble(col 3:double) -> double
+                    className: VectorGroupByOperator
+                    groupByMode: MERGEPARTIAL
+                    keyExpressions: col 0:string, col 1:string, col 2:int
+                    native: false
+                    vectorProcessingMode: MERGE_PARTIAL
+                    projectedOutputColumnNums: [0]
                 keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: int)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 13 Data size: 3003 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Reduce Output Operator
+                  key expressions: _col1 (type: string), _col0 (type: string)
+                  sort order: ++
+                  Map-reduce partition columns: _col1 (type: string)
+                  Reduce Sink Vectorization:
+                      className: VectorReduceSinkObjectHashOperator
+                      keyColumnNums: [1, 0]
+                      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, 3]
+                  Statistics: Num rows: 13 Data size: 3003 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  value expressions: _col2 (type: int), _col3 (type: double)
+        Reducer 3 
+            Execution mode: llap
+            Reduce Vectorization:
+                enabled: true
+                enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
+                notVectorizedReason: PTF operator: lag not in supported 
functions [avg, count, dense_rank, first_value, last_value, max, min, rank, 
row_number, sum]
+                vectorized: false
+            Reduce Operator Tree:
+              Select Operator
+                expressions: KEY.reducesinkkey1 (type: string), 
KEY.reducesinkkey0 (type: string), VALUE._col0 (type: int), VALUE._col1 (type: 
double)
+                outputColumnNames: _col0, _col1, _col2, _col3
+                Statistics: Num rows: 13 Data size: 3003 Basic stats: COMPLETE 
Column stats: COMPLETE
                 PTF Operator
                   Function definitions:
                       Input definition
@@ -6093,20 +6219,20 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: _col1 ASC NULLS FIRST
-                        partition by: _col0
+                        order by: _col0 ASC NULLS FIRST
+                        partition by: _col1
                         raw input shape:
                         window functions:
                             window function definition
                               alias: rank_window_0
-                              arguments: _col1
+                              arguments: _col0
                               name: rank
                               window function: GenericUDAFRankEvaluator
                               window frame: ROWS PRECEDING(MAX)~FOLLOWING(MAX)
                               isPivotResult: true
                             window function definition
                               alias: dense_rank_window_1
-                              arguments: _col1
+                              arguments: _col0
                               name: dense_rank
                               window function: GenericUDAFDenseRankEvaluator
                               window frame: ROWS PRECEDING(MAX)~FOLLOWING(MAX)
@@ -6120,7 +6246,7 @@ STAGE PLANS:
                               isPivotResult: true
                   Statistics: Num rows: 13 Data size: 3003 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: int), _col3 (type: double), rank_window_0 (type: int), 
dense_rank_window_1 (type: int), _col2 (type: int), (_col2 - lag_window_2) 
(type: int)
+                    expressions: _col1 (type: string), _col0 (type: string), 
_col2 (type: int), _col3 (type: double), rank_window_0 (type: int), 
dense_rank_window_1 (type: int), _col2 (type: int), (_col2 - lag_window_2) 
(type: int)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7
                     Statistics: Num rows: 13 Data size: 3211 Basic stats: 
COMPLETE Column stats: COMPLETE
                     File Output Operator
@@ -6157,7 +6283,7 @@ having p_size > 0
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
-p_mfgr p_name  p_size  mi      r       dr      p_size  deltasz
+p_mfgr p_name  p_size  mi      r       dr      p_size_1        deltasz
 Manufacturer#1 almond antique burnished rose metallic  2       1173.15 1       
1       2       0
 Manufacturer#1 almond antique chartreuse lavender yellow       34      1753.76 
2       2       34      32
 Manufacturer#1 almond antique salmon chartreuse burlywood      6       1602.59 
3       3       6       -28

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/masking_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/masking_8.q.out 
b/ql/src/test/results/clientpositive/masking_8.q.out
index c4590d3..115a8d3 100644
--- a/ql/src/test/results/clientpositive/masking_8.q.out
+++ b/ql/src/test/results/clientpositive/masking_8.q.out
@@ -258,14 +258,14 @@ POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@masking_test_n2
 POSTHOOK: Output: default@masking_test_n2
 PREHOOK: query: create table masking_test_n2 as select cast(key as int) as 
key, '12'
-'12', '12', '12', '12', '12', INPUT__FILE__NAME, '12', '12', '12', '12', '12'
+'12', '12', '12', '12', '12', INPUT__FILE__NAME as file_name, '12', '12', 
'12', '12', '12'
  from src
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@src
 PREHOOK: Output: database:default
 PREHOOK: Output: default@masking_test_n2
 POSTHOOK: query: create table masking_test_n2 as select cast(key as int) as 
key, '12'
-'12', '12', '12', '12', '12', INPUT__FILE__NAME, '12', '12', '12', '12', '12'
+'12', '12', '12', '12', '12', INPUT__FILE__NAME as file_name, '12', '12', 
'12', '12', '12'
  from src
 POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@src
@@ -281,7 +281,7 @@ POSTHOOK: Lineage: masking_test_n2._c5 SIMPLE []
 POSTHOOK: Lineage: masking_test_n2._c7 SIMPLE []
 POSTHOOK: Lineage: masking_test_n2._c8 SIMPLE []
 POSTHOOK: Lineage: masking_test_n2._c9 SIMPLE []
-POSTHOOK: Lineage: masking_test_n2.input__file__name SIMPLE 
[(src)src.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
+POSTHOOK: Lineage: masking_test_n2.file_name SIMPLE 
[(src)src.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
 POSTHOOK: Lineage: masking_test_n2.key EXPRESSION 
[(src)src.FieldSchema(name:key, type:string, comment:default), ]
 PREHOOK: query: select INPUT__FILE__NAME, *, ROW__ID from masking_test_n2
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/mm_buckets.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/mm_buckets.q.out 
b/ql/src/test/results/clientpositive/mm_buckets.q.out
index d37e2f6..1f12575 100644
--- a/ql/src/test/results/clientpositive/mm_buckets.q.out
+++ b/ql/src/test/results/clientpositive/mm_buckets.q.out
@@ -397,8 +397,8 @@ POSTHOOK: Input: default@intermediate_n2@p=455
 POSTHOOK: Input: default@intermediate_n2@p=456
 POSTHOOK: Input: default@intermediate_n2@p=457
 POSTHOOK: Output: default@bucket2_mm
-POSTHOOK: Lineage: bucket2_mm.id SIMPLE 
[(intermediate_n2)intermediate_n2.FieldSchema(name:key, type:int, 
comment:null), ]
-POSTHOOK: Lineage: bucket2_mm.key SIMPLE 
[(intermediate_n2)intermediate_n2.FieldSchema(name:key, type:int, 
comment:null), ]
+POSTHOOK: Lineage: bucket2_mm.id SIMPLE []
+POSTHOOK: Lineage: bucket2_mm.key SIMPLE []
 PREHOOK: query: select * from bucket2_mm order by key, id
 PREHOOK: type: QUERY
 PREHOOK: Input: default@bucket2_mm

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/smb_mapjoin_20.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_20.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_20.q.out
index efaa17e..37327d7 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_20.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_20.q.out
@@ -77,12 +77,12 @@ STAGE PLANS:
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 name: default.test_table2
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col2 
(type: string)
-            outputColumnNames: key, value1, value2
+            expressions: _col0 (type: string), _col1 (type: string), _col2 
(type: string), '1' (type: string)
+            outputColumnNames: key, value1, value2, ds
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Group By Operator
               aggregations: compute_stats(key, 'hll'), compute_stats(value1, 
'hll'), compute_stats(value2, 'hll')
-              keys: '1' (type: string)
+              keys: ds (type: string)
               mode: hash
               outputColumnNames: _col0, _col1, _col2, _col3
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
@@ -118,21 +118,21 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             Reduce Output Operator
-              key expressions: '1' (type: string)
+              key expressions: _col0 (type: string)
               sort order: +
-              Map-reduce partition columns: '1' (type: string)
+              Map-reduce partition columns: _col0 (type: string)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col1 (type: 
struct<columntype:string,maxlength:bigint,sumlength:bigint,count:bigint,countnulls:bigint,bitvector:binary>),
 _col2 (type: 
struct<columntype:string,maxlength:bigint,sumlength:bigint,count:bigint,countnulls:bigint,bitvector:binary>),
 _col3 (type: 
struct<columntype:string,maxlength:bigint,sumlength:bigint,count:bigint,countnulls:bigint,bitvector:binary>)
       Execution mode: vectorized
       Reduce Operator Tree:
         Group By Operator
           aggregations: compute_stats(VALUE._col0), 
compute_stats(VALUE._col1), compute_stats(VALUE._col2)
-          keys: '1' (type: string)
+          keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col1 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col2 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col3 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 '1' (type: string)
+            expressions: _col1 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col2 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col3 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col0 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -246,12 +246,12 @@ STAGE PLANS:
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 name: default.test_table3
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: int), _col2 (type: 
string)
-            outputColumnNames: key, value1, value2
+            expressions: _col0 (type: string), _col1 (type: int), _col2 (type: 
string), '1' (type: string)
+            outputColumnNames: key, value1, value2, ds
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Group By Operator
               aggregations: compute_stats(key, 'hll'), compute_stats(value1, 
'hll'), compute_stats(value2, 'hll')
-              keys: '1' (type: string)
+              keys: ds (type: string)
               mode: hash
               outputColumnNames: _col0, _col1, _col2, _col3
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
@@ -287,21 +287,21 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             Reduce Output Operator
-              key expressions: '1' (type: string)
+              key expressions: _col0 (type: string)
               sort order: +
-              Map-reduce partition columns: '1' (type: string)
+              Map-reduce partition columns: _col0 (type: string)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col1 (type: 
struct<columntype:string,maxlength:bigint,sumlength:bigint,count:bigint,countnulls:bigint,bitvector:binary>),
 _col2 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,bitvector:binary>),
 _col3 (type: 
struct<columntype:string,maxlength:bigint,sumlength:bigint,count:bigint,countnulls:bigint,bitvector:binary>)
       Execution mode: vectorized
       Reduce Operator Tree:
         Group By Operator
           aggregations: compute_stats(VALUE._col0), 
compute_stats(VALUE._col1), compute_stats(VALUE._col2)
-          keys: '1' (type: string)
+          keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col1 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col2 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col3 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 '1' (type: string)
+            expressions: _col1 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col2 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col3 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col0 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -1462,12 +1462,12 @@ STAGE PLANS:
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 name: default.test_table2
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col2 
(type: string)
-            outputColumnNames: key, value1, value2
+            expressions: _col0 (type: string), _col1 (type: string), _col2 
(type: string), '2' (type: string)
+            outputColumnNames: key, value1, value2, ds
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Group By Operator
               aggregations: compute_stats(key, 'hll'), compute_stats(value1, 
'hll'), compute_stats(value2, 'hll')
-              keys: '2' (type: string)
+              keys: ds (type: string)
               mode: hash
               outputColumnNames: _col0, _col1, _col2, _col3
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
@@ -1503,21 +1503,21 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             Reduce Output Operator
-              key expressions: '2' (type: string)
+              key expressions: _col0 (type: string)
               sort order: +
-              Map-reduce partition columns: '2' (type: string)
+              Map-reduce partition columns: _col0 (type: string)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col1 (type: 
struct<columntype:string,maxlength:bigint,sumlength:bigint,count:bigint,countnulls:bigint,bitvector:binary>),
 _col2 (type: 
struct<columntype:string,maxlength:bigint,sumlength:bigint,count:bigint,countnulls:bigint,bitvector:binary>),
 _col3 (type: 
struct<columntype:string,maxlength:bigint,sumlength:bigint,count:bigint,countnulls:bigint,bitvector:binary>)
       Execution mode: vectorized
       Reduce Operator Tree:
         Group By Operator
           aggregations: compute_stats(VALUE._col0), 
compute_stats(VALUE._col1), compute_stats(VALUE._col2)
-          keys: '2' (type: string)
+          keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col1 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col2 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col3 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 '2' (type: string)
+            expressions: _col1 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col2 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col3 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col0 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out 
b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out
index b5daffb..a741c8e 100644
--- a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out
@@ -79,15 +79,19 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: a
-                  filterExpr: (key is not null and (ds = '1')) (type: boolean)
+                  filterExpr: ((ds = '1') and key is not null) (type: boolean)
                   Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 10 Data size: 70 Basic stats: 
COMPLETE Column stats: NONE
-                    Spark HashTable Sink Operator
-                      keys:
-                        0 key (type: int)
-                        1 key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
+                      Statistics: Num rows: 10 Data size: 70 Basic stats: 
COMPLETE Column stats: NONE
+                      Spark HashTable Sink Operator
+                        keys:
+                          0 _col0 (type: int)
+                          1 _col0 (type: int)
             Local Work:
               Map Reduce Local Work
 
@@ -101,31 +105,35 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: b
-                  filterExpr: (key is not null and (ds = '1')) (type: boolean)
+                  filterExpr: ((ds = '1') and key is not null) (type: boolean)
                   Statistics: Num rows: 84 Data size: 736 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 84 Data size: 736 Basic stats: 
COMPLETE Column stats: NONE
-                    Map Join Operator
-                      condition map:
-                           Inner Join 0 to 1
-                      keys:
-                        0 key (type: int)
-                        1 key (type: int)
-                      outputColumnNames: _col0, _col1, _col7
-                      input vertices:
-                        0 Map 1
-                      Statistics: Num rows: 92 Data size: 809 Basic stats: 
COMPLETE Column stats: NONE
-                      Select Operator
-                        expressions: _col0 (type: int), concat(_col1, _col7) 
(type: string)
-                        outputColumnNames: _col1, _col2
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
+                      Statistics: Num rows: 84 Data size: 736 Basic stats: 
COMPLETE Column stats: NONE
+                      Map Join Operator
+                        condition map:
+                             Inner Join 0 to 1
+                        keys:
+                          0 _col0 (type: int)
+                          1 _col0 (type: int)
+                        outputColumnNames: _col0, _col1, _col4
+                        input vertices:
+                          0 Map 1
                         Statistics: Num rows: 92 Data size: 809 Basic stats: 
COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col1 (type: int)
-                          sort order: +
-                          Map-reduce partition columns: _col1 (type: int)
+                        Select Operator
+                          expressions: _col0 (type: int), concat(_col1, _col4) 
(type: string)
+                          outputColumnNames: _col1, _col2
                           Statistics: Num rows: 92 Data size: 809 Basic stats: 
COMPLETE Column stats: NONE
-                          value expressions: _col2 (type: string)
+                          Reduce Output Operator
+                            key expressions: _col1 (type: int)
+                            sort order: +
+                            Map-reduce partition columns: _col1 (type: int)
+                            Statistics: Num rows: 92 Data size: 809 Basic 
stats: COMPLETE Column stats: NONE
+                            value expressions: _col2 (type: string)
             Local Work:
               Map Reduce Local Work
         Reducer 3 

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/spark/union_remove_22.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_22.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_22.q.out
index 90861a3..1d23016 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_22.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_22.q.out
@@ -62,7 +62,7 @@ STAGE PLANS:
                     outputColumnNames: key
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
+                      aggregations: count()
                       keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/union37.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union37.q.out 
b/ql/src/test/results/clientpositive/union37.q.out
index 1b9ac10..9f3e350 100644
--- a/ql/src/test/results/clientpositive/union37.q.out
+++ b/ql/src/test/results/clientpositive/union37.q.out
@@ -438,12 +438,12 @@ STAGE PLANS:
             Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: id (type: bigint), 'table_1' (type: string), 
trans_date (type: string), '2016-11-11' (type: string)
-              outputColumnNames: _col0, _col2, _col3, _col4
+              outputColumnNames: _col0, _col1, _col2, _col3
               Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE 
Column stats: NONE
               Union
                 Statistics: Num rows: 2 Data size: 40 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: bigint), 999 (type: int), _col2 
(type: string), _col3 (type: string), _col4 (type: string)
+                  expressions: _col0 (type: bigint), 999 (type: int), _col1 
(type: string), _col2 (type: string), _col3 (type: string)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4
                   Statistics: Num rows: 2 Data size: 40 Basic stats: COMPLETE 
Column stats: NONE
                   File Output Operator
@@ -458,12 +458,12 @@ STAGE PLANS:
             Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: id (type: bigint), val (type: string), trans_date 
(type: string), trans_date (type: string)
-              outputColumnNames: _col0, _col2, _col3, _col4
+              outputColumnNames: _col0, _col1, _col2, _col3
               Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE 
Column stats: NONE
               Union
                 Statistics: Num rows: 2 Data size: 40 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: bigint), 999 (type: int), _col2 
(type: string), _col3 (type: string), _col4 (type: string)
+                  expressions: _col0 (type: bigint), 999 (type: int), _col1 
(type: string), _col2 (type: string), _col3 (type: string)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4
                   Statistics: Num rows: 2 Data size: 40 Basic stats: COMPLETE 
Column stats: NONE
                   File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/union_remove_22.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_22.q.out 
b/ql/src/test/results/clientpositive/union_remove_22.q.out
index 247db09..83217fa 100644
--- a/ql/src/test/results/clientpositive/union_remove_22.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_22.q.out
@@ -57,7 +57,7 @@ STAGE PLANS:
               outputColumnNames: key
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                aggregations: count(1)
+                aggregations: count()
                 keys: key (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1
@@ -110,7 +110,7 @@ STAGE PLANS:
               outputColumnNames: key
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                aggregations: count(1)
+                aggregations: count()
                 keys: key (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/vector_case_when_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_case_when_2.q.out 
b/ql/src/test/results/clientpositive/vector_case_when_2.q.out
index 9ff8750..d7bb76a 100644
--- a/ql/src/test/results/clientpositive/vector_case_when_2.q.out
+++ b/ql/src/test/results/clientpositive/vector_case_when_2.q.out
@@ -36,7 +36,7 @@ POSTHOOK: Lineage: timestamps.cdate EXPRESSION 
[(timestamps_txt)timestamps_txt.F
 POSTHOOK: Lineage: timestamps.ctimestamp1 SIMPLE 
[(timestamps_txt)timestamps_txt.FieldSchema(name:tsval, type:timestamp, 
comment:null), ]
 POSTHOOK: Lineage: timestamps.ctimestamp2 EXPRESSION 
[(timestamps_txt)timestamps_txt.FieldSchema(name:tsval, type:timestamp, 
comment:null), ]
 POSTHOOK: Lineage: timestamps.stimestamp1 EXPRESSION 
[(timestamps_txt)timestamps_txt.FieldSchema(name:tsval, type:timestamp, 
comment:null), ]
-tsval  tsval   _c2     _c3
+tsval  tsval_1 _c2     _c3
 PREHOOK: query: INSERT INTO TABLE timestamps VALUES (NULL,NULL,NULL,NULL)
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/vector_interval_arithmetic.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/vector_interval_arithmetic.q.out 
b/ql/src/test/results/clientpositive/vector_interval_arithmetic.q.out
index ee7602a..3b398cb 100644
--- a/ql/src/test/results/clientpositive/vector_interval_arithmetic.q.out
+++ b/ql/src/test/results/clientpositive/vector_interval_arithmetic.q.out
@@ -34,7 +34,7 @@ POSTHOOK: Input: default@unique_timestamps
 POSTHOOK: Output: default@interval_arithmetic_1
 POSTHOOK: Lineage: interval_arithmetic_1.dateval EXPRESSION 
[(unique_timestamps)unique_timestamps.FieldSchema(name:tsval, type:timestamp, 
comment:null), ]
 POSTHOOK: Lineage: interval_arithmetic_1.tsval SIMPLE 
[(unique_timestamps)unique_timestamps.FieldSchema(name:tsval, type:timestamp, 
comment:null), ]
-tsval  tsval
+tsval  tsval_1
 PREHOOK: query: explain vectorization expression
 select
   dateval,

Reply via email to