[hive] branch master updated: HIVE-22080: Prevent implicit conversion from String/char/varchar to double/decimal (Ramesh Kumar Thangarajan, reviewed by Jason Dere)

[jd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jdere pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new f9bd0bf  HIVE-22080: Prevent implicit conversion from String/char/varchar to double/decimal (Ramesh Kumar Thangarajan, reviewed by Jason Dere)
f9bd0bf is described below

commit f9bd0bf36d781e5360223df7c4263a69bea06b36
Author: Jason Dere <jd...@cloudera.com>
AuthorDate: Wed Aug 7 10:57:38 2019 -0700

    HIVE-22080: Prevent implicit conversion from String/char/varchar to double/decimal (Ramesh Kumar Thangarajan, reviewed by Jason Dere)
---
 ql/src/test/queries/clientpositive/schema_evol_orc_acid_part.q        | 2 ++
 .../test/queries/clientpositive/schema_evol_orc_acid_part_llap_io.q   | 2 ++
 ql/src/test/queries/clientpositive/schema_evol_orc_acid_table.q       | 2 ++
 .../test/queries/clientpositive/schema_evol_orc_acid_table_llap_io.q  | 2 ++
 ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part.q     | 2 ++
 .../queries/clientpositive/schema_evol_orc_acidvec_part_llap_io.q     | 2 ++
 ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_table.q    | 2 ++
 .../queries/clientpositive/schema_evol_orc_acidvec_table_llap_io.q    | 2 ++
 ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part.q      | 2 ++
 .../test/queries/clientpositive/schema_evol_orc_nonvec_part_llap_io.q | 2 ++
 ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_table.q     | 2 ++
 .../queries/clientpositive/schema_evol_orc_nonvec_table_llap_io.q     | 2 ++
 ql/src/test/queries/clientpositive/schema_evol_orc_vec_part.q         | 2 ++
 ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_llap_io.q | 2 ++
 ql/src/test/queries/clientpositive/schema_evol_orc_vec_table.q        | 2 ++
 .../test/queries/clientpositive/schema_evol_orc_vec_table_llap_io.q   | 2 ++
 ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part.q     | 2 ++
 .../queries/clientpositive/schema_evol_text_nonvec_part_llap_io.q     | 2 ++
 ql/src/test/queries/clientpositive/schema_evol_text_nonvec_table.q    | 2 ++
 .../queries/clientpositive/schema_evol_text_nonvec_table_llap_io.q    | 2 ++
 ql/src/test/queries/clientpositive/schema_evol_text_vec_part.q        | 2 ++
 .../test/queries/clientpositive/schema_evol_text_vec_part_llap_io.q   | 2 ++
 ql/src/test/queries/clientpositive/schema_evol_text_vec_table.q       | 2 ++
 .../test/queries/clientpositive/schema_evol_text_vec_table_llap_io.q  | 2 ++
 ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part.q     | 2 ++
 .../queries/clientpositive/schema_evol_text_vecrow_part_llap_io.q     | 2 ++
 ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table.q    | 2 ++
 .../queries/clientpositive/schema_evol_text_vecrow_table_llap_io.q    | 2 ++
 ql/src/test/queries/clientpositive/schema_evol_undecorated.q          | 2 +-
 .../src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java    | 4 ----
 30 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part.q
index 7231123..37413fa 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part.q
@@ -92,7 +92,9 @@ CREATE TABLE part_change_string_group_double_n9(insert_num int, c1 STRING, c2 CH
 insert into table part_change_string_group_double_n9 partition(part=1) SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n29;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table part_change_string_group_double_n9 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table part_change_string_group_double_n9 partition(part=1) SELECT insert_num, double1, double1, double1, 'new' FROM schema_evolution_data_n29 WHERE insert_num = 111;
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_llap_io.q
index 7366326..96b0c43 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_llap_io.q
@@ -93,7 +93,9 @@ CREATE TABLE part_change_string_group_double_n5(insert_num int, c1 STRING, c2 CH
 insert into table part_change_string_group_double_n5 partition(part=1) SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n22;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table part_change_string_group_double_n5 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table part_change_string_group_double_n5 partition(part=1) SELECT insert_num, double1, double1, double1, 'new' FROM schema_evolution_data_n22 WHERE insert_num = 111;
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_table.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_table.q
index 650d415..fbc132a 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_table.q
@@ -90,7 +90,9 @@ CREATE TABLE table_change_string_group_double_n6(insert_num int, c1 STRING, c2 C
 insert into table table_change_string_group_double_n6 SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n18;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table table_change_string_group_double_n6 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table table_change_string_group_double_n6 VALUES (111, 789.321, 789.321, 789.321, 'new');
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_table_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_table_llap_io.q
index 5e617e3..a206a9d 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_table_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_table_llap_io.q
@@ -91,7 +91,9 @@ CREATE TABLE table_change_string_group_double_n0(insert_num int, c1 STRING, c2 C
 insert into table table_change_string_group_double_n0 SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n4;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table table_change_string_group_double_n0 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table table_change_string_group_double_n0 VALUES (111, 789.321, 789.321, 789.321, 'new');
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part.q
index a32f5c8..09b3acb 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part.q
@@ -95,7 +95,9 @@ CREATE TABLE part_change_string_group_double_n3(insert_num int, c1 STRING, c2 CH
 insert into table part_change_string_group_double_n3 partition(part=1) SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n14;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table part_change_string_group_double_n3 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table part_change_string_group_double_n3 partition(part=1) SELECT insert_num, double1, double1, double1, 'new' FROM schema_evolution_data_n14 WHERE insert_num = 111;
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_llap_io.q
index 7e08e76..dd23cef 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_llap_io.q
@@ -96,7 +96,9 @@ CREATE TABLE part_change_string_group_double_n6(insert_num int, c1 STRING, c2 CH
 insert into table part_change_string_group_double_n6 partition(part=1) SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n23;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table part_change_string_group_double_n6 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table part_change_string_group_double_n6 partition(part=1) SELECT insert_num, double1, double1, double1, 'new' FROM schema_evolution_data_n23 WHERE insert_num = 111;
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_table.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_table.q
index 476318b..56191f5 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_table.q
@@ -93,7 +93,9 @@ CREATE TABLE table_change_string_group_double(insert_num int, c1 STRING, c2 CHAR
 insert into table table_change_string_group_double SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n1;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table table_change_string_group_double replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table table_change_string_group_double VALUES (111, 789.321, 789.321, 789.321, 'new');
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_table_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_table_llap_io.q
index ebc9664..0bd5d02 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_table_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_table_llap_io.q
@@ -94,7 +94,9 @@ CREATE TABLE table_change_string_group_double_n12(insert_num int, c1 STRING, c2
 insert into table table_change_string_group_double_n12 SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n39;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table table_change_string_group_double_n12 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table table_change_string_group_double_n12 VALUES (111, 789.321, 789.321, 789.321, 'new');
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part.q
index e2a4f30..0ded207 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part.q
@@ -89,7 +89,9 @@ CREATE TABLE part_change_string_group_double_n7(insert_num int, c1 STRING, c2 CH
 insert into table part_change_string_group_double_n7 partition(part=1) SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n25;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table part_change_string_group_double_n7 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table part_change_string_group_double_n7 partition(part=1) SELECT insert_num, double1, double1, double1, 'new' FROM schema_evolution_data_n25 WHERE insert_num = 111;
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_llap_io.q
index 59d9187..99ba0dd 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_llap_io.q
@@ -90,7 +90,9 @@ CREATE TABLE part_change_string_group_double_n2(insert_num int, c1 STRING, c2 CH
 insert into table part_change_string_group_double_n2 partition(part=1) SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n11;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table part_change_string_group_double_n2 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table part_change_string_group_double_n2 partition(part=1) SELECT insert_num, double1, double1, double1, 'new' FROM schema_evolution_data_n11 WHERE insert_num = 111;
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_table.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_table.q
index c9e27be..7945edd 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_table.q
@@ -88,7 +88,9 @@ CREATE TABLE table_change_string_group_double_n10(insert_num int, c1 STRING, c2
 insert into table table_change_string_group_double_n10 SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n36;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table table_change_string_group_double_n10 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table table_change_string_group_double_n10 VALUES (111, 789.321, 789.321, 789.321, 'new');
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_table_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_table_llap_io.q
index fd3e87d..ca76ef1 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_table_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_table_llap_io.q
@@ -89,7 +89,9 @@ CREATE TABLE table_change_string_group_double_n7(insert_num int, c1 STRING, c2 C
 insert into table table_change_string_group_double_n7 SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n19;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table table_change_string_group_double_n7 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table table_change_string_group_double_n7 VALUES (111, 789.321, 789.321, 789.321, 'new');
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part.q
index 024bb3a..5c6897d 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part.q
@@ -90,7 +90,9 @@ CREATE TABLE part_change_string_group_double_n4(insert_num int, c1 STRING, c2 CH
 insert into table part_change_string_group_double_n4 partition(part=1) SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n17;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table part_change_string_group_double_n4 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table part_change_string_group_double_n4 partition(part=1) SELECT insert_num, double1, double1, double1, 'new' FROM schema_evolution_data_n17 WHERE insert_num = 111;
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_llap_io.q
index c99ae38..3db87c1 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_llap_io.q
@@ -91,7 +91,9 @@ CREATE TABLE part_change_string_group_double_n12(insert_num int, c1 STRING, c2 C
 insert into table part_change_string_group_double_n12 partition(part=1) SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n42;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table part_change_string_group_double_n12 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table part_change_string_group_double_n12 partition(part=1) SELECT insert_num, double1, double1, double1, 'new' FROM schema_evolution_data_n42 WHERE insert_num = 111;
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_table.q b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_table.q
index cf89ab1..c0e934d 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_table.q
@@ -87,7 +87,9 @@ CREATE TABLE table_change_string_group_double_n3(insert_num int, c1 STRING, c2 C
 insert into table table_change_string_group_double_n3 SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n13;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table table_change_string_group_double_n3 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table table_change_string_group_double_n3 VALUES (111, 789.321, 789.321, 789.321, 'new');
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_table_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_table_llap_io.q
index 230d57c..1b4c253 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_table_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_table_llap_io.q
@@ -88,7 +88,9 @@ CREATE TABLE table_change_string_group_double_n5(insert_num int, c1 STRING, c2 C
 insert into table table_change_string_group_double_n5 SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n16;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table table_change_string_group_double_n5 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table table_change_string_group_double_n5 VALUES (111, 789.321, 789.321, 789.321, 'new');
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part.q b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part.q
index dbc3a33..2f3c173 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part.q
@@ -89,7 +89,9 @@ CREATE TABLE part_change_string_group_double_n8(insert_num int, c1 STRING, c2 CH
 insert into table part_change_string_group_double_n8 partition(part=1) SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n27;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table part_change_string_group_double_n8 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table part_change_string_group_double_n8 partition(part=1) SELECT insert_num, double1, double1, double1, 'new' FROM schema_evolution_data_n27 WHERE insert_num = 111;
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_llap_io.q
index 9b14b21..471e213 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_llap_io.q
@@ -90,7 +90,9 @@ CREATE TABLE part_change_string_group_double_n1(insert_num int, c1 STRING, c2 CH
 insert into table part_change_string_group_double_n1 partition(part=1) SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n6;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table part_change_string_group_double_n1 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table part_change_string_group_double_n1 partition(part=1) SELECT insert_num, double1, double1, double1, 'new' FROM schema_evolution_data_n6 WHERE insert_num = 111;
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_table.q b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_table.q
index c940e0d..1fec56f 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_table.q
@@ -87,7 +87,9 @@ CREATE TABLE table_change_string_group_double_n9(insert_num int, c1 STRING, c2 C
 insert into table table_change_string_group_double_n9 SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n32;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table table_change_string_group_double_n9 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table table_change_string_group_double_n9 VALUES (111, 789.321, 789.321, 789.321, 'new');
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_table_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_table_llap_io.q
index 9cc3a89..e3a1f8f 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_table_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_table_llap_io.q
@@ -88,7 +88,9 @@ CREATE TABLE table_change_string_group_double_n2(insert_num int, c1 STRING, c2 C
 insert into table table_change_string_group_double_n2 SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n10;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table table_change_string_group_double_n2 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table table_change_string_group_double_n2 VALUES (111, 789.321, 789.321, 789.321, 'new');
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vec_part.q b/ql/src/test/queries/clientpositive/schema_evol_text_vec_part.q
index fb216f8..9916470 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vec_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vec_part.q
@@ -91,7 +91,9 @@ CREATE TABLE part_change_string_group_double_n10(insert_num int, c1 STRING, c2 C
 insert into table part_change_string_group_double_n10 partition(part=1) SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n31;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table part_change_string_group_double_n10 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table part_change_string_group_double_n10 partition(part=1) SELECT insert_num, double1, double1, double1, 'new' FROM schema_evolution_data_n31 WHERE insert_num = 111;
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_llap_io.q
index 2c4c25f..cf44bd9 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_llap_io.q
@@ -106,7 +106,9 @@ select insert_num,part,c1,c2,c3,b from part_change_string_group_double_n0;
 select insert_num,part,c1,c2,c3,b from part_change_string_group_double_n0;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+--** set hive.metastore.disallow.incompatible.col.type.changes=false;
 --** alter table part_change_string_group_double_n0 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+--** set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 --** insert into table part_change_string_group_double_n0 partition(part=1) SELECT insert_num, double1, double1, double1, 'new' FROM schema_evolution_data_n3 WHERE insert_num = 111;
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vec_table.q b/ql/src/test/queries/clientpositive/schema_evol_text_vec_table.q
index 3088a8d..01df582 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vec_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vec_table.q
@@ -89,7 +89,9 @@ CREATE TABLE table_change_string_group_double_n4(insert_num int, c1 STRING, c2 C
 insert into table table_change_string_group_double_n4 SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n15;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table table_change_string_group_double_n4 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table table_change_string_group_double_n4 VALUES (111, 789.321, 789.321, 789.321, 'new');
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vec_table_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_text_vec_table_llap_io.q
index 5777f39..47c8165 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vec_table_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vec_table_llap_io.q
@@ -104,7 +104,9 @@ select insert_num,c1,c2,c3,b from table_change_string_group_double_n1;
 select insert_num,c1,c2,c3,b from table_change_string_group_double_n1;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table table_change_string_group_double_n1 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table table_change_string_group_double_n1 VALUES (111, 789.321, 789.321, 789.321, 'new');
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part.q b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part.q
index fa39e40..724aa6e 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part.q
@@ -91,7 +91,9 @@ CREATE TABLE part_change_string_group_double_n11(insert_num int, c1 STRING, c2 C
 insert into table part_change_string_group_double_n11 partition(part=1) SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n33;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table part_change_string_group_double_n11 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table part_change_string_group_double_n11 partition(part=1) SELECT insert_num, double1, double1, double1, 'new' FROM schema_evolution_data_n33 WHERE insert_num = 111;
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_llap_io.q
index 389353a..356be2c 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_llap_io.q
@@ -106,7 +106,9 @@ select insert_num,part,c1,c2,c3,b from part_change_string_group_double;
 select insert_num,part,c1,c2,c3,b from part_change_string_group_double;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table part_change_string_group_double replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table part_change_string_group_double partition(part=1) SELECT insert_num, double1, double1, double1, 'new' FROM schema_evolution_data_n0 WHERE insert_num = 111;
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table.q b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table.q
index 5256597..ab06791 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table.q
@@ -89,7 +89,9 @@ CREATE TABLE table_change_string_group_double_n8(insert_num int, c1 STRING, c2 C
 insert into table table_change_string_group_double_n8 SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n24;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table table_change_string_group_double_n8 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table table_change_string_group_double_n8 VALUES (111, 789.321, 789.321, 789.321, 'new');
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table_llap_io.q
index 9607896..130bab7 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table_llap_io.q
@@ -104,7 +104,9 @@ select insert_num,c1,c2,c3,b from table_change_string_group_double_n11;
 select insert_num,c1,c2,c3,b from table_change_string_group_double_n11;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 alter table table_change_string_group_double_n11 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+set hive.metastore.disallow.incompatible.col.type.changes=true;
 
 insert into table table_change_string_group_double_n11 VALUES (111, 789.321, 789.321, 789.321, 'new');
 
diff --git a/ql/src/test/queries/clientpositive/schema_evol_undecorated.q b/ql/src/test/queries/clientpositive/schema_evol_undecorated.q
index 1fe5c08..6bc10a7 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_undecorated.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_undecorated.q
@@ -1,5 +1,5 @@
 
-set hive.metastore.disallow.incompatible.col.type.changes=true;
+set hive.metastore.disallow.incompatible.col.type.changes=false;
 
 create external table new_char_decimal (c1 char(20));
 alter table new_char_decimal change c1 c1 decimal(31,0);
diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java
index 39d2b2f..bcce1f1 100644
--- a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java
+++ b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ColumnType.java
@@ -229,10 +229,6 @@ public class ColumnType {
         return NumericCastOrder.get(from) < NumericCastOrder.get(to);
       }
 
-      // Allow string to double/decimal conversion
-      if (StringTypes.contains(from) &&
-          (to.equals(DOUBLE_TYPE_NAME) || to.equals(DECIMAL_TYPE_NAME))) return true;
-
       // Void can go to anything
       if (from.equals(VOID_TYPE_NAME)) return true;