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:18 UTC

[2/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_text_nonvec_part_llap_io.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_part_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_part_llap_io.q.out
index 7331225..f362f86 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_part_llap_io.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_part_llap_io.q.out
@@ -377,8 +377,8 @@ POSTHOOK: Lineage: part_change_string_group_double_n1 PARTITION(part=1).b SIMPLE
 POSTHOOK: Lineage: part_change_string_group_double_n1 PARTITION(part=1).c1 SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: part_change_string_group_double_n1 PARTITION(part=1).c2 SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: part_change_string_group_double_n1 PARTITION(part=1).c3 SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.FieldSchema(name:double1, type:double, comment:null), ]
-POSTHOOK: Lineage: part_change_string_group_double_n1 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	double1	double1	double1	_c4
+POSTHOOK: Lineage: part_change_string_group_double_n1 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_n1
 PREHOOK: type: QUERY
@@ -476,7 +476,7 @@ POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n1 PARTITI
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n1 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n1 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n1 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.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_n1 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_n1
@@ -630,7 +630,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_n1 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.FieldSchema(name:bigint1, type:bigint, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_multi_ints_string_group_n1 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.FieldSchema(name:tinyint1, type:tinyint, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_multi_ints_string_group_n1 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.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_n1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_change_numeric_group_string_group_multi_ints_string_group_n1
@@ -821,7 +821,7 @@ POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_
 POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_n1 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_n1 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_n1 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.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_n1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_change_numeric_group_string_group_floating_string_group_n1
@@ -1186,7 +1186,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_n1 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n1 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n1 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.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_n1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n1
@@ -1363,7 +1363,7 @@ POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n1
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n1 PARTITION(part=1).c2 SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n1 PARTITION(part=1).c3 SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n1 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n6)schema_evolution_data_n6.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_n1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal_to_float_n1

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_table.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_table.q.out
index 17ee442..905ab32 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_table.q.out
@@ -492,7 +492,7 @@ POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n9.c7 SIMPLE
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n9.c8 SIMPLE [(schema_evolution_data_n32)schema_evolution_data_n32.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n9.c9 SIMPLE [(schema_evolution_data_n32)schema_evolution_data_n32.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n9.insert_num SIMPLE [(schema_evolution_data_n32)schema_evolution_data_n32.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_n9 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_n9
@@ -599,7 +599,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_n9.c8 SIMPLE [(schema_evolution_data_n32)schema_evolution_data_n32.FieldSchema(name:bigint1, type:bigint, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_multi_ints_string_group_n9.c9 SIMPLE [(schema_evolution_data_n32)schema_evolution_data_n32.FieldSchema(name:tinyint1, type:tinyint, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_multi_ints_string_group_n9.insert_num SIMPLE [(schema_evolution_data_n32)schema_evolution_data_n32.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_n9
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_numeric_group_string_group_multi_ints_string_group_n9
@@ -785,7 +785,7 @@ POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n9.c8 SIMPLE [(schema_evolution_data_n32)schema_evolution_data_n32.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n9.c9 SIMPLE [(schema_evolution_data_n32)schema_evolution_data_n32.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n9.insert_num SIMPLE [(schema_evolution_data_n32)schema_evolution_data_n32.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_n9
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_numeric_group_string_group_floating_string_group_n9
@@ -1096,7 +1096,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_n9.c8 SIMPLE [(schema_evolution_data_n32)schema_evolution_data_n32.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n9.c9 SIMPLE [(schema_evolution_data_n32)schema_evolution_data_n32.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n9.insert_num SIMPLE [(schema_evolution_data_n32)schema_evolution_data_n32.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_n9
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n9
@@ -1224,7 +1224,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_n9.c2 SIMPLE [(schema_evolution_data_n32)schema_evolution_data_n32.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_decimal_to_float_n9.c3 SIMPLE [(schema_evolution_data_n32)schema_evolution_data_n32.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_decimal_to_float_n9.insert_num SIMPLE [(schema_evolution_data_n32)schema_evolution_data_n32.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_n9
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal_to_float_n9

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_table_llap_io.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_table_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_table_llap_io.q.out
index 5aba880..9a5132d 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_table_llap_io.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_table_llap_io.q.out
@@ -495,7 +495,7 @@ POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n2.c7 SIMPLE
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n2.c8 SIMPLE [(schema_evolution_data_n10)schema_evolution_data_n10.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n2.c9 SIMPLE [(schema_evolution_data_n10)schema_evolution_data_n10.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n2.insert_num SIMPLE [(schema_evolution_data_n10)schema_evolution_data_n10.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_n2 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_n2
@@ -602,7 +602,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_n2.c8 SIMPLE [(schema_evolution_data_n10)schema_evolution_data_n10.FieldSchema(name:bigint1, type:bigint, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_multi_ints_string_group_n2.c9 SIMPLE [(schema_evolution_data_n10)schema_evolution_data_n10.FieldSchema(name:tinyint1, type:tinyint, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_multi_ints_string_group_n2.insert_num SIMPLE [(schema_evolution_data_n10)schema_evolution_data_n10.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_n2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_numeric_group_string_group_multi_ints_string_group_n2
@@ -789,7 +789,7 @@ POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n2.c8 SIMPLE [(schema_evolution_data_n10)schema_evolution_data_n10.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n2.c9 SIMPLE [(schema_evolution_data_n10)schema_evolution_data_n10.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n2.insert_num SIMPLE [(schema_evolution_data_n10)schema_evolution_data_n10.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_n2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_numeric_group_string_group_floating_string_group_n2
@@ -1101,7 +1101,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_n2.c8 SIMPLE [(schema_evolution_data_n10)schema_evolution_data_n10.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n2.c9 SIMPLE [(schema_evolution_data_n10)schema_evolution_data_n10.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n2.insert_num SIMPLE [(schema_evolution_data_n10)schema_evolution_data_n10.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_n2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n2
@@ -1229,7 +1229,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_n2.c2 SIMPLE [(schema_evolution_data_n10)schema_evolution_data_n10.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_decimal_to_float_n2.c3 SIMPLE [(schema_evolution_data_n10)schema_evolution_data_n10.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_decimal_to_float_n2.insert_num SIMPLE [(schema_evolution_data_n10)schema_evolution_data_n10.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_n2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal_to_float_n2

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part.q.out
index a0d81b6..2d6dde8 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part.q.out
@@ -427,8 +427,8 @@ POSTHOOK: Lineage: part_change_string_group_double_n10 PARTITION(part=1).b SIMPL
 POSTHOOK: Lineage: part_change_string_group_double_n10 PARTITION(part=1).c1 SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: part_change_string_group_double_n10 PARTITION(part=1).c2 SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: part_change_string_group_double_n10 PARTITION(part=1).c3 SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.FieldSchema(name:double1, type:double, comment:null), ]
-POSTHOOK: Lineage: part_change_string_group_double_n10 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	double1	double1	double1	_c4
+POSTHOOK: Lineage: part_change_string_group_double_n10 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_n10
 PREHOOK: type: QUERY
@@ -551,7 +551,7 @@ POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n10 PARTIT
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n10 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n10 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n10 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.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_n10 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_n10
@@ -730,7 +730,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_n10 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.FieldSchema(name:bigint1, type:bigint, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_multi_ints_string_group_n10 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.FieldSchema(name:tinyint1, type:tinyint, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_multi_ints_string_group_n10 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.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_n10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_change_numeric_group_string_group_multi_ints_string_group_n10
@@ -946,7 +946,7 @@ POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_
 POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_n10 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_n10 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_n10 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.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_n10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_change_numeric_group_string_group_floating_string_group_n10
@@ -1361,7 +1361,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_n10 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n10 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n10 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.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_n10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n10
@@ -1563,7 +1563,7 @@ POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n1
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n10 PARTITION(part=1).c2 SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n10 PARTITION(part=1).c3 SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n10 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n31)schema_evolution_data_n31.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_n10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal_to_float_n10

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_all_primitive.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_all_primitive.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_all_primitive.q.out
index 5c49695..7c87d12 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_all_primitive.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_all_primitive.q.out
@@ -241,7 +241,7 @@ POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n8 PARTITION(pa
 POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n8 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n44)schema_evolution_data_n44.FieldSchema(name:boolean1, type:boolean, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n8 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n44)schema_evolution_data_n44.FieldSchema(name:boolean1, type:boolean, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n8 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n44)schema_evolution_data_n44.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_n8
 PREHOOK: type: QUERY
@@ -491,8 +491,8 @@ POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n8 PARTITION(pa
 POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n8 PARTITION(part=1).c7 SIMPLE [(schema_evolution_data_2_n16)schema_evolution_data_2_n16.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n8 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_2_n16)schema_evolution_data_2_n16.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n8 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_2_n16)schema_evolution_data_2_n16.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
-POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n8 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n16)schema_evolution_data_2_n16.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_n8 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_n8
 PREHOOK: type: QUERY
@@ -664,8 +664,8 @@ POSTHOOK: Lineage: part_change_various_various_timestamp_n8 PARTITION(part=1).c6
 POSTHOOK: Lineage: part_change_various_various_timestamp_n8 PARTITION(part=1).c7 SIMPLE [(schema_evolution_data_2_n16)schema_evolution_data_2_n16.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_timestamp_n8 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_2_n16)schema_evolution_data_2_n16.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_timestamp_n8 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_2_n16)schema_evolution_data_2_n16.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
-POSTHOOK: Lineage: part_change_various_various_timestamp_n8 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n16)schema_evolution_data_2_n16.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_n8 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_n8
 PREHOOK: type: QUERY
@@ -821,8 +821,8 @@ POSTHOOK: Lineage: part_change_various_various_date_n8 PARTITION(part=1).c1 SIMP
 POSTHOOK: Lineage: part_change_various_various_date_n8 PARTITION(part=1).c2 SIMPLE [(schema_evolution_data_2_n16)schema_evolution_data_2_n16.FieldSchema(name:date1, type:date, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_date_n8 PARTITION(part=1).c3 SIMPLE [(schema_evolution_data_2_n16)schema_evolution_data_2_n16.FieldSchema(name:date1, type:date, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_date_n8 PARTITION(part=1).c4 SIMPLE [(schema_evolution_data_2_n16)schema_evolution_data_2_n16.FieldSchema(name:date1, type:date, comment:null), ]
-POSTHOOK: Lineage: part_change_various_various_date_n8 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n16)schema_evolution_data_2_n16.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	date1	date1	date1	date1	_c5
+POSTHOOK: Lineage: part_change_various_various_date_n8 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_n8
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_all_primitive_llap_io.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_all_primitive_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_all_primitive_llap_io.q.out
index eceff3b..d0fae32 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_all_primitive_llap_io.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_all_primitive_llap_io.q.out
@@ -312,7 +312,7 @@ POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n3 PARTITION(pa
 POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n3 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n30)schema_evolution_data_n30.FieldSchema(name:boolean1, type:boolean, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n3 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n30)schema_evolution_data_n30.FieldSchema(name:boolean1, type:boolean, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n3 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n30)schema_evolution_data_n30.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_n3
 PREHOOK: type: QUERY
@@ -613,8 +613,8 @@ POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n3 PARTITION(pa
 POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n3 PARTITION(part=1).c7 SIMPLE [(schema_evolution_data_2_n9)schema_evolution_data_2_n9.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n3 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_2_n9)schema_evolution_data_2_n9.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n3 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_2_n9)schema_evolution_data_2_n9.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
-POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n3 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n9)schema_evolution_data_2_n9.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_n3 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_n3
 PREHOOK: type: QUERY
@@ -837,8 +837,8 @@ POSTHOOK: Lineage: part_change_various_various_timestamp_n3 PARTITION(part=1).c6
 POSTHOOK: Lineage: part_change_various_various_timestamp_n3 PARTITION(part=1).c7 SIMPLE [(schema_evolution_data_2_n9)schema_evolution_data_2_n9.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_timestamp_n3 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_2_n9)schema_evolution_data_2_n9.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_timestamp_n3 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_2_n9)schema_evolution_data_2_n9.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
-POSTHOOK: Lineage: part_change_various_various_timestamp_n3 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n9)schema_evolution_data_2_n9.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_n3 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_n3
 PREHOOK: type: QUERY
@@ -1045,8 +1045,8 @@ POSTHOOK: Lineage: part_change_various_various_date_n3 PARTITION(part=1).c1 SIMP
 POSTHOOK: Lineage: part_change_various_various_date_n3 PARTITION(part=1).c2 SIMPLE [(schema_evolution_data_2_n9)schema_evolution_data_2_n9.FieldSchema(name:date1, type:date, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_date_n3 PARTITION(part=1).c3 SIMPLE [(schema_evolution_data_2_n9)schema_evolution_data_2_n9.FieldSchema(name:date1, type:date, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_date_n3 PARTITION(part=1).c4 SIMPLE [(schema_evolution_data_2_n9)schema_evolution_data_2_n9.FieldSchema(name:date1, type:date, comment:null), ]
-POSTHOOK: Lineage: part_change_various_various_date_n3 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n9)schema_evolution_data_2_n9.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	date1	date1	date1	date1	_c5
+POSTHOOK: Lineage: part_change_various_various_date_n3 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_n3
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_llap_io.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_llap_io.q.out
index 36b53e5..ed00e24 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_llap_io.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_llap_io.q.out
@@ -383,7 +383,7 @@ POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n0 PARTITI
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n0 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n3)schema_evolution_data_n3.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n0 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n3)schema_evolution_data_n3.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n0 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n3)schema_evolution_data_n3.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_n0
 PREHOOK: type: QUERY
@@ -533,7 +533,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_n0 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n3)schema_evolution_data_n3.FieldSchema(name:bigint1, type:bigint, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_multi_ints_string_group_n0 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n3)schema_evolution_data_n3.FieldSchema(name:tinyint1, type:tinyint, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_multi_ints_string_group_n0 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n3)schema_evolution_data_n3.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_n0
 PREHOOK: type: QUERY
@@ -678,7 +678,7 @@ POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_
 POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_n0 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n3)schema_evolution_data_n3.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_n0 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n3)schema_evolution_data_n3.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_n0 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n3)schema_evolution_data_n3.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_n0
 PREHOOK: type: QUERY
@@ -968,7 +968,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_n0 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n3)schema_evolution_data_n3.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n0 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n3)schema_evolution_data_n3.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n0 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n3)schema_evolution_data_n3.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_n0
 PREHOOK: type: QUERY
@@ -1097,7 +1097,7 @@ POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n0
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n0 PARTITION(part=1).c2 SIMPLE [(schema_evolution_data_n3)schema_evolution_data_n3.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n0 PARTITION(part=1).c3 SIMPLE [(schema_evolution_data_n3)schema_evolution_data_n3.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n0 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n3)schema_evolution_data_n3.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_n0
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_table.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_table.q.out
index ed7a0b6..31677a3 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_table.q.out
@@ -567,7 +567,7 @@ POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n4.c7 SIMPLE
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n4.c8 SIMPLE [(schema_evolution_data_n15)schema_evolution_data_n15.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n4.c9 SIMPLE [(schema_evolution_data_n15)schema_evolution_data_n15.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n4.insert_num SIMPLE [(schema_evolution_data_n15)schema_evolution_data_n15.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_n4 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_n4
@@ -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_n4.c8 SIMPLE [(schema_evolution_data_n15)schema_evolution_data_n15.FieldSchema(name:bigint1, type:bigint, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_multi_ints_string_group_n4.c9 SIMPLE [(schema_evolution_data_n15)schema_evolution_data_n15.FieldSchema(name:tinyint1, type:tinyint, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_multi_ints_string_group_n4.insert_num SIMPLE [(schema_evolution_data_n15)schema_evolution_data_n15.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_n4
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_numeric_group_string_group_multi_ints_string_group_n4
@@ -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_n4.c8 SIMPLE [(schema_evolution_data_n15)schema_evolution_data_n15.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n4.c9 SIMPLE [(schema_evolution_data_n15)schema_evolution_data_n15.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n4.insert_num SIMPLE [(schema_evolution_data_n15)schema_evolution_data_n15.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_n4
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_numeric_group_string_group_floating_string_group_n4
@@ -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_n4.c8 SIMPLE [(schema_evolution_data_n15)schema_evolution_data_n15.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n4.c9 SIMPLE [(schema_evolution_data_n15)schema_evolution_data_n15.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n4.insert_num SIMPLE [(schema_evolution_data_n15)schema_evolution_data_n15.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_n4
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n4
@@ -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_n4.c2 SIMPLE [(schema_evolution_data_n15)schema_evolution_data_n15.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_decimal_to_float_n4.c3 SIMPLE [(schema_evolution_data_n15)schema_evolution_data_n15.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_decimal_to_float_n4.insert_num SIMPLE [(schema_evolution_data_n15)schema_evolution_data_n15.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_n4
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal_to_float_n4

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_table_llap_io.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_table_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_table_llap_io.q.out
index 867e134..008e52c 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_table_llap_io.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_table_llap_io.q.out
@@ -657,7 +657,7 @@ POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n1.c7 SIMPLE
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n1.c8 SIMPLE [(schema_evolution_data_n5)schema_evolution_data_n5.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n1.c9 SIMPLE [(schema_evolution_data_n5)schema_evolution_data_n5.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: table_change_date_group_string_group_date_group_n1.insert_num SIMPLE [(schema_evolution_data_n5)schema_evolution_data_n5.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_n1
 PREHOOK: type: QUERY
@@ -819,7 +819,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_n1.c8 SIMPLE [(schema_evolution_data_n5)schema_evolution_data_n5.FieldSchema(name:bigint1, type:bigint, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_multi_ints_string_group_n1.c9 SIMPLE [(schema_evolution_data_n5)schema_evolution_data_n5.FieldSchema(name:tinyint1, type:tinyint, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_multi_ints_string_group_n1.insert_num SIMPLE [(schema_evolution_data_n5)schema_evolution_data_n5.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_n1
 PREHOOK: type: QUERY
@@ -1072,7 +1072,7 @@ POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n1.c8 SIMPLE [(schema_evolution_data_n5)schema_evolution_data_n5.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n1.c9 SIMPLE [(schema_evolution_data_n5)schema_evolution_data_n5.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: table_change_numeric_group_string_group_floating_string_group_n1.insert_num SIMPLE [(schema_evolution_data_n5)schema_evolution_data_n5.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_n1
 PREHOOK: type: QUERY
@@ -1491,7 +1491,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_n1.c8 SIMPLE [(schema_evolution_data_n5)schema_evolution_data_n5.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n1.c9 SIMPLE [(schema_evolution_data_n5)schema_evolution_data_n5.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n1.insert_num SIMPLE [(schema_evolution_data_n5)schema_evolution_data_n5.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_n1
 PREHOOK: type: QUERY
@@ -1660,7 +1660,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_n1.c2 SIMPLE [(schema_evolution_data_n5)schema_evolution_data_n5.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_decimal_to_float_n1.c3 SIMPLE [(schema_evolution_data_n5)schema_evolution_data_n5.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: table_change_lower_to_higher_numeric_group_decimal_to_float_n1.insert_num SIMPLE [(schema_evolution_data_n5)schema_evolution_data_n5.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_n1
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part.q.out
index a9db624..f47d6c9 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part.q.out
@@ -427,8 +427,8 @@ POSTHOOK: Lineage: part_change_string_group_double_n11 PARTITION(part=1).b SIMPL
 POSTHOOK: Lineage: part_change_string_group_double_n11 PARTITION(part=1).c1 SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: part_change_string_group_double_n11 PARTITION(part=1).c2 SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: part_change_string_group_double_n11 PARTITION(part=1).c3 SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.FieldSchema(name:double1, type:double, comment:null), ]
-POSTHOOK: Lineage: part_change_string_group_double_n11 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	double1	double1	double1	_c4
+POSTHOOK: Lineage: part_change_string_group_double_n11 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_n11
 PREHOOK: type: QUERY
@@ -551,7 +551,7 @@ POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n11 PARTIT
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n11 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n11 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp_n11 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.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_n11 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_n11
@@ -730,7 +730,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_n11 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.FieldSchema(name:bigint1, type:bigint, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_multi_ints_string_group_n11 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.FieldSchema(name:tinyint1, type:tinyint, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_multi_ints_string_group_n11 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.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_n11
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_change_numeric_group_string_group_multi_ints_string_group_n11
@@ -946,7 +946,7 @@ POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_
 POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_n11 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_n11 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.FieldSchema(name:double1, type:double, comment:null), ]
 POSTHOOK: Lineage: part_change_numeric_group_string_group_floating_string_group_n11 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.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_n11
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_change_numeric_group_string_group_floating_string_group_n11
@@ -1361,7 +1361,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_n11 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n11 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.FieldSchema(name:smallint1, type:smallint, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n11 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.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_n11
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n11
@@ -1563,7 +1563,7 @@ POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n1
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n11 PARTITION(part=1).c2 SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n11 PARTITION(part=1).c3 SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.FieldSchema(name:float1, type:float, comment:null), ]
 POSTHOOK: Lineage: part_change_lower_to_higher_numeric_group_decimal_to_float_n11 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n33)schema_evolution_data_n33.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_n11
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal_to_float_n11

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_all_primitive.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_all_primitive.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_all_primitive.q.out
index 9d32b03..fe844dc 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_all_primitive.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_all_primitive.q.out
@@ -241,7 +241,7 @@ POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n7 PARTITION(pa
 POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n7 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n43)schema_evolution_data_n43.FieldSchema(name:boolean1, type:boolean, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n7 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n43)schema_evolution_data_n43.FieldSchema(name:boolean1, type:boolean, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint_n7 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n43)schema_evolution_data_n43.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_n7
 PREHOOK: type: QUERY
@@ -491,8 +491,8 @@ POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n7 PARTITION(pa
 POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n7 PARTITION(part=1).c7 SIMPLE [(schema_evolution_data_2_n15)schema_evolution_data_2_n15.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n7 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_2_n15)schema_evolution_data_2_n15.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n7 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_2_n15)schema_evolution_data_2_n15.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
-POSTHOOK: Lineage: part_change_various_various_decimal_to_double_n7 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n15)schema_evolution_data_2_n15.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_n7 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_n7
 PREHOOK: type: QUERY
@@ -664,8 +664,8 @@ POSTHOOK: Lineage: part_change_various_various_timestamp_n7 PARTITION(part=1).c6
 POSTHOOK: Lineage: part_change_various_various_timestamp_n7 PARTITION(part=1).c7 SIMPLE [(schema_evolution_data_2_n15)schema_evolution_data_2_n15.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_timestamp_n7 PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_2_n15)schema_evolution_data_2_n15.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_timestamp_n7 PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_2_n15)schema_evolution_data_2_n15.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
-POSTHOOK: Lineage: part_change_various_various_timestamp_n7 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n15)schema_evolution_data_2_n15.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_n7 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_n7
 PREHOOK: type: QUERY
@@ -821,8 +821,8 @@ POSTHOOK: Lineage: part_change_various_various_date_n7 PARTITION(part=1).c1 SIMP
 POSTHOOK: Lineage: part_change_various_various_date_n7 PARTITION(part=1).c2 SIMPLE [(schema_evolution_data_2_n15)schema_evolution_data_2_n15.FieldSchema(name:date1, type:date, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_date_n7 PARTITION(part=1).c3 SIMPLE [(schema_evolution_data_2_n15)schema_evolution_data_2_n15.FieldSchema(name:date1, type:date, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_date_n7 PARTITION(part=1).c4 SIMPLE [(schema_evolution_data_2_n15)schema_evolution_data_2_n15.FieldSchema(name:date1, type:date, comment:null), ]
-POSTHOOK: Lineage: part_change_various_various_date_n7 PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n15)schema_evolution_data_2_n15.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	date1	date1	date1	date1	_c5
+POSTHOOK: Lineage: part_change_various_various_date_n7 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_n7
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/83e53972/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_all_primitive_llap_io.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_all_primitive_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_all_primitive_llap_io.q.out
index 9a9f41e..4ff8855 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_all_primitive_llap_io.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_all_primitive_llap_io.q.out
@@ -312,7 +312,7 @@ POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint PARTITION(part=
 POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_n2)schema_evolution_data_n2.FieldSchema(name:boolean1, type:boolean, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_n2)schema_evolution_data_n2.FieldSchema(name:boolean1, type:boolean, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_boolean_to_bigint PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_n2)schema_evolution_data_n2.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
 PREHOOK: type: QUERY
@@ -592,8 +592,8 @@ POSTHOOK: Lineage: part_change_various_various_decimal_to_double PARTITION(part=
 POSTHOOK: Lineage: part_change_various_various_decimal_to_double PARTITION(part=1).c7 SIMPLE [(schema_evolution_data_2_n0)schema_evolution_data_2_n0.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_decimal_to_double PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_2_n0)schema_evolution_data_2_n0.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_decimal_to_double PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_2_n0)schema_evolution_data_2_n0.FieldSchema(name:decimal1, type:decimal(38,18), comment:null), ]
-POSTHOOK: Lineage: part_change_various_various_decimal_to_double PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n0)schema_evolution_data_2_n0.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 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
 PREHOOK: type: QUERY
@@ -783,8 +783,8 @@ POSTHOOK: Lineage: part_change_various_various_timestamp PARTITION(part=1).c6 SI
 POSTHOOK: Lineage: part_change_various_various_timestamp PARTITION(part=1).c7 SIMPLE [(schema_evolution_data_2_n0)schema_evolution_data_2_n0.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_timestamp PARTITION(part=1).c8 SIMPLE [(schema_evolution_data_2_n0)schema_evolution_data_2_n0.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_timestamp PARTITION(part=1).c9 SIMPLE [(schema_evolution_data_2_n0)schema_evolution_data_2_n0.FieldSchema(name:timestamp1, type:timestamp, comment:null), ]
-POSTHOOK: Lineage: part_change_various_various_timestamp PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n0)schema_evolution_data_2_n0.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 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
 PREHOOK: type: QUERY
@@ -958,8 +958,8 @@ POSTHOOK: Lineage: part_change_various_various_date PARTITION(part=1).c1 SIMPLE
 POSTHOOK: Lineage: part_change_various_various_date PARTITION(part=1).c2 SIMPLE [(schema_evolution_data_2_n0)schema_evolution_data_2_n0.FieldSchema(name:date1, type:date, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_date PARTITION(part=1).c3 SIMPLE [(schema_evolution_data_2_n0)schema_evolution_data_2_n0.FieldSchema(name:date1, type:date, comment:null), ]
 POSTHOOK: Lineage: part_change_various_various_date PARTITION(part=1).c4 SIMPLE [(schema_evolution_data_2_n0)schema_evolution_data_2_n0.FieldSchema(name:date1, type:date, comment:null), ]
-POSTHOOK: Lineage: part_change_various_various_date PARTITION(part=1).insert_num SIMPLE [(schema_evolution_data_2_n0)schema_evolution_data_2_n0.FieldSchema(name:insert_num, type:int, comment:null), ]
-insert_num	date1	date1	date1	date1	_c5
+POSTHOOK: Lineage: part_change_various_various_date 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
 PREHOOK: type: QUERY