http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_table.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_table.q 
b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_table.q
index c16fef5..29743c9 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_table.q
@@ -10,6 +10,7 @@ set hive.fetch.task.conversion=none;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.metastore.disallow.incompatible.col.type.changes=true;
 set hive.default.fileformat=orc;
+set hive.llap.io.enabled=false;
 
 -- SORT_QUERY_RESULTS
 --
@@ -368,7 +369,7 @@ drop table 
table_change_numeric_group_string_group_multi_ints_varchar_trunc;
 --
 -- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), STRING
 --
-CREATE TABLE 
table_change_numeric_group_string_group_floating_string(insert_num int, c1 
decimal(38,18), c2 float, c3 double, b STRING);
+CREATE TABLE 
table_change_numeric_group_string_group_floating_string(insert_num int, c1 
float, c2 double, c3 decimal(38,18), b STRING);
 
 insert into table table_change_numeric_group_string_group_floating_string
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -398,9 +399,9 @@ drop table 
table_change_numeric_group_string_group_floating_string;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), CHAR
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), CHAR
 --
-CREATE TABLE table_change_numeric_group_string_group_floating_char(insert_num 
int, c1 decimal(38,18), c2 float, c3 double, b STRING);
+CREATE TABLE table_change_numeric_group_string_group_floating_char(insert_num 
int, c1 float, c2 double, c3 decimal(38,18), b STRING);
 
 insert into table table_change_numeric_group_string_group_floating_char
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -430,9 +431,9 @@ drop table 
table_change_numeric_group_string_group_floating_char;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), CHAR truncation
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), CHAR truncation
 --
-CREATE TABLE 
table_change_numeric_group_string_group_floating_char_trunc(insert_num int, c1 
decimal(38,18), c2 float, c3 double, b STRING);
+CREATE TABLE 
table_change_numeric_group_string_group_floating_char_trunc(insert_num int, c1 
float, c2 double, c3 decimal(38,18), b STRING);
 
 insert into table table_change_numeric_group_string_group_floating_char_trunc
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -462,7 +463,7 @@ drop table 
table_change_numeric_group_string_group_floating_char_trunc;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), VARCHAR
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), VARCHAR
 --
 CREATE TABLE 
table_change_numeric_group_string_group_floating_varchar(insert_num int, c1 
float, c2 double, c3 decimal(38,18), b STRING);
 
@@ -494,9 +495,9 @@ drop table 
table_change_numeric_group_string_group_floating_varchar;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), VARCHAR truncation
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), VARCHAR truncation
 --
-CREATE TABLE 
table_change_numeric_group_string_group_floating_varchar_trunc(insert_num int, 
c1 decimal(38,18), c2 float, c3 double, b STRING);
+CREATE TABLE 
table_change_numeric_group_string_group_floating_varchar_trunc(insert_num int, 
c1 float, c2 double, c3 decimal(38,18), b STRING);
 
 insert into table 
table_change_numeric_group_string_group_floating_varchar_trunc
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -633,7 +634,7 @@ drop table table_change_string_group_string_group_varchar;
 --
 --
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: TINYINT, (SMALLINT, INT, BIGINT, DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: TINYINT, (SMALLINT, INT, BIGINT, FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE table_change_lower_to_higher_numeric_group_tinyint(insert_num 
int, c1 tinyint, c2 tinyint, c3 tinyint, c4 tinyint, c5 tinyint, c6 tinyint, b 
STRING);
 
@@ -646,7 +647,7 @@ insert into table 
table_change_lower_to_higher_numeric_group_tinyint
 select insert_num,c1,c2,c3,c4,c5,c6,b from 
table_change_lower_to_higher_numeric_group_tinyint order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_tinyint replace columns 
(insert_num int, c1 SMALLINT, c2 INT, c3 BIGINT, c4 decimal(38,18), c5 FLOAT, 
c6 DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_tinyint replace columns 
(insert_num int, c1 SMALLINT, c2 INT, c3 BIGINT, c4 FLOAT, c5 DOUBLE, c6 
decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_tinyint
     values (5, '774', '2031', '200', '12', '99', '0', 'new'),
@@ -665,7 +666,7 @@ drop table 
table_change_lower_to_higher_numeric_group_tinyint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: SMALLINT, (INT, BIGINT, DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: SMALLINT, (INT, BIGINT, FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE table_change_lower_to_higher_numeric_group_smallint(insert_num 
int, c1 smallint, c2 smallint, c3 smallint, c4 smallint, c5 smallint, b STRING);
 
@@ -678,7 +679,7 @@ insert into table 
table_change_lower_to_higher_numeric_group_smallint
 select insert_num,c1,c2,c3,c4,c5,b from 
table_change_lower_to_higher_numeric_group_smallint order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_smallint replace 
columns (insert_num int, c1 INT, c2 BIGINT, c3 decimal(38,18), c4 FLOAT, c5 
DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_smallint replace 
columns (insert_num int, c1 INT, c2 BIGINT, c3 FLOAT, c4 DOUBLE, c5 
decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_smallint
     values (5, '774', '2031', '200', '12', '99', 'new'),
@@ -698,7 +699,7 @@ drop table 
table_change_lower_to_higher_numeric_group_smallint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: INT, (BIGINT, DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: INT, (BIGINT, FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE table_change_lower_to_higher_numeric_group_int(insert_num int, c1 
int, c2 int, c3 int, c4 int, b STRING);
 
@@ -711,7 +712,7 @@ insert into table 
table_change_lower_to_higher_numeric_group_int
 select insert_num,c1,c2,c3,c4,b from 
table_change_lower_to_higher_numeric_group_int order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_int replace columns 
(insert_num int, c1 BIGINT, c2 decimal(38,18), c3 FLOAT, c4 DOUBLE,  b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_int replace columns 
(insert_num int, c1 BIGINT, c2 FLOAT, c3 DOUBLE, c4 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_int
     values (5, '774', '2031', '200', '12', 'new'),
@@ -730,7 +731,7 @@ drop table table_change_lower_to_higher_numeric_group_int;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: BIGINT, (DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: BIGINT, (FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE table_change_lower_to_higher_numeric_group_bigint(insert_num int, 
c1 bigint, c2 bigint, c3 bigint, b STRING);
 
@@ -743,7 +744,7 @@ insert into table 
table_change_lower_to_higher_numeric_group_bigint
 select insert_num,c1,c2,c3,b from 
table_change_lower_to_higher_numeric_group_bigint order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_bigint replace columns 
(insert_num int, c1 decimal(38,18), c2 FLOAT, c3 DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_bigint replace columns 
(insert_num int, c1 FLOAT, c2 DOUBLE, c3 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_bigint
     values (5, '774', '2031', '200', 'new'),
@@ -762,22 +763,22 @@ drop table 
table_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: FLOAT, (DOUBLE, DECIMAL)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: FLOAT, (FLOAT, DECIMAL)
 --
-CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num 
int, c1 float, c2 float, b STRING);
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, 
c1 float, c2 float, b STRING);
 
-insert into table table_change_lower_to_higher_numeric_group_decimal
+insert into table table_change_lower_to_higher_numeric_group_float
     values (1, -29.0764, -29.0764, 'original'),
            (2, 753.7028, 753.7028, 'original'),
            (3, -5000, -5000, 'original'),
            (4, 52927714, 52927714, 'original');
 
-select insert_num,c1,c2,b from 
table_change_lower_to_higher_numeric_group_decimal order by insert_num;
+select insert_num,c1,c2,b from 
table_change_lower_to_higher_numeric_group_float order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_decimal replace columns 
(insert_num int, c1 double, c2 decimal(38,18), b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_float replace columns 
(insert_num int, c1 double, c2 decimal(38,18), b STRING) ;
 
-insert into table table_change_lower_to_higher_numeric_group_decimal
+insert into table table_change_lower_to_higher_numeric_group_float
     values (5, '7.74', '22.3', 'new'),
            (6, '56.1431', '90.9', 'new'),
            (7, '2.56', '25.6', 'new'),
@@ -786,31 +787,31 @@ insert into table 
table_change_lower_to_higher_numeric_group_decimal
            (10, '1.7', '17.8888', 'new');
 
 explain
-select insert_num,c1,c2,b from 
table_change_lower_to_higher_numeric_group_decimal order by insert_num;
+select insert_num,c1,c2,b from 
table_change_lower_to_higher_numeric_group_float order by insert_num;
 
-select insert_num,c1,c2,b from 
table_change_lower_to_higher_numeric_group_decimal order by insert_num;
+select insert_num,c1,c2,b from 
table_change_lower_to_higher_numeric_group_float order by insert_num;
 
-drop table table_change_lower_to_higher_numeric_group_decimal;
+drop table table_change_lower_to_higher_numeric_group_float;
 
 
 
 --
 -- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: DOUBLE, (DECIMAL)
 --
-CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, 
c1 double, b STRING);
+CREATE TABLE table_change_lower_to_higher_numeric_group_double(insert_num int, 
c1 double, b STRING);
 
-insert into table table_change_lower_to_higher_numeric_group_float
+insert into table table_change_lower_to_higher_numeric_group_double
     values (1, -29.0764, 'original'),
            (2, 753.7028, 'original'),
            (3, -5000, 'original'),
            (4, 52927714, 'original');
 
-select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float 
order by insert_num;
+select insert_num,c1,b from table_change_lower_to_higher_numeric_group_double 
order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_float replace columns 
(insert_num int, c1 decimal(38,18), b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_double replace columns 
(insert_num int, c1 decimal(38,18), b STRING) ;
 
-insert into table table_change_lower_to_higher_numeric_group_float
+insert into table table_change_lower_to_higher_numeric_group_double
     values (5, '774', 'new'),
            (6, '561431', 'new'),
            (7, '256', 'new'),
@@ -819,8 +820,8 @@ insert into table 
table_change_lower_to_higher_numeric_group_float
            (10, '17', 'new');
 
 explain
-select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float 
order by insert_num;
+select insert_num,c1,b from table_change_lower_to_higher_numeric_group_double 
order by insert_num;
 
-select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float 
order by insert_num;
+select insert_num,c1,b from table_change_lower_to_higher_numeric_group_double 
order by insert_num;
 
-drop table table_change_lower_to_higher_numeric_group_float;
\ No newline at end of file
+drop table table_change_lower_to_higher_numeric_group_double;

http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part.q 
b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part.q
index 246b0be..32483fb 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part.q
@@ -11,6 +11,7 @@ set hive.fetch.task.conversion=none;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.metastore.disallow.incompatible.col.type.changes=true;
 set hive.default.fileformat=orc;
+set hive.llap.io.enabled=false;
 
 -- SORT_QUERY_RESULTS
 --
@@ -366,9 +367,9 @@ drop table 
part_change_numeric_group_string_group_multi_ints_varchar_trunc;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), STRING
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), STRING
 --
-CREATE TABLE part_change_numeric_group_string_group_floating_string(insert_num 
int, c1 decimal(38,18), c2 float, c3 double, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_numeric_group_string_group_floating_string(insert_num 
int, c1 float, c2 double, c3 decimal(38,18), b STRING) PARTITIONED BY(part INT);
 
 insert into table part_change_numeric_group_string_group_floating_string 
partition(part=1)
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -398,9 +399,9 @@ drop table 
part_change_numeric_group_string_group_floating_string;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), CHAR
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), CHAR
 --
-CREATE TABLE part_change_numeric_group_string_group_floating_char(insert_num 
int, c1 decimal(38,18), c2 float, c3 double, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_numeric_group_string_group_floating_char(insert_num 
int, c1 float, c2 double, c3 decimal(38,18), b STRING) PARTITIONED BY(part INT);
 
 insert into table part_change_numeric_group_string_group_floating_char 
partition(part=1)
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -430,9 +431,9 @@ drop table 
part_change_numeric_group_string_group_floating_char;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), CHAR truncation
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), CHAR truncation
 --
-CREATE TABLE 
part_change_numeric_group_string_group_floating_char_trunc(insert_num int, c1 
decimal(38,18), c2 float, c3 double, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE 
part_change_numeric_group_string_group_floating_char_trunc(insert_num int, c1 
float, c2 double, c3 decimal(38,18), b STRING) PARTITIONED BY(part INT);
 
 insert into table part_change_numeric_group_string_group_floating_char_trunc 
partition(part=1)
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -462,7 +463,7 @@ drop table 
part_change_numeric_group_string_group_floating_char_trunc;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), VARCHAR
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), VARCHAR
 --
 CREATE TABLE 
part_change_numeric_group_string_group_floating_varchar(insert_num int, c1 
float, c2 double, c3 decimal(38,18), b STRING) PARTITIONED BY(part INT);
 
@@ -494,9 +495,9 @@ drop table 
part_change_numeric_group_string_group_floating_varchar;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), VARCHAR truncation
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), VARCHAR truncation
 --
-CREATE TABLE 
part_change_numeric_group_string_group_floating_varchar_trunc(insert_num int, 
c1 decimal(38,18), c2 float, c3 double, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE 
part_change_numeric_group_string_group_floating_varchar_trunc(insert_num int, 
c1 float, c2 double, c3 decimal(38,18), b STRING) PARTITIONED BY(part INT);
 
 insert into table 
part_change_numeric_group_string_group_floating_varchar_trunc partition(part=1)
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -633,7 +634,7 @@ drop table part_change_string_group_string_group_varchar;
 --
 --
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: TINYINT, (SMALLINT, INT, BIGINT, DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: TINYINT, (SMALLINT, INT, BIGINT, FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE part_change_lower_to_higher_numeric_group_tinyint(insert_num int, 
c1 tinyint, c2 tinyint, c3 tinyint, c4 tinyint, c5 tinyint, c6 tinyint, b 
STRING) PARTITIONED BY(part INT);
 
@@ -646,7 +647,7 @@ insert into table 
part_change_lower_to_higher_numeric_group_tinyint partition(pa
 select insert_num,part,c1,c2,c3,c4,c5,c6,b from 
part_change_lower_to_higher_numeric_group_tinyint order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_tinyint replace columns 
(insert_num int, c1 SMALLINT, c2 INT, c3 BIGINT, c4 decimal(38,18), c5 FLOAT, 
c6 DOUBLE, b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_tinyint replace columns 
(insert_num int, c1 SMALLINT, c2 INT, c3 BIGINT, c4 FLOAT, c5 DOUBLE, c6 
decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_tinyint 
partition(part)
     values (5, '774', '2031', '200', '12', '99', '0', 'new', 2),
@@ -665,7 +666,7 @@ drop table 
part_change_lower_to_higher_numeric_group_tinyint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: SMALLINT, (INT, BIGINT, DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: SMALLINT, (INT, BIGINT, FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE part_change_lower_to_higher_numeric_group_smallint(insert_num 
int, c1 smallint, c2 smallint, c3 smallint, c4 smallint, c5 smallint, b STRING) 
PARTITIONED BY(part INT);
 
@@ -678,7 +679,7 @@ insert into table 
part_change_lower_to_higher_numeric_group_smallint partition(p
 select insert_num,part,c1,c2,c3,c4,c5,b from 
part_change_lower_to_higher_numeric_group_smallint order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_smallint replace columns 
(insert_num int, c1 INT, c2 BIGINT, c3 decimal(38,18), c4 FLOAT, c5 DOUBLE, b 
STRING) ;
+alter table part_change_lower_to_higher_numeric_group_smallint replace columns 
(insert_num int, c1 INT, c2 BIGINT, c3 FLOAT, c4 DOUBLE, c5 decimal(38,18), b 
STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_smallint 
partition(part)
     values (5, '774', '2031', '200', '12', '99', 'new', 2),
@@ -698,7 +699,7 @@ drop table 
part_change_lower_to_higher_numeric_group_smallint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: INT, (BIGINT, DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: INT, (BIGINT, FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE part_change_lower_to_higher_numeric_group_int(insert_num int, c1 
int, c2 int, c3 int, c4 int, b STRING) PARTITIONED BY(part INT);
 
@@ -711,7 +712,7 @@ insert into table 
part_change_lower_to_higher_numeric_group_int partition(part=1
 select insert_num,part,c1,c2,c3,c4,b from 
part_change_lower_to_higher_numeric_group_int order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_int replace columns 
(insert_num int, c1 BIGINT, c2 decimal(38,18), c3 FLOAT, c4 DOUBLE,  b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_int replace columns 
(insert_num int, c1 BIGINT, c2 FLOAT, c3 DOUBLE, c4 decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_int partition(part)
     values (5, '774', '2031', '200', '12', 'new', 2),
@@ -730,7 +731,7 @@ drop table part_change_lower_to_higher_numeric_group_int;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: BIGINT, (DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: BIGINT, (FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE part_change_lower_to_higher_numeric_group_bigint(insert_num int, 
c1 bigint, c2 bigint, c3 bigint, b STRING) PARTITIONED BY(part INT);
 
@@ -743,7 +744,7 @@ insert into table 
part_change_lower_to_higher_numeric_group_bigint partition(par
 select insert_num,part,c1,c2,c3,b from 
part_change_lower_to_higher_numeric_group_bigint order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_bigint replace columns 
(insert_num int, c1 decimal(38,18), c2 FLOAT, c3 DOUBLE, b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_bigint replace columns 
(insert_num int, c1 FLOAT, c2 DOUBLE, c3 decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_bigint 
partition(part)
     values (5, '774', '2031', '200', 'new', 2),
@@ -764,58 +765,26 @@ drop table 
part_change_lower_to_higher_numeric_group_bigint;
 --
 -- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: FLOAT, (DOUBLE, DECIMAL)
 --
-CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, 
c1 float, c2 float, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, 
c1 float, c2 float, b STRING) PARTITIONED BY(part INT);
 
-insert into table part_change_lower_to_higher_numeric_group_decimal 
partition(part=1)
-    values (1, -29.0764, -29.0764, 'original'),
+insert into table part_change_lower_to_higher_numeric_group_float 
partition(part=1)
+    values (1, -29.0764,  -29.0764, 'original'),
            (2, 753.7028, 753.7028, 'original'),
            (3, -5000, -5000, 'original'),
            (4, 52927714, 52927714, 'original');
 
-select insert_num,part,c1,b from 
part_change_lower_to_higher_numeric_group_decimal order by insert_num;
-
--- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_decimal replace columns 
(insert_num int, c1 double, c2 decimal(38,18), b STRING) ;
-
-insert into table part_change_lower_to_higher_numeric_group_decimal 
partition(part)
-    values (5, '7.74', '22.3', 'new', 2),
-           (6, '56.1431', '90.9', 'new', 2),
-           (7, '2.56', '25.6', 'new', 2),
-           (8, '555.5', '55.55', 'new', 2),
-           (9, '10.0', '0.100', 'new', 1),
-           (10, '1.7', '17.8888', 'new', 1);
-
-explain
-select insert_num,part,c1,b from 
part_change_lower_to_higher_numeric_group_decimal order by insert_num;
-
-select insert_num,part,c1,b from 
part_change_lower_to_higher_numeric_group_decimal order by insert_num;
-
-drop table part_change_lower_to_higher_numeric_group_decimal;
-
-
---
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: DOUBLE, (DECIMAL)
---
-CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, 
c1 double, b STRING) PARTITIONED BY(part INT);
-
-insert into table part_change_lower_to_higher_numeric_group_float 
partition(part=1)
-    values (1, -29.0764, 'original'),
-           (2, 753.7028, 'original'),
-           (3, -5000, 'original'),
-           (4, 52927714, 'original');
-
 select insert_num,part,c1,b from 
part_change_lower_to_higher_numeric_group_float order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_float replace columns 
(insert_num int, c1 decimal(38,18), b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_float replace columns 
(insert_num int, c1 DOUBLE, c2 decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_float 
partition(part)
-    values (5, '774', 'new', 2),
-           (6, '561431', 'new', 2),
-           (7, '256', 'new', 2),
-           (8, '5555', 'new', 2),
-           (9, '100', 'new', 1),
-           (10, '17',  'new', 1);
+    values (5, '774', '774', 'new', 2),
+           (6, '561431', '561431', 'new', 2),
+           (7, '256', '256', 'new', 2),
+           (8, '5555', '5555', 'new', 2),
+           (9, '100', '100', 'new', 1),
+           (10, '17', '17', 'new', 1);
 
 explain
 select insert_num,part,c1,b from 
part_change_lower_to_higher_numeric_group_float order by insert_num;

http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part_all_complex.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part_all_complex.q
 
b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part_all_complex.q
index f8a8fa6..7b8f765 100644
--- 
a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part_all_complex.q
+++ 
b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part_all_complex.q
@@ -10,6 +10,7 @@ SET hive.vectorized.execution.enabled=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.metastore.disallow.incompatible.col.type.changes=false;
 set hive.default.fileformat=orc;
+set hive.llap.io.enabled=false;
 
 -- SORT_QUERY_RESULTS
 --

http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part_all_primitive.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part_all_primitive.q
 
b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part_all_primitive.q
index 3769485..fb63eef 100644
--- 
a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part_all_primitive.q
+++ 
b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part_all_primitive.q
@@ -10,6 +10,7 @@ SET hive.vectorized.execution.enabled=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.metastore.disallow.incompatible.col.type.changes=false;
 set hive.default.fileformat=orc;
+set hive.llap.io.enabled=false;
 
 -- SORT_QUERY_RESULTS
 --

http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_table.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_table.q 
b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_table.q
index 06ff02c..9bfa0c5 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_table.q
@@ -9,6 +9,7 @@ SET hive.vectorized.execution.enabled=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.metastore.disallow.incompatible.col.type.changes=true;
 set hive.default.fileformat=orc;
+set hive.llap.io.enabled=false;
 
 -- SORT_QUERY_RESULTS
 --
@@ -178,7 +179,8 @@ insert into table table_change_date_group_string_group_date
            (3, '2021-09-24', '2021-09-24', '2021-09-24', '2021-09-24', 
'2021-09-24', 'original');
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_date_group_string_group_date replace 
columns(insert_num int, c1 STRING, c2 CHAR(50), c3 CHAR(15), c4 VARCHAR(50), c5 
VARCHAR(15), b STRING);DESCRIBE FORMATTED 
table_change_date_group_string_group_date;
+alter table table_change_date_group_string_group_date replace 
columns(insert_num int, c1 STRING, c2 CHAR(50), c3 CHAR(15), c4 VARCHAR(50), c5 
VARCHAR(15), b STRING);
+DESCRIBE FORMATTED table_change_date_group_string_group_date;
 
 insert into table table_change_date_group_string_group_date
     values (4, '0004-09-22', '0004-09-22', '0004-09-22', '0004-09-22', 
'0004-09-22', 'new'),
@@ -366,7 +368,7 @@ drop table 
table_change_numeric_group_string_group_multi_ints_varchar_trunc;
 --
 -- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), STRING
 --
-CREATE TABLE 
table_change_numeric_group_string_group_floating_string(insert_num int, c1 
decimal(38,18), c2 float, c3 double, b STRING);
+CREATE TABLE 
table_change_numeric_group_string_group_floating_string(insert_num int, c1 
float, c2 double, c3 decimal(38,18), b STRING);
 
 insert into table table_change_numeric_group_string_group_floating_string
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -396,9 +398,9 @@ drop table 
table_change_numeric_group_string_group_floating_string;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), CHAR
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), CHAR
 --
-CREATE TABLE table_change_numeric_group_string_group_floating_char(insert_num 
int, c1 decimal(38,18), c2 float, c3 double, b STRING);
+CREATE TABLE table_change_numeric_group_string_group_floating_char(insert_num 
int, c1 float, c2 double, c3 decimal(38,18), b STRING);
 
 insert into table table_change_numeric_group_string_group_floating_char
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -428,9 +430,9 @@ drop table 
table_change_numeric_group_string_group_floating_char;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), CHAR truncation
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), CHAR truncation
 --
-CREATE TABLE 
table_change_numeric_group_string_group_floating_char_trunc(insert_num int, c1 
decimal(38,18), c2 float, c3 double, b STRING);
+CREATE TABLE 
table_change_numeric_group_string_group_floating_char_trunc(insert_num int, c1 
float, c2 double, c3 decimal(38,18), b STRING);
 
 insert into table table_change_numeric_group_string_group_floating_char_trunc
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -460,7 +462,7 @@ drop table 
table_change_numeric_group_string_group_floating_char_trunc;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), VARCHAR
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), VARCHAR
 --
 CREATE TABLE 
table_change_numeric_group_string_group_floating_varchar(insert_num int, c1 
float, c2 double, c3 decimal(38,18), b STRING);
 
@@ -492,9 +494,9 @@ drop table 
table_change_numeric_group_string_group_floating_varchar;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), VARCHAR truncation
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), VARCHAR truncation
 --
-CREATE TABLE 
table_change_numeric_group_string_group_floating_varchar_trunc(insert_num int, 
c1 decimal(38,18), c2 float, c3 double, b STRING);
+CREATE TABLE 
table_change_numeric_group_string_group_floating_varchar_trunc(insert_num int, 
c1 float, c2 double, c3 decimal(38,18), b STRING);
 
 insert into table 
table_change_numeric_group_string_group_floating_varchar_trunc
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -631,7 +633,7 @@ drop table table_change_string_group_string_group_varchar;
 --
 --
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: TINYINT, (SMALLINT, INT, BIGINT, DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: TINYINT, (SMALLINT, INT, BIGINT, FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE table_change_lower_to_higher_numeric_group_tinyint(insert_num 
int, c1 tinyint, c2 tinyint, c3 tinyint, c4 tinyint, c5 tinyint, c6 tinyint, b 
STRING);
 
@@ -644,7 +646,7 @@ insert into table 
table_change_lower_to_higher_numeric_group_tinyint
 select insert_num,c1,c2,c3,c4,c5,c6,b from 
table_change_lower_to_higher_numeric_group_tinyint order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_tinyint replace columns 
(insert_num int, c1 SMALLINT, c2 INT, c3 BIGINT, c4 decimal(38,18), c5 FLOAT, 
c6 DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_tinyint replace columns 
(insert_num int, c1 SMALLINT, c2 INT, c3 BIGINT, c4 FLOAT, c5 DOUBLE, c6 
decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_tinyint
     values (5, '774', '2031', '200', '12', '99', '0', 'new'),
@@ -663,7 +665,7 @@ drop table 
table_change_lower_to_higher_numeric_group_tinyint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: SMALLINT, (INT, BIGINT, DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: SMALLINT, (INT, BIGINT, FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE table_change_lower_to_higher_numeric_group_smallint(insert_num 
int, c1 smallint, c2 smallint, c3 smallint, c4 smallint, c5 smallint, b STRING);
 
@@ -676,7 +678,7 @@ insert into table 
table_change_lower_to_higher_numeric_group_smallint
 select insert_num,c1,c2,c3,c4,c5,b from 
table_change_lower_to_higher_numeric_group_smallint order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_smallint replace 
columns (insert_num int, c1 INT, c2 BIGINT, c3 decimal(38,18), c4 FLOAT, c5 
DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_smallint replace 
columns (insert_num int, c1 INT, c2 BIGINT, c3 FLOAT, c4 DOUBLE, c5 
decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_smallint
     values (5, '774', '2031', '200', '12', '99', 'new'),
@@ -696,7 +698,7 @@ drop table 
table_change_lower_to_higher_numeric_group_smallint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: INT, (BIGINT, DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: INT, (BIGINT, FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE table_change_lower_to_higher_numeric_group_int(insert_num int, c1 
int, c2 int, c3 int, c4 int, b STRING);
 
@@ -709,7 +711,7 @@ insert into table 
table_change_lower_to_higher_numeric_group_int
 select insert_num,c1,c2,c3,c4,b from 
table_change_lower_to_higher_numeric_group_int order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_int replace columns 
(insert_num int, c1 BIGINT, c2 decimal(38,18), c3 FLOAT, c4 DOUBLE,  b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_int replace columns 
(insert_num int, c1 BIGINT, c2 FLOAT, c3 DOUBLE, c4 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_int
     values (5, '774', '2031', '200', '12', 'new'),
@@ -728,7 +730,7 @@ drop table table_change_lower_to_higher_numeric_group_int;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: BIGINT, (DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: BIGINT, (FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE table_change_lower_to_higher_numeric_group_bigint(insert_num int, 
c1 bigint, c2 bigint, c3 bigint, b STRING);
 
@@ -741,7 +743,7 @@ insert into table 
table_change_lower_to_higher_numeric_group_bigint
 select insert_num,c1,c2,c3,b from 
table_change_lower_to_higher_numeric_group_bigint order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_bigint replace columns 
(insert_num int, c1 decimal(38,18), c2 FLOAT, c3 DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_bigint replace columns 
(insert_num int, c1 FLOAT, c2 DOUBLE, c3 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_bigint
     values (5, '774', '2031', '200', 'new'),
@@ -760,22 +762,22 @@ drop table 
table_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: FLOAT, (DOUBLE, DECIMAL)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: FLOAT, (FLOAT, DECIMAL)
 --
-CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num 
int, c1 float, c2 float, b STRING);
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, 
c1 float, c2 float, b STRING);
 
-insert into table table_change_lower_to_higher_numeric_group_decimal
+insert into table table_change_lower_to_higher_numeric_group_float
     values (1, -29.0764, -29.0764, 'original'),
            (2, 753.7028, 753.7028, 'original'),
            (3, -5000, -5000, 'original'),
            (4, 52927714, 52927714, 'original');
 
-select insert_num,c1,c2,b from 
table_change_lower_to_higher_numeric_group_decimal order by insert_num;
+select insert_num,c1,c2,b from 
table_change_lower_to_higher_numeric_group_float order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_decimal replace columns 
(insert_num int, c1 double, c2 decimal(38,18), b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_float replace columns 
(insert_num int, c1 double, c2 decimal(38,18), b STRING) ;
 
-insert into table table_change_lower_to_higher_numeric_group_decimal
+insert into table table_change_lower_to_higher_numeric_group_float
     values (5, '7.74', '22.3', 'new'),
            (6, '56.1431', '90.9', 'new'),
            (7, '2.56', '25.6', 'new'),
@@ -784,31 +786,31 @@ insert into table 
table_change_lower_to_higher_numeric_group_decimal
            (10, '1.7', '17.8888', 'new');
 
 explain
-select insert_num,c1,c2,b from 
table_change_lower_to_higher_numeric_group_decimal order by insert_num;
+select insert_num,c1,c2,b from 
table_change_lower_to_higher_numeric_group_float order by insert_num;
 
-select insert_num,c1,c2,b from 
table_change_lower_to_higher_numeric_group_decimal order by insert_num;
+select insert_num,c1,c2,b from 
table_change_lower_to_higher_numeric_group_float order by insert_num;
 
-drop table table_change_lower_to_higher_numeric_group_decimal;
+drop table table_change_lower_to_higher_numeric_group_float;
 
 
 
 --
 -- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: DOUBLE, (DECIMAL)
 --
-CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, 
c1 double, b STRING);
+CREATE TABLE table_change_lower_to_higher_numeric_group_double(insert_num int, 
c1 double, b STRING);
 
-insert into table table_change_lower_to_higher_numeric_group_float
+insert into table table_change_lower_to_higher_numeric_group_double
     values (1, -29.0764, 'original'),
            (2, 753.7028, 'original'),
            (3, -5000, 'original'),
            (4, 52927714, 'original');
 
-select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float 
order by insert_num;
+select insert_num,c1,b from table_change_lower_to_higher_numeric_group_double 
order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_float replace columns 
(insert_num int, c1 decimal(38,18), b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_double replace columns 
(insert_num int, c1 decimal(38,18), b STRING) ;
 
-insert into table table_change_lower_to_higher_numeric_group_float
+insert into table table_change_lower_to_higher_numeric_group_double
     values (5, '774', 'new'),
            (6, '561431', 'new'),
            (7, '256', 'new'),
@@ -817,8 +819,8 @@ insert into table 
table_change_lower_to_higher_numeric_group_float
            (10, '17', 'new');
 
 explain
-select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float 
order by insert_num;
+select insert_num,c1,b from table_change_lower_to_higher_numeric_group_double 
order by insert_num;
 
-select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float 
order by insert_num;
+select insert_num,c1,b from table_change_lower_to_higher_numeric_group_double 
order by insert_num;
 
-drop table table_change_lower_to_higher_numeric_group_float;
\ No newline at end of file
+drop table table_change_lower_to_higher_numeric_group_double;

http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/queries/clientpositive/schema_evol_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_stats.q 
b/ql/src/test/queries/clientpositive/schema_evol_stats.q
index 322379d..210146b 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_stats.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_stats.q
@@ -1,5 +1,6 @@
 set hive.mapred.mode=nonstrict;
 SET hive.exec.schema.evolution=true;
+set hive.llap.io.enabled=false;
 
 CREATE TABLE partitioned1(a INT, b STRING) PARTITIONED BY(part INT) STORED AS 
TEXTFILE;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part.q 
b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part.q
index 5382969..3e0cdab 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part.q
@@ -10,6 +10,7 @@ SET hive.vectorized.execution.enabled=false;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.metastore.disallow.incompatible.col.type.changes=true;
 set hive.default.fileformat=textfile;
+set hive.llap.io.enabled=false;
 
 -- SORT_QUERY_RESULTS
 --
@@ -365,9 +366,9 @@ drop table 
part_change_numeric_group_string_group_multi_ints_varchar_trunc;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), STRING
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), STRING
 --
-CREATE TABLE part_change_numeric_group_string_group_floating_string(insert_num 
int, c1 decimal(38,18), c2 float, c3 double, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_numeric_group_string_group_floating_string(insert_num 
int, c1 float, c2 double, c3 decimal(38,18), b STRING) PARTITIONED BY(part INT);
 
 insert into table part_change_numeric_group_string_group_floating_string 
partition(part=1)
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -397,9 +398,9 @@ drop table 
part_change_numeric_group_string_group_floating_string;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), CHAR
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), CHAR
 --
-CREATE TABLE part_change_numeric_group_string_group_floating_char(insert_num 
int, c1 decimal(38,18), c2 float, c3 double, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_numeric_group_string_group_floating_char(insert_num 
int, c1 float, c2 double, c3 decimal(38,18), b STRING) PARTITIONED BY(part INT);
 
 insert into table part_change_numeric_group_string_group_floating_char 
partition(part=1)
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -429,9 +430,9 @@ drop table 
part_change_numeric_group_string_group_floating_char;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), CHAR truncation
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), CHAR truncation
 --
-CREATE TABLE 
part_change_numeric_group_string_group_floating_char_trunc(insert_num int, c1 
decimal(38,18), c2 float, c3 double, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE 
part_change_numeric_group_string_group_floating_char_trunc(insert_num int, c1 
float, c2 double, c3 decimal(38,18), b STRING) PARTITIONED BY(part INT);
 
 insert into table part_change_numeric_group_string_group_floating_char_trunc 
partition(part=1)
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -461,7 +462,7 @@ drop table 
part_change_numeric_group_string_group_floating_char_trunc;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), VARCHAR
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), VARCHAR
 --
 CREATE TABLE 
part_change_numeric_group_string_group_floating_varchar(insert_num int, c1 
float, c2 double, c3 decimal(38,18), b STRING) PARTITIONED BY(part INT);
 
@@ -493,9 +494,9 @@ drop table 
part_change_numeric_group_string_group_floating_varchar;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), VARCHAR truncation
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), VARCHAR truncation
 --
-CREATE TABLE 
part_change_numeric_group_string_group_floating_varchar_trunc(insert_num int, 
c1 decimal(38,18), c2 float, c3 double, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE 
part_change_numeric_group_string_group_floating_varchar_trunc(insert_num int, 
c1 float, c2 double, c3 decimal(38,18), b STRING) PARTITIONED BY(part INT);
 
 insert into table 
part_change_numeric_group_string_group_floating_varchar_trunc partition(part=1)
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -632,7 +633,7 @@ drop table part_change_string_group_string_group_varchar;
 --
 --
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: TINYINT, (SMALLINT, INT, BIGINT, DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: TINYINT, (SMALLINT, INT, BIGINT, FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE part_change_lower_to_higher_numeric_group_tinyint(insert_num int, 
c1 tinyint, c2 tinyint, c3 tinyint, c4 tinyint, c5 tinyint, c6 tinyint, b 
STRING) PARTITIONED BY(part INT);
 
@@ -645,7 +646,7 @@ insert into table 
part_change_lower_to_higher_numeric_group_tinyint partition(pa
 select insert_num,part,c1,c2,c3,c4,c5,c6,b from 
part_change_lower_to_higher_numeric_group_tinyint order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_tinyint replace columns 
(insert_num int, c1 SMALLINT, c2 INT, c3 BIGINT, c4 decimal(38,18), c5 FLOAT, 
c6 DOUBLE, b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_tinyint replace columns 
(insert_num int, c1 SMALLINT, c2 INT, c3 BIGINT, c4 FLOAT, c5 DOUBLE, c6 
decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_tinyint 
partition(part)
     values (5, '774', '2031', '200', '12', '99', '0', 'new', 2),
@@ -664,7 +665,7 @@ drop table 
part_change_lower_to_higher_numeric_group_tinyint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: SMALLINT, (INT, BIGINT, DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: SMALLINT, (INT, BIGINT, FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE part_change_lower_to_higher_numeric_group_smallint(insert_num 
int, c1 smallint, c2 smallint, c3 smallint, c4 smallint, c5 smallint, b STRING) 
PARTITIONED BY(part INT);
 
@@ -677,7 +678,7 @@ insert into table 
part_change_lower_to_higher_numeric_group_smallint partition(p
 select insert_num,part,c1,c2,c3,c4,c5,b from 
part_change_lower_to_higher_numeric_group_smallint order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_smallint replace columns 
(insert_num int, c1 INT, c2 BIGINT, c3 decimal(38,18), c4 FLOAT, c5 DOUBLE, b 
STRING) ;
+alter table part_change_lower_to_higher_numeric_group_smallint replace columns 
(insert_num int, c1 INT, c2 BIGINT, c3 FLOAT, c4 DOUBLE, c5 decimal(38,18), b 
STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_smallint 
partition(part)
     values (5, '774', '2031', '200', '12', '99', 'new', 2),
@@ -697,7 +698,7 @@ drop table 
part_change_lower_to_higher_numeric_group_smallint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: INT, (BIGINT, DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: INT, (BIGINT, FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE part_change_lower_to_higher_numeric_group_int(insert_num int, c1 
int, c2 int, c3 int, c4 int, b STRING) PARTITIONED BY(part INT);
 
@@ -710,7 +711,7 @@ insert into table 
part_change_lower_to_higher_numeric_group_int partition(part=1
 select insert_num,part,c1,c2,c3,c4,b from 
part_change_lower_to_higher_numeric_group_int order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_int replace columns 
(insert_num int, c1 BIGINT, c2 decimal(38,18), c3 FLOAT, c4 DOUBLE,  b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_int replace columns 
(insert_num int, c1 BIGINT, c2 FLOAT, c3 DOUBLE, c4 decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_int partition(part)
     values (5, '774', '2031', '200', '12', 'new', 2),
@@ -729,7 +730,7 @@ drop table part_change_lower_to_higher_numeric_group_int;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: BIGINT, (DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: BIGINT, (FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE part_change_lower_to_higher_numeric_group_bigint(insert_num int, 
c1 bigint, c2 bigint, c3 bigint, b STRING) PARTITIONED BY(part INT);
 
@@ -742,7 +743,7 @@ insert into table 
part_change_lower_to_higher_numeric_group_bigint partition(par
 select insert_num,part,c1,c2,c3,b from 
part_change_lower_to_higher_numeric_group_bigint order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_bigint replace columns 
(insert_num int, c1 decimal(38,18), c2 FLOAT, c3 DOUBLE, b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_bigint replace columns 
(insert_num int, c1 FLOAT, c2 DOUBLE, c3 decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_bigint 
partition(part)
     values (5, '774', '2031', '200', 'new', 2),
@@ -763,58 +764,26 @@ drop table 
part_change_lower_to_higher_numeric_group_bigint;
 --
 -- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: FLOAT, (DOUBLE, DECIMAL)
 --
-CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, 
c1 float, c2 float, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, 
c1 float, c2 float, b STRING) PARTITIONED BY(part INT);
 
-insert into table part_change_lower_to_higher_numeric_group_decimal 
partition(part=1)
-    values (1, -29.0764, -29.0764, 'original'),
+insert into table part_change_lower_to_higher_numeric_group_float 
partition(part=1)
+    values (1, -29.0764,  -29.0764, 'original'),
            (2, 753.7028, 753.7028, 'original'),
            (3, -5000, -5000, 'original'),
            (4, 52927714, 52927714, 'original');
 
-select insert_num,part,c1,b from 
part_change_lower_to_higher_numeric_group_decimal order by insert_num;
-
--- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_decimal replace columns 
(insert_num int, c1 double, c2 decimal(38,18), b STRING) ;
-
-insert into table part_change_lower_to_higher_numeric_group_decimal 
partition(part)
-    values (5, '7.74', '22.3', 'new', 2),
-           (6, '56.1431', '90.9', 'new', 2),
-           (7, '2.56', '25.6', 'new', 2),
-           (8, '555.5', '55.55', 'new', 2),
-           (9, '10.0', '0.100', 'new', 1),
-           (10, '1.7', '17.8888', 'new', 1);
-
-explain
-select insert_num,part,c1,b from 
part_change_lower_to_higher_numeric_group_decimal order by insert_num;
-
-select insert_num,part,c1,b from 
part_change_lower_to_higher_numeric_group_decimal order by insert_num;
-
-drop table part_change_lower_to_higher_numeric_group_decimal;
-
-
---
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: DOUBLE, (DECIMAL)
---
-CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, 
c1 double, b STRING) PARTITIONED BY(part INT);
-
-insert into table part_change_lower_to_higher_numeric_group_float 
partition(part=1)
-    values (1, -29.0764, 'original'),
-           (2, 753.7028, 'original'),
-           (3, -5000, 'original'),
-           (4, 52927714, 'original');
-
 select insert_num,part,c1,b from 
part_change_lower_to_higher_numeric_group_float order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_float replace columns 
(insert_num int, c1 decimal(38,18), b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_float replace columns 
(insert_num int, c1 DOUBLE, c2 decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_float 
partition(part)
-    values (5, '774', 'new', 2),
-           (6, '561431', 'new', 2),
-           (7, '256', 'new', 2),
-           (8, '5555', 'new', 2),
-           (9, '100', 'new', 1),
-           (10, '17',  'new', 1);
+    values (5, '774', '774', 'new', 2),
+           (6, '561431', '561431', 'new', 2),
+           (7, '256', '256', 'new', 2),
+           (8, '5555', '5555', 'new', 2),
+           (9, '100', '100', 'new', 1),
+           (10, '17', '17', 'new', 1);
 
 explain
 select insert_num,part,c1,b from 
part_change_lower_to_higher_numeric_group_float order by insert_num;

http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part_all_complex.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part_all_complex.q
 
b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part_all_complex.q
index c1e8af6..a02123f 100644
--- 
a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part_all_complex.q
+++ 
b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part_all_complex.q
@@ -10,6 +10,7 @@ SET hive.vectorized.execution.enabled=false;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.metastore.disallow.incompatible.col.type.changes=false;
 set hive.default.fileformat=textfile;
+set hive.llap.io.enabled=false;
 
 -- SORT_QUERY_RESULTS
 --

http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part_all_primitive.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part_all_primitive.q
 
b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part_all_primitive.q
index 4ed92c7..e633ccf 100644
--- 
a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part_all_primitive.q
+++ 
b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part_all_primitive.q
@@ -10,6 +10,7 @@ SET hive.vectorized.execution.enabled=false;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.metastore.disallow.incompatible.col.type.changes=false;
 set hive.default.fileformat=textfile;
+set hive.llap.io.enabled=false;
 
 -- SORT_QUERY_RESULTS
 --

http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_table.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_table.q 
b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_table.q
index 9e9549e..2cfb85c 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_table.q
@@ -9,6 +9,7 @@ SET hive.vectorized.execution.enabled=false;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.metastore.disallow.incompatible.col.type.changes=true;
 set hive.default.fileformat=textfile;
+set hive.llap.io.enabled=false;
 
 -- SORT_QUERY_RESULTS
 --
@@ -178,7 +179,8 @@ insert into table table_change_date_group_string_group_date
            (3, '2021-09-24', '2021-09-24', '2021-09-24', '2021-09-24', 
'2021-09-24', 'original');
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_date_group_string_group_date replace 
columns(insert_num int, c1 STRING, c2 CHAR(50), c3 CHAR(15), c4 VARCHAR(50), c5 
VARCHAR(15), b STRING);DESCRIBE FORMATTED 
table_change_date_group_string_group_date;
+alter table table_change_date_group_string_group_date replace 
columns(insert_num int, c1 STRING, c2 CHAR(50), c3 CHAR(15), c4 VARCHAR(50), c5 
VARCHAR(15), b STRING);
+DESCRIBE FORMATTED table_change_date_group_string_group_date;
 
 insert into table table_change_date_group_string_group_date
     values (4, '0004-09-22', '0004-09-22', '0004-09-22', '0004-09-22', 
'0004-09-22', 'new'),
@@ -366,7 +368,7 @@ drop table 
table_change_numeric_group_string_group_multi_ints_varchar_trunc;
 --
 -- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), STRING
 --
-CREATE TABLE 
table_change_numeric_group_string_group_floating_string(insert_num int, c1 
decimal(38,18), c2 float, c3 double, b STRING);
+CREATE TABLE 
table_change_numeric_group_string_group_floating_string(insert_num int, c1 
float, c2 double, c3 decimal(38,18), b STRING);
 
 insert into table table_change_numeric_group_string_group_floating_string
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -396,9 +398,9 @@ drop table 
table_change_numeric_group_string_group_floating_string;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), CHAR
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), CHAR
 --
-CREATE TABLE table_change_numeric_group_string_group_floating_char(insert_num 
int, c1 decimal(38,18), c2 float, c3 double, b STRING);
+CREATE TABLE table_change_numeric_group_string_group_floating_char(insert_num 
int, c1 float, c2 double, c3 decimal(38,18), b STRING);
 
 insert into table table_change_numeric_group_string_group_floating_char
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -428,9 +430,9 @@ drop table 
table_change_numeric_group_string_group_floating_char;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), CHAR truncation
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), CHAR truncation
 --
-CREATE TABLE 
table_change_numeric_group_string_group_floating_char_trunc(insert_num int, c1 
decimal(38,18), c2 float, c3 double, b STRING);
+CREATE TABLE 
table_change_numeric_group_string_group_floating_char_trunc(insert_num int, c1 
float, c2 double, c3 decimal(38,18), b STRING);
 
 insert into table table_change_numeric_group_string_group_floating_char_trunc
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -460,7 +462,7 @@ drop table 
table_change_numeric_group_string_group_floating_char_trunc;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), VARCHAR
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), VARCHAR
 --
 CREATE TABLE 
table_change_numeric_group_string_group_floating_varchar(insert_num int, c1 
float, c2 double, c3 decimal(38,18), b STRING);
 
@@ -492,9 +494,9 @@ drop table 
table_change_numeric_group_string_group_floating_varchar;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), VARCHAR truncation
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), VARCHAR truncation
 --
-CREATE TABLE 
table_change_numeric_group_string_group_floating_varchar_trunc(insert_num int, 
c1 decimal(38,18), c2 float, c3 double, b STRING);
+CREATE TABLE 
table_change_numeric_group_string_group_floating_varchar_trunc(insert_num int, 
c1 float, c2 double, c3 decimal(38,18), b STRING);
 
 insert into table 
table_change_numeric_group_string_group_floating_varchar_trunc
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -631,7 +633,7 @@ drop table table_change_string_group_string_group_varchar;
 --
 --
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: TINYINT, (SMALLINT, INT, BIGINT, DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: TINYINT, (SMALLINT, INT, BIGINT, FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE table_change_lower_to_higher_numeric_group_tinyint(insert_num 
int, c1 tinyint, c2 tinyint, c3 tinyint, c4 tinyint, c5 tinyint, c6 tinyint, b 
STRING);
 
@@ -644,7 +646,7 @@ insert into table 
table_change_lower_to_higher_numeric_group_tinyint
 select insert_num,c1,c2,c3,c4,c5,c6,b from 
table_change_lower_to_higher_numeric_group_tinyint order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_tinyint replace columns 
(insert_num int, c1 SMALLINT, c2 INT, c3 BIGINT, c4 decimal(38,18), c5 FLOAT, 
c6 DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_tinyint replace columns 
(insert_num int, c1 SMALLINT, c2 INT, c3 BIGINT, c4 FLOAT, c5 DOUBLE, c6 
decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_tinyint
     values (5, '774', '2031', '200', '12', '99', '0', 'new'),
@@ -663,7 +665,7 @@ drop table 
table_change_lower_to_higher_numeric_group_tinyint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: SMALLINT, (INT, BIGINT, DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: SMALLINT, (INT, BIGINT, FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE table_change_lower_to_higher_numeric_group_smallint(insert_num 
int, c1 smallint, c2 smallint, c3 smallint, c4 smallint, c5 smallint, b STRING);
 
@@ -676,7 +678,7 @@ insert into table 
table_change_lower_to_higher_numeric_group_smallint
 select insert_num,c1,c2,c3,c4,c5,b from 
table_change_lower_to_higher_numeric_group_smallint order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_smallint replace 
columns (insert_num int, c1 INT, c2 BIGINT, c3 decimal(38,18), c4 FLOAT, c5 
DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_smallint replace 
columns (insert_num int, c1 INT, c2 BIGINT, c3 FLOAT, c4 DOUBLE, c5 
decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_smallint
     values (5, '774', '2031', '200', '12', '99', 'new'),
@@ -696,7 +698,7 @@ drop table 
table_change_lower_to_higher_numeric_group_smallint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: INT, (BIGINT, DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: INT, (BIGINT, FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE table_change_lower_to_higher_numeric_group_int(insert_num int, c1 
int, c2 int, c3 int, c4 int, b STRING);
 
@@ -709,7 +711,7 @@ insert into table 
table_change_lower_to_higher_numeric_group_int
 select insert_num,c1,c2,c3,c4,b from 
table_change_lower_to_higher_numeric_group_int order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_int replace columns 
(insert_num int, c1 BIGINT, c2 decimal(38,18), c3 FLOAT, c4 DOUBLE,  b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_int replace columns 
(insert_num int, c1 BIGINT, c2 FLOAT, c3 DOUBLE, c4 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_int
     values (5, '774', '2031', '200', '12', 'new'),
@@ -728,7 +730,7 @@ drop table table_change_lower_to_higher_numeric_group_int;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: BIGINT, (DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: BIGINT, (FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE table_change_lower_to_higher_numeric_group_bigint(insert_num int, 
c1 bigint, c2 bigint, c3 bigint, b STRING);
 
@@ -741,7 +743,7 @@ insert into table 
table_change_lower_to_higher_numeric_group_bigint
 select insert_num,c1,c2,c3,b from 
table_change_lower_to_higher_numeric_group_bigint order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_bigint replace columns 
(insert_num int, c1 decimal(38,18), c2 FLOAT, c3 DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_bigint replace columns 
(insert_num int, c1 FLOAT, c2 DOUBLE, c3 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_bigint
     values (5, '774', '2031', '200', 'new'),
@@ -760,22 +762,22 @@ drop table 
table_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: FLOAT, (DOUBLE, DECIMAL)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: FLOAT, (FLOAT, DECIMAL)
 --
-CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num 
int, c1 float, c2 float, b STRING);
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, 
c1 float, c2 float, b STRING);
 
-insert into table table_change_lower_to_higher_numeric_group_decimal
+insert into table table_change_lower_to_higher_numeric_group_float
     values (1, -29.0764, -29.0764, 'original'),
            (2, 753.7028, 753.7028, 'original'),
            (3, -5000, -5000, 'original'),
            (4, 52927714, 52927714, 'original');
 
-select insert_num,c1,c2,b from 
table_change_lower_to_higher_numeric_group_decimal order by insert_num;
+select insert_num,c1,c2,b from 
table_change_lower_to_higher_numeric_group_float order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_decimal replace columns 
(insert_num int, c1 double, c2 decimal(38,18), b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_float replace columns 
(insert_num int, c1 double, c2 decimal(38,18), b STRING) ;
 
-insert into table table_change_lower_to_higher_numeric_group_decimal
+insert into table table_change_lower_to_higher_numeric_group_float
     values (5, '7.74', '22.3', 'new'),
            (6, '56.1431', '90.9', 'new'),
            (7, '2.56', '25.6', 'new'),
@@ -784,31 +786,31 @@ insert into table 
table_change_lower_to_higher_numeric_group_decimal
            (10, '1.7', '17.8888', 'new');
 
 explain
-select insert_num,c1,c2,b from 
table_change_lower_to_higher_numeric_group_decimal order by insert_num;
+select insert_num,c1,c2,b from 
table_change_lower_to_higher_numeric_group_float order by insert_num;
 
-select insert_num,c1,c2,b from 
table_change_lower_to_higher_numeric_group_decimal order by insert_num;
+select insert_num,c1,c2,b from 
table_change_lower_to_higher_numeric_group_float order by insert_num;
 
-drop table table_change_lower_to_higher_numeric_group_decimal;
+drop table table_change_lower_to_higher_numeric_group_float;
 
 
 
 --
 -- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: DOUBLE, (DECIMAL)
 --
-CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, 
c1 double, b STRING);
+CREATE TABLE table_change_lower_to_higher_numeric_group_double(insert_num int, 
c1 double, b STRING);
 
-insert into table table_change_lower_to_higher_numeric_group_float
+insert into table table_change_lower_to_higher_numeric_group_double
     values (1, -29.0764, 'original'),
            (2, 753.7028, 'original'),
            (3, -5000, 'original'),
            (4, 52927714, 'original');
 
-select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float 
order by insert_num;
+select insert_num,c1,b from table_change_lower_to_higher_numeric_group_double 
order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_float replace columns 
(insert_num int, c1 decimal(38,18), b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_double replace columns 
(insert_num int, c1 decimal(38,18), b STRING) ;
 
-insert into table table_change_lower_to_higher_numeric_group_float
+insert into table table_change_lower_to_higher_numeric_group_double
     values (5, '774', 'new'),
            (6, '561431', 'new'),
            (7, '256', 'new'),
@@ -817,8 +819,8 @@ insert into table 
table_change_lower_to_higher_numeric_group_float
            (10, '17', 'new');
 
 explain
-select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float 
order by insert_num;
+select insert_num,c1,b from table_change_lower_to_higher_numeric_group_double 
order by insert_num;
 
-select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float 
order by insert_num;
+select insert_num,c1,b from table_change_lower_to_higher_numeric_group_double 
order by insert_num;
 
-drop table table_change_lower_to_higher_numeric_group_float;
\ No newline at end of file
+drop table table_change_lower_to_higher_numeric_group_double;

http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_part.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_part.q 
b/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_part.q
index 17504de..19814a1 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_part.q
@@ -10,6 +10,7 @@ SET hive.vectorized.execution.enabled=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.metastore.disallow.incompatible.col.type.changes=true;
 set hive.default.fileformat=textfile;
+set hive.llap.io.enabled=false;
 
 -- SORT_QUERY_RESULTS
 --
@@ -367,9 +368,9 @@ drop table 
part_change_numeric_group_string_group_multi_ints_varchar_trunc;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), STRING
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), STRING
 --
-CREATE TABLE part_change_numeric_group_string_group_floating_string(insert_num 
int, c1 decimal(38,18), c2 float, c3 double, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_numeric_group_string_group_floating_string(insert_num 
int, c1 float, c2 double, c3 decimal(38,18), b STRING) PARTITIONED BY(part INT);
 
 insert into table part_change_numeric_group_string_group_floating_string 
partition(part=1)
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -399,9 +400,9 @@ drop table 
part_change_numeric_group_string_group_floating_string;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), CHAR
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), CHAR
 --
-CREATE TABLE part_change_numeric_group_string_group_floating_char(insert_num 
int, c1 decimal(38,18), c2 float, c3 double, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_numeric_group_string_group_floating_char(insert_num 
int, c1 float, c2 double, c3 decimal(38,18), b STRING) PARTITIONED BY(part INT);
 
 insert into table part_change_numeric_group_string_group_floating_char 
partition(part=1)
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -431,9 +432,9 @@ drop table 
part_change_numeric_group_string_group_floating_char;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), CHAR truncation
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), CHAR truncation
 --
-CREATE TABLE 
part_change_numeric_group_string_group_floating_char_trunc(insert_num int, c1 
decimal(38,18), c2 float, c3 double, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE 
part_change_numeric_group_string_group_floating_char_trunc(insert_num int, c1 
float, c2 double, c3 decimal(38,18), b STRING) PARTITIONED BY(part INT);
 
 insert into table part_change_numeric_group_string_group_floating_char_trunc 
partition(part=1)
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -463,7 +464,7 @@ drop table 
part_change_numeric_group_string_group_floating_char_trunc;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), VARCHAR
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), VARCHAR
 --
 CREATE TABLE 
part_change_numeric_group_string_group_floating_varchar(insert_num int, c1 
float, c2 double, c3 decimal(38,18), b STRING) PARTITIONED BY(part INT);
 
@@ -495,9 +496,9 @@ drop table 
part_change_numeric_group_string_group_floating_varchar;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(DECIMAL, FLOAT, DOUBLE), VARCHAR truncation
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP: 
(FLOAT, DOUBLE, DECIMAL), VARCHAR truncation
 --
-CREATE TABLE 
part_change_numeric_group_string_group_floating_varchar_trunc(insert_num int, 
c1 decimal(38,18), c2 float, c3 double, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE 
part_change_numeric_group_string_group_floating_varchar_trunc(insert_num int, 
c1 float, c2 double, c3 decimal(38,18), b STRING) PARTITIONED BY(part INT);
 
 insert into table 
part_change_numeric_group_string_group_floating_varchar_trunc partition(part=1)
     values (1, -23866739993, 753.7028, -3651.672121, 'original'),
@@ -634,7 +635,7 @@ drop table part_change_string_group_string_group_varchar;
 --
 --
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: TINYINT, (SMALLINT, INT, BIGINT, DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: TINYINT, (SMALLINT, INT, BIGINT, FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE part_change_lower_to_higher_numeric_group_tinyint(insert_num int, 
c1 tinyint, c2 tinyint, c3 tinyint, c4 tinyint, c5 tinyint, c6 tinyint, b 
STRING) PARTITIONED BY(part INT);
 
@@ -647,7 +648,7 @@ insert into table 
part_change_lower_to_higher_numeric_group_tinyint partition(pa
 select insert_num,part,c1,c2,c3,c4,c5,c6,b from 
part_change_lower_to_higher_numeric_group_tinyint order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_tinyint replace columns 
(insert_num int, c1 SMALLINT, c2 INT, c3 BIGINT, c4 decimal(38,18), c5 FLOAT, 
c6 DOUBLE, b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_tinyint replace columns 
(insert_num int, c1 SMALLINT, c2 INT, c3 BIGINT, c4 FLOAT, c5 DOUBLE, c6 
decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_tinyint 
partition(part)
     values (5, '774', '2031', '200', '12', '99', '0', 'new', 2),
@@ -666,7 +667,7 @@ drop table 
part_change_lower_to_higher_numeric_group_tinyint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: SMALLINT, (INT, BIGINT, DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: SMALLINT, (INT, BIGINT, FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE part_change_lower_to_higher_numeric_group_smallint(insert_num 
int, c1 smallint, c2 smallint, c3 smallint, c4 smallint, c5 smallint, b STRING) 
PARTITIONED BY(part INT);
 
@@ -679,7 +680,7 @@ insert into table 
part_change_lower_to_higher_numeric_group_smallint partition(p
 select insert_num,part,c1,c2,c3,c4,c5,b from 
part_change_lower_to_higher_numeric_group_smallint order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_smallint replace columns 
(insert_num int, c1 INT, c2 BIGINT, c3 decimal(38,18), c4 FLOAT, c5 DOUBLE, b 
STRING) ;
+alter table part_change_lower_to_higher_numeric_group_smallint replace columns 
(insert_num int, c1 INT, c2 BIGINT, c3 FLOAT, c4 DOUBLE, c5 decimal(38,18), b 
STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_smallint 
partition(part)
     values (5, '774', '2031', '200', '12', '99', 'new', 2),
@@ -699,7 +700,7 @@ drop table 
part_change_lower_to_higher_numeric_group_smallint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: INT, (BIGINT, DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: INT, (BIGINT, FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE part_change_lower_to_higher_numeric_group_int(insert_num int, c1 
int, c2 int, c3 int, c4 int, b STRING) PARTITIONED BY(part INT);
 
@@ -712,7 +713,7 @@ insert into table 
part_change_lower_to_higher_numeric_group_int partition(part=1
 select insert_num,part,c1,c2,c3,c4,b from 
part_change_lower_to_higher_numeric_group_int order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_int replace columns 
(insert_num int, c1 BIGINT, c2 decimal(38,18), c3 FLOAT, c4 DOUBLE,  b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_int replace columns 
(insert_num int, c1 BIGINT, c2 FLOAT, c3 DOUBLE, c4 decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_int partition(part)
     values (5, '774', '2031', '200', '12', 'new', 2),
@@ -731,7 +732,7 @@ drop table part_change_lower_to_higher_numeric_group_int;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: BIGINT, (DECIMAL, FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: BIGINT, (FLOAT, DOUBLE, DECIMAL)
 --
 CREATE TABLE part_change_lower_to_higher_numeric_group_bigint(insert_num int, 
c1 bigint, c2 bigint, c3 bigint, b STRING) PARTITIONED BY(part INT);
 
@@ -744,7 +745,7 @@ insert into table 
part_change_lower_to_higher_numeric_group_bigint partition(par
 select insert_num,part,c1,c2,c3,b from 
part_change_lower_to_higher_numeric_group_bigint order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_bigint replace columns 
(insert_num int, c1 decimal(38,18), c2 FLOAT, c3 DOUBLE, b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_bigint replace columns 
(insert_num int, c1 FLOAT, c2 DOUBLE, c3 decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_bigint 
partition(part)
     values (5, '774', '2031', '200', 'new', 2),
@@ -765,58 +766,26 @@ drop table 
part_change_lower_to_higher_numeric_group_bigint;
 --
 -- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: FLOAT, (DOUBLE, DECIMAL)
 --
-CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, 
c1 float, c2 float, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, 
c1 float, c2 float, b STRING) PARTITIONED BY(part INT);
 
-insert into table part_change_lower_to_higher_numeric_group_decimal 
partition(part=1)
-    values (1, -29.0764, -29.0764, 'original'),
+insert into table part_change_lower_to_higher_numeric_group_float 
partition(part=1)
+    values (1, -29.0764,  -29.0764, 'original'),
            (2, 753.7028, 753.7028, 'original'),
            (3, -5000, -5000, 'original'),
            (4, 52927714, 52927714, 'original');
 
-select insert_num,part,c1,b from 
part_change_lower_to_higher_numeric_group_decimal order by insert_num;
-
--- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_decimal replace columns 
(insert_num int, c1 double, c2 decimal(38,18), b STRING) ;
-
-insert into table part_change_lower_to_higher_numeric_group_decimal 
partition(part)
-    values (5, '7.74', '22.3', 'new', 2),
-           (6, '56.1431', '90.9', 'new', 2),
-           (7, '2.56', '25.6', 'new', 2),
-           (8, '555.5', '55.55', 'new', 2),
-           (9, '10.0', '0.100', 'new', 1),
-           (10, '1.7', '17.8888', 'new', 1);
-
-explain
-select insert_num,part,c1,b from 
part_change_lower_to_higher_numeric_group_decimal order by insert_num;
-
-select insert_num,part,c1,b from 
part_change_lower_to_higher_numeric_group_decimal order by insert_num;
-
-drop table part_change_lower_to_higher_numeric_group_decimal;
-
-
---
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP: DOUBLE, (DECIMAL)
---
-CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, 
c1 DOUBLE, b STRING) PARTITIONED BY(part INT);
-
-insert into table part_change_lower_to_higher_numeric_group_float 
partition(part=1)
-    values (1, -29.0764, 'original'),
-           (2, 753.7028, 'original'),
-           (3, -5000, 'original'),
-           (4, 52927714, 'original');
-
 select insert_num,part,c1,b from 
part_change_lower_to_higher_numeric_group_float order by insert_num;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_float replace columns 
(insert_num int, c1 decimal(38,18), b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_float replace columns 
(insert_num int, c1 DOUBLE, c2 decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_float 
partition(part)
-    values (5, '774', 'new', 2),
-           (6, '561431', 'new', 2),
-           (7, '256', 'new', 2),
-           (8, '5555', 'new', 2),
-           (9, '100', 'new', 1),
-           (10, '17',  'new', 1);
+    values (5, '774', '774', 'new', 2),
+           (6, '561431', '561431', 'new', 2),
+           (7, '256', '256', 'new', 2),
+           (8, '5555', '5555', 'new', 2),
+           (9, '100', '100', 'new', 1),
+           (10, '17', '17', 'new', 1);
 
 explain
 select insert_num,part,c1,b from 
part_change_lower_to_higher_numeric_group_float order by insert_num;

http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_part_all_complex.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_part_all_complex.q
 
b/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_part_all_complex.q
index a914544..5be6883 100644
--- 
a/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_part_all_complex.q
+++ 
b/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_part_all_complex.q
@@ -10,6 +10,7 @@ SET hive.vectorized.execution.enabled=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.metastore.disallow.incompatible.col.type.changes=false;
 set hive.default.fileformat=textfile;
+set hive.llap.io.enabled=false;
 
 -- SORT_QUERY_RESULTS
 --

http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_part_all_primitive.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_part_all_primitive.q
 
b/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_part_all_primitive.q
index 30a1c08..e8c1a01 100644
--- 
a/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_part_all_primitive.q
+++ 
b/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_part_all_primitive.q
@@ -10,6 +10,7 @@ SET hive.vectorized.execution.enabled=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.metastore.disallow.incompatible.col.type.changes=false;
 set hive.default.fileformat=textfile;
+set hive.llap.io.enabled=false;
 
 -- SORT_QUERY_RESULTS
 --

Reply via email to