You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jc...@apache.org on 2016/11/08 17:11:31 UTC
[7/7] hive git commit: HIVE-15094: Fix test failures for 2.1.1 regarding schema evolution with DECIMAL types (Jesus Camacho Rodriguez, reviewed by Sergio Peña)

HIVE-15094: Fix test failures for 2.1.1 regarding schema evolution with DECIMAL types (Jesus Camacho Rodriguez, reviewed by Sergio Pe�a)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/2e2b3d66
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/2e2b3d66
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/2e2b3d66

Branch: refs/heads/branch-2.1
Commit: 2e2b3d66465676498f6a1f3298d85cfb4cb075eb
Parents: 742e8e7
Author: Jesus Camacho Rodriguez <jc...@apache.org>
Authored: Mon Oct 31 17:08:59 2016 -0700
Committer: Jesus Camacho Rodriguez <jc...@apache.org>
Committed: Tue Nov 8 17:10:23 2016 +0000

----------------------------------------------------------------------
 .../schema_evol_orc_acid_mapwork_part.q         |  12 +--
 .../schema_evol_orc_acid_mapwork_table.q        |  12 +--
 .../schema_evol_orc_acidvec_mapwork_part.q      |  12 +--
 .../schema_evol_orc_acidvec_mapwork_table.q     |  12 +--
 .../schema_evol_orc_nonvec_fetchwork_part.q     |  12 +--
 .../schema_evol_orc_nonvec_fetchwork_table.q    |  12 +--
 .../schema_evol_orc_nonvec_mapwork_part.q       |  12 +--
 .../schema_evol_orc_nonvec_mapwork_table.q      |  12 +--
 .../schema_evol_orc_vec_mapwork_part.q          |  12 +--
 .../schema_evol_orc_vec_mapwork_table.q         |  12 +--
 .../schema_evol_text_nonvec_mapwork_part.q      |  12 +--
 .../schema_evol_text_nonvec_mapwork_table.q     |  12 +--
 .../schema_evol_text_vec_mapwork_part.q         |  12 +--
 .../schema_evol_text_vec_mapwork_table.q        |  12 +--
 .../schema_evol_text_vecrow_mapwork_part.q      |  12 +--
 .../schema_evol_text_vecrow_mapwork_table.q     |  12 +--
 .../schema_evol_orc_acid_mapwork_part.q.out     |  54 +++++-----
 .../schema_evol_orc_acid_mapwork_table.q.out    |  74 ++++++-------
 .../schema_evol_orc_acidvec_mapwork_part.q.out  |  54 +++++-----
 .../schema_evol_orc_acidvec_mapwork_table.q.out |  74 ++++++-------
 .../schema_evol_orc_nonvec_fetchwork_part.q.out |  66 ++++++------
 ...schema_evol_orc_nonvec_fetchwork_table.q.out |  86 +++++++--------
 .../schema_evol_orc_nonvec_mapwork_part.q.out   |  66 ++++++------
 .../schema_evol_orc_nonvec_mapwork_table.q.out  |  86 +++++++--------
 .../llap/schema_evol_orc_vec_mapwork_part.q.out |  66 ++++++------
 .../schema_evol_orc_vec_mapwork_table.q.out     |  86 +++++++--------
 .../schema_evol_text_nonvec_mapwork_part.q.out  |  72 ++++++-------
 .../schema_evol_text_nonvec_mapwork_table.q.out |  80 +++++++-------
 .../schema_evol_text_vec_mapwork_part.q.out     |  72 ++++++-------
 .../schema_evol_text_vec_mapwork_table.q.out    |  80 +++++++-------
 .../schema_evol_text_vecrow_mapwork_part.q.out  |  72 ++++++-------
 .../schema_evol_text_vecrow_mapwork_table.q.out |  80 +++++++-------
 .../schema_evol_orc_acid_mapwork_part.q.out     |  54 +++++-----
 .../schema_evol_orc_acid_mapwork_table.q.out    |  74 ++++++-------
 .../schema_evol_orc_acidvec_mapwork_part.q.out  |  54 +++++-----
 .../schema_evol_orc_acidvec_mapwork_table.q.out |  74 ++++++-------
 .../schema_evol_orc_nonvec_fetchwork_part.q.out |  86 +++++++--------
 ...schema_evol_orc_nonvec_fetchwork_table.q.out | 106 +++++++++----------
 .../schema_evol_orc_nonvec_mapwork_part.q.out   |  86 +++++++--------
 .../schema_evol_orc_nonvec_mapwork_table.q.out  | 106 +++++++++----------
 .../schema_evol_orc_vec_mapwork_part.q.out      |  86 +++++++--------
 .../schema_evol_orc_vec_mapwork_table.q.out     | 106 +++++++++----------
 .../schema_evol_text_nonvec_mapwork_part.q.out  |  92 ++++++++--------
 .../schema_evol_text_nonvec_mapwork_table.q.out |  96 ++++++++---------
 .../schema_evol_text_vec_mapwork_part.q.out     |  92 ++++++++--------
 .../schema_evol_text_vec_mapwork_table.q.out    |  96 ++++++++---------
 .../schema_evol_text_vecrow_mapwork_part.q.out  |  92 ++++++++--------
 .../schema_evol_text_vecrow_mapwork_table.q.out |  96 ++++++++---------
 .../tez/schema_evol_orc_acid_mapwork_part.q.out |  54 +++++-----
 .../schema_evol_orc_acid_mapwork_table.q.out    |  74 ++++++-------
 .../schema_evol_orc_acidvec_mapwork_part.q.out  |  54 +++++-----
 .../schema_evol_orc_acidvec_mapwork_table.q.out |  74 ++++++-------
 .../schema_evol_orc_nonvec_fetchwork_part.q.out |  66 ++++++------
 ...schema_evol_orc_nonvec_fetchwork_table.q.out |  86 +++++++--------
 .../schema_evol_orc_nonvec_mapwork_part.q.out   |  66 ++++++------
 .../schema_evol_orc_nonvec_mapwork_table.q.out  |  86 +++++++--------
 .../tez/schema_evol_orc_vec_mapwork_part.q.out  |  66 ++++++------
 .../tez/schema_evol_orc_vec_mapwork_table.q.out |  86 +++++++--------
 .../schema_evol_text_nonvec_mapwork_part.q.out  |  72 ++++++-------
 .../schema_evol_text_nonvec_mapwork_table.q.out |  80 +++++++-------
 .../tez/schema_evol_text_vec_mapwork_part.q.out |  72 ++++++-------
 .../schema_evol_text_vec_mapwork_table.q.out    |  80 +++++++-------
 .../schema_evol_text_vecrow_mapwork_part.q.out  |  72 ++++++-------
 .../schema_evol_text_vecrow_mapwork_table.q.out |  80 +++++++-------
 64 files changed, 1962 insertions(+), 1962 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_part.q
index 768d77d..7819fee 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_part.q
@@ -698,9 +698,9 @@ drop table part_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- 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 decimal(38,18), c2 decimal(38,18), b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
 
 insert into table part_change_lower_to_higher_numeric_group_decimal partition(part=1)
     values (1, -29.0764, -29.0764, 'original'),
@@ -711,7 +711,7 @@ insert into table part_change_lower_to_higher_numeric_group_decimal partition(pa
 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 float, c2 double, b STRING) ;
+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),
@@ -727,9 +727,9 @@ drop table part_change_lower_to_higher_numeric_group_decimal;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
 
 insert into table part_change_lower_to_higher_numeric_group_float partition(part=1)
     values (1, -29.0764, 'original'),
@@ -740,7 +740,7 @@ insert into table part_change_lower_to_higher_numeric_group_float partition(part
 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 DOUBLE, b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_float partition(part)
     values (5, '774', 'new', 2),

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_table.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_table.q
index 09f4f22..e82d183 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_table.q
@@ -694,9 +694,9 @@ drop table table_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE, DECIMAL)
 --
-CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 decimal(38,18), c2 decimal(38,18), b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
 
 insert into table table_change_lower_to_higher_numeric_group_decimal
     values (1, -29.0764, -29.0764, 'original'),
@@ -707,7 +707,7 @@ insert into table table_change_lower_to_higher_numeric_group_decimal
 select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal 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 float, c2 double, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 double, c2 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_decimal
     values (5, '7.74', '22.3', 'new'),
@@ -724,9 +724,9 @@ drop table table_change_lower_to_higher_numeric_group_decimal;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
 
 insert into table table_change_lower_to_higher_numeric_group_float
     values (1, -29.0764, 'original'),
@@ -737,7 +737,7 @@ insert into table table_change_lower_to_higher_numeric_group_float
 select insert_num,c1,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_float replace columns (insert_num int, c1 DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_float
     values (5, '774', 'new'),

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q
index 38afb9d..9dfe8b2 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q
@@ -698,9 +698,9 @@ drop table part_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- 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 decimal(38,18), c2 decimal(38,18), b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
 
 insert into table part_change_lower_to_higher_numeric_group_decimal partition(part=1)
     values (1, -29.0764, -29.0764, 'original'),
@@ -711,7 +711,7 @@ insert into table part_change_lower_to_higher_numeric_group_decimal partition(pa
 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 float, c2 double, b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 double, c2 decimal, b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_decimal partition(part)
     values (5, '7.74', '22.3', 'new', 2),
@@ -727,9 +727,9 @@ drop table part_change_lower_to_higher_numeric_group_decimal;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
 
 insert into table part_change_lower_to_higher_numeric_group_float partition(part=1)
     values (1, -29.0764, 'original'),
@@ -740,7 +740,7 @@ insert into table part_change_lower_to_higher_numeric_group_float partition(part
 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 DOUBLE, b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_float partition(part)
     values (5, '774', 'new', 2),

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_table.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_table.q
index 63de008..b30f1a9 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_table.q
@@ -694,9 +694,9 @@ drop table table_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE, DECIMAL)
 --
-CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 decimal(38,18), c2 decimal(38,18), b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
 
 insert into table table_change_lower_to_higher_numeric_group_decimal
     values (1, -29.0764, -29.0764, 'original'),
@@ -707,7 +707,7 @@ insert into table table_change_lower_to_higher_numeric_group_decimal
 select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal 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 float, c2 double, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 double, c2 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_decimal
     values (5, '7.74', '22.3', 'new'),
@@ -724,9 +724,9 @@ drop table table_change_lower_to_higher_numeric_group_decimal;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
 
 insert into table table_change_lower_to_higher_numeric_group_float
     values (1, -29.0764, 'original'),
@@ -737,7 +737,7 @@ insert into table table_change_lower_to_higher_numeric_group_float
 select insert_num,c1,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_float replace columns (insert_num int, c1 DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_float
     values (5, '774', 'new'),

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q
index 8f33636..8c89b65 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q
@@ -761,9 +761,9 @@ drop table part_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- 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 decimal(38,18), c2 decimal(38,18), b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(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'),
@@ -774,7 +774,7 @@ insert into table part_change_lower_to_higher_numeric_group_decimal partition(pa
 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 float, c2 double, b STRING) ;
+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),
@@ -793,9 +793,9 @@ drop table part_change_lower_to_higher_numeric_group_decimal;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING) PARTITIONED BY(part INT);
+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'),
@@ -806,7 +806,7 @@ insert into table part_change_lower_to_higher_numeric_group_float partition(part
 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 DOUBLE, b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_float partition(part)
     values (5, '774', 'new', 2),

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q
index 0328d0a..7a681af 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q
@@ -760,9 +760,9 @@ drop table table_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE, DECIMAL)
 --
-CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 decimal(38,18), c2 decimal(38,18), b STRING);
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING);
 
 insert into table table_change_lower_to_higher_numeric_group_decimal
     values (1, -29.0764, -29.0764, 'original'),
@@ -773,7 +773,7 @@ insert into table table_change_lower_to_higher_numeric_group_decimal
 select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal 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 float, c2 double, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 double, c2 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_decimal
     values (5, '7.74', '22.3', 'new'),
@@ -793,9 +793,9 @@ drop table table_change_lower_to_higher_numeric_group_decimal;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING);
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING);
 
 insert into table table_change_lower_to_higher_numeric_group_float
     values (1, -29.0764, 'original'),
@@ -806,7 +806,7 @@ insert into table table_change_lower_to_higher_numeric_group_float
 select insert_num,c1,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_float replace columns (insert_num int, c1 DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_float
     values (5, '774', 'new'),

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q
index 859dc65..f90fc4b 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q
@@ -761,9 +761,9 @@ drop table part_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- 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 decimal(38,18), c2 decimal(38,18), b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(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'),
@@ -774,7 +774,7 @@ insert into table part_change_lower_to_higher_numeric_group_decimal partition(pa
 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 float, c2 double, b STRING) ;
+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),
@@ -793,9 +793,9 @@ drop table part_change_lower_to_higher_numeric_group_decimal;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING) PARTITIONED BY(part INT);
+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'),
@@ -806,7 +806,7 @@ insert into table part_change_lower_to_higher_numeric_group_float partition(part
 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 DOUBLE, b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_float partition(part)
     values (5, '774', 'new', 2),

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/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 88c7cf6..c16fef5 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
@@ -762,9 +762,9 @@ drop table table_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE, DECIMAL)
 --
-CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 decimal(38,18), c2 decimal(38,18), b STRING);
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING);
 
 insert into table table_change_lower_to_higher_numeric_group_decimal
     values (1, -29.0764, -29.0764, 'original'),
@@ -775,7 +775,7 @@ insert into table table_change_lower_to_higher_numeric_group_decimal
 select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal 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 float, c2 double, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 double, c2 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_decimal
     values (5, '7.74', '22.3', 'new'),
@@ -795,9 +795,9 @@ drop table table_change_lower_to_higher_numeric_group_decimal;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING);
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING);
 
 insert into table table_change_lower_to_higher_numeric_group_float
     values (1, -29.0764, 'original'),
@@ -808,7 +808,7 @@ insert into table table_change_lower_to_higher_numeric_group_float
 select insert_num,c1,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_float replace columns (insert_num int, c1 DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_float
     values (5, '774', 'new'),

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/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 180ce21..246b0be 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
@@ -762,9 +762,9 @@ drop table part_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- 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 decimal(38,18), c2 decimal(38,18), b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(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'),
@@ -775,7 +775,7 @@ insert into table part_change_lower_to_higher_numeric_group_decimal partition(pa
 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 float, c2 double, b STRING) ;
+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),
@@ -794,9 +794,9 @@ drop table part_change_lower_to_higher_numeric_group_decimal;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING) PARTITIONED BY(part INT);
+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'),
@@ -807,7 +807,7 @@ insert into table part_change_lower_to_higher_numeric_group_float partition(part
 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 DOUBLE, b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_float partition(part)
     values (5, '774', 'new', 2),

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/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 98b70f9..06ff02c 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
@@ -760,9 +760,9 @@ drop table table_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE, DECIMAL)
 --
-CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 decimal(38,18), c2 decimal(38,18), b STRING);
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING);
 
 insert into table table_change_lower_to_higher_numeric_group_decimal
     values (1, -29.0764, -29.0764, 'original'),
@@ -773,7 +773,7 @@ insert into table table_change_lower_to_higher_numeric_group_decimal
 select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal 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 float, c2 double, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 double, c2 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_decimal
     values (5, '7.74', '22.3', 'new'),
@@ -793,9 +793,9 @@ drop table table_change_lower_to_higher_numeric_group_decimal;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING);
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING);
 
 insert into table table_change_lower_to_higher_numeric_group_float
     values (1, -29.0764, 'original'),
@@ -806,7 +806,7 @@ insert into table table_change_lower_to_higher_numeric_group_float
 select insert_num,c1,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_float replace columns (insert_num int, c1 DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_float
     values (5, '774', 'new'),

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/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 978e76d..5382969 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
@@ -761,9 +761,9 @@ drop table part_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- 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 decimal(38,18), c2 decimal(38,18), b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(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'),
@@ -774,7 +774,7 @@ insert into table part_change_lower_to_higher_numeric_group_decimal partition(pa
 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 float, c2 double, b STRING) ;
+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),
@@ -793,9 +793,9 @@ drop table part_change_lower_to_higher_numeric_group_decimal;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING) PARTITIONED BY(part INT);
+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'),
@@ -806,7 +806,7 @@ insert into table part_change_lower_to_higher_numeric_group_float partition(part
 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 DOUBLE, b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_float partition(part)
     values (5, '774', 'new', 2),

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/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 9fa020a..9e9549e 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
@@ -760,9 +760,9 @@ drop table table_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE, DECIMAL)
 --
-CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 decimal(38,18), c2 decimal(38,18), b STRING);
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING);
 
 insert into table table_change_lower_to_higher_numeric_group_decimal
     values (1, -29.0764, -29.0764, 'original'),
@@ -773,7 +773,7 @@ insert into table table_change_lower_to_higher_numeric_group_decimal
 select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal 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 float, c2 double, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 double, c2 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_decimal
     values (5, '7.74', '22.3', 'new'),
@@ -793,9 +793,9 @@ drop table table_change_lower_to_higher_numeric_group_decimal;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING);
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING);
 
 insert into table table_change_lower_to_higher_numeric_group_float
     values (1, -29.0764, 'original'),
@@ -806,7 +806,7 @@ insert into table table_change_lower_to_higher_numeric_group_float
 select insert_num,c1,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_float replace columns (insert_num int, c1 DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_float
     values (5, '774', 'new'),

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/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 c21bf8f..17504de 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
@@ -763,9 +763,9 @@ drop table part_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- 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 decimal(38,18), c2 decimal(38,18), b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(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'),
@@ -776,7 +776,7 @@ insert into table part_change_lower_to_higher_numeric_group_decimal partition(pa
 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 float, c2 double, b STRING) ;
+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),
@@ -795,9 +795,9 @@ drop table part_change_lower_to_higher_numeric_group_decimal;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING) PARTITIONED BY(part INT);
+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'),
@@ -808,7 +808,7 @@ insert into table part_change_lower_to_higher_numeric_group_float partition(part
 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 DOUBLE, b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_float partition(part)
     values (5, '774', 'new', 2),

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_table.q b/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_table.q
index b20f7e8..3dd2085 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vec_mapwork_table.q
@@ -762,9 +762,9 @@ drop table table_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE, DECIMAL)
 --
-CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 decimal(38,18), c2 decimal(38,18), b STRING);
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING);
 
 insert into table table_change_lower_to_higher_numeric_group_decimal
     values (1, -29.0764, -29.0764, 'original'),
@@ -775,7 +775,7 @@ insert into table table_change_lower_to_higher_numeric_group_decimal
 select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal 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 float, c2 double, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 double, c2 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_decimal
     values (5, '7.74', '22.3', 'new'),
@@ -795,9 +795,9 @@ drop table table_change_lower_to_higher_numeric_group_decimal;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING);
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING);
 
 insert into table table_change_lower_to_higher_numeric_group_float
     values (1, -29.0764, 'original'),
@@ -808,7 +808,7 @@ insert into table table_change_lower_to_higher_numeric_group_float
 select insert_num,c1,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_float replace columns (insert_num int, c1 DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_float
     values (5, '774', 'new'),

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_mapwork_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_mapwork_part.q b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_mapwork_part.q
index c54ed91..0ba38c9 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_mapwork_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_mapwork_part.q
@@ -763,9 +763,9 @@ drop table part_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- 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 decimal(38,18), c2 decimal(38,18), b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(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'),
@@ -776,7 +776,7 @@ insert into table part_change_lower_to_higher_numeric_group_decimal partition(pa
 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 float, c2 double, b STRING) ;
+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),
@@ -795,9 +795,9 @@ drop table part_change_lower_to_higher_numeric_group_decimal;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING) PARTITIONED BY(part INT);
+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'),
@@ -808,7 +808,7 @@ insert into table part_change_lower_to_higher_numeric_group_float partition(part
 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 DOUBLE, b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING) ;
 
 insert into table part_change_lower_to_higher_numeric_group_float partition(part)
     values (5, '774', 'new', 2),

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_mapwork_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_mapwork_table.q b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_mapwork_table.q
index 8871623..7ab00a7 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_mapwork_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_mapwork_table.q
@@ -762,9 +762,9 @@ drop table table_change_lower_to_higher_numeric_group_bigint;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE, DECIMAL)
 --
-CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 decimal(38,18), c2 decimal(38,18), b STRING);
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING);
 
 insert into table table_change_lower_to_higher_numeric_group_decimal
     values (1, -29.0764, -29.0764, 'original'),
@@ -775,7 +775,7 @@ insert into table table_change_lower_to_higher_numeric_group_decimal
 select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal 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 float, c2 double, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 double, c2 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_decimal
     values (5, '7.74', '22.3', 'new'),
@@ -795,9 +795,9 @@ drop table table_change_lower_to_higher_numeric_group_decimal;
 
 
 --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING);
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING);
 
 insert into table table_change_lower_to_higher_numeric_group_float
     values (1, -29.0764, 'original'),
@@ -808,7 +808,7 @@ insert into table table_change_lower_to_higher_numeric_group_float
 select insert_num,c1,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_float replace columns (insert_num int, c1 DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING) ;
 
 insert into table table_change_lower_to_higher_numeric_group_float
     values (5, '774', 'new'),

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_mapwork_part.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_mapwork_part.q.out
index fafad50..adc0154 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_mapwork_part.q.out
@@ -2960,16 +2960,16 @@ POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_bigint
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_bigint
 PREHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- 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 decimal(38,18), c2 decimal(38,18), b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
 POSTHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- 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 decimal(38,18), c2 decimal(38,18), b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -3005,17 +3005,17 @@ POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=1
 #### A masked pattern was here ####
 insert_num	part	c1	b
-1	1	-29.076400000000000000	original
-2	1	753.702800000000000000	original
-3	1	-5000.000000000000000000	original
-4	1	52927714.000000000000000000	original
+1	1	-29.0764	original
+2	1	753.7028	original
+3	1	-5000.0	original
+4	1	5.2927712E7	original
 PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 float, c2 double, b STRING)
+alter table part_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 double, c2 decimal(38,18), b STRING)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal
 PREHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
 POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 float, c2 double, b STRING)
+alter table part_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 double, c2 decimal(38,18), b STRING)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -3081,16 +3081,16 @@ POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
 PREHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
 POSTHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -3128,14 +3128,14 @@ insert_num	part	c1	b
 1	1	-29.0764	original
 2	1	753.7028	original
 3	1	-5000.0	original
-4	1	5.2927712E7	original
+4	1	5.2927714E7	original
 PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 DOUBLE, b STRING)
+alter table part_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@part_change_lower_to_higher_numeric_group_float
 PREHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
 POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 DOUBLE, b STRING)
+alter table part_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_float
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -3180,16 +3180,16 @@ POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_float@part=1
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_float@part=2
 #### A masked pattern was here ####
 insert_num	part	c1	b
-1	1	-29.0764	original
-10	1	17.0	new
-2	1	753.7028	original
-3	1	-5000.0	original
-4	1	5.2927712E7	original
-5	2	774.0	new
-6	2	561431.0	new
-7	2	256.0	new
-8	2	5555.0	new
-9	1	100.0	new
+1	1	-29.076400000000000000	original
+10	1	17.000000000000000000	new
+2	1	753.702800000000000000	original
+3	1	-5000.000000000000000000	original
+4	1	52927714.000000000000000000	original
+5	2	774.000000000000000000	new
+6	2	561431.000000000000000000	new
+7	2	256.000000000000000000	new
+8	2	5555.000000000000000000	new
+9	1	100.000000000000000000	new
 PREHOOK: query: drop table part_change_lower_to_higher_numeric_group_float
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@part_change_lower_to_higher_numeric_group_float

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_mapwork_table.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_mapwork_table.q.out
index e69e9bd..e497395 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_mapwork_table.q.out
@@ -2692,16 +2692,16 @@ POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@table_change_lower_to_higher_numeric_group_bigint
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_bigint
 PREHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE, DECIMAL)
 --
-CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 decimal(38,18), c2 decimal(38,18), b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
 POSTHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE, DECIMAL)
 --
-CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 decimal(38,18), c2 decimal(38,18), b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -2735,17 +2735,17 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal
 #### A masked pattern was here ####
 insert_num	c1	c2	b
-1	-29.076400000000000000	-29.076400000000000000	original
-2	753.702800000000000000	753.702800000000000000	original
-3	-5000.000000000000000000	-5000.000000000000000000	original
-4	52927714.000000000000000000	52927714.000000000000000000	original
+1	-29.0764	-29.0764	original
+2	753.7028	753.7028	original
+3	-5000.0	-5000.0	original
+4	5.2927712E7	5.2927712E7	original
 PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 float, c2 double, b STRING)
+alter table table_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 double, c2 decimal(38,18), b STRING)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal
 PREHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
 POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 float, c2 double, b STRING)
+alter table table_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 double, c2 decimal(38,18), b STRING)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -2783,16 +2783,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal
 #### A masked pattern was here ####
 insert_num	c1	c2	b
-1	-29.0764	-29.0764	original
-10	1.7	17.8888	new
-2	753.7028	753.7028	original
-3	-5000.0	-5000.0	original
-4	5.2927712E7	5.2927714E7	original
-5	7.74	22.3	new
-6	56.1431	90.9	new
-7	2.56	25.6	new
-8	555.5	55.55	new
-9	10.0	0.1	new
+1	-29.0764	-29.076400000000000000	original
+10	1.7	17.888800000000000000	new
+2	753.7028	753.702800000000000000	original
+3	-5000.0	-5000.000000000000000000	original
+4	5.2927712E7	52927712.000000000000000000	original
+5	7.74	22.300000000000000000	new
+6	56.1431	90.900000000000000000	new
+7	2.56	25.600000000000000000	new
+8	555.5	55.550000000000000000	new
+9	10.0	0.100000000000000000	new
 PREHOOK: query: drop table table_change_lower_to_higher_numeric_group_decimal
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal
@@ -2802,16 +2802,16 @@ POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
 PREHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
 POSTHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -2847,14 +2847,14 @@ insert_num	c1	b
 1	-29.0764	original
 2	753.7028	original
 3	-5000.0	original
-4	5.2927712E7	original
+4	5.2927714E7	original
 PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 DOUBLE, b STRING)
+alter table table_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_float
 PREHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
 POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 DOUBLE, b STRING)
+alter table table_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: default@table_change_lower_to_higher_numeric_group_float
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -2891,16 +2891,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@table_change_lower_to_higher_numeric_group_float
 #### A masked pattern was here ####
 insert_num	c1	b
-1	-29.0764	original
-10	17.0	new
-2	753.7028	original
-3	-5000.0	original
-4	5.2927712E7	original
-5	774.0	new
-6	561431.0	new
-7	256.0	new
-8	5555.0	new
-9	100.0	new
+1	-29.076400000000000000	original
+10	17.000000000000000000	new
+2	753.702800000000000000	original
+3	-5000.000000000000000000	original
+4	52927714.000000000000000000	original
+5	774.000000000000000000	new
+6	561431.000000000000000000	new
+7	256.000000000000000000	new
+8	5555.000000000000000000	new
+9	100.000000000000000000	new
 PREHOOK: query: drop table table_change_lower_to_higher_numeric_group_float
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_float

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_mapwork_part.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_mapwork_part.q.out
index abe001d..7ac4d1c 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_mapwork_part.q.out
@@ -2960,16 +2960,16 @@ POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_bigint
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_bigint
 PREHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- 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 decimal(38,18), c2 decimal(38,18), b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
 POSTHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- 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 decimal(38,18), c2 decimal(38,18), b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -3005,17 +3005,17 @@ POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=1
 #### A masked pattern was here ####
 insert_num	part	c1	b
-1	1	-29.076400000000000000	original
-2	1	753.702800000000000000	original
-3	1	-5000.000000000000000000	original
-4	1	52927714.000000000000000000	original
+1	1	-29.0764	original
+2	1	753.7028	original
+3	1	-5000.0	original
+4	1	5.2927712E7	original
 PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 float, c2 double, b STRING)
+alter table part_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 double, c2 decimal, b STRING)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal
 PREHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
 POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 float, c2 double, b STRING)
+alter table part_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 double, c2 decimal, b STRING)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -3081,16 +3081,16 @@ POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
 PREHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
 POSTHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -3128,14 +3128,14 @@ insert_num	part	c1	b
 1	1	-29.0764	original
 2	1	753.7028	original
 3	1	-5000.0	original
-4	1	5.2927712E7	original
+4	1	5.2927714E7	original
 PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 DOUBLE, b STRING)
+alter table part_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@part_change_lower_to_higher_numeric_group_float
 PREHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
 POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 DOUBLE, b STRING)
+alter table part_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_float
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -3180,16 +3180,16 @@ POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_float@part=1
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_float@part=2
 #### A masked pattern was here ####
 insert_num	part	c1	b
-1	1	-29.0764	original
-10	1	17.0	new
-2	1	753.7028	original
-3	1	-5000.0	original
-4	1	5.2927712E7	original
-5	2	774.0	new
-6	2	561431.0	new
-7	2	256.0	new
-8	2	5555.0	new
-9	1	100.0	new
+1	1	-29.076400000000000000	original
+10	1	17.000000000000000000	new
+2	1	753.702800000000000000	original
+3	1	-5000.000000000000000000	original
+4	1	52927714.000000000000000000	original
+5	2	774.000000000000000000	new
+6	2	561431.000000000000000000	new
+7	2	256.000000000000000000	new
+8	2	5555.000000000000000000	new
+9	1	100.000000000000000000	new
 PREHOOK: query: drop table part_change_lower_to_higher_numeric_group_float
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@part_change_lower_to_higher_numeric_group_float

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_mapwork_table.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_mapwork_table.q.out
index 8ce8794..01e6382 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acidvec_mapwork_table.q.out
@@ -2692,16 +2692,16 @@ POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@table_change_lower_to_higher_numeric_group_bigint
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_bigint
 PREHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE, DECIMAL)
 --
-CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 decimal(38,18), c2 decimal(38,18), b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
 POSTHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: DECIMAL, (FLOAT, DOUBLE)
+-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE, DECIMAL)
 --
-CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 decimal(38,18), c2 decimal(38,18), b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -2735,17 +2735,17 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal
 #### A masked pattern was here ####
 insert_num	c1	c2	b
-1	-29.076400000000000000	-29.076400000000000000	original
-2	753.702800000000000000	753.702800000000000000	original
-3	-5000.000000000000000000	-5000.000000000000000000	original
-4	52927714.000000000000000000	52927714.000000000000000000	original
+1	-29.0764	-29.0764	original
+2	753.7028	753.7028	original
+3	-5000.0	-5000.0	original
+4	5.2927712E7	5.2927712E7	original
 PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 float, c2 double, b STRING)
+alter table table_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 double, c2 decimal(38,18), b STRING)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal
 PREHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
 POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 float, c2 double, b STRING)
+alter table table_change_lower_to_higher_numeric_group_decimal replace columns (insert_num int, c1 double, c2 decimal(38,18), b STRING)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -2783,16 +2783,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal
 #### A masked pattern was here ####
 insert_num	c1	c2	b
-1	-29.0764	-29.0764	original
-10	1.7	17.8888	new
-2	753.7028	753.7028	original
-3	-5000.0	-5000.0	original
-4	5.2927712E7	5.2927714E7	original
-5	7.74	22.3	new
-6	56.1431	90.9	new
-7	2.56	25.6	new
-8	555.5	55.55	new
-9	10.0	0.1	new
+1	-29.0764	-29.076400000000000000	original
+10	1.7	17.888800000000000000	new
+2	753.7028	753.702800000000000000	original
+3	-5000.0	-5000.000000000000000000	original
+4	5.2927712E7	52927712.000000000000000000	original
+5	7.74	22.300000000000000000	new
+6	56.1431	90.900000000000000000	new
+7	2.56	25.600000000000000000	new
+8	555.5	55.550000000000000000	new
+9	10.0	0.100000000000000000	new
 PREHOOK: query: drop table table_change_lower_to_higher_numeric_group_decimal
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal
@@ -2802,16 +2802,16 @@ POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@table_change_lower_to_higher_numeric_group_decimal
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
 PREHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
 POSTHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" NUMERIC_GROUP: FLOAT, (DOUBLE)
+-- 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 float, b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -2847,14 +2847,14 @@ insert_num	c1	b
 1	-29.0764	original
 2	753.7028	original
 3	-5000.0	original
-4	5.2927712E7	original
+4	5.2927714E7	original
 PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 DOUBLE, b STRING)
+alter table table_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_float
 PREHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
 POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 DOUBLE, b STRING)
+alter table table_change_lower_to_higher_numeric_group_float replace columns (insert_num int, c1 decimal(38,18), b STRING)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: default@table_change_lower_to_higher_numeric_group_float
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -2891,16 +2891,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@table_change_lower_to_higher_numeric_group_float
 #### A masked pattern was here ####
 insert_num	c1	b
-1	-29.0764	original
-10	17.0	new
-2	753.7028	original
-3	-5000.0	original
-4	5.2927712E7	original
-5	774.0	new
-6	561431.0	new
-7	256.0	new
-8	5555.0	new
-9	100.0	new
+1	-29.076400000000000000	original
+10	17.000000000000000000	new
+2	753.702800000000000000	original
+3	-5000.000000000000000000	original
+4	52927714.000000000000000000	original
+5	774.000000000000000000	new
+6	561431.000000000000000000	new
+7	256.000000000000000000	new
+8	5555.000000000000000000	new
+9	100.000000000000000000	new
 PREHOOK: query: drop table table_change_lower_to_higher_numeric_group_float
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@table_change_lower_to_higher_numeric_group_float