You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by vg...@apache.org on 2018/07/29 19:22:20 UTC

[4/5] hive git commit: HIVE-19770: Support for CBO for queries with multiple same columns in select (Vineet Garg, reviewed by Ashutosh Chauhan)

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table.q.out
index a043b67..edc7e59 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table.q.out
@@ -371,7 +371,7 @@ POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n6.c7 SIMPLE
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n6.c8 SIMPLE [(schema_evolution_data_n18)schema_evolution_data_n18.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n6.c9 SIMPLE [(schema_evolution_data_n18)schema_evolution_data_n18.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n6.insert_num SIMPLE [(schema_evolution_data_n18)schema_evolution_data_n18.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_n6 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_n6
@@ -478,7 +478,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_n6.c8 SIMPLE [(schema_evolution_data_n18)schema_evolution_data_n18.FieldSchema(name:bigint1, type:bigint, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_multi_ints_string_group_n6.c9 SIMPLE [(schema_evolution_data_n18)schema_evolution_data_n18.FieldSchema(name:tinyint1, type:tinyint, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_multi_ints_string_group_n6.insert_num SIMPLE [(schema_evolution_data_n18)schema_evolution_data_n18.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_n6
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_numeric_group_string_group_multi_ints_string_group_n6
@@ -620,7 +620,7 @@ POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n6.c8 SIMPLE [(schema_evolution_data_n18)schema_evolution_data_n18.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n6.c9 SIMPLE [(schema_evolution_data_n18)schema_evolution_data_n18.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n6.insert_num SIMPLE [(schema_evolution_data_n18)schema_evolution_data_n18.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_n6
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_numeric_group_string_group_floating_string_group_n6
@@ -887,7 +887,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_n6.c8 SIMPLE [(schema_evolution_data_n18)schema_evolution_data_n18.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n6.c9 SIMPLE [(schema_evolution_data_n18)schema_evolution_data_n18.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n6.insert_num SIMPLE [(schema_evolution_data_n18)schema_evolution_data_n18.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_n6
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n6
@@ -1015,7 +1015,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_n6.c2 SIMPLE [(schema_evolution_data_n18)schema_evolution_data_n18.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_decimal_to_float_n6.c3 SIMPLE [(schema_evolution_data_n18)schema_evolution_data_n18.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_decimal_to_float_n6.insert_num SIMPLE [(schema_evolution_data_n18)schema_evolution_data_n18.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_n6
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal_to_float_n6

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_llap_io.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_llap_io.q.out
index 35c1fae..e79db2a 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_llap_io.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_llap_io.q.out
@@ -371,7 +371,7 @@ POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n0.c7 SIMPLE
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n0.c8 SIMPLE [(schema_evolution_data_n4)schema_evolution_data_n4.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n0.c9 SIMPLE [(schema_evolution_data_n4)schema_evolution_data_n4.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n0.insert_num SIMPLE [(schema_evolution_data_n4)schema_evolution_data_n4.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_n0 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_n0
@@ -478,7 +478,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_n0.c8 SIMPLE [(schema_evolution_data_n4)schema_evolution_data_n4.FieldSchema(name:bigint1, type:bigint, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_multi_ints_string_group_n0.c9 SIMPLE [(schema_evolution_data_n4)schema_evolution_data_n4.FieldSchema(name:tinyint1, type:tinyint, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_multi_ints_string_group_n0.insert_num SIMPLE [(schema_evolution_data_n4)schema_evolution_data_n4.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_n0
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_numeric_group_string_group_multi_ints_string_group_n0
@@ -620,7 +620,7 @@ POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n0.c8 SIMPLE [(schema_evolution_data_n4)schema_evolution_data_n4.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n0.c9 SIMPLE [(schema_evolution_data_n4)schema_evolution_data_n4.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n0.insert_num SIMPLE [(schema_evolution_data_n4)schema_evolution_data_n4.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_n0
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_numeric_group_string_group_floating_string_group_n0
@@ -887,7 +887,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_n0.c8 SIMPLE [(schema_evolution_data_n4)schema_evolution_data_n4.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n0.c9 SIMPLE [(schema_evolution_data_n4)schema_evolution_data_n4.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n0.insert_num SIMPLE [(schema_evolution_data_n4)schema_evolution_data_n4.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_n0
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n0
@@ -1015,7 +1015,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_n0.c2 SIMPLE [(schema_evolution_data_n4)schema_evolution_data_n4.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_decimal_to_float_n0.c3 SIMPLE [(schema_evolution_data_n4)schema_evolution_data_n4.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_decimal_to_float_n0.insert_num SIMPLE [(schema_evolution_data_n4)schema_evolution_data_n4.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_n0
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal_to_float_n0

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_update.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_update.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_update.q.out
index 730d3d2..16c9082 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_update.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_update.q.out
@@ -75,7 +75,7 @@ POSTHOOK: Lineage: table5_n2.b SIMPLE []
 POSTHOOK: Lineage: table5_n2.c SIMPLE [(schema_evolution_data_2_n5)schema_evolution_data_2_n5.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table5_n2.d SIMPLE [(schema_evolution_data_2_n5)schema_evolution_data_2_n5.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table5_n2.insert_num SIMPLE [(schema_evolution_data_2_n5)schema_evolution_data_2_n5.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: select a,b,c,d from table5_n2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table5_n2
@@ -210,7 +210,7 @@ POSTHOOK: Lineage: table6_n1.b SIMPLE []
 POSTHOOK: Lineage: table6_n1.c SIMPLE [(schema_evolution_data_2_n5)schema_evolution_data_2_n5.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table6_n1.d SIMPLE [(schema_evolution_data_2_n5)schema_evolution_data_2_n5.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table6_n1.insert_num SIMPLE [(schema_evolution_data_2_n5)schema_evolution_data_2_n5.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: insert into table table6_n1 SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2_n5 WHERE insert_num > 110
 PREHOOK: type: QUERY
 PREHOOK: Input: default@schema_evolution_data_2_n5
@@ -224,7 +224,7 @@ POSTHOOK: Lineage: table6_n1.b SIMPLE []
 POSTHOOK: Lineage: table6_n1.c SIMPLE [(schema_evolution_data_2_n5)schema_evolution_data_2_n5.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table6_n1.d SIMPLE [(schema_evolution_data_2_n5)schema_evolution_data_2_n5.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table6_n1.insert_num SIMPLE [(schema_evolution_data_2_n5)schema_evolution_data_2_n5.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: select a,b,c,d from table6_n1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table6_n1
@@ -353,7 +353,7 @@ POSTHOOK: Lineage: table7_n1.b SIMPLE []
 POSTHOOK: Lineage: table7_n1.c SIMPLE [(schema_evolution_data_2_n5)schema_evolution_data_2_n5.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table7_n1.d SIMPLE [(schema_evolution_data_2_n5)schema_evolution_data_2_n5.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table7_n1.insert_num SIMPLE [(schema_evolution_data_2_n5)schema_evolution_data_2_n5.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: insert into table table7_n1 SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2_n5 WHERE insert_num > 110
 PREHOOK: type: QUERY
 PREHOOK: Input: default@schema_evolution_data_2_n5
@@ -367,7 +367,7 @@ POSTHOOK: Lineage: table7_n1.b SIMPLE []
 POSTHOOK: Lineage: table7_n1.c SIMPLE [(schema_evolution_data_2_n5)schema_evolution_data_2_n5.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table7_n1.d SIMPLE [(schema_evolution_data_2_n5)schema_evolution_data_2_n5.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table7_n1.insert_num SIMPLE [(schema_evolution_data_2_n5)schema_evolution_data_2_n5.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: select a,b,c,d from table7_n1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table7_n1

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_update_llap_io.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_update_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_update_llap_io.q.out
index 95bfa25..79aa17f 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_update_llap_io.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_update_llap_io.q.out
@@ -75,7 +75,7 @@ POSTHOOK: Lineage: table5_n0.b SIMPLE []
 POSTHOOK: Lineage: table5_n0.c SIMPLE [(schema_evolution_data_2_n4)schema_evolution_data_2_n4.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table5_n0.d SIMPLE [(schema_evolution_data_2_n4)schema_evolution_data_2_n4.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table5_n0.insert_num SIMPLE [(schema_evolution_data_2_n4)schema_evolution_data_2_n4.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: select a,b,c,d from table5_n0
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table5_n0
@@ -210,7 +210,7 @@ POSTHOOK: Lineage: table6_n0.b SIMPLE []
 POSTHOOK: Lineage: table6_n0.c SIMPLE [(schema_evolution_data_2_n4)schema_evolution_data_2_n4.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table6_n0.d SIMPLE [(schema_evolution_data_2_n4)schema_evolution_data_2_n4.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table6_n0.insert_num SIMPLE [(schema_evolution_data_2_n4)schema_evolution_data_2_n4.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: insert into table table6_n0 SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2_n4 WHERE insert_num > 110
 PREHOOK: type: QUERY
 PREHOOK: Input: default@schema_evolution_data_2_n4
@@ -224,7 +224,7 @@ POSTHOOK: Lineage: table6_n0.b SIMPLE []
 POSTHOOK: Lineage: table6_n0.c SIMPLE [(schema_evolution_data_2_n4)schema_evolution_data_2_n4.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table6_n0.d SIMPLE [(schema_evolution_data_2_n4)schema_evolution_data_2_n4.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table6_n0.insert_num SIMPLE [(schema_evolution_data_2_n4)schema_evolution_data_2_n4.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: select a,b,c,d from table6_n0
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table6_n0
@@ -353,7 +353,7 @@ POSTHOOK: Lineage: table7_n0.b SIMPLE []
 POSTHOOK: Lineage: table7_n0.c SIMPLE [(schema_evolution_data_2_n4)schema_evolution_data_2_n4.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table7_n0.d SIMPLE [(schema_evolution_data_2_n4)schema_evolution_data_2_n4.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table7_n0.insert_num SIMPLE [(schema_evolution_data_2_n4)schema_evolution_data_2_n4.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: insert into table table7_n0 SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2_n4 WHERE insert_num > 110
 PREHOOK: type: QUERY
 PREHOOK: Input: default@schema_evolution_data_2_n4
@@ -367,7 +367,7 @@ POSTHOOK: Lineage: table7_n0.b SIMPLE []
 POSTHOOK: Lineage: table7_n0.c SIMPLE [(schema_evolution_data_2_n4)schema_evolution_data_2_n4.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table7_n0.d SIMPLE [(schema_evolution_data_2_n4)schema_evolution_data_2_n4.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table7_n0.insert_num SIMPLE [(schema_evolution_data_2_n4)schema_evolution_data_2_n4.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: select a,b,c,d from table7_n0
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table7_n0

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_part_llap_io.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_part_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_part_llap_io.q.out
index 7e1cce3..64da7b0 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_part_llap_io.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_part_llap_io.q.out
@@ -393,8 +393,8 @@ POSTHOOK: Lineage: part_change_string_group_double_n6 PARTITION(part=1).b SIMPLE
 POSTHOOK: Lineage: part_change_string_group_double_n6 PARTITION(part=1).c1 SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: part_change_string_group_double_n6 PARTITION(part=1).c2 SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: part_change_string_group_double_n6 PARTITION(part=1).c3 SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.FieldSchema(name:double1, type:double, comment:null), ]
-POSTHOOK: Lineage: part_change_string_group_double_n6 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	double1	double1	double1	_c4
+POSTHOOK: Lineage: part_change_string_group_double_n6 PARTITION(part=1).insert_num SIMPLE []
+insert_num	double1	double1_1	double1_2	_c4
 PREHOOK: query: explain vectorization only detail
 select insert_num,part,c1,c2,c3,b from part_change_string_group_double_n6
 PREHOOK: type: QUERY
@@ -500,7 +500,7 @@ POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n6 PARTITI
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n6 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n6 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n6 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.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 part_change_date_group_string_group_date_timestamp_n6 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@part_change_date_group_string_group_date_timestamp_n6
@@ -662,7 +662,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_n6 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.FieldSchema(name:bigint1, type:bigint, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_multi_ints_string_group_n6 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.FieldSchema(name:tinyint1, type:tinyint, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_multi_ints_string_group_n6 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.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 only 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_n6
 PREHOOK: type: QUERY
@@ -914,7 +914,7 @@ POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_
 POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_n6 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_n6 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_n6 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.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 only 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_n6
 PREHOOK: type: QUERY
@@ -1401,7 +1401,7 @@ POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n6 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n6 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n6 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.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 only 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_n6
 PREHOOK: type: QUERY
@@ -1639,7 +1639,7 @@ POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n6
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n6 PARTITION(part=1).c2 SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n6 PARTITION(part=1).c3 SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n6 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n23)schema_evolution_data_n23.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 only detail
 select insert_num,part,c1,c2,c3,b from part_change_lower_to_higher_numeric_group_decimal_to_float_n6
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_part_update.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_part_update.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_part_update.q.out
index 242b95e..cdf2ee2 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_part_update.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_part_update.q.out
@@ -75,7 +75,7 @@ POSTHOOK: Lineage: partitioned_update_1_n2 PARTITION(part=2).b SIMPLE []
 POSTHOOK: Lineage: partitioned_update_1_n2 PARTITION(part=2).c SIMPLE [(schema_evolution_data_2_n12)schema_evolution_data_2_n12.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: partitioned_update_1_n2 PARTITION(part=2).d SIMPLE [(schema_evolution_data_2_n12)schema_evolution_data_2_n12.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: partitioned_update_1_n2 PARTITION(part=2).insert_num SIMPLE [(schema_evolution_data_2_n12)schema_evolution_data_2_n12.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: insert into table partitioned_update_1_n2 partition(part=1) SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2_n12 WHERE insert_num > 110
 PREHOOK: type: QUERY
 PREHOOK: Input: default@schema_evolution_data_2_n12
@@ -89,7 +89,7 @@ POSTHOOK: Lineage: partitioned_update_1_n2 PARTITION(part=1).b SIMPLE []
 POSTHOOK: Lineage: partitioned_update_1_n2 PARTITION(part=1).c SIMPLE [(schema_evolution_data_2_n12)schema_evolution_data_2_n12.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: partitioned_update_1_n2 PARTITION(part=1).d SIMPLE [(schema_evolution_data_2_n12)schema_evolution_data_2_n12.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: partitioned_update_1_n2 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n12)schema_evolution_data_2_n12.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: select insert_num,part,a,b,c,d from partitioned_update_1_n2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partitioned_update_1_n2
@@ -246,7 +246,7 @@ POSTHOOK: Lineage: partitioned_delete_1_n2 PARTITION(part=2).b SIMPLE []
 POSTHOOK: Lineage: partitioned_delete_1_n2 PARTITION(part=2).c SIMPLE [(schema_evolution_data_2_n12)schema_evolution_data_2_n12.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: partitioned_delete_1_n2 PARTITION(part=2).d SIMPLE [(schema_evolution_data_2_n12)schema_evolution_data_2_n12.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: partitioned_delete_1_n2 PARTITION(part=2).insert_num SIMPLE [(schema_evolution_data_2_n12)schema_evolution_data_2_n12.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: insert into table partitioned_delete_1_n2 partition(part=1) SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2_n12 WHERE insert_num > 110
 PREHOOK: type: QUERY
 PREHOOK: Input: default@schema_evolution_data_2_n12
@@ -260,7 +260,7 @@ POSTHOOK: Lineage: partitioned_delete_1_n2 PARTITION(part=1).b SIMPLE []
 POSTHOOK: Lineage: partitioned_delete_1_n2 PARTITION(part=1).c SIMPLE [(schema_evolution_data_2_n12)schema_evolution_data_2_n12.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: partitioned_delete_1_n2 PARTITION(part=1).d SIMPLE [(schema_evolution_data_2_n12)schema_evolution_data_2_n12.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: partitioned_delete_1_n2 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n12)schema_evolution_data_2_n12.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: select part,a,b,c,d from partitioned_delete_1_n2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partitioned_delete_1_n2
@@ -411,7 +411,7 @@ POSTHOOK: Lineage: partitioned_delete_2_n2 PARTITION(part=2).b SIMPLE []
 POSTHOOK: Lineage: partitioned_delete_2_n2 PARTITION(part=2).c SIMPLE [(schema_evolution_data_2_n12)schema_evolution_data_2_n12.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: partitioned_delete_2_n2 PARTITION(part=2).d SIMPLE [(schema_evolution_data_2_n12)schema_evolution_data_2_n12.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: partitioned_delete_2_n2 PARTITION(part=2).insert_num SIMPLE [(schema_evolution_data_2_n12)schema_evolution_data_2_n12.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: insert into table partitioned_delete_2_n2 partition(part=1)  SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2_n12 WHERE insert_num > 110
 PREHOOK: type: QUERY
 PREHOOK: Input: default@schema_evolution_data_2_n12
@@ -425,7 +425,7 @@ POSTHOOK: Lineage: partitioned_delete_2_n2 PARTITION(part=1).b SIMPLE []
 POSTHOOK: Lineage: partitioned_delete_2_n2 PARTITION(part=1).c SIMPLE [(schema_evolution_data_2_n12)schema_evolution_data_2_n12.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: partitioned_delete_2_n2 PARTITION(part=1).d SIMPLE [(schema_evolution_data_2_n12)schema_evolution_data_2_n12.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: partitioned_delete_2_n2 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n12)schema_evolution_data_2_n12.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: select insert_num,part,a,b,c,d from partitioned_delete_2_n2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partitioned_delete_2_n2

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_part_update_llap_io.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_part_update_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_part_update_llap_io.q.out
index 53cb8fc..556c559 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_part_update_llap_io.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_part_update_llap_io.q.out
@@ -75,7 +75,7 @@ POSTHOOK: Lineage: partitioned_update_1_n0 PARTITION(part=2).b SIMPLE []
 POSTHOOK: Lineage: partitioned_update_1_n0 PARTITION(part=2).c SIMPLE [(schema_evolution_data_2_n8)schema_evolution_data_2_n8.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: partitioned_update_1_n0 PARTITION(part=2).d SIMPLE [(schema_evolution_data_2_n8)schema_evolution_data_2_n8.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: partitioned_update_1_n0 PARTITION(part=2).insert_num SIMPLE [(schema_evolution_data_2_n8)schema_evolution_data_2_n8.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: insert into table partitioned_update_1_n0 partition(part=1) SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2_n8 WHERE insert_num > 110
 PREHOOK: type: QUERY
 PREHOOK: Input: default@schema_evolution_data_2_n8
@@ -89,7 +89,7 @@ POSTHOOK: Lineage: partitioned_update_1_n0 PARTITION(part=1).b SIMPLE []
 POSTHOOK: Lineage: partitioned_update_1_n0 PARTITION(part=1).c SIMPLE [(schema_evolution_data_2_n8)schema_evolution_data_2_n8.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: partitioned_update_1_n0 PARTITION(part=1).d SIMPLE [(schema_evolution_data_2_n8)schema_evolution_data_2_n8.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: partitioned_update_1_n0 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n8)schema_evolution_data_2_n8.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: select insert_num,part,a,b,c,d from partitioned_update_1_n0
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partitioned_update_1_n0
@@ -246,7 +246,7 @@ POSTHOOK: Lineage: partitioned_delete_1_n0 PARTITION(part=2).b SIMPLE []
 POSTHOOK: Lineage: partitioned_delete_1_n0 PARTITION(part=2).c SIMPLE [(schema_evolution_data_2_n8)schema_evolution_data_2_n8.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: partitioned_delete_1_n0 PARTITION(part=2).d SIMPLE [(schema_evolution_data_2_n8)schema_evolution_data_2_n8.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: partitioned_delete_1_n0 PARTITION(part=2).insert_num SIMPLE [(schema_evolution_data_2_n8)schema_evolution_data_2_n8.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: insert into table partitioned_delete_1_n0 partition(part=1) SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2_n8 WHERE insert_num > 110
 PREHOOK: type: QUERY
 PREHOOK: Input: default@schema_evolution_data_2_n8
@@ -260,7 +260,7 @@ POSTHOOK: Lineage: partitioned_delete_1_n0 PARTITION(part=1).b SIMPLE []
 POSTHOOK: Lineage: partitioned_delete_1_n0 PARTITION(part=1).c SIMPLE [(schema_evolution_data_2_n8)schema_evolution_data_2_n8.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: partitioned_delete_1_n0 PARTITION(part=1).d SIMPLE [(schema_evolution_data_2_n8)schema_evolution_data_2_n8.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: partitioned_delete_1_n0 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n8)schema_evolution_data_2_n8.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: select part,a,b,c,d from partitioned_delete_1_n0
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partitioned_delete_1_n0
@@ -411,7 +411,7 @@ POSTHOOK: Lineage: partitioned_delete_2_n0 PARTITION(part=2).b SIMPLE []
 POSTHOOK: Lineage: partitioned_delete_2_n0 PARTITION(part=2).c SIMPLE [(schema_evolution_data_2_n8)schema_evolution_data_2_n8.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: partitioned_delete_2_n0 PARTITION(part=2).d SIMPLE [(schema_evolution_data_2_n8)schema_evolution_data_2_n8.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: partitioned_delete_2_n0 PARTITION(part=2).insert_num SIMPLE [(schema_evolution_data_2_n8)schema_evolution_data_2_n8.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: insert into table partitioned_delete_2_n0 partition(part=1)  SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2_n8 WHERE insert_num > 110
 PREHOOK: type: QUERY
 PREHOOK: Input: default@schema_evolution_data_2_n8
@@ -425,7 +425,7 @@ POSTHOOK: Lineage: partitioned_delete_2_n0 PARTITION(part=1).b SIMPLE []
 POSTHOOK: Lineage: partitioned_delete_2_n0 PARTITION(part=1).c SIMPLE [(schema_evolution_data_2_n8)schema_evolution_data_2_n8.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: partitioned_delete_2_n0 PARTITION(part=1).d SIMPLE [(schema_evolution_data_2_n8)schema_evolution_data_2_n8.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: partitioned_delete_2_n0 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n8)schema_evolution_data_2_n8.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: select insert_num,part,a,b,c,d from partitioned_delete_2_n0
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partitioned_delete_2_n0

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table.q.out
index 219ad7a..2247feb 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table.q.out
@@ -513,7 +513,7 @@ POSTHOOK: Lineage: table_change_date_group_string_group_date_group.c7 SIMPLE [(s
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group.c8 SIMPLE [(schema_evolution_data_n1)schema_evolution_data_n1.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group.c9 SIMPLE [(schema_evolution_data_n1)schema_evolution_data_n1.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group.insert_num SIMPLE [(schema_evolution_data_n1)schema_evolution_data_n1.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 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
@@ -671,7 +671,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.c8 SIMPLE [(schema_evolution_data_n1)schema_evolution_data_n1.FieldSchema(name:bigint1, type:bigint, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_multi_ints_string_group.c9 SIMPLE [(schema_evolution_data_n1)schema_evolution_data_n1.FieldSchema(name:tinyint1, type:tinyint, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_multi_ints_string_group.insert_num SIMPLE [(schema_evolution_data_n1)schema_evolution_data_n1.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 only 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
 PREHOOK: type: QUERY
@@ -915,7 +915,7 @@ POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group.c8 SIMPLE [(schema_evolution_data_n1)schema_evolution_data_n1.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group.c9 SIMPLE [(schema_evolution_data_n1)schema_evolution_data_n1.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group.insert_num SIMPLE [(schema_evolution_data_n1)schema_evolution_data_n1.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 only 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
 PREHOOK: type: QUERY
@@ -1386,7 +1386,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.c8 SIMPLE [(schema_evolution_data_n1)schema_evolution_data_n1.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_tinyint_to_bigint.c9 SIMPLE [(schema_evolution_data_n1)schema_evolution_data_n1.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_tinyint_to_bigint.insert_num SIMPLE [(schema_evolution_data_n1)schema_evolution_data_n1.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 only 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
 PREHOOK: type: QUERY
@@ -1616,7 +1616,7 @@ POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_decimal_to_float.c
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_decimal_to_float.c2 SIMPLE [(schema_evolution_data_n1)schema_evolution_data_n1.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_decimal_to_float.c3 SIMPLE [(schema_evolution_data_n1)schema_evolution_data_n1.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_decimal_to_float.insert_num SIMPLE [(schema_evolution_data_n1)schema_evolution_data_n1.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 only detail
 select insert_num,c1,c2,c3,b from table_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_orc_acidvec_table_llap_io.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table_llap_io.q.out
index ce9fe84..475d589 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table_llap_io.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table_llap_io.q.out
@@ -516,7 +516,7 @@ POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n12.c7 SIMPLE
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n12.c8 SIMPLE [(schema_evolution_data_n39)schema_evolution_data_n39.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n12.c9 SIMPLE [(schema_evolution_data_n39)schema_evolution_data_n39.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n12.insert_num SIMPLE [(schema_evolution_data_n39)schema_evolution_data_n39.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_n12 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_n12
@@ -675,7 +675,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_n12.c8 SIMPLE [(schema_evolution_data_n39)schema_evolution_data_n39.FieldSchema(name:bigint1, type:bigint, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_multi_ints_string_group_n12.c9 SIMPLE [(schema_evolution_data_n39)schema_evolution_data_n39.FieldSchema(name:tinyint1, type:tinyint, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_multi_ints_string_group_n12.insert_num SIMPLE [(schema_evolution_data_n39)schema_evolution_data_n39.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 only 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_n12
 PREHOOK: type: QUERY
@@ -921,7 +921,7 @@ POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n12.c8 SIMPLE [(schema_evolution_data_n39)schema_evolution_data_n39.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n12.c9 SIMPLE [(schema_evolution_data_n39)schema_evolution_data_n39.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n12.insert_num SIMPLE [(schema_evolution_data_n39)schema_evolution_data_n39.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 only 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_n12
 PREHOOK: type: QUERY
@@ -1396,7 +1396,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_n12.c8 SIMPLE [(schema_evolution_data_n39)schema_evolution_data_n39.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n12.c9 SIMPLE [(schema_evolution_data_n39)schema_evolution_data_n39.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n12.insert_num SIMPLE [(schema_evolution_data_n39)schema_evolution_data_n39.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 only 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_n12
 PREHOOK: type: QUERY
@@ -1628,7 +1628,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_n12.c2 SIMPLE [(schema_evolution_data_n39)schema_evolution_data_n39.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_decimal_to_float_n12.c3 SIMPLE [(schema_evolution_data_n39)schema_evolution_data_n39.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_decimal_to_float_n12.insert_num SIMPLE [(schema_evolution_data_n39)schema_evolution_data_n39.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 only detail
 select insert_num,c1,c2,c3,b from table_change_lower_to_higher_numeric_group_decimal_to_float_n12
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table_update.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table_update.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table_update.q.out
index f8df92f..7e31453 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table_update.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table_update.q.out
@@ -75,7 +75,7 @@ POSTHOOK: Lineage: table5_n3.b SIMPLE []
 POSTHOOK: Lineage: table5_n3.c SIMPLE [(schema_evolution_data_2_n6)schema_evolution_data_2_n6.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table5_n3.d SIMPLE [(schema_evolution_data_2_n6)schema_evolution_data_2_n6.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table5_n3.insert_num SIMPLE [(schema_evolution_data_2_n6)schema_evolution_data_2_n6.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: select a,b,c,d from table5_n3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table5_n3
@@ -210,7 +210,7 @@ POSTHOOK: Lineage: table6_n2.b SIMPLE []
 POSTHOOK: Lineage: table6_n2.c SIMPLE [(schema_evolution_data_2_n6)schema_evolution_data_2_n6.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table6_n2.d SIMPLE [(schema_evolution_data_2_n6)schema_evolution_data_2_n6.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table6_n2.insert_num SIMPLE [(schema_evolution_data_2_n6)schema_evolution_data_2_n6.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: insert into table table6_n2 SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2_n6 WHERE insert_num > 110
 PREHOOK: type: QUERY
 PREHOOK: Input: default@schema_evolution_data_2_n6
@@ -224,7 +224,7 @@ POSTHOOK: Lineage: table6_n2.b SIMPLE []
 POSTHOOK: Lineage: table6_n2.c SIMPLE [(schema_evolution_data_2_n6)schema_evolution_data_2_n6.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table6_n2.d SIMPLE [(schema_evolution_data_2_n6)schema_evolution_data_2_n6.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table6_n2.insert_num SIMPLE [(schema_evolution_data_2_n6)schema_evolution_data_2_n6.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: select a,b,c,d from table6_n2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table6_n2
@@ -353,7 +353,7 @@ POSTHOOK: Lineage: table7_n2.b SIMPLE []
 POSTHOOK: Lineage: table7_n2.c SIMPLE [(schema_evolution_data_2_n6)schema_evolution_data_2_n6.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table7_n2.d SIMPLE [(schema_evolution_data_2_n6)schema_evolution_data_2_n6.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table7_n2.insert_num SIMPLE [(schema_evolution_data_2_n6)schema_evolution_data_2_n6.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: insert into table table7_n2 SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2_n6 WHERE insert_num > 110
 PREHOOK: type: QUERY
 PREHOOK: Input: default@schema_evolution_data_2_n6
@@ -367,7 +367,7 @@ POSTHOOK: Lineage: table7_n2.b SIMPLE []
 POSTHOOK: Lineage: table7_n2.c SIMPLE [(schema_evolution_data_2_n6)schema_evolution_data_2_n6.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table7_n2.d SIMPLE [(schema_evolution_data_2_n6)schema_evolution_data_2_n6.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table7_n2.insert_num SIMPLE [(schema_evolution_data_2_n6)schema_evolution_data_2_n6.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: select a,b,c,d from table7_n2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table7_n2

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table_update_llap_io.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table_update_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table_update_llap_io.q.out
index 2292dcb..06db5da 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table_update_llap_io.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_table_update_llap_io.q.out
@@ -75,7 +75,7 @@ POSTHOOK: Lineage: table5.b SIMPLE []
 POSTHOOK: Lineage: table5.c SIMPLE [(schema_evolution_data_2)schema_evolution_data_2.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table5.d SIMPLE [(schema_evolution_data_2)schema_evolution_data_2.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table5.insert_num SIMPLE [(schema_evolution_data_2)schema_evolution_data_2.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: select a,b,c,d from table5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table5
@@ -210,7 +210,7 @@ POSTHOOK: Lineage: table6.b SIMPLE []
 POSTHOOK: Lineage: table6.c SIMPLE [(schema_evolution_data_2)schema_evolution_data_2.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table6.d SIMPLE [(schema_evolution_data_2)schema_evolution_data_2.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table6.insert_num SIMPLE [(schema_evolution_data_2)schema_evolution_data_2.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: insert into table table6 SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2 WHERE insert_num > 110
 PREHOOK: type: QUERY
 PREHOOK: Input: default@schema_evolution_data_2
@@ -224,7 +224,7 @@ POSTHOOK: Lineage: table6.b SIMPLE []
 POSTHOOK: Lineage: table6.c SIMPLE [(schema_evolution_data_2)schema_evolution_data_2.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table6.d SIMPLE [(schema_evolution_data_2)schema_evolution_data_2.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table6.insert_num SIMPLE [(schema_evolution_data_2)schema_evolution_data_2.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: select a,b,c,d from table6
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table6
@@ -353,7 +353,7 @@ POSTHOOK: Lineage: table7.b SIMPLE []
 POSTHOOK: Lineage: table7.c SIMPLE [(schema_evolution_data_2)schema_evolution_data_2.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table7.d SIMPLE [(schema_evolution_data_2)schema_evolution_data_2.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table7.insert_num SIMPLE [(schema_evolution_data_2)schema_evolution_data_2.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: insert into table table7 SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2 WHERE insert_num > 110
 PREHOOK: type: QUERY
 PREHOOK: Input: default@schema_evolution_data_2
@@ -367,7 +367,7 @@ POSTHOOK: Lineage: table7.b SIMPLE []
 POSTHOOK: Lineage: table7.c SIMPLE [(schema_evolution_data_2)schema_evolution_data_2.FieldSchema(name:int1, type:int, comment:null), ]
 POSTHOOK: Lineage: table7.d SIMPLE [(schema_evolution_data_2)schema_evolution_data_2.FieldSchema(name:string1, type:string, comment:null), ]
 POSTHOOK: Lineage: table7.insert_num SIMPLE [(schema_evolution_data_2)schema_evolution_data_2.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	int1	_c2	int1	string1
+insert_num	int1	_c2	int1_1	string1
 PREHOOK: query: select a,b,c,d from table7
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table7

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part.q.out
index e02a1e2..48ab0d2 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part.q.out
@@ -375,8 +375,8 @@ POSTHOOK: Lineage: part_change_string_group_double_n7 PARTITION(part=1).b SIMPLE
 POSTHOOK: Lineage: part_change_string_group_double_n7 PARTITION(part=1).c1 SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: part_change_string_group_double_n7 PARTITION(part=1).c2 SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: part_change_string_group_double_n7 PARTITION(part=1).c3 SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.FieldSchema(name:double1, type:double, comment:null), ]
-POSTHOOK: Lineage: part_change_string_group_double_n7 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	double1	double1	double1	_c4
+POSTHOOK: Lineage: part_change_string_group_double_n7 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_n7
 PREHOOK: type: QUERY
@@ -473,7 +473,7 @@ POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n7 PARTITI
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n7 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n7 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n7 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.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 part_change_date_group_string_group_date_timestamp_n7 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@part_change_date_group_string_group_date_timestamp_n7
@@ -626,7 +626,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_n7 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.FieldSchema(name:bigint1, type:bigint, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_multi_ints_string_group_n7 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.FieldSchema(name:tinyint1, type:tinyint, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_multi_ints_string_group_n7 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.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,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_n7
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_change_numeric_group_string_group_multi_ints_string_group_n7
@@ -816,7 +816,7 @@ POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_
 POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_n7 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_n7 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_n7 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.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,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_n7
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_change_numeric_group_string_group_floating_string_group_n7
@@ -1179,7 +1179,7 @@ POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n7 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n7 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n7 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.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,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_n7
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n7
@@ -1355,7 +1355,7 @@ POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n7
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n7 PARTITION(part=1).c2 SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n7 PARTITION(part=1).c3 SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n7 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n25)schema_evolution_data_n25.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,part,c1,c2,c3,b from part_change_lower_to_higher_numeric_group_decimal_to_float_n7
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal_to_float_n7

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part_all_primitive.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part_all_primitive.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part_all_primitive.q.out
index f70efd6..a838d6f 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part_all_primitive.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part_all_primitive.q.out
@@ -241,7 +241,7 @@ POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n6 PARTITION(pa
 POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n6 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n41)schema_evolution_data_n41.FieldSchema(name:boolean1, type:boolean, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n6 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n41)schema_evolution_data_n41.FieldSchema(name:boolean1, type:boolean, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n6 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n41)schema_evolution_data_n41.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	boolean1	boolean1	boolean1	boolean1	boolean1	boolean1	boolean1	boolean1	boolean1	tinyint1	tinyint1	tinyint1	tinyint1	tinyint1	tinyint1	tinyint1	tinyint1	tinyint1	tinyint1	tinyint1	smallint1	smallint1	smallint1	smallint1	smallint1	smallint1	smallint1	smallint1	smallint1	smallint1	smallint1	int1	int1	int1	int1	int1	int1	int1	int1	int1	int1	int1	bigint1	bigint1	bigint1	bigint1	bigint1	bigint1	bigint1	bigint1	bigint1	bigint1	bigint1	_c54
+insert_num	boolean1	boolean1_1	boolean1_2	boolean1_3	boolean1_4	boolean1_5	boolean1_6	boolean1_7	boolean1_8	tinyint1	tinyint1_1	tinyint1_2	tinyint1_3	tinyint1_4	tinyint1_5	tinyint1_6	tinyint1_7	tinyint1_8	tinyint1_9	tinyint1_10	smallint1	smallint1_1	smallint1_2	smallint1_3	smallint1_4	smallint1_5	smallint1_6	smallint1_7	smallint1_8	smallint1_9	smallint1_10	int1	int1_1	int1_2	int1_3	int1_4	int1_5	int1_6	int1_7	int1_8	int1_9	int1_10	bigint1	bigint1_1	bigint1_2	bigint1_3	bigint1_4	bigint1_5	bigint1_6	bigint1_7	bigint1_8	bigint1_9	bigint1_10	_c54
 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,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,c34,c35,c36,c37,c38,c39,c40,c41,c42,c43,c44,c45,c46,c47,c48,c49,c50,c51,c52,c53,b from part_change_various_various_boolean_to_bigint_n6
 PREHOOK: type: QUERY
@@ -465,8 +465,8 @@ POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n6 PARTITION(pa
 POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n6 PARTITION(part=1).c7 SIMPLE [(schema_evolution_data_2_n14)schema_evolution_data_2_n14.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n6 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_2_n14)schema_evolution_data_2_n14.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n6 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_2_n14)schema_evolution_data_2_n14.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
-POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n6 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n14)schema_evolution_data_2_n14.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	decimal1	decimal1	decimal1	decimal1	decimal1	decimal1	decimal1	decimal1	decimal1	decimal1	decimal1	float1	float1	float1	float1	float1	float1	float1	float1	float1	float1	float1	double1	double1	double1	double1	double1	double1	double1	double1	double1	double1	double1	_c34
+POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n6 PARTITION(part=1).insert_num SIMPLE []
+insert_num	decimal1	decimal1_1	decimal1_2	decimal1_3	decimal1_4	decimal1_5	decimal1_6	decimal1_7	decimal1_8	decimal1_9	decimal1_10	float1	float1_1	float1_2	float1_3	float1_4	float1_5	float1_6	float1_7	float1_8	float1_9	float1_10	double1	double1_1	double1_2	double1_3	double1_4	double1_5	double1_6	double1_7	double1_8	double1_9	double1_10	_c34
 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,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,b from part_change_various_various_decimal_to_double_n6
 PREHOOK: type: QUERY
@@ -612,8 +612,8 @@ POSTHOOK: Lineage: part_change_various_various_timestamp_n6 PARTITION(part=1).c6
 POSTHOOK: Lineage: part_change_various_various_timestamp_n6 PARTITION(part=1).c7 SIMPLE [(schema_evolution_data_2_n14)schema_evolution_data_2_n14.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_timestamp_n6 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_2_n14)schema_evolution_data_2_n14.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_timestamp_n6 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_2_n14)schema_evolution_data_2_n14.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
-POSTHOOK: Lineage: part_change_various_various_timestamp_n6 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n14)schema_evolution_data_2_n14.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	timestamp1	timestamp1	timestamp1	timestamp1	timestamp1	timestamp1	timestamp1	timestamp1	timestamp1	timestamp1	timestamp1	timestamp1	_c13
+POSTHOOK: Lineage: part_change_various_various_timestamp_n6 PARTITION(part=1).insert_num SIMPLE []
+insert_num	timestamp1	timestamp1_1	timestamp1_2	timestamp1_3	timestamp1_4	timestamp1_5	timestamp1_6	timestamp1_7	timestamp1_8	timestamp1_9	timestamp1_10	timestamp1_11	_c13
 PREHOOK: query: explain vectorization detail
 select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,b from part_change_various_various_timestamp_n6
 PREHOOK: type: QUERY
@@ -743,8 +743,8 @@ POSTHOOK: Lineage: part_change_various_various_date_n6 PARTITION(part=1).c1 SIMP
 POSTHOOK: Lineage: part_change_various_various_date_n6 PARTITION(part=1).c2 SIMPLE [(schema_evolution_data_2_n14)schema_evolution_data_2_n14.FieldSchema(name:date1, type:date, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_date_n6 PARTITION(part=1).c3 SIMPLE [(schema_evolution_data_2_n14)schema_evolution_data_2_n14.FieldSchema(name:date1, type:date, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_date_n6 PARTITION(part=1).c4 SIMPLE [(schema_evolution_data_2_n14)schema_evolution_data_2_n14.FieldSchema(name:date1, type:date, comment:null), ]
-POSTHOOK: Lineage: part_change_various_various_date_n6 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n14)schema_evolution_data_2_n14.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	date1	date1	date1	date1	_c5
+POSTHOOK: Lineage: part_change_various_various_date_n6 PARTITION(part=1).insert_num SIMPLE []
+insert_num	date1	date1_1	date1_2	date1_3	_c5
 PREHOOK: query: explain vectorization detail
 select insert_num,part,c1,c2,c3,c4,b from part_change_various_various_date_n6
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part_all_primitive_llap_io.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part_all_primitive_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part_all_primitive_llap_io.q.out
index 351d201..9bb5648 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part_all_primitive_llap_io.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part_all_primitive_llap_io.q.out
@@ -241,7 +241,7 @@ POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n5 PARTITION(pa
 POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n5 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n40)schema_evolution_data_n40.FieldSchema(name:boolean1, type:boolean, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n5 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n40)schema_evolution_data_n40.FieldSchema(name:boolean1, type:boolean, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n5 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n40)schema_evolution_data_n40.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	boolean1	boolean1	boolean1	boolean1	boolean1	boolean1	boolean1	boolean1	boolean1	tinyint1	tinyint1	tinyint1	tinyint1	tinyint1	tinyint1	tinyint1	tinyint1	tinyint1	tinyint1	tinyint1	smallint1	smallint1	smallint1	smallint1	smallint1	smallint1	smallint1	smallint1	smallint1	smallint1	smallint1	int1	int1	int1	int1	int1	int1	int1	int1	int1	int1	int1	bigint1	bigint1	bigint1	bigint1	bigint1	bigint1	bigint1	bigint1	bigint1	bigint1	bigint1	_c54
+insert_num	boolean1	boolean1_1	boolean1_2	boolean1_3	boolean1_4	boolean1_5	boolean1_6	boolean1_7	boolean1_8	tinyint1	tinyint1_1	tinyint1_2	tinyint1_3	tinyint1_4	tinyint1_5	tinyint1_6	tinyint1_7	tinyint1_8	tinyint1_9	tinyint1_10	smallint1	smallint1_1	smallint1_2	smallint1_3	smallint1_4	smallint1_5	smallint1_6	smallint1_7	smallint1_8	smallint1_9	smallint1_10	int1	int1_1	int1_2	int1_3	int1_4	int1_5	int1_6	int1_7	int1_8	int1_9	int1_10	bigint1	bigint1_1	bigint1_2	bigint1_3	bigint1_4	bigint1_5	bigint1_6	bigint1_7	bigint1_8	bigint1_9	bigint1_10	_c54
 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,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,c34,c35,c36,c37,c38,c39,c40,c41,c42,c43,c44,c45,c46,c47,c48,c49,c50,c51,c52,c53,b from part_change_various_various_boolean_to_bigint_n5
 PREHOOK: type: QUERY
@@ -466,8 +466,8 @@ POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n5 PARTITION(pa
 POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n5 PARTITION(part=1).c7 SIMPLE [(schema_evolution_data_2_n13)schema_evolution_data_2_n13.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n5 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_2_n13)schema_evolution_data_2_n13.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n5 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_2_n13)schema_evolution_data_2_n13.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
-POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n5 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n13)schema_evolution_data_2_n13.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	decimal1	decimal1	decimal1	decimal1	decimal1	decimal1	decimal1	decimal1	decimal1	decimal1	decimal1	float1	float1	float1	float1	float1	float1	float1	float1	float1	float1	float1	double1	double1	double1	double1	double1	double1	double1	double1	double1	double1	double1	_c34
+POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n5 PARTITION(part=1).insert_num SIMPLE []
+insert_num	decimal1	decimal1_1	decimal1_2	decimal1_3	decimal1_4	decimal1_5	decimal1_6	decimal1_7	decimal1_8	decimal1_9	decimal1_10	float1	float1_1	float1_2	float1_3	float1_4	float1_5	float1_6	float1_7	float1_8	float1_9	float1_10	double1	double1_1	double1_2	double1_3	double1_4	double1_5	double1_6	double1_7	double1_8	double1_9	double1_10	_c34
 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,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,b from part_change_various_various_decimal_to_double_n5
 PREHOOK: type: QUERY
@@ -614,8 +614,8 @@ POSTHOOK: Lineage: part_change_various_various_timestamp_n5 PARTITION(part=1).c6
 POSTHOOK: Lineage: part_change_various_various_timestamp_n5 PARTITION(part=1).c7 SIMPLE [(schema_evolution_data_2_n13)schema_evolution_data_2_n13.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_timestamp_n5 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_2_n13)schema_evolution_data_2_n13.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_timestamp_n5 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_2_n13)schema_evolution_data_2_n13.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
-POSTHOOK: Lineage: part_change_various_various_timestamp_n5 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n13)schema_evolution_data_2_n13.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	timestamp1	timestamp1	timestamp1	timestamp1	timestamp1	timestamp1	timestamp1	timestamp1	timestamp1	timestamp1	timestamp1	timestamp1	_c13
+POSTHOOK: Lineage: part_change_various_various_timestamp_n5 PARTITION(part=1).insert_num SIMPLE []
+insert_num	timestamp1	timestamp1_1	timestamp1_2	timestamp1_3	timestamp1_4	timestamp1_5	timestamp1_6	timestamp1_7	timestamp1_8	timestamp1_9	timestamp1_10	timestamp1_11	_c13
 PREHOOK: query: explain vectorization detail
 select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,b from part_change_various_various_timestamp_n5
 PREHOOK: type: QUERY
@@ -746,8 +746,8 @@ POSTHOOK: Lineage: part_change_various_various_date_n5 PARTITION(part=1).c1 SIMP
 POSTHOOK: Lineage: part_change_various_various_date_n5 PARTITION(part=1).c2 SIMPLE [(schema_evolution_data_2_n13)schema_evolution_data_2_n13.FieldSchema(name:date1, type:date, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_date_n5 PARTITION(part=1).c3 SIMPLE [(schema_evolution_data_2_n13)schema_evolution_data_2_n13.FieldSchema(name:date1, type:date, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_date_n5 PARTITION(part=1).c4 SIMPLE [(schema_evolution_data_2_n13)schema_evolution_data_2_n13.FieldSchema(name:date1, type:date, comment:null), ]
-POSTHOOK: Lineage: part_change_various_various_date_n5 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n13)schema_evolution_data_2_n13.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	date1	date1	date1	date1	_c5
+POSTHOOK: Lineage: part_change_various_various_date_n5 PARTITION(part=1).insert_num SIMPLE []
+insert_num	date1	date1_1	date1_2	date1_3	_c5
 PREHOOK: query: explain vectorization detail
 select insert_num,part,c1,c2,c3,c4,b from part_change_various_various_date_n5
 PREHOOK: type: QUERY