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 723112332a..37413fa73e 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 7366326922..96b0c43fd3 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 650d415818..fbc132ab56 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 5e617e37ad..a206a9d8d7 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 a32f5c88de..09b3acbc31 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 7e08e76300..dd23cefc65 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 476318b2a1..56191f522b 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 ebc9664d27..0bd5d02165 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 e2a4f30af3..0ded2076cd 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 59d9187d42..99ba0dd19a 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 c9e27bec16..7945edd9ca 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 fd3e87dc57..ca76ef1410 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 024bb3a7d4..5c6897d549 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 c99ae38600..3db87c197a 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 cf89ab195c..c0e934dd51 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 230d57c761..1b4c253ac2 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 dbc3a3318e..2f3c173723 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 9b14b2131b..471e21339b 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 c940e0dbad..1fec56f46c 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 9cc3a8950b..e3a1f8f924 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 fb216f88d6..99164704c6 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 2c4c25f134..cf44bd9a16 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 3088a8dc69..01df582d3c 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 5777f39005..47c81659b3 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 fa39e4005f..724aa6e9ef 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 389353a021..356be2cc6a 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 5256597a98..ab06791cf0 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 9607896f5c..130bab74c5 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 1fe5c08d5a..6bc10a7d5e 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 39d2b2f96c..bcce1f1731 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 static boolean areColTypesCompatible(String from, String to) { 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;