[1/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)

[jc...@apache.org]

Repository: hive
Updated Branches:
  refs/heads/branch-2.1 742e8e7c7 -> 2e2b3d664


http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/results/clientpositive/tez/schema_evol_text_vecrow_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/schema_evol_text_vecrow_mapwork_table.q.out b/ql/src/test/results/clientpositive/tez/schema_evol_text_vecrow_mapwork_table.q.out
index 81cb662..84a99ac 100644
--- a/ql/src/test/results/clientpositive/tez/schema_evol_text_vecrow_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/tez/schema_evol_text_vecrow_mapwork_table.q.out
@@ -3478,16 +3478,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -3521,17 +3521,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
@@ -3578,13 +3578,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=4 width=59)
+        Select Operator [SEL_7] (rows=4 width=29)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] vectorized
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=4 width=59)
+            Select Operator [SEL_5] (rows=4 width=29)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=4 width=59)
+              TableScan [TS_0] (rows=4 width=29)
                 default@table_change_lower_to_higher_numeric_group_decimal,table_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","c2","b"]
 
 PREHOOK: query: select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3596,16 +3596,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
@@ -3615,16 +3615,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -3660,14 +3660,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
@@ -3731,16 +3731,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

[6/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)

[jc...@apache.org]

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_fetchwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_fetchwork_part.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_fetchwork_part.q.out
index d1634a9..f92ba85 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_fetchwork_part.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_fetchwork_part.q.out
@@ -3701,16 +3701,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -3746,17 +3746,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
@@ -3808,13 +3808,13 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=10 width=189)
+        Select Operator [SEL_3] (rows=10 width=168)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] llap
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=10 width=189)
+            Select Operator [SEL_1] (rows=10 width=168)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=189)
+              TableScan [TS_0] (rows=10 width=168)
                 default@part_change_lower_to_higher_numeric_group_decimal,part_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3849,16 +3849,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -3896,14 +3896,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
@@ -3953,13 +3953,13 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=10 width=99)
+        Select Operator [SEL_3] (rows=10 width=163)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] llap
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=10 width=99)
+            Select Operator [SEL_1] (rows=10 width=163)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=99)
+              TableScan [TS_0] (rows=10 width=163)
                 default@part_change_lower_to_higher_numeric_group_float,part_change_lower_to_higher_numeric_group_float,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_float order by insert_num
@@ -3975,16 +3975,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_nonvec_fetchwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_fetchwork_table.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_fetchwork_table.q.out
index b569a94..08e4535 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_fetchwork_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_fetchwork_table.q.out
@@ -3474,16 +3474,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -3517,17 +3517,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
@@ -3574,13 +3574,13 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=4 width=320)
+        Select Operator [SEL_3] (rows=4 width=104)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] llap
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=4 width=320)
+            Select Operator [SEL_1] (rows=4 width=104)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=4 width=320)
+              TableScan [TS_0] (rows=4 width=104)
                 default@table_change_lower_to_higher_numeric_group_decimal,table_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","c2","b"]
 
 PREHOOK: query: select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3592,16 +3592,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
@@ -3611,16 +3611,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -3656,14 +3656,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
@@ -3709,13 +3709,13 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=4 width=100)
+        Select Operator [SEL_3] (rows=4 width=104)
           Output:["_col0","_col1","_col2"]
         <-Map 1 [SIMPLE_EDGE] llap
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=4 width=100)
+            Select Operator [SEL_1] (rows=4 width=104)
               Output:["_col0","_col1","_col2"]
-              TableScan [TS_0] (rows=4 width=100)
+              TableScan [TS_0] (rows=4 width=104)
                 default@table_change_lower_to_higher_numeric_group_float,table_change_lower_to_higher_numeric_group_float,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float order by insert_num
@@ -3727,16 +3727,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_nonvec_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_mapwork_part.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_mapwork_part.q.out
index 127d5a9..f116d3e 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_mapwork_part.q.out
@@ -3701,16 +3701,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -3746,17 +3746,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
@@ -3808,13 +3808,13 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=10 width=189)
+        Select Operator [SEL_3] (rows=10 width=168)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] llap
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=10 width=189)
+            Select Operator [SEL_1] (rows=10 width=168)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=189)
+              TableScan [TS_0] (rows=10 width=168)
                 default@part_change_lower_to_higher_numeric_group_decimal,part_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3849,16 +3849,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -3896,14 +3896,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
@@ -3953,13 +3953,13 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=10 width=99)
+        Select Operator [SEL_3] (rows=10 width=163)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] llap
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=10 width=99)
+            Select Operator [SEL_1] (rows=10 width=163)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=99)
+              TableScan [TS_0] (rows=10 width=163)
                 default@part_change_lower_to_higher_numeric_group_float,part_change_lower_to_higher_numeric_group_float,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_float order by insert_num
@@ -3975,16 +3975,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_nonvec_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_mapwork_table.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_mapwork_table.q.out
index 798aee1..4d0da4f 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_mapwork_table.q.out
@@ -3474,16 +3474,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -3517,17 +3517,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
@@ -3574,13 +3574,13 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=4 width=320)
+        Select Operator [SEL_3] (rows=4 width=104)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] llap
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=4 width=320)
+            Select Operator [SEL_1] (rows=4 width=104)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=4 width=320)
+              TableScan [TS_0] (rows=4 width=104)
                 default@table_change_lower_to_higher_numeric_group_decimal,table_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","c2","b"]
 
 PREHOOK: query: select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3592,16 +3592,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
@@ -3611,16 +3611,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -3656,14 +3656,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
@@ -3709,13 +3709,13 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=4 width=100)
+        Select Operator [SEL_3] (rows=4 width=104)
           Output:["_col0","_col1","_col2"]
         <-Map 1 [SIMPLE_EDGE] llap
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=4 width=100)
+            Select Operator [SEL_1] (rows=4 width=104)
               Output:["_col0","_col1","_col2"]
-              TableScan [TS_0] (rows=4 width=100)
+              TableScan [TS_0] (rows=4 width=104)
                 default@table_change_lower_to_higher_numeric_group_float,table_change_lower_to_higher_numeric_group_float,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float order by insert_num
@@ -3727,16 +3727,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_vec_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_mapwork_part.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_mapwork_part.q.out
index ad1bd9b..d0462f5 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_mapwork_part.q.out
@@ -3701,16 +3701,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -3746,17 +3746,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
@@ -3808,13 +3808,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized, llap
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=10 width=189)
+        Select Operator [SEL_7] (rows=10 width=168)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] vectorized, llap
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=10 width=189)
+            Select Operator [SEL_5] (rows=10 width=168)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=189)
+              TableScan [TS_0] (rows=10 width=168)
                 default@part_change_lower_to_higher_numeric_group_decimal,part_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3849,16 +3849,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -3896,14 +3896,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
@@ -3953,13 +3953,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized, llap
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=10 width=99)
+        Select Operator [SEL_7] (rows=10 width=163)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] vectorized, llap
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=10 width=99)
+            Select Operator [SEL_5] (rows=10 width=163)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=99)
+              TableScan [TS_0] (rows=10 width=163)
                 default@part_change_lower_to_higher_numeric_group_float,part_change_lower_to_higher_numeric_group_float,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_float order by insert_num
@@ -3975,16 +3975,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_vec_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_mapwork_table.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_mapwork_table.q.out
index a0f0703..13efb04 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_mapwork_table.q.out
@@ -3474,16 +3474,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -3517,17 +3517,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
@@ -3574,13 +3574,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized, llap
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=4 width=320)
+        Select Operator [SEL_7] (rows=4 width=104)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] vectorized, llap
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=4 width=320)
+            Select Operator [SEL_5] (rows=4 width=104)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=4 width=320)
+              TableScan [TS_0] (rows=4 width=104)
                 default@table_change_lower_to_higher_numeric_group_decimal,table_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","c2","b"]
 
 PREHOOK: query: select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3592,16 +3592,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
@@ -3611,16 +3611,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -3656,14 +3656,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
@@ -3709,13 +3709,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized, llap
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=4 width=100)
+        Select Operator [SEL_7] (rows=4 width=104)
           Output:["_col0","_col1","_col2"]
         <-Map 1 [SIMPLE_EDGE] vectorized, llap
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=4 width=100)
+            Select Operator [SEL_5] (rows=4 width=104)
               Output:["_col0","_col1","_col2"]
-              TableScan [TS_0] (rows=4 width=100)
+              TableScan [TS_0] (rows=4 width=104)
                 default@table_change_lower_to_higher_numeric_group_float,table_change_lower_to_higher_numeric_group_float,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float order by insert_num
@@ -3727,16 +3727,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_text_nonvec_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_mapwork_part.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_mapwork_part.q.out
index e0d0cab..f128fd2 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_mapwork_part.q.out
@@ -3701,16 +3701,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -3746,17 +3746,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
@@ -3808,13 +3808,13 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=10 width=33)
+        Select Operator [SEL_3] (rows=10 width=31)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] llap
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=10 width=33)
+            Select Operator [SEL_1] (rows=10 width=31)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=33)
+              TableScan [TS_0] (rows=10 width=31)
                 default@part_change_lower_to_higher_numeric_group_decimal,part_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3830,9 +3830,9 @@ POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=2
 #### A masked pattern was here ####
 insert_num	part	c1	b
-1	1	-29.0764	original
-10	1	1.7	new
-2	1	753.7028	original
+1	1	-29.076400756835938	original
+10	1	1.7000000476837158	new
+2	1	753.7028198242188	original
 3	1	-5000.0	original
 4	1	5.2927712E7	original
 5	2	7.74	new
@@ -3849,16 +3849,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -3896,14 +3896,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
@@ -3953,13 +3953,13 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=10 width=14)
+        Select Operator [SEL_3] (rows=10 width=25)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] llap
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=10 width=14)
+            Select Operator [SEL_1] (rows=10 width=25)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=14)
+              TableScan [TS_0] (rows=10 width=25)
                 default@part_change_lower_to_higher_numeric_group_float,part_change_lower_to_higher_numeric_group_float,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_float order by insert_num
@@ -3975,16 +3975,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.076400756835938	original
-10	1	17.0	new
-2	1	753.7028198242188	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_text_nonvec_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_mapwork_table.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_mapwork_table.q.out
index a0a1241..72df64b 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_mapwork_table.q.out
@@ -3474,16 +3474,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -3517,17 +3517,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
@@ -3574,13 +3574,13 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=4 width=59)
+        Select Operator [SEL_3] (rows=4 width=29)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] llap
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=4 width=59)
+            Select Operator [SEL_1] (rows=4 width=29)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=4 width=59)
+              TableScan [TS_0] (rows=4 width=29)
                 default@table_change_lower_to_higher_numeric_group_decimal,table_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","c2","b"]
 
 PREHOOK: query: select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3592,16 +3592,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
@@ -3611,16 +3611,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -3656,14 +3656,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
@@ -3727,16 +3727,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_text_vec_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_mapwork_part.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_mapwork_part.q.out
index 5b1ec99..bd6d209 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_mapwork_part.q.out
@@ -3705,16 +3705,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -3750,17 +3750,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
@@ -3812,13 +3812,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized, llap
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=10 width=33)
+        Select Operator [SEL_7] (rows=10 width=31)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] vectorized, llap
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=10 width=33)
+            Select Operator [SEL_5] (rows=10 width=31)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=33)
+              TableScan [TS_0] (rows=10 width=31)
                 default@part_change_lower_to_higher_numeric_group_decimal,part_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3834,9 +3834,9 @@ POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=2
 #### A masked pattern was here ####
 insert_num	part	c1	b
-1	1	-29.0764	original
-10	1	1.7	new
-2	1	753.7028	original
+1	1	-29.076400756835938	original
+10	1	1.7000000476837158	new
+2	1	753.7028198242188	original
 3	1	-5000.0	original
 4	1	5.2927712E7	original
 5	2	7.74	new
@@ -3853,16 +3853,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 DOUBLE, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 DOUBLE, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -3900,14 +3900,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
@@ -3957,13 +3957,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized, llap
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=10 width=14)
+        Select Operator [SEL_7] (rows=10 width=25)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] vectorized, llap
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=10 width=14)
+            Select Operator [SEL_5] (rows=10 width=25)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=14)
+              TableScan [TS_0] (rows=10 width=25)
                 default@part_change_lower_to_higher_numeric_group_float,part_change_lower_to_higher_numeric_group_float,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_float order by insert_num
@@ -3979,16 +3979,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.076400756835938	original
-10	1	17.0	new
-2	1	753.7028198242188	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

[2/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)

[jc...@apache.org]

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/results/clientpositive/tez/schema_evol_orc_nonvec_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/schema_evol_orc_nonvec_mapwork_part.q.out b/ql/src/test/results/clientpositive/tez/schema_evol_orc_nonvec_mapwork_part.q.out
index 572dc0b..334d55e 100644
--- a/ql/src/test/results/clientpositive/tez/schema_evol_orc_nonvec_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/tez/schema_evol_orc_nonvec_mapwork_part.q.out
@@ -3701,16 +3701,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -3746,17 +3746,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
@@ -3808,13 +3808,13 @@ Stage-0
     Stage-1
       Reducer 2
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=10 width=189)
+        Select Operator [SEL_3] (rows=10 width=168)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE]
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=10 width=189)
+            Select Operator [SEL_1] (rows=10 width=168)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=189)
+              TableScan [TS_0] (rows=10 width=168)
                 default@part_change_lower_to_higher_numeric_group_decimal,part_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3849,16 +3849,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -3896,14 +3896,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
@@ -3953,13 +3953,13 @@ Stage-0
     Stage-1
       Reducer 2
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=10 width=99)
+        Select Operator [SEL_3] (rows=10 width=163)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE]
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=10 width=99)
+            Select Operator [SEL_1] (rows=10 width=163)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=99)
+              TableScan [TS_0] (rows=10 width=163)
                 default@part_change_lower_to_higher_numeric_group_float,part_change_lower_to_higher_numeric_group_float,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_float order by insert_num
@@ -3975,16 +3975,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/tez/schema_evol_orc_nonvec_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/schema_evol_orc_nonvec_mapwork_table.q.out b/ql/src/test/results/clientpositive/tez/schema_evol_orc_nonvec_mapwork_table.q.out
index 1f093a6..a3edfee 100644
--- a/ql/src/test/results/clientpositive/tez/schema_evol_orc_nonvec_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/tez/schema_evol_orc_nonvec_mapwork_table.q.out
@@ -3474,16 +3474,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -3517,17 +3517,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
@@ -3574,13 +3574,13 @@ Stage-0
     Stage-1
       Reducer 2
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=4 width=320)
+        Select Operator [SEL_3] (rows=4 width=104)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE]
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=4 width=320)
+            Select Operator [SEL_1] (rows=4 width=104)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=4 width=320)
+              TableScan [TS_0] (rows=4 width=104)
                 default@table_change_lower_to_higher_numeric_group_decimal,table_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","c2","b"]
 
 PREHOOK: query: select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3592,16 +3592,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
@@ -3611,16 +3611,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -3656,14 +3656,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
@@ -3709,13 +3709,13 @@ Stage-0
     Stage-1
       Reducer 2
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=4 width=100)
+        Select Operator [SEL_3] (rows=4 width=104)
           Output:["_col0","_col1","_col2"]
         <-Map 1 [SIMPLE_EDGE]
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=4 width=100)
+            Select Operator [SEL_1] (rows=4 width=104)
               Output:["_col0","_col1","_col2"]
-              TableScan [TS_0] (rows=4 width=100)
+              TableScan [TS_0] (rows=4 width=104)
                 default@table_change_lower_to_higher_numeric_group_float,table_change_lower_to_higher_numeric_group_float,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float order by insert_num
@@ -3727,16 +3727,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/tez/schema_evol_orc_vec_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/schema_evol_orc_vec_mapwork_part.q.out b/ql/src/test/results/clientpositive/tez/schema_evol_orc_vec_mapwork_part.q.out
index e58079d..03a973e 100644
--- a/ql/src/test/results/clientpositive/tez/schema_evol_orc_vec_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/tez/schema_evol_orc_vec_mapwork_part.q.out
@@ -3701,16 +3701,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -3746,17 +3746,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
@@ -3808,13 +3808,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=10 width=189)
+        Select Operator [SEL_7] (rows=10 width=168)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] vectorized
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=10 width=189)
+            Select Operator [SEL_5] (rows=10 width=168)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=189)
+              TableScan [TS_0] (rows=10 width=168)
                 default@part_change_lower_to_higher_numeric_group_decimal,part_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3849,16 +3849,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -3896,14 +3896,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
@@ -3953,13 +3953,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=10 width=99)
+        Select Operator [SEL_7] (rows=10 width=163)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] vectorized
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=10 width=99)
+            Select Operator [SEL_5] (rows=10 width=163)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=99)
+              TableScan [TS_0] (rows=10 width=163)
                 default@part_change_lower_to_higher_numeric_group_float,part_change_lower_to_higher_numeric_group_float,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_float order by insert_num
@@ -3975,16 +3975,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/tez/schema_evol_orc_vec_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/schema_evol_orc_vec_mapwork_table.q.out b/ql/src/test/results/clientpositive/tez/schema_evol_orc_vec_mapwork_table.q.out
index 76a972a..98ebe2c 100644
--- a/ql/src/test/results/clientpositive/tez/schema_evol_orc_vec_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/tez/schema_evol_orc_vec_mapwork_table.q.out
@@ -3474,16 +3474,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -3517,17 +3517,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
@@ -3574,13 +3574,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=4 width=320)
+        Select Operator [SEL_7] (rows=4 width=104)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] vectorized
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=4 width=320)
+            Select Operator [SEL_5] (rows=4 width=104)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=4 width=320)
+              TableScan [TS_0] (rows=4 width=104)
                 default@table_change_lower_to_higher_numeric_group_decimal,table_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","c2","b"]
 
 PREHOOK: query: select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3592,16 +3592,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
@@ -3611,16 +3611,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -3656,14 +3656,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
@@ -3709,13 +3709,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=4 width=100)
+        Select Operator [SEL_7] (rows=4 width=104)
           Output:["_col0","_col1","_col2"]
         <-Map 1 [SIMPLE_EDGE] vectorized
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=4 width=100)
+            Select Operator [SEL_5] (rows=4 width=104)
               Output:["_col0","_col1","_col2"]
-              TableScan [TS_0] (rows=4 width=100)
+              TableScan [TS_0] (rows=4 width=104)
                 default@table_change_lower_to_higher_numeric_group_float,table_change_lower_to_higher_numeric_group_float,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float order by insert_num
@@ -3727,16 +3727,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/tez/schema_evol_text_nonvec_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/schema_evol_text_nonvec_mapwork_part.q.out b/ql/src/test/results/clientpositive/tez/schema_evol_text_nonvec_mapwork_part.q.out
index 40c3f47..8d2fdde 100644
--- a/ql/src/test/results/clientpositive/tez/schema_evol_text_nonvec_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/tez/schema_evol_text_nonvec_mapwork_part.q.out
@@ -3701,16 +3701,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -3746,17 +3746,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
@@ -3808,13 +3808,13 @@ Stage-0
     Stage-1
       Reducer 2
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=10 width=33)
+        Select Operator [SEL_3] (rows=10 width=31)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE]
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=10 width=33)
+            Select Operator [SEL_1] (rows=10 width=31)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=33)
+              TableScan [TS_0] (rows=10 width=31)
                 default@part_change_lower_to_higher_numeric_group_decimal,part_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3830,9 +3830,9 @@ POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=2
 #### A masked pattern was here ####
 insert_num	part	c1	b
-1	1	-29.0764	original
-10	1	1.7	new
-2	1	753.7028	original
+1	1	-29.076400756835938	original
+10	1	1.7000000476837158	new
+2	1	753.7028198242188	original
 3	1	-5000.0	original
 4	1	5.2927712E7	original
 5	2	7.74	new
@@ -3849,16 +3849,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -3896,14 +3896,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
@@ -3953,13 +3953,13 @@ Stage-0
     Stage-1
       Reducer 2
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=10 width=14)
+        Select Operator [SEL_3] (rows=10 width=25)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE]
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=10 width=14)
+            Select Operator [SEL_1] (rows=10 width=25)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=14)
+              TableScan [TS_0] (rows=10 width=25)
                 default@part_change_lower_to_higher_numeric_group_float,part_change_lower_to_higher_numeric_group_float,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_float order by insert_num
@@ -3975,16 +3975,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.076400756835938	original
-10	1	17.0	new
-2	1	753.7028198242188	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/tez/schema_evol_text_nonvec_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/schema_evol_text_nonvec_mapwork_table.q.out b/ql/src/test/results/clientpositive/tez/schema_evol_text_nonvec_mapwork_table.q.out
index f8f413c..0ca4c8f 100644
--- a/ql/src/test/results/clientpositive/tez/schema_evol_text_nonvec_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/tez/schema_evol_text_nonvec_mapwork_table.q.out
@@ -3474,16 +3474,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -3517,17 +3517,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
@@ -3574,13 +3574,13 @@ Stage-0
     Stage-1
       Reducer 2
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=4 width=59)
+        Select Operator [SEL_3] (rows=4 width=29)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE]
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=4 width=59)
+            Select Operator [SEL_1] (rows=4 width=29)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=4 width=59)
+              TableScan [TS_0] (rows=4 width=29)
                 default@table_change_lower_to_higher_numeric_group_decimal,table_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","c2","b"]
 
 PREHOOK: query: select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3592,16 +3592,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
@@ -3611,16 +3611,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -3656,14 +3656,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
@@ -3727,16 +3727,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/tez/schema_evol_text_vec_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/schema_evol_text_vec_mapwork_part.q.out b/ql/src/test/results/clientpositive/tez/schema_evol_text_vec_mapwork_part.q.out
index cac8a9e..69a4fbc 100644
--- a/ql/src/test/results/clientpositive/tez/schema_evol_text_vec_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/tez/schema_evol_text_vec_mapwork_part.q.out
@@ -3705,16 +3705,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -3750,17 +3750,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
@@ -3812,13 +3812,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=10 width=33)
+        Select Operator [SEL_7] (rows=10 width=31)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] vectorized
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=10 width=33)
+            Select Operator [SEL_5] (rows=10 width=31)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=33)
+              TableScan [TS_0] (rows=10 width=31)
                 default@part_change_lower_to_higher_numeric_group_decimal,part_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3834,9 +3834,9 @@ POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=2
 #### A masked pattern was here ####
 insert_num	part	c1	b
-1	1	-29.0764	original
-10	1	1.7	new
-2	1	753.7028	original
+1	1	-29.076400756835938	original
+10	1	1.7000000476837158	new
+2	1	753.7028198242188	original
 3	1	-5000.0	original
 4	1	5.2927712E7	original
 5	2	7.74	new
@@ -3853,16 +3853,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 DOUBLE, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 DOUBLE, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -3900,14 +3900,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
@@ -3957,13 +3957,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=10 width=14)
+        Select Operator [SEL_7] (rows=10 width=25)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] vectorized
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=10 width=14)
+            Select Operator [SEL_5] (rows=10 width=25)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=14)
+              TableScan [TS_0] (rows=10 width=25)
                 default@part_change_lower_to_higher_numeric_group_float,part_change_lower_to_higher_numeric_group_float,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_float order by insert_num
@@ -3979,16 +3979,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.076400756835938	original
-10	1	17.0	new
-2	1	753.7028198242188	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/tez/schema_evol_text_vec_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/schema_evol_text_vec_mapwork_table.q.out b/ql/src/test/results/clientpositive/tez/schema_evol_text_vec_mapwork_table.q.out
index f74a754..eaa4730 100644
--- a/ql/src/test/results/clientpositive/tez/schema_evol_text_vec_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/tez/schema_evol_text_vec_mapwork_table.q.out
@@ -3478,16 +3478,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -3521,17 +3521,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
@@ -3578,13 +3578,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=4 width=59)
+        Select Operator [SEL_7] (rows=4 width=29)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] vectorized
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=4 width=59)
+            Select Operator [SEL_5] (rows=4 width=29)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=4 width=59)
+              TableScan [TS_0] (rows=4 width=29)
                 default@table_change_lower_to_higher_numeric_group_decimal,table_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","c2","b"]
 
 PREHOOK: query: select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3596,16 +3596,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
@@ -3615,16 +3615,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -3660,14 +3660,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
@@ -3731,16 +3731,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/tez/schema_evol_text_vecrow_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/schema_evol_text_vecrow_mapwork_part.q.out b/ql/src/test/results/clientpositive/tez/schema_evol_text_vecrow_mapwork_part.q.out
index 24600d9..954a4c4 100644
--- a/ql/src/test/results/clientpositive/tez/schema_evol_text_vecrow_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/tez/schema_evol_text_vecrow_mapwork_part.q.out
@@ -3705,16 +3705,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -3750,17 +3750,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
@@ -3812,13 +3812,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=10 width=33)
+        Select Operator [SEL_7] (rows=10 width=31)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] vectorized
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=10 width=33)
+            Select Operator [SEL_5] (rows=10 width=31)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=33)
+              TableScan [TS_0] (rows=10 width=31)
                 default@part_change_lower_to_higher_numeric_group_decimal,part_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3834,9 +3834,9 @@ POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=2
 #### A masked pattern was here ####
 insert_num	part	c1	b
-1	1	-29.0764	original
-10	1	1.7	new
-2	1	753.7028	original
+1	1	-29.076400756835938	original
+10	1	1.7000000476837158	new
+2	1	753.7028198242188	original
 3	1	-5000.0	original
 4	1	5.2927712E7	original
 5	2	7.74	new
@@ -3853,16 +3853,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -3900,14 +3900,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
@@ -3957,13 +3957,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=10 width=14)
+        Select Operator [SEL_7] (rows=10 width=25)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] vectorized
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=10 width=14)
+            Select Operator [SEL_5] (rows=10 width=25)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=14)
+              TableScan [TS_0] (rows=10 width=25)
                 default@part_change_lower_to_higher_numeric_group_float,part_change_lower_to_higher_numeric_group_float,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_float order by insert_num
@@ -3979,16 +3979,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.076400756835938	original
-10	1	17.0	new
-2	1	753.7028198242188	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

[4/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)

[jc...@apache.org]

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/results/clientpositive/schema_evol_orc_nonvec_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/schema_evol_orc_nonvec_mapwork_part.q.out b/ql/src/test/results/clientpositive/schema_evol_orc_nonvec_mapwork_part.q.out
index 0b1c78f..68300ab 100644
--- a/ql/src/test/results/clientpositive/schema_evol_orc_nonvec_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/schema_evol_orc_nonvec_mapwork_part.q.out
@@ -4119,16 +4119,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -4164,17 +4164,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
@@ -4225,24 +4225,24 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: part_change_lower_to_higher_numeric_group_decimal
-            Statistics: Num rows: 10 Data size: 1898 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 1682 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), part (type: int), c1 (type: float), b (type: string)
+              expressions: insert_num (type: int), part (type: int), c1 (type: double), b (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 10 Data size: 1898 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 10 Data size: 1682 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 10 Data size: 1898 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: int), _col2 (type: float), _col3 (type: string)
+                Statistics: Num rows: 10 Data size: 1682 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: int), _col2 (type: double), _col3 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: float), VALUE._col2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: double), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 10 Data size: 1898 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 10 Data size: 1682 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 10 Data size: 1898 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 1682 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4286,16 +4286,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -4333,14 +4333,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
@@ -4389,24 +4389,24 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: part_change_lower_to_higher_numeric_group_float
-            Statistics: Num rows: 10 Data size: 994 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 1634 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), part (type: int), c1 (type: double), b (type: string)
+              expressions: insert_num (type: int), part (type: int), c1 (type: decimal(38,18)), b (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 10 Data size: 994 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 10 Data size: 1634 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 10 Data size: 994 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: int), _col2 (type: double), _col3 (type: string)
+                Statistics: Num rows: 10 Data size: 1634 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: int), _col2 (type: decimal(38,18)), _col3 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: double), VALUE._col2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: decimal(38,18)), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 10 Data size: 994 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 10 Data size: 1634 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 10 Data size: 994 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 1634 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4431,16 +4431,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/schema_evol_orc_nonvec_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/schema_evol_orc_nonvec_mapwork_table.q.out b/ql/src/test/results/clientpositive/schema_evol_orc_nonvec_mapwork_table.q.out
index 766d694..bf7ff6c 100644
--- a/ql/src/test/results/clientpositive/schema_evol_orc_nonvec_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/schema_evol_orc_nonvec_mapwork_table.q.out
@@ -3892,16 +3892,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -3935,17 +3935,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
@@ -3991,24 +3991,24 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: table_change_lower_to_higher_numeric_group_decimal
-            Statistics: Num rows: 4 Data size: 1280 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), c1 (type: float), c2 (type: double), b (type: string)
+              expressions: insert_num (type: int), c1 (type: double), c2 (type: decimal(38,18)), b (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 4 Data size: 1280 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 4 Data size: 1280 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: float), _col2 (type: double), _col3 (type: string)
+                Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: double), _col2 (type: decimal(38,18)), _col3 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: float), VALUE._col1 (type: double), VALUE._col2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: double), VALUE._col1 (type: decimal(38,18)), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 4 Data size: 1280 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 4 Data size: 1280 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4029,16 +4029,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
@@ -4048,16 +4048,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -4093,14 +4093,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
@@ -4145,24 +4145,24 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: table_change_lower_to_higher_numeric_group_float
-            Statistics: Num rows: 4 Data size: 400 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), c1 (type: double), b (type: string)
+              expressions: insert_num (type: int), c1 (type: decimal(38,18)), b (type: string)
               outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 4 Data size: 400 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 4 Data size: 400 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: double), _col2 (type: string)
+                Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: decimal(38,18)), _col2 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: double), VALUE._col1 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(38,18)), VALUE._col1 (type: string)
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 4 Data size: 400 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 4 Data size: 400 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4183,16 +4183,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/schema_evol_orc_vec_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/schema_evol_orc_vec_mapwork_part.q.out b/ql/src/test/results/clientpositive/schema_evol_orc_vec_mapwork_part.q.out
index d5bcda5..dbd8cb2 100644
--- a/ql/src/test/results/clientpositive/schema_evol_orc_vec_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/schema_evol_orc_vec_mapwork_part.q.out
@@ -4141,16 +4141,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -4186,17 +4186,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
@@ -4247,25 +4247,25 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: part_change_lower_to_higher_numeric_group_decimal
-            Statistics: Num rows: 10 Data size: 1898 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 1682 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), part (type: int), c1 (type: float), b (type: string)
+              expressions: insert_num (type: int), part (type: int), c1 (type: double), b (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 10 Data size: 1898 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 10 Data size: 1682 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 10 Data size: 1898 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: int), _col2 (type: float), _col3 (type: string)
+                Statistics: Num rows: 10 Data size: 1682 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: int), _col2 (type: double), _col3 (type: string)
       Execution mode: vectorized
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: float), VALUE._col2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: double), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 10 Data size: 1898 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 10 Data size: 1682 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 10 Data size: 1898 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 1682 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4309,16 +4309,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -4356,14 +4356,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
@@ -4412,25 +4412,25 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: part_change_lower_to_higher_numeric_group_float
-            Statistics: Num rows: 10 Data size: 994 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 1634 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), part (type: int), c1 (type: double), b (type: string)
+              expressions: insert_num (type: int), part (type: int), c1 (type: decimal(38,18)), b (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 10 Data size: 994 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 10 Data size: 1634 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 10 Data size: 994 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: int), _col2 (type: double), _col3 (type: string)
+                Statistics: Num rows: 10 Data size: 1634 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: int), _col2 (type: decimal(38,18)), _col3 (type: string)
       Execution mode: vectorized
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: double), VALUE._col2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: decimal(38,18)), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 10 Data size: 994 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 10 Data size: 1634 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 10 Data size: 994 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 1634 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4455,16 +4455,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/schema_evol_orc_vec_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/schema_evol_orc_vec_mapwork_table.q.out b/ql/src/test/results/clientpositive/schema_evol_orc_vec_mapwork_table.q.out
index e9b42c3..f5c29a7 100644
--- a/ql/src/test/results/clientpositive/schema_evol_orc_vec_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/schema_evol_orc_vec_mapwork_table.q.out
@@ -3914,16 +3914,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -3957,17 +3957,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
@@ -4013,25 +4013,25 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: table_change_lower_to_higher_numeric_group_decimal
-            Statistics: Num rows: 4 Data size: 1280 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), c1 (type: float), c2 (type: double), b (type: string)
+              expressions: insert_num (type: int), c1 (type: double), c2 (type: decimal(38,18)), b (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 4 Data size: 1280 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 4 Data size: 1280 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: float), _col2 (type: double), _col3 (type: string)
+                Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: double), _col2 (type: decimal(38,18)), _col3 (type: string)
       Execution mode: vectorized
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: float), VALUE._col1 (type: double), VALUE._col2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: double), VALUE._col1 (type: decimal(38,18)), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 4 Data size: 1280 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 4 Data size: 1280 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4052,16 +4052,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
@@ -4071,16 +4071,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -4116,14 +4116,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
@@ -4168,25 +4168,25 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: table_change_lower_to_higher_numeric_group_float
-            Statistics: Num rows: 4 Data size: 400 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), c1 (type: double), b (type: string)
+              expressions: insert_num (type: int), c1 (type: decimal(38,18)), b (type: string)
               outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 4 Data size: 400 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 4 Data size: 400 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: double), _col2 (type: string)
+                Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: decimal(38,18)), _col2 (type: string)
       Execution mode: vectorized
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: double), VALUE._col1 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(38,18)), VALUE._col1 (type: string)
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 4 Data size: 400 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 4 Data size: 400 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4207,16 +4207,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/schema_evol_text_nonvec_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/schema_evol_text_nonvec_mapwork_part.q.out b/ql/src/test/results/clientpositive/schema_evol_text_nonvec_mapwork_part.q.out
index 2c1caa3..01072d0 100644
--- a/ql/src/test/results/clientpositive/schema_evol_text_nonvec_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/schema_evol_text_nonvec_mapwork_part.q.out
@@ -4119,16 +4119,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -4164,17 +4164,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
@@ -4225,24 +4225,24 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: part_change_lower_to_higher_numeric_group_decimal
-            Statistics: Num rows: 10 Data size: 335 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 311 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), part (type: int), c1 (type: float), b (type: string)
+              expressions: insert_num (type: int), part (type: int), c1 (type: double), b (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 10 Data size: 335 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 10 Data size: 311 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 10 Data size: 335 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: int), _col2 (type: float), _col3 (type: string)
+                Statistics: Num rows: 10 Data size: 311 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: int), _col2 (type: double), _col3 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: float), VALUE._col2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: double), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 10 Data size: 335 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 10 Data size: 311 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 10 Data size: 335 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 311 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4267,9 +4267,9 @@ POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=2
 #### A masked pattern was here ####
 insert_num	part	c1	b
-1	1	-29.0764	original
-10	1	1.7	new
-2	1	753.7028	original
+1	1	-29.076400756835938	original
+10	1	1.7000000476837158	new
+2	1	753.7028198242188	original
 3	1	-5000.0	original
 4	1	5.2927712E7	original
 5	2	7.74	new
@@ -4286,16 +4286,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -4333,14 +4333,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
@@ -4389,24 +4389,24 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: part_change_lower_to_higher_numeric_group_float
-            Statistics: Num rows: 10 Data size: 148 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 250 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), part (type: int), c1 (type: double), b (type: string)
+              expressions: insert_num (type: int), part (type: int), c1 (type: decimal(38,18)), b (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 10 Data size: 148 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 10 Data size: 250 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 10 Data size: 148 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: int), _col2 (type: double), _col3 (type: string)
+                Statistics: Num rows: 10 Data size: 250 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: int), _col2 (type: decimal(38,18)), _col3 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: double), VALUE._col2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: decimal(38,18)), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 10 Data size: 148 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 10 Data size: 250 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 10 Data size: 148 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 250 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4431,16 +4431,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.076400756835938	original
-10	1	17.0	new
-2	1	753.7028198242188	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/schema_evol_text_nonvec_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/schema_evol_text_nonvec_mapwork_table.q.out b/ql/src/test/results/clientpositive/schema_evol_text_nonvec_mapwork_table.q.out
index 7426c5e..24ffaa9 100644
--- a/ql/src/test/results/clientpositive/schema_evol_text_nonvec_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/schema_evol_text_nonvec_mapwork_table.q.out
@@ -3892,16 +3892,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -3935,17 +3935,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
@@ -3991,24 +3991,24 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: table_change_lower_to_higher_numeric_group_decimal
-            Statistics: Num rows: 4 Data size: 238 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 4 Data size: 116 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), c1 (type: float), c2 (type: double), b (type: string)
+              expressions: insert_num (type: int), c1 (type: double), c2 (type: decimal(38,18)), b (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 4 Data size: 238 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 4 Data size: 116 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 4 Data size: 238 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: float), _col2 (type: double), _col3 (type: string)
+                Statistics: Num rows: 4 Data size: 116 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: double), _col2 (type: decimal(38,18)), _col3 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: float), VALUE._col1 (type: double), VALUE._col2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: double), VALUE._col1 (type: decimal(38,18)), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 4 Data size: 238 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 4 Data size: 116 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 4 Data size: 238 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 4 Data size: 116 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4029,16 +4029,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
@@ -4048,16 +4048,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -4093,14 +4093,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
@@ -4147,17 +4147,17 @@ STAGE PLANS:
             alias: table_change_lower_to_higher_numeric_group_float
             Statistics: Num rows: 4 Data size: 78 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), c1 (type: double), b (type: string)
+              expressions: insert_num (type: int), c1 (type: decimal(38,18)), b (type: string)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 4 Data size: 78 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
                 Statistics: Num rows: 4 Data size: 78 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: double), _col2 (type: string)
+                value expressions: _col1 (type: decimal(38,18)), _col2 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: double), VALUE._col1 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(38,18)), VALUE._col1 (type: string)
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 4 Data size: 78 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
@@ -4183,16 +4183,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/schema_evol_text_vec_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/schema_evol_text_vec_mapwork_part.q.out b/ql/src/test/results/clientpositive/schema_evol_text_vec_mapwork_part.q.out
index f105795..fefe9c4 100644
--- a/ql/src/test/results/clientpositive/schema_evol_text_vec_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/schema_evol_text_vec_mapwork_part.q.out
@@ -4145,16 +4145,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -4190,17 +4190,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
@@ -4251,25 +4251,25 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: part_change_lower_to_higher_numeric_group_decimal
-            Statistics: Num rows: 10 Data size: 335 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 311 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), part (type: int), c1 (type: float), b (type: string)
+              expressions: insert_num (type: int), part (type: int), c1 (type: double), b (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 10 Data size: 335 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 10 Data size: 311 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 10 Data size: 335 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: int), _col2 (type: float), _col3 (type: string)
+                Statistics: Num rows: 10 Data size: 311 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: int), _col2 (type: double), _col3 (type: string)
       Execution mode: vectorized
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: float), VALUE._col2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: double), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 10 Data size: 335 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 10 Data size: 311 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 10 Data size: 335 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 311 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4294,9 +4294,9 @@ POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=2
 #### A masked pattern was here ####
 insert_num	part	c1	b
-1	1	-29.0764	original
-10	1	1.7	new
-2	1	753.7028	original
+1	1	-29.076400756835938	original
+10	1	1.7000000476837158	new
+2	1	753.7028198242188	original
 3	1	-5000.0	original
 4	1	5.2927712E7	original
 5	2	7.74	new
@@ -4313,16 +4313,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 DOUBLE, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 DOUBLE, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -4360,14 +4360,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
@@ -4416,25 +4416,25 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: part_change_lower_to_higher_numeric_group_float
-            Statistics: Num rows: 10 Data size: 148 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 250 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), part (type: int), c1 (type: double), b (type: string)
+              expressions: insert_num (type: int), part (type: int), c1 (type: decimal(38,18)), b (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 10 Data size: 148 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 10 Data size: 250 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 10 Data size: 148 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: int), _col2 (type: double), _col3 (type: string)
+                Statistics: Num rows: 10 Data size: 250 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: int), _col2 (type: decimal(38,18)), _col3 (type: string)
       Execution mode: vectorized
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: double), VALUE._col2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: decimal(38,18)), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 10 Data size: 148 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 10 Data size: 250 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 10 Data size: 148 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 250 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4459,16 +4459,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.076400756835938	original
-10	1	17.0	new
-2	1	753.7028198242188	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

[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)

[jc...@apache.org]

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

[3/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)

[jc...@apache.org]

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/results/clientpositive/schema_evol_text_vec_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/schema_evol_text_vec_mapwork_table.q.out b/ql/src/test/results/clientpositive/schema_evol_text_vec_mapwork_table.q.out
index aac5bc2..f7f178a 100644
--- a/ql/src/test/results/clientpositive/schema_evol_text_vec_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/schema_evol_text_vec_mapwork_table.q.out
@@ -3918,16 +3918,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -3961,17 +3961,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
@@ -4017,25 +4017,25 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: table_change_lower_to_higher_numeric_group_decimal
-            Statistics: Num rows: 4 Data size: 238 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 4 Data size: 116 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), c1 (type: float), c2 (type: double), b (type: string)
+              expressions: insert_num (type: int), c1 (type: double), c2 (type: decimal(38,18)), b (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 4 Data size: 238 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 4 Data size: 116 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 4 Data size: 238 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: float), _col2 (type: double), _col3 (type: string)
+                Statistics: Num rows: 4 Data size: 116 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: double), _col2 (type: decimal(38,18)), _col3 (type: string)
       Execution mode: vectorized
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: float), VALUE._col1 (type: double), VALUE._col2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: double), VALUE._col1 (type: decimal(38,18)), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 4 Data size: 238 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 4 Data size: 116 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 4 Data size: 238 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 4 Data size: 116 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4056,16 +4056,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
@@ -4075,16 +4075,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -4120,14 +4120,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
@@ -4174,18 +4174,18 @@ STAGE PLANS:
             alias: table_change_lower_to_higher_numeric_group_float
             Statistics: Num rows: 4 Data size: 78 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), c1 (type: double), b (type: string)
+              expressions: insert_num (type: int), c1 (type: decimal(38,18)), b (type: string)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 4 Data size: 78 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
                 Statistics: Num rows: 4 Data size: 78 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: double), _col2 (type: string)
+                value expressions: _col1 (type: decimal(38,18)), _col2 (type: string)
       Execution mode: vectorized
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: double), VALUE._col1 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(38,18)), VALUE._col1 (type: string)
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 4 Data size: 78 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
@@ -4211,16 +4211,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/schema_evol_text_vecrow_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/schema_evol_text_vecrow_mapwork_part.q.out b/ql/src/test/results/clientpositive/schema_evol_text_vecrow_mapwork_part.q.out
index b53c373..fd737d7 100644
--- a/ql/src/test/results/clientpositive/schema_evol_text_vecrow_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/schema_evol_text_vecrow_mapwork_part.q.out
@@ -4145,16 +4145,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -4190,17 +4190,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
@@ -4251,25 +4251,25 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: part_change_lower_to_higher_numeric_group_decimal
-            Statistics: Num rows: 10 Data size: 335 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 311 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), part (type: int), c1 (type: float), b (type: string)
+              expressions: insert_num (type: int), part (type: int), c1 (type: double), b (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 10 Data size: 335 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 10 Data size: 311 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 10 Data size: 335 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: int), _col2 (type: float), _col3 (type: string)
+                Statistics: Num rows: 10 Data size: 311 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: int), _col2 (type: double), _col3 (type: string)
       Execution mode: vectorized
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: float), VALUE._col2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: double), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 10 Data size: 335 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 10 Data size: 311 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 10 Data size: 335 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 311 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4294,9 +4294,9 @@ POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=2
 #### A masked pattern was here ####
 insert_num	part	c1	b
-1	1	-29.0764	original
-10	1	1.7	new
-2	1	753.7028	original
+1	1	-29.076400756835938	original
+10	1	1.7000000476837158	new
+2	1	753.7028198242188	original
 3	1	-5000.0	original
 4	1	5.2927712E7	original
 5	2	7.74	new
@@ -4313,16 +4313,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -4360,14 +4360,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
@@ -4416,25 +4416,25 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: part_change_lower_to_higher_numeric_group_float
-            Statistics: Num rows: 10 Data size: 148 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 250 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), part (type: int), c1 (type: double), b (type: string)
+              expressions: insert_num (type: int), part (type: int), c1 (type: decimal(38,18)), b (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 10 Data size: 148 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 10 Data size: 250 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 10 Data size: 148 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: int), _col2 (type: double), _col3 (type: string)
+                Statistics: Num rows: 10 Data size: 250 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: int), _col2 (type: decimal(38,18)), _col3 (type: string)
       Execution mode: vectorized
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: double), VALUE._col2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: decimal(38,18)), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 10 Data size: 148 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 10 Data size: 250 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 10 Data size: 148 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 250 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4459,16 +4459,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.076400756835938	original
-10	1	17.0	new
-2	1	753.7028198242188	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/schema_evol_text_vecrow_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/schema_evol_text_vecrow_mapwork_table.q.out b/ql/src/test/results/clientpositive/schema_evol_text_vecrow_mapwork_table.q.out
index 561c128..370900f 100644
--- a/ql/src/test/results/clientpositive/schema_evol_text_vecrow_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/schema_evol_text_vecrow_mapwork_table.q.out
@@ -3918,16 +3918,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -3961,17 +3961,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
@@ -4017,25 +4017,25 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: table_change_lower_to_higher_numeric_group_decimal
-            Statistics: Num rows: 4 Data size: 238 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 4 Data size: 116 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), c1 (type: float), c2 (type: double), b (type: string)
+              expressions: insert_num (type: int), c1 (type: double), c2 (type: decimal(38,18)), b (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 4 Data size: 238 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 4 Data size: 116 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 4 Data size: 238 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: float), _col2 (type: double), _col3 (type: string)
+                Statistics: Num rows: 4 Data size: 116 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: double), _col2 (type: decimal(38,18)), _col3 (type: string)
       Execution mode: vectorized
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: float), VALUE._col1 (type: double), VALUE._col2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: double), VALUE._col1 (type: decimal(38,18)), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 4 Data size: 238 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 4 Data size: 116 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 4 Data size: 238 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 4 Data size: 116 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4056,16 +4056,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
@@ -4075,16 +4075,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -4120,14 +4120,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
@@ -4174,18 +4174,18 @@ STAGE PLANS:
             alias: table_change_lower_to_higher_numeric_group_float
             Statistics: Num rows: 4 Data size: 78 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), c1 (type: double), b (type: string)
+              expressions: insert_num (type: int), c1 (type: decimal(38,18)), b (type: string)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 4 Data size: 78 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
                 Statistics: Num rows: 4 Data size: 78 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: double), _col2 (type: string)
+                value expressions: _col1 (type: decimal(38,18)), _col2 (type: string)
       Execution mode: vectorized
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: double), VALUE._col1 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(38,18)), VALUE._col1 (type: string)
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 4 Data size: 78 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
@@ -4211,16 +4211,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/tez/schema_evol_orc_acid_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/schema_evol_orc_acid_mapwork_part.q.out b/ql/src/test/results/clientpositive/tez/schema_evol_orc_acid_mapwork_part.q.out
index fafad50..adc0154 100644
--- a/ql/src/test/results/clientpositive/tez/schema_evol_orc_acid_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/tez/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/tez/schema_evol_orc_acid_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/schema_evol_orc_acid_mapwork_table.q.out b/ql/src/test/results/clientpositive/tez/schema_evol_orc_acid_mapwork_table.q.out
index e69e9bd..e497395 100644
--- a/ql/src/test/results/clientpositive/tez/schema_evol_orc_acid_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/tez/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/tez/schema_evol_orc_acidvec_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/schema_evol_orc_acidvec_mapwork_part.q.out b/ql/src/test/results/clientpositive/tez/schema_evol_orc_acidvec_mapwork_part.q.out
index abe001d..7ac4d1c 100644
--- a/ql/src/test/results/clientpositive/tez/schema_evol_orc_acidvec_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/tez/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/tez/schema_evol_orc_acidvec_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/schema_evol_orc_acidvec_mapwork_table.q.out b/ql/src/test/results/clientpositive/tez/schema_evol_orc_acidvec_mapwork_table.q.out
index 8ce8794..01e6382 100644
--- a/ql/src/test/results/clientpositive/tez/schema_evol_orc_acidvec_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/tez/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

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/results/clientpositive/tez/schema_evol_orc_nonvec_fetchwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/schema_evol_orc_nonvec_fetchwork_part.q.out b/ql/src/test/results/clientpositive/tez/schema_evol_orc_nonvec_fetchwork_part.q.out
index 762e5b3..908c32a 100644
--- a/ql/src/test/results/clientpositive/tez/schema_evol_orc_nonvec_fetchwork_part.q.out
+++ b/ql/src/test/results/clientpositive/tez/schema_evol_orc_nonvec_fetchwork_part.q.out
@@ -3701,16 +3701,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -3746,17 +3746,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
@@ -3808,13 +3808,13 @@ Stage-0
     Stage-1
       Reducer 2
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=10 width=189)
+        Select Operator [SEL_3] (rows=10 width=168)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE]
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=10 width=189)
+            Select Operator [SEL_1] (rows=10 width=168)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=189)
+              TableScan [TS_0] (rows=10 width=168)
                 default@part_change_lower_to_higher_numeric_group_decimal,part_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3849,16 +3849,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -3896,14 +3896,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
@@ -3953,13 +3953,13 @@ Stage-0
     Stage-1
       Reducer 2
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=10 width=99)
+        Select Operator [SEL_3] (rows=10 width=163)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE]
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=10 width=99)
+            Select Operator [SEL_1] (rows=10 width=163)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=99)
+              TableScan [TS_0] (rows=10 width=163)
                 default@part_change_lower_to_higher_numeric_group_float,part_change_lower_to_higher_numeric_group_float,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_float order by insert_num
@@ -3975,16 +3975,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/tez/schema_evol_orc_nonvec_fetchwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/schema_evol_orc_nonvec_fetchwork_table.q.out b/ql/src/test/results/clientpositive/tez/schema_evol_orc_nonvec_fetchwork_table.q.out
index 466e4c8..245855f 100644
--- a/ql/src/test/results/clientpositive/tez/schema_evol_orc_nonvec_fetchwork_table.q.out
+++ b/ql/src/test/results/clientpositive/tez/schema_evol_orc_nonvec_fetchwork_table.q.out
@@ -3474,16 +3474,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -3517,17 +3517,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
@@ -3574,13 +3574,13 @@ Stage-0
     Stage-1
       Reducer 2
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=4 width=320)
+        Select Operator [SEL_3] (rows=4 width=104)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE]
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=4 width=320)
+            Select Operator [SEL_1] (rows=4 width=104)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=4 width=320)
+              TableScan [TS_0] (rows=4 width=104)
                 default@table_change_lower_to_higher_numeric_group_decimal,table_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","c2","b"]
 
 PREHOOK: query: select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3592,16 +3592,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
@@ -3611,16 +3611,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -3656,14 +3656,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
@@ -3709,13 +3709,13 @@ Stage-0
     Stage-1
       Reducer 2
       File Output Operator [FS_4]
-        Select Operator [SEL_3] (rows=4 width=100)
+        Select Operator [SEL_3] (rows=4 width=104)
           Output:["_col0","_col1","_col2"]
         <-Map 1 [SIMPLE_EDGE]
           SHUFFLE [RS_2]
-            Select Operator [SEL_1] (rows=4 width=100)
+            Select Operator [SEL_1] (rows=4 width=104)
               Output:["_col0","_col1","_col2"]
-              TableScan [TS_0] (rows=4 width=100)
+              TableScan [TS_0] (rows=4 width=104)
                 default@table_change_lower_to_higher_numeric_group_float,table_change_lower_to_higher_numeric_group_float,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,c1,b from table_change_lower_to_higher_numeric_group_float order by insert_num
@@ -3727,16 +3727,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

[5/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)

[jc...@apache.org]

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_mapwork_table.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_mapwork_table.q.out
index 4137c31..8cbe217 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_mapwork_table.q.out
@@ -3478,16 +3478,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -3521,17 +3521,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
@@ -3578,13 +3578,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized, llap
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=4 width=59)
+        Select Operator [SEL_7] (rows=4 width=29)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] vectorized, llap
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=4 width=59)
+            Select Operator [SEL_5] (rows=4 width=29)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=4 width=59)
+              TableScan [TS_0] (rows=4 width=29)
                 default@table_change_lower_to_higher_numeric_group_decimal,table_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","c2","b"]
 
 PREHOOK: query: select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3596,16 +3596,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
@@ -3615,16 +3615,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -3660,14 +3660,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
@@ -3731,16 +3731,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_text_vecrow_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_mapwork_part.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_mapwork_part.q.out
index 7f5afd6..6eccb76 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_mapwork_part.q.out
@@ -3705,16 +3705,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -3750,17 +3750,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
@@ -3812,13 +3812,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized, llap
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=10 width=33)
+        Select Operator [SEL_7] (rows=10 width=31)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] vectorized, llap
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=10 width=33)
+            Select Operator [SEL_5] (rows=10 width=31)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=33)
+              TableScan [TS_0] (rows=10 width=31)
                 default@part_change_lower_to_higher_numeric_group_decimal,part_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3834,9 +3834,9 @@ POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=
 POSTHOOK: Input: default@part_change_lower_to_higher_numeric_group_decimal@part=2
 #### A masked pattern was here ####
 insert_num	part	c1	b
-1	1	-29.0764	original
-10	1	1.7	new
-2	1	753.7028	original
+1	1	-29.076400756835938	original
+10	1	1.7000000476837158	new
+2	1	753.7028198242188	original
 3	1	-5000.0	original
 4	1	5.2927712E7	original
 5	2	7.74	new
@@ -3853,16 +3853,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -3900,14 +3900,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
@@ -3957,13 +3957,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized, llap
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=10 width=14)
+        Select Operator [SEL_7] (rows=10 width=25)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] vectorized, llap
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=10 width=14)
+            Select Operator [SEL_5] (rows=10 width=25)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=10 width=14)
+              TableScan [TS_0] (rows=10 width=25)
                 default@part_change_lower_to_higher_numeric_group_float,part_change_lower_to_higher_numeric_group_float,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","b"]
 
 PREHOOK: query: select insert_num,part,c1,b from part_change_lower_to_higher_numeric_group_float order by insert_num
@@ -3979,16 +3979,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.076400756835938	original
-10	1	17.0	new
-2	1	753.7028198242188	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_text_vecrow_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_mapwork_table.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_mapwork_table.q.out
index bfa8195..5cb4e78 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_mapwork_table.q.out
@@ -3478,16 +3478,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -3521,17 +3521,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
@@ -3578,13 +3578,13 @@ Stage-0
     Stage-1
       Reducer 2 vectorized, llap
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=4 width=59)
+        Select Operator [SEL_7] (rows=4 width=29)
           Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] vectorized, llap
           SHUFFLE [RS_6]
-            Select Operator [SEL_5] (rows=4 width=59)
+            Select Operator [SEL_5] (rows=4 width=29)
               Output:["_col0","_col1","_col2","_col3"]
-              TableScan [TS_0] (rows=4 width=59)
+              TableScan [TS_0] (rows=4 width=29)
                 default@table_change_lower_to_higher_numeric_group_decimal,table_change_lower_to_higher_numeric_group_decimal,Tbl:COMPLETE,Col:NONE,Output:["insert_num","c1","c2","b"]
 
 PREHOOK: query: select insert_num,c1,c2,b from table_change_lower_to_higher_numeric_group_decimal order by insert_num
@@ -3596,16 +3596,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
@@ -3615,16 +3615,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -3660,14 +3660,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
@@ -3731,16 +3731,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/schema_evol_orc_acid_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/schema_evol_orc_acid_mapwork_part.q.out b/ql/src/test/results/clientpositive/schema_evol_orc_acid_mapwork_part.q.out
index fafad50..adc0154 100644
--- a/ql/src/test/results/clientpositive/schema_evol_orc_acid_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/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/schema_evol_orc_acid_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/schema_evol_orc_acid_mapwork_table.q.out b/ql/src/test/results/clientpositive/schema_evol_orc_acid_mapwork_table.q.out
index e69e9bd..e497395 100644
--- a/ql/src/test/results/clientpositive/schema_evol_orc_acid_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/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/schema_evol_orc_acidvec_mapwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/schema_evol_orc_acidvec_mapwork_part.q.out b/ql/src/test/results/clientpositive/schema_evol_orc_acidvec_mapwork_part.q.out
index abe001d..7ac4d1c 100644
--- a/ql/src/test/results/clientpositive/schema_evol_orc_acidvec_mapwork_part.q.out
+++ b/ql/src/test/results/clientpositive/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/schema_evol_orc_acidvec_mapwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/schema_evol_orc_acidvec_mapwork_table.q.out b/ql/src/test/results/clientpositive/schema_evol_orc_acidvec_mapwork_table.q.out
index 8ce8794..01e6382 100644
--- a/ql/src/test/results/clientpositive/schema_evol_orc_acidvec_mapwork_table.q.out
+++ b/ql/src/test/results/clientpositive/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

http://git-wip-us.apache.org/repos/asf/hive/blob/2e2b3d66/ql/src/test/results/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q.out b/ql/src/test/results/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q.out
index 4403ba7..65e6238 100644
--- a/ql/src/test/results/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q.out
+++ b/ql/src/test/results/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q.out
@@ -4119,16 +4119,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_decimal
@@ -4164,17 +4164,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
@@ -4225,24 +4225,24 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: part_change_lower_to_higher_numeric_group_decimal
-            Statistics: Num rows: 10 Data size: 1898 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 1682 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), part (type: int), c1 (type: float), b (type: string)
+              expressions: insert_num (type: int), part (type: int), c1 (type: double), b (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 10 Data size: 1898 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 10 Data size: 1682 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 10 Data size: 1898 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: int), _col2 (type: float), _col3 (type: string)
+                Statistics: Num rows: 10 Data size: 1682 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: int), _col2 (type: double), _col3 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: float), VALUE._col2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: double), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 10 Data size: 1898 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 10 Data size: 1682 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 10 Data size: 1898 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 1682 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4286,16 +4286,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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 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)
+CREATE TABLE part_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING) PARTITIONED BY(part INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_lower_to_higher_numeric_group_float
@@ -4333,14 +4333,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
@@ -4389,24 +4389,24 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: part_change_lower_to_higher_numeric_group_float
-            Statistics: Num rows: 10 Data size: 994 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 1634 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), part (type: int), c1 (type: double), b (type: string)
+              expressions: insert_num (type: int), part (type: int), c1 (type: decimal(38,18)), b (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 10 Data size: 994 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 10 Data size: 1634 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 10 Data size: 994 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: int), _col2 (type: double), _col3 (type: string)
+                Statistics: Num rows: 10 Data size: 1634 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: int), _col2 (type: decimal(38,18)), _col3 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: double), VALUE._col2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: decimal(38,18)), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 10 Data size: 994 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 10 Data size: 1634 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 10 Data size: 994 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 10 Data size: 1634 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4431,16 +4431,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/schema_evol_orc_nonvec_fetchwork_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q.out b/ql/src/test/results/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q.out
index ef34968..3704de6 100644
--- a/ql/src/test/results/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q.out
+++ b/ql/src/test/results/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q.out
@@ -3892,16 +3892,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal(insert_num int, c1 float, c2 float, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_decimal
@@ -3935,17 +3935,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
@@ -3991,24 +3991,24 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: table_change_lower_to_higher_numeric_group_decimal
-            Statistics: Num rows: 4 Data size: 1280 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), c1 (type: float), c2 (type: double), b (type: string)
+              expressions: insert_num (type: int), c1 (type: double), c2 (type: decimal(38,18)), b (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 4 Data size: 1280 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 4 Data size: 1280 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: float), _col2 (type: double), _col3 (type: string)
+                Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: double), _col2 (type: decimal(38,18)), _col3 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: float), VALUE._col1 (type: double), VALUE._col2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: double), VALUE._col1 (type: decimal(38,18)), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 4 Data size: 1280 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 4 Data size: 1280 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4029,16 +4029,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
@@ -4048,16 +4048,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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 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)
+CREATE TABLE table_change_lower_to_higher_numeric_group_float(insert_num int, c1 double, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@table_change_lower_to_higher_numeric_group_float
@@ -4093,14 +4093,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
@@ -4145,24 +4145,24 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: table_change_lower_to_higher_numeric_group_float
-            Statistics: Num rows: 4 Data size: 400 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: insert_num (type: int), c1 (type: double), b (type: string)
+              expressions: insert_num (type: int), c1 (type: decimal(38,18)), b (type: string)
               outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 4 Data size: 400 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int)
                 sort order: +
-                Statistics: Num rows: 4 Data size: 400 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col1 (type: double), _col2 (type: string)
+                Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col1 (type: decimal(38,18)), _col2 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: double), VALUE._col1 (type: string)
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(38,18)), VALUE._col1 (type: string)
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 4 Data size: 400 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 4 Data size: 400 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 4 Data size: 416 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -4183,16 +4183,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