You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jc...@apache.org on 2018/05/21 20:24:51 UTC
[14/51] [abbrv] [partial] hive git commit: HIVE-19617: Rename test
tables to avoid collisions during execution in batches (Jesus Camacho
Rodriguez, reviewed by Gunther Hagleitner)
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_table_update.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_table_update.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_table_update.q
index 65e68a6..22b84d0 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_table_update.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_table_update.q
@@ -21,92 +21,92 @@ set hive.llap.io.enabled=false;
-- Also, we don't do EXPLAINs on ACID files because the write id causes Q file statistics differences...
--
-CREATE TABLE schema_evolution_data(insert_num int, boolean1 boolean, tinyint1 tinyint, smallint1 smallint, int1 int, bigint1 bigint, decimal1 decimal(38,18), float1 float, double1 double, string1 string, string2 string, date1 date, timestamp1 timestamp, boolean_str string, tinyint_str string, smallint_str string, int_str string, bigint_str string, decimal_str string, float_str string, double_str string, date_str string, timestamp_str string, filler string)
+CREATE TABLE schema_evolution_data_n21(insert_num int, boolean1 boolean, tinyint1 tinyint, smallint1 smallint, int1 int, bigint1 bigint, decimal1 decimal(38,18), float1 float, double1 double, string1 string, string2 string, date1 date, timestamp1 timestamp, boolean_str string, tinyint_str string, smallint_str string, int_str string, bigint_str string, decimal_str string, float_str string, double_str string, date_str string, timestamp_str string, filler string)
row format delimited fields terminated by '|' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/schema_evolution_data.txt' overwrite into table schema_evolution_data;
+load data local inpath '../../data/files/schema_evolution/schema_evolution_data.txt' overwrite into table schema_evolution_data_n21;
-CREATE TABLE schema_evolution_data_2(insert_num int, boolean1 boolean, tinyint1 tinyint, smallint1 smallint, int1 int, bigint1 bigint, decimal1 decimal(38,18), float1 float, double1 double, string1 string, string2 string, date1 date, timestamp1 timestamp, boolean_str string, tinyint_str string, smallint_str string, int_str string, bigint_str string, decimal_str string, float_str string, double_str string, date_str string, timestamp_str string, filler string)
+CREATE TABLE schema_evolution_data_2_n6(insert_num int, boolean1 boolean, tinyint1 tinyint, smallint1 smallint, int1 int, bigint1 bigint, decimal1 decimal(38,18), float1 float, double1 double, string1 string, string2 string, date1 date, timestamp1 timestamp, boolean_str string, tinyint_str string, smallint_str string, int_str string, bigint_str string, decimal_str string, float_str string, double_str string, date_str string, timestamp_str string, filler string)
row format delimited fields terminated by '|' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/schema_evolution_data_2.txt' overwrite into table schema_evolution_data_2;
+load data local inpath '../../data/files/schema_evolution/schema_evolution_data_2.txt' overwrite into table schema_evolution_data_2_n6;
--
--
-- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... UPDATE New Columns
---
-CREATE TABLE table5(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
+CREATE TABLE table5_n3(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
-insert into table table5 SELECT insert_num, int1, 'original' FROM schema_evolution_data;
+insert into table table5_n3 SELECT insert_num, int1, 'original' FROM schema_evolution_data_n21;
-- Table-Non-Cascade ADD COLUMNS ...
-alter table table5 add columns(c int, d string);
+alter table table5_n3 add columns(c int, d string);
-insert into table table5 SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2;
+insert into table table5_n3 SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2_n6;
-select a,b,c,d from table5;
+select a,b,c,d from table5_n3;
-- UPDATE New Columns
-update table5 set c=99;
+update table5_n3 set c=99;
-select a,b,c,d from table5;
+select a,b,c,d from table5_n3;
-alter table table5 compact 'major';
+alter table table5_n3 compact 'major';
-select a,b,c,d from table5;
+select a,b,c,d from table5_n3;
-DROP TABLE table5;
+DROP TABLE table5_n3;
--
--
-- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... DELETE where old column
---
-CREATE TABLE table6(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
+CREATE TABLE table6_n2(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
-insert into table table6 SELECT insert_num, int1, 'original' FROM schema_evolution_data;
+insert into table table6_n2 SELECT insert_num, int1, 'original' FROM schema_evolution_data_n21;
-- Table-Non-Cascade ADD COLUMNS ...
-alter table table6 add columns(c int, d string);
+alter table table6_n2 add columns(c int, d string);
-insert into table table6 SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2 WHERE insert_num <= 110;
+insert into table table6_n2 SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2_n6 WHERE insert_num <= 110;
-insert into table table6 SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2 WHERE insert_num > 110;
+insert into table table6_n2 SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2_n6 WHERE insert_num > 110;
-select a,b,c,d from table6;
+select a,b,c,d from table6_n2;
-- DELETE where old column
-delete from table6 where insert_num = 102 or insert_num = 104 or insert_num = 106;
+delete from table6_n2 where insert_num = 102 or insert_num = 104 or insert_num = 106;
-select a,b,c,d from table6;
+select a,b,c,d from table6_n2;
-alter table table6 compact 'major';
+alter table table6_n2 compact 'major';
-select a,b,c,d from table6;
+select a,b,c,d from table6_n2;
-DROP TABLE table6;
+DROP TABLE table6_n2;
--
--
-- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... DELETE where new column
---
-CREATE TABLE table7(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
+CREATE TABLE table7_n2(insert_num int, a INT, b STRING) clustered by (a) into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true');
-insert into table table7 SELECT insert_num, int1, 'original' FROM schema_evolution_data;
+insert into table table7_n2 SELECT insert_num, int1, 'original' FROM schema_evolution_data_n21;
-- Table-Non-Cascade ADD COLUMNS ...
-alter table table7 add columns(c int, d string);
+alter table table7_n2 add columns(c int, d string);
-insert into table table7 SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2 WHERE insert_num <= 110;
+insert into table table7_n2 SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2_n6 WHERE insert_num <= 110;
-insert into table table7 SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2 WHERE insert_num > 110;
+insert into table table7_n2 SELECT insert_num, int1, 'new', int1, string1 FROM schema_evolution_data_2_n6 WHERE insert_num > 110;
-select a,b,c,d from table7;
+select a,b,c,d from table7_n2;
-- DELETE where new column
-delete from table7 where insert_num = 107 or insert_num >= 110;
+delete from table7_n2 where insert_num = 107 or insert_num >= 110;
-select a,b,c,d from table7;
+select a,b,c,d from table7_n2;
-alter table table7 compact 'major';
+alter table table7_n2 compact 'major';
-select a,b,c,d from table7;
+select a,b,c,d from table7_n2;
-DROP TABLE table7;
+DROP TABLE table7_n2;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part.q
----------------------------------------------------------------------
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 c15792e..e2a4f30 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
@@ -18,9 +18,9 @@ set hive.llap.io.enabled=false;
-- FILE VARIATION: ORC, Non-Vectorized, MapWork, Partitioned
--
-CREATE TABLE schema_evolution_data(insert_num int, boolean1 boolean, tinyint1 tinyint, smallint1 smallint, int1 int, bigint1 bigint, decimal1 decimal(38,18), float1 float, double1 double, string1 string, string2 string, date1 date, timestamp1 timestamp, boolean_str string, tinyint_str string, smallint_str string, int_str string, bigint_str string, decimal_str string, float_str string, double_str string, date_str string, timestamp_str string, filler string)
+CREATE TABLE schema_evolution_data_n25(insert_num int, boolean1 boolean, tinyint1 tinyint, smallint1 smallint, int1 int, bigint1 bigint, decimal1 decimal(38,18), float1 float, double1 double, string1 string, string2 string, date1 date, timestamp1 timestamp, boolean_str string, tinyint_str string, smallint_str string, int_str string, bigint_str string, decimal_str string, float_str string, double_str string, date_str string, timestamp_str string, filler string)
row format delimited fields terminated by '|' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/schema_evolution_data.txt' overwrite into table schema_evolution_data;
+load data local inpath '../../data/files/schema_evolution/schema_evolution_data.txt' overwrite into table schema_evolution_data_n25;
------------------------------------------------------------------------------------------
-- SECTION: ALTER TABLE ADD COLUMNS
@@ -29,51 +29,51 @@ load data local inpath '../../data/files/schema_evolution/schema_evolution_data.
-- SUBSECTION: ALTER TABLE ADD COLUMNS: INT PERMUTE SELECT
--
--
-CREATE TABLE part_add_int_permute_select(insert_num int, a INT, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_add_int_permute_select_n7(insert_num int, a INT, b STRING) PARTITIONED BY(part INT);
-insert into table part_add_int_permute_select partition(part=1) VALUES (1, 1111, 'new');
+insert into table part_add_int_permute_select_n7 partition(part=1) VALUES (1, 1111, 'new');
-- Table-Non-Cascade ADD COLUMNS ...
-alter table part_add_int_permute_select add columns(c int);
+alter table part_add_int_permute_select_n7 add columns(c int);
-insert into table part_add_int_permute_select partition(part=1) VALUES (2, 2222, 'new', 3333);
+insert into table part_add_int_permute_select_n7 partition(part=1) VALUES (2, 2222, 'new', 3333);
explain vectorization detail
-select insert_num,part,a,b from part_add_int_permute_select;
+select insert_num,part,a,b from part_add_int_permute_select_n7;
-- SELECT permutation columns to make sure NULL defaulting works right
-select insert_num,part,a,b from part_add_int_permute_select;
-select insert_num,part,a,b,c from part_add_int_permute_select;
-select insert_num,part,c from part_add_int_permute_select;
+select insert_num,part,a,b from part_add_int_permute_select_n7;
+select insert_num,part,a,b,c from part_add_int_permute_select_n7;
+select insert_num,part,c from part_add_int_permute_select_n7;
-drop table part_add_int_permute_select;
+drop table part_add_int_permute_select_n7;
-- SUBSECTION: ALTER TABLE ADD COLUMNS: INT, STRING, PERMUTE SELECT
--
--
-CREATE TABLE part_add_int_string_permute_select(insert_num int, a INT, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_add_int_string_permute_select_n7(insert_num int, a INT, b STRING) PARTITIONED BY(part INT);
-insert into table part_add_int_string_permute_select partition(part=1) VALUES (1, 1111, 'new');
+insert into table part_add_int_string_permute_select_n7 partition(part=1) VALUES (1, 1111, 'new');
-- Table-Non-Cascade ADD COLUMNS ...
-alter table part_add_int_string_permute_select add columns(c int, d string);
+alter table part_add_int_string_permute_select_n7 add columns(c int, d string);
-insert into table part_add_int_string_permute_select partition(part=1) VALUES (2, 2222, 'new', 3333, '4444');
+insert into table part_add_int_string_permute_select_n7 partition(part=1) VALUES (2, 2222, 'new', 3333, '4444');
explain vectorization detail
-select insert_num,part,a,b from part_add_int_string_permute_select;
+select insert_num,part,a,b from part_add_int_string_permute_select_n7;
-- SELECT permutation columns to make sure NULL defaulting works right
-select insert_num,part,a,b from part_add_int_string_permute_select;
-select insert_num,part,a,b,c from part_add_int_string_permute_select;
-select insert_num,part,a,b,c,d from part_add_int_string_permute_select;
-select insert_num,part,a,c,d from part_add_int_string_permute_select;
-select insert_num,part,a,d from part_add_int_string_permute_select;
-select insert_num,part,c from part_add_int_string_permute_select;
-select insert_num,part,d from part_add_int_string_permute_select;
+select insert_num,part,a,b from part_add_int_string_permute_select_n7;
+select insert_num,part,a,b,c from part_add_int_string_permute_select_n7;
+select insert_num,part,a,b,c,d from part_add_int_string_permute_select_n7;
+select insert_num,part,a,c,d from part_add_int_string_permute_select_n7;
+select insert_num,part,a,d from part_add_int_string_permute_select_n7;
+select insert_num,part,c from part_add_int_string_permute_select_n7;
+select insert_num,part,d from part_add_int_string_permute_select_n7;
-drop table part_add_int_string_permute_select;
+drop table part_add_int_string_permute_select_n7;
@@ -84,21 +84,21 @@ drop table part_add_int_string_permute_select;
--
-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> DOUBLE: (STRING, CHAR, VARCHAR)
--
-CREATE TABLE part_change_string_group_double(insert_num int, c1 STRING, c2 CHAR(50), c3 VARCHAR(50), b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_string_group_double_n7(insert_num int, c1 STRING, c2 CHAR(50), c3 VARCHAR(50), b STRING) PARTITIONED BY(part INT);
-insert into table part_change_string_group_double partition(part=1) SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data;
+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 ...
-alter table part_change_string_group_double replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+alter table part_change_string_group_double_n7 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
-insert into table part_change_string_group_double partition(part=1) SELECT insert_num, double1, double1, double1, 'new' FROM schema_evolution_data WHERE insert_num = 111;
+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;
explain vectorization detail
-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_n7;
-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_n7;
-drop table part_change_string_group_double;
+drop table part_change_string_group_double_n7;
------------------------------------------------------------------------------------------
-- SECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP
@@ -107,21 +107,21 @@ drop table part_change_string_group_double;
--
-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP: DATE,TIMESTAMP, (STRING, CHAR, CHAR trunc, VARCHAR, VARCHAR trunc)
--
-CREATE TABLE part_change_date_group_string_group_date_timestamp(insert_num int, c1 DATE, c2 DATE, c3 DATE, c4 DATE, c5 DATE, c6 TIMESTAMP, c7 TIMESTAMP, c8 TIMESTAMP, c9 TIMESTAMP, c10 TIMESTAMP, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_date_group_string_group_date_timestamp_n7(insert_num int, c1 DATE, c2 DATE, c3 DATE, c4 DATE, c5 DATE, c6 TIMESTAMP, c7 TIMESTAMP, c8 TIMESTAMP, c9 TIMESTAMP, c10 TIMESTAMP, b STRING) PARTITIONED BY(part INT);
-insert into table part_change_date_group_string_group_date_timestamp partition(part=1) SELECT insert_num, date1, date1, date1, date1, date1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, 'original' FROM schema_evolution_data;
+insert into table part_change_date_group_string_group_date_timestamp_n7 partition(part=1) SELECT insert_num, date1, date1, date1, date1, date1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, 'original' FROM schema_evolution_data_n25;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_date_group_string_group_date_timestamp replace columns(insert_num int, c1 STRING, c2 CHAR(50), c3 CHAR(15), c4 VARCHAR(50), c5 VARCHAR(15), c6 STRING, c7 CHAR(50), c8 CHAR(15), c9 VARCHAR(50), c10 VARCHAR(15), b STRING);
+alter table part_change_date_group_string_group_date_timestamp_n7 replace columns(insert_num int, c1 STRING, c2 CHAR(50), c3 CHAR(15), c4 VARCHAR(50), c5 VARCHAR(15), c6 STRING, c7 CHAR(50), c8 CHAR(15), c9 VARCHAR(50), c10 VARCHAR(15), b STRING);
-insert into table part_change_date_group_string_group_date_timestamp partition(part=1) VALUES (111, 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'new');
+insert into table part_change_date_group_string_group_date_timestamp_n7 partition(part=1) VALUES (111, 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'new');
explain vectorization detail
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,b from part_change_date_group_string_group_date_timestamp;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,b from part_change_date_group_string_group_date_timestamp_n7;
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,b from part_change_date_group_string_group_date_timestamp;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,b from part_change_date_group_string_group_date_timestamp_n7;
-drop table part_change_date_group_string_group_date_timestamp;
+drop table part_change_date_group_string_group_date_timestamp_n7;
@@ -137,39 +137,39 @@ drop table part_change_date_group_string_group_date_timestamp;
-- (TINYINT, SMALLINT, INT, BIGINT), VARCHAR and VARCHAR trunc
--
--
-CREATE TABLE part_change_numeric_group_string_group_multi_ints_string_group(insert_num int,
+CREATE TABLE part_change_numeric_group_string_group_multi_ints_string_group_n7(insert_num int,
c1 tinyint, c2 smallint, c3 int, c4 bigint,
c5 tinyint, c6 smallint, c7 int, c8 bigint, c9 tinyint, c10 smallint, c11 int, c12 bigint,
c13 tinyint, c14 smallint, c15 int, c16 bigint, c17 tinyint, c18 smallint, c19 int, c20 bigint,
b STRING) PARTITIONED BY(part INT);
-insert into table part_change_numeric_group_string_group_multi_ints_string_group partition(part=1) SELECT insert_num,
+insert into table part_change_numeric_group_string_group_multi_ints_string_group_n7 partition(part=1) SELECT insert_num,
tinyint1, smallint1, int1, bigint1,
tinyint1, smallint1, int1, bigint1, tinyint1, smallint1, int1, bigint1,
tinyint1, smallint1, int1, bigint1, tinyint1, smallint1, int1, bigint1,
- 'original' FROM schema_evolution_data;
+ 'original' FROM schema_evolution_data_n25;
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b from part_change_numeric_group_string_group_multi_ints_string_group;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b from part_change_numeric_group_string_group_multi_ints_string_group_n7;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_numeric_group_string_group_multi_ints_string_group replace columns (insert_num int,
+alter table part_change_numeric_group_string_group_multi_ints_string_group_n7 replace columns (insert_num int,
c1 STRING, c2 STRING, c3 STRING, c4 STRING,
c5 CHAR(50), c6 CHAR(50), c7 CHAR(50), c8 CHAR(50), c9 CHAR(5), c10 CHAR(5), c11 CHAR(5), c12 CHAR(5),
c13 VARCHAR(50), c14 VARCHAR(50), c15 VARCHAR(50), c16 VARCHAR(50), c17 VARCHAR(5), c18 VARCHAR(5), c19 VARCHAR(5), c20 VARCHAR(5),
b STRING) ;
-insert into table part_change_numeric_group_string_group_multi_ints_string_group partition(part=1) VALUES (111,
+insert into table part_change_numeric_group_string_group_multi_ints_string_group_n7 partition(part=1) VALUES (111,
'filler', 'filler', 'filler', 'filler',
'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler',
'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler',
'new');
explain vectorization detail
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b from part_change_numeric_group_string_group_multi_ints_string_group;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b from part_change_numeric_group_string_group_multi_ints_string_group_n7;
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b from part_change_numeric_group_string_group_multi_ints_string_group;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b from part_change_numeric_group_string_group_multi_ints_string_group_n7;
-drop table part_change_numeric_group_string_group_multi_ints_string_group;
+drop table part_change_numeric_group_string_group_multi_ints_string_group_n7;
@@ -180,39 +180,39 @@ drop table part_change_numeric_group_string_group_multi_ints_string_group;
-- (DECIMAL, FLOAT, DOUBLE), VARCHAR and VARCHAR trunc
--
--
-CREATE TABLE part_change_numeric_group_string_group_floating_string_group(insert_num int,
+CREATE TABLE part_change_numeric_group_string_group_floating_string_group_n7(insert_num int,
c1 decimal(38,18), c2 float, c3 double,
c4 decimal(38,18), c5 float, c6 double, c7 decimal(38,18), c8 float, c9 double,
c10 decimal(38,18), c11 float, c12 double, c13 decimal(38,18), c14 float, c15 double,
b STRING) PARTITIONED BY(part INT);
-insert into table part_change_numeric_group_string_group_floating_string_group partition(part=1) SELECT insert_num,
+insert into table part_change_numeric_group_string_group_floating_string_group_n7 partition(part=1) SELECT insert_num,
decimal1, float1, double1,
decimal1, float1, double1, decimal1, float1, double1,
decimal1, float1, double1, decimal1, float1, double1,
- 'original' FROM schema_evolution_data;
+ 'original' FROM schema_evolution_data_n25;
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from part_change_numeric_group_string_group_floating_string_group;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from part_change_numeric_group_string_group_floating_string_group_n7;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_numeric_group_string_group_floating_string_group replace columns (insert_num int,
+alter table part_change_numeric_group_string_group_floating_string_group_n7 replace columns (insert_num int,
c1 STRING, c2 STRING, c3 STRING,
c4 CHAR(50), c5 CHAR(50), c6 CHAR(50), c7 CHAR(7), c8 CHAR(7), c9 CHAR(7),
c10 VARCHAR(50), c11 VARCHAR(50), c12 VARCHAR(50), c13 VARCHAR(7), c14 VARCHAR(7), c15 VARCHAR(7),
b STRING);
-insert into table part_change_numeric_group_string_group_floating_string_group partition(part=1) VALUES (111,
+insert into table part_change_numeric_group_string_group_floating_string_group_n7 partition(part=1) VALUES (111,
'filler', 'filler', 'filler',
'filler', 'filler', 'filler', 'filler', 'filler', 'filler',
'filler', 'filler', 'filler', 'filler', 'filler', 'filler',
'new');
explain vectorization detail
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from part_change_numeric_group_string_group_floating_string_group;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from part_change_numeric_group_string_group_floating_string_group_n7;
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from part_change_numeric_group_string_group_floating_string_group;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from part_change_numeric_group_string_group_floating_string_group_n7;
-drop table part_change_numeric_group_string_group_floating_string_group;
+drop table part_change_numeric_group_string_group_floating_string_group_n7;
@@ -224,37 +224,37 @@ drop table part_change_numeric_group_string_group_floating_string_group;
-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> STRING_GROUP: STRING, (CHAR, CHAR trunc, VARCHAR, VARCHAR trunc) and
-- CHAR, (VARCHAR, VARCHAR trunc, STRING) and VARCHAR, (CHAR, CHAR trunc, STRING)
--
-CREATE TABLE part_change_string_group_string_group_string(insert_num int,
+CREATE TABLE part_change_string_group_string_group_string_n7(insert_num int,
c1 string, c2 string, c3 string, c4 string,
c5 CHAR(50), c6 CHAR(50), c7 CHAR(50),
c8 VARCHAR(50), c9 VARCHAR(50), c10 VARCHAR(50), b STRING) PARTITIONED BY(part INT);
-insert into table part_change_string_group_string_group_string partition(part=1) SELECT insert_num,
+insert into table part_change_string_group_string_group_string_n7 partition(part=1) SELECT insert_num,
string2, string2, string2, string2,
string2, string2, string2,
string2, string2, string2,
- 'original' FROM schema_evolution_data;
+ 'original' FROM schema_evolution_data_n25;
-select insert_num,part,c1,c2,c3,c4,b from part_change_string_group_string_group_string;
+select insert_num,part,c1,c2,c3,c4,b from part_change_string_group_string_group_string_n7;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_string_group_string_group_string replace columns (insert_num int,
+alter table part_change_string_group_string_group_string_n7 replace columns (insert_num int,
c1 CHAR(50), c2 CHAR(9), c3 VARCHAR(50), c4 CHAR(9),
c5 VARCHAR(50), c6 VARCHAR(9), c7 STRING,
c8 CHAR(50), c9 CHAR(9), c10 STRING, b STRING) ;
-insert into table part_change_string_group_string_group_string partition(part=1) VALUES (111,
+insert into table part_change_string_group_string_group_string_n7 partition(part=1) VALUES (111,
'filler', 'filler', 'filler', 'filler',
'filler', 'filler', 'filler',
'filler', 'filler', 'filler',
'new');
explain vectorization detail
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,b from part_change_string_group_string_group_string;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,b from part_change_string_group_string_group_string_n7;
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,b from part_change_string_group_string_group_string;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,b from part_change_string_group_string_group_string_n7;
-drop table part_change_string_group_string_group_string;
+drop table part_change_string_group_string_group_string_n7;
------------------------------------------------------------------------------------------
@@ -268,31 +268,31 @@ drop table part_change_string_group_string_group_string;
-- INT, (BIGINT, DECIMAL, FLOAT, DOUBLE) and
-- BIGINT, (DECIMAL, FLOAT, DOUBLE)
--
-CREATE TABLE part_change_lower_to_higher_numeric_group_tinyint_to_bigint(insert_num int,
+CREATE TABLE part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n7(insert_num int,
c1 tinyint, c2 tinyint, c3 tinyint, c4 tinyint, c5 tinyint, c6 tinyint,
c7 smallint, c8 smallint, c9 smallint, c10 smallint, c11 smallint,
c12 int, c13 int, c14 int, c15 int,
c16 bigint, c17 bigint, c18 bigint,
b STRING) PARTITIONED BY(part INT);
-insert into table part_change_lower_to_higher_numeric_group_tinyint_to_bigint partition(part=1) SELECT insert_num,
+insert into table part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n7 partition(part=1) SELECT insert_num,
tinyint1, tinyint1, tinyint1, tinyint1, tinyint1, tinyint1,
smallint1, smallint1, smallint1, smallint1, smallint1,
int1, int1, int1, int1,
bigint1, bigint1, bigint1,
- 'original' FROM schema_evolution_data;
+ 'original' FROM schema_evolution_data_n25;
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b from part_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b from part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n7;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_tinyint_to_bigint replace columns (insert_num int,
+alter table part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n7 replace columns (insert_num int,
c1 SMALLINT, c2 INT, c3 BIGINT, c4 decimal(38,18), c5 FLOAT, c6 DOUBLE,
c7 INT, c8 BIGINT, c9 decimal(38,18), c10 FLOAT, c11 DOUBLE,
c12 BIGINT, c13 decimal(38,18), c14 FLOAT, c15 DOUBLE,
c16 decimal(38,18), c17 FLOAT, c18 DOUBLE,
b STRING) ;
-insert into table part_change_lower_to_higher_numeric_group_tinyint_to_bigint partition(part=1) VALUES (111,
+insert into table part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n7 partition(part=1) VALUES (111,
7000, 80000, 90000000, 1234.5678, 9876.543, 789.321,
80000, 90000000, 1234.5678, 9876.543, 789.321,
90000000, 1234.5678, 9876.543, 789.321,
@@ -300,11 +300,11 @@ insert into table part_change_lower_to_higher_numeric_group_tinyint_to_bigint pa
'new');
explain vectorization detail
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b from part_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b from part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n7;
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b from part_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b from part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n7;
-drop table part_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+drop table part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n7;
@@ -313,26 +313,26 @@ drop table part_change_lower_to_higher_numeric_group_tinyint_to_bigint;
-- DECIMAL, (FLOAT, DOUBLE) and
-- FLOAT, (DOUBLE)
--
-CREATE TABLE part_change_lower_to_higher_numeric_group_decimal_to_float(insert_num int,
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal_to_float_n7(insert_num int,
c1 decimal(38,18), c2 decimal(38,18),
c3 float,
b STRING) PARTITIONED BY(part INT);
-insert into table part_change_lower_to_higher_numeric_group_decimal_to_float partition(part=1) SELECT insert_num,
+insert into table part_change_lower_to_higher_numeric_group_decimal_to_float_n7 partition(part=1) SELECT insert_num,
decimal1, decimal1,
float1,
- 'original' FROM schema_evolution_data;
+ 'original' FROM schema_evolution_data_n25;
-select insert_num,part,c1,c2,c3,b from part_change_lower_to_higher_numeric_group_decimal_to_float;
+select insert_num,part,c1,c2,c3,b from part_change_lower_to_higher_numeric_group_decimal_to_float_n7;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_decimal_to_float replace columns (insert_num int, c1 float, c2 double, c3 DOUBLE, b STRING) ;
+alter table part_change_lower_to_higher_numeric_group_decimal_to_float_n7 replace columns (insert_num int, c1 float, c2 double, c3 DOUBLE, b STRING) ;
-insert into table part_change_lower_to_higher_numeric_group_decimal_to_float partition(part=1) VALUES (111, 1234.5678, 9876.543, 1234.5678, 'new');
+insert into table part_change_lower_to_higher_numeric_group_decimal_to_float_n7 partition(part=1) VALUES (111, 1234.5678, 9876.543, 1234.5678, 'new');
explain vectorization detail
-select insert_num,part,c1,c2,c3,b from part_change_lower_to_higher_numeric_group_decimal_to_float;
+select insert_num,part,c1,c2,c3,b from part_change_lower_to_higher_numeric_group_decimal_to_float_n7;
-select insert_num,part,c1,c2,c3,b from part_change_lower_to_higher_numeric_group_decimal_to_float;
+select insert_num,part,c1,c2,c3,b from part_change_lower_to_higher_numeric_group_decimal_to_float_n7;
-drop table part_change_lower_to_higher_numeric_group_decimal_to_float;
\ No newline at end of file
+drop table part_change_lower_to_higher_numeric_group_decimal_to_float_n7;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex.q
index 76e2f57..c34a062 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex.q
@@ -21,103 +21,103 @@ set hive.llap.io.enabled=false;
--
-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for Various --> Various: STRUCT<BOOLEAN, TINYINT, SMALLINT, INT, LONG, FLOAT, DOUBLE, DECIMAL(38,18), CHAR, VARCHAR, TIMESTAMP, DATE, BINARY> --> STRUCT<STRING...
--
-CREATE TABLE part_change_various_various_struct1(insert_num int, s1 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_various_various_struct1_n2(insert_num int, s1 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>, b STRING) PARTITIONED BY(part INT);
-CREATE TABLE complex_struct1_a_txt(insert_num int, s1 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>, b STRING)
+CREATE TABLE complex_struct1_a_txt_n2(insert_num int, s1 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>, b STRING)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct1_a.txt' overwrite into table complex_struct1_a_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct1_a.txt' overwrite into table complex_struct1_a_txt_n2;
-insert into table part_change_various_various_struct1 partition(part=1) select * from complex_struct1_a_txt;
+insert into table part_change_various_various_struct1_n2 partition(part=1) select * from complex_struct1_a_txt_n2;
-select insert_num,part,s1,b from part_change_various_various_struct1;
+select insert_num,part,s1,b from part_change_various_various_struct1_n2;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_various_various_struct1 replace columns (insert_num int, s1 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>, b STRING);
+alter table part_change_various_various_struct1_n2 replace columns (insert_num int, s1 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>, b STRING);
-CREATE TABLE complex_struct1_b_txt(insert_num int, s1 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>, b STRING)
+CREATE TABLE complex_struct1_b_txt_n2(insert_num int, s1 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>, b STRING)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct1_b.txt' overwrite into table complex_struct1_b_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct1_b.txt' overwrite into table complex_struct1_b_txt_n2;
-insert into table part_change_various_various_struct1 partition(part=2) select * from complex_struct1_b_txt;
+insert into table part_change_various_various_struct1_n2 partition(part=2) select * from complex_struct1_b_txt_n2;
-CREATE TABLE complex_struct1_c_txt(insert_num int, s1 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>, b STRING)
+CREATE TABLE complex_struct1_c_txt_n2(insert_num int, s1 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>, b STRING)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct1_c.txt' overwrite into table complex_struct1_c_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct1_c.txt' overwrite into table complex_struct1_c_txt_n2;
-insert into table part_change_various_various_struct1 partition(part=1) select * from complex_struct1_c_txt;
+insert into table part_change_various_various_struct1_n2 partition(part=1) select * from complex_struct1_c_txt_n2;
explain vectorization detail
-select insert_num,part,s1,b from part_change_various_various_struct1;
+select insert_num,part,s1,b from part_change_various_various_struct1_n2;
-select insert_num,part,s1,b from part_change_various_various_struct1;
+select insert_num,part,s1,b from part_change_various_various_struct1_n2;
-drop table part_change_various_various_struct1;
+drop table part_change_various_various_struct1_n2;
--
-- SUBSECTION: ALTER TABLE ADD COLUMNS for Various --> Various: STRUCT
--
-CREATE TABLE part_add_various_various_struct2(insert_num int, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_add_various_various_struct2_n2(insert_num int, b STRING) PARTITIONED BY(part INT);
-insert into table part_add_various_various_struct2 partition(part=1)
+insert into table part_add_various_various_struct2_n2 partition(part=1)
values(1, 'original'),
(2, 'original');
-select insert_num,part,b from part_add_various_various_struct2;
+select insert_num,part,b from part_add_various_various_struct2_n2;
-- Table-Non-Cascade ADD COLUMN ...
-alter table part_add_various_various_struct2 ADD columns (s2 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>);
+alter table part_add_various_various_struct2_n2 ADD columns (s2 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>);
-CREATE TABLE complex_struct2_a_txt(insert_num int, b STRING, s2 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>)
+CREATE TABLE complex_struct2_a_txt_n2(insert_num int, b STRING, s2 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct2_a.txt' overwrite into table complex_struct2_a_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct2_a.txt' overwrite into table complex_struct2_a_txt_n2;
-insert into table part_add_various_various_struct2 partition(part=1) select * from complex_struct2_a_txt;
+insert into table part_add_various_various_struct2_n2 partition(part=1) select * from complex_struct2_a_txt_n2;
-CREATE TABLE complex_struct2_b_txt(insert_num int, b STRING, s2 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>)
+CREATE TABLE complex_struct2_b_txt_n2(insert_num int, b STRING, s2 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct2_b.txt' overwrite into table complex_struct2_b_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct2_b.txt' overwrite into table complex_struct2_b_txt_n2;
-insert into table part_add_various_various_struct2 partition(part=2) select * from complex_struct2_b_txt;
+insert into table part_add_various_various_struct2_n2 partition(part=2) select * from complex_struct2_b_txt_n2;
-select insert_num,part,b,s2 from part_add_various_various_struct2;
+select insert_num,part,b,s2 from part_add_various_various_struct2_n2;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_add_various_various_struct2 REPLACE columns (insert_num int, b STRING, s2 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>);
+alter table part_add_various_various_struct2_n2 REPLACE columns (insert_num int, b STRING, s2 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>);
-CREATE TABLE complex_struct2_c_txt(insert_num int, b STRING, s2 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>)
+CREATE TABLE complex_struct2_c_txt_n2(insert_num int, b STRING, s2 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct2_c.txt' overwrite into table complex_struct2_c_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct2_c.txt' overwrite into table complex_struct2_c_txt_n2;
-insert into table part_add_various_various_struct2 partition(part=2) select * from complex_struct2_c_txt;
+insert into table part_add_various_various_struct2_n2 partition(part=2) select * from complex_struct2_c_txt_n2;
-CREATE TABLE complex_struct2_d_txt(insert_num int, b STRING, s2 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>)
+CREATE TABLE complex_struct2_d_txt_n2(insert_num int, b STRING, s2 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct2_d.txt' overwrite into table complex_struct2_d_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct2_d.txt' overwrite into table complex_struct2_d_txt_n2;
-insert into table part_add_various_various_struct2 partition(part=1) select * from complex_struct2_d_txt;
+insert into table part_add_various_various_struct2_n2 partition(part=1) select * from complex_struct2_d_txt_n2;
explain vectorization detail
-select insert_num,part,b,s2 from part_add_various_various_struct2;
+select insert_num,part,b,s2 from part_add_various_various_struct2_n2;
-select insert_num,part,b,s2 from part_add_various_various_struct2;
+select insert_num,part,b,s2 from part_add_various_various_struct2_n2;
-drop table part_add_various_various_struct2;
+drop table part_add_various_various_struct2_n2;
@@ -125,40 +125,40 @@ drop table part_add_various_various_struct2;
--
-- SUBSECTION: ALTER TABLE ADD COLUMNS for Various --> Various: ADD COLUMNS to STRUCT type as LAST column of 3 columns
--
-CREATE TABLE part_add_to_various_various_struct4(insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT>) PARTITIONED BY(part INT);
+CREATE TABLE part_add_to_various_various_struct4_n2(insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT>) PARTITIONED BY(part INT);
-CREATE TABLE complex_struct4_a_txt(insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT>)
+CREATE TABLE complex_struct4_a_txt_n2(insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT>)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct4_a.txt' overwrite into table complex_struct4_a_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct4_a.txt' overwrite into table complex_struct4_a_txt_n2;
-insert into table part_add_to_various_various_struct4 partition(part=1) select * from complex_struct4_a_txt;
+insert into table part_add_to_various_various_struct4_n2 partition(part=1) select * from complex_struct4_a_txt_n2;
-select insert_num,part,b,s3 from part_add_to_various_various_struct4;
+select insert_num,part,b,s3 from part_add_to_various_various_struct4_n2;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_add_to_various_various_struct4 replace columns (insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>);
+alter table part_add_to_various_various_struct4_n2 replace columns (insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>);
-CREATE TABLE complex_struct4_b_txt(insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>)
+CREATE TABLE complex_struct4_b_txt_n2(insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct4_b.txt' overwrite into table complex_struct4_b_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct4_b.txt' overwrite into table complex_struct4_b_txt_n2;
-insert into table part_add_to_various_various_struct4 partition(part=2) select * from complex_struct4_b_txt;
+insert into table part_add_to_various_various_struct4_n2 partition(part=2) select * from complex_struct4_b_txt_n2;
-CREATE TABLE complex_struct4_c_txt(insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>)
+CREATE TABLE complex_struct4_c_txt_n2(insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct4_c.txt' overwrite into table complex_struct4_c_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct4_c.txt' overwrite into table complex_struct4_c_txt_n2;
-insert into table part_add_to_various_various_struct4 partition(part=1) select * from complex_struct4_c_txt;
+insert into table part_add_to_various_various_struct4_n2 partition(part=1) select * from complex_struct4_c_txt_n2;
explain vectorization detail
-select insert_num,part,b,s3 from part_add_to_various_various_struct4;
+select insert_num,part,b,s3 from part_add_to_various_various_struct4_n2;
-select insert_num,part,b,s3 from part_add_to_various_various_struct4;
+select insert_num,part,b,s3 from part_add_to_various_various_struct4_n2;
-drop table part_add_to_various_various_struct4;
+drop table part_add_to_various_various_struct4_n2;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex_llap_io.q
index a2800b5..9b97aa9 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex_llap_io.q
@@ -22,103 +22,103 @@ set hive.llap.io.encode.enabled=true;
--
-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for Various --> Various: STRUCT<BOOLEAN, TINYINT, SMALLINT, INT, LONG, FLOAT, DOUBLE, DECIMAL(38,18), CHAR, VARCHAR, TIMESTAMP, DATE, BINARY> --> STRUCT<STRING...
--
-CREATE TABLE part_change_various_various_struct1(insert_num int, s1 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_various_various_struct1_n5(insert_num int, s1 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>, b STRING) PARTITIONED BY(part INT);
-CREATE TABLE complex_struct1_a_txt(insert_num int, s1 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>, b STRING)
+CREATE TABLE complex_struct1_a_txt_n5(insert_num int, s1 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>, b STRING)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct1_a.txt' overwrite into table complex_struct1_a_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct1_a.txt' overwrite into table complex_struct1_a_txt_n5;
-insert into table part_change_various_various_struct1 partition(part=1) select * from complex_struct1_a_txt;
+insert into table part_change_various_various_struct1_n5 partition(part=1) select * from complex_struct1_a_txt_n5;
-select insert_num,part,s1,b from part_change_various_various_struct1;
+select insert_num,part,s1,b from part_change_various_various_struct1_n5;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_various_various_struct1 replace columns (insert_num int, s1 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>, b STRING);
+alter table part_change_various_various_struct1_n5 replace columns (insert_num int, s1 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>, b STRING);
-CREATE TABLE complex_struct1_b_txt(insert_num int, s1 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>, b STRING)
+CREATE TABLE complex_struct1_b_txt_n5(insert_num int, s1 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>, b STRING)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct1_b.txt' overwrite into table complex_struct1_b_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct1_b.txt' overwrite into table complex_struct1_b_txt_n5;
-insert into table part_change_various_various_struct1 partition(part=2) select * from complex_struct1_b_txt;
+insert into table part_change_various_various_struct1_n5 partition(part=2) select * from complex_struct1_b_txt_n5;
-CREATE TABLE complex_struct1_c_txt(insert_num int, s1 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>, b STRING)
+CREATE TABLE complex_struct1_c_txt_n5(insert_num int, s1 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>, b STRING)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct1_c.txt' overwrite into table complex_struct1_c_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct1_c.txt' overwrite into table complex_struct1_c_txt_n5;
-insert into table part_change_various_various_struct1 partition(part=1) select * from complex_struct1_c_txt;
+insert into table part_change_various_various_struct1_n5 partition(part=1) select * from complex_struct1_c_txt_n5;
explain vectorization detail
-select insert_num,part,s1,b from part_change_various_various_struct1;
+select insert_num,part,s1,b from part_change_various_various_struct1_n5;
-select insert_num,part,s1,b from part_change_various_various_struct1;
+select insert_num,part,s1,b from part_change_various_various_struct1_n5;
-drop table part_change_various_various_struct1;
+drop table part_change_various_various_struct1_n5;
--
-- SUBSECTION: ALTER TABLE ADD COLUMNS for Various --> Various: STRUCT
--
-CREATE TABLE part_add_various_various_struct2(insert_num int, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_add_various_various_struct2_n5(insert_num int, b STRING) PARTITIONED BY(part INT);
-insert into table part_add_various_various_struct2 partition(part=1)
+insert into table part_add_various_various_struct2_n5 partition(part=1)
values(1, 'original'),
(2, 'original');
-select insert_num,part,b from part_add_various_various_struct2;
+select insert_num,part,b from part_add_various_various_struct2_n5;
-- Table-Non-Cascade ADD COLUMN ...
-alter table part_add_various_various_struct2 ADD columns (s2 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>);
+alter table part_add_various_various_struct2_n5 ADD columns (s2 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>);
-CREATE TABLE complex_struct2_a_txt(insert_num int, b STRING, s2 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>)
+CREATE TABLE complex_struct2_a_txt_n5(insert_num int, b STRING, s2 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct2_a.txt' overwrite into table complex_struct2_a_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct2_a.txt' overwrite into table complex_struct2_a_txt_n5;
-insert into table part_add_various_various_struct2 partition(part=1) select * from complex_struct2_a_txt;
+insert into table part_add_various_various_struct2_n5 partition(part=1) select * from complex_struct2_a_txt_n5;
-CREATE TABLE complex_struct2_b_txt(insert_num int, b STRING, s2 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>)
+CREATE TABLE complex_struct2_b_txt_n5(insert_num int, b STRING, s2 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct2_b.txt' overwrite into table complex_struct2_b_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct2_b.txt' overwrite into table complex_struct2_b_txt_n5;
-insert into table part_add_various_various_struct2 partition(part=2) select * from complex_struct2_b_txt;
+insert into table part_add_various_various_struct2_n5 partition(part=2) select * from complex_struct2_b_txt_n5;
-select insert_num,part,b,s2 from part_add_various_various_struct2;
+select insert_num,part,b,s2 from part_add_various_various_struct2_n5;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_add_various_various_struct2 REPLACE columns (insert_num int, b STRING, s2 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>);
+alter table part_add_various_various_struct2_n5 REPLACE columns (insert_num int, b STRING, s2 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>);
-CREATE TABLE complex_struct2_c_txt(insert_num int, b STRING, s2 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>)
+CREATE TABLE complex_struct2_c_txt_n5(insert_num int, b STRING, s2 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct2_c.txt' overwrite into table complex_struct2_c_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct2_c.txt' overwrite into table complex_struct2_c_txt_n5;
-insert into table part_add_various_various_struct2 partition(part=2) select * from complex_struct2_c_txt;
+insert into table part_add_various_various_struct2_n5 partition(part=2) select * from complex_struct2_c_txt_n5;
-CREATE TABLE complex_struct2_d_txt(insert_num int, b STRING, s2 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>)
+CREATE TABLE complex_struct2_d_txt_n5(insert_num int, b STRING, s2 STRUCT<c1:STRING, c2:STRING, c3:STRING, c4:STRING, c5:STRING, c6:STRING, c7:STRING, c8:STRING, c9:STRING, c10:STRING, c11:STRING, c12:STRING, c13:STRING>)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct2_d.txt' overwrite into table complex_struct2_d_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct2_d.txt' overwrite into table complex_struct2_d_txt_n5;
-insert into table part_add_various_various_struct2 partition(part=1) select * from complex_struct2_d_txt;
+insert into table part_add_various_various_struct2_n5 partition(part=1) select * from complex_struct2_d_txt_n5;
explain vectorization detail
-select insert_num,part,b,s2 from part_add_various_various_struct2;
+select insert_num,part,b,s2 from part_add_various_various_struct2_n5;
-select insert_num,part,b,s2 from part_add_various_various_struct2;
+select insert_num,part,b,s2 from part_add_various_various_struct2_n5;
-drop table part_add_various_various_struct2;
+drop table part_add_various_various_struct2_n5;
@@ -126,40 +126,40 @@ drop table part_add_various_various_struct2;
--
-- SUBSECTION: ALTER TABLE ADD COLUMNS for Various --> Various: ADD COLUMNS to STRUCT type as LAST column of 3 columns
--
-CREATE TABLE part_add_to_various_various_struct4(insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT>) PARTITIONED BY(part INT);
+CREATE TABLE part_add_to_various_various_struct4_n5(insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT>) PARTITIONED BY(part INT);
-CREATE TABLE complex_struct4_a_txt(insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT>)
+CREATE TABLE complex_struct4_a_txt_n5(insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT>)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct4_a.txt' overwrite into table complex_struct4_a_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct4_a.txt' overwrite into table complex_struct4_a_txt_n5;
-insert into table part_add_to_various_various_struct4 partition(part=1) select * from complex_struct4_a_txt;
+insert into table part_add_to_various_various_struct4_n5 partition(part=1) select * from complex_struct4_a_txt_n5;
-select insert_num,part,b,s3 from part_add_to_various_various_struct4;
+select insert_num,part,b,s3 from part_add_to_various_various_struct4_n5;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_add_to_various_various_struct4 replace columns (insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>);
+alter table part_add_to_various_various_struct4_n5 replace columns (insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>);
-CREATE TABLE complex_struct4_b_txt(insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>)
+CREATE TABLE complex_struct4_b_txt_n5(insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct4_b.txt' overwrite into table complex_struct4_b_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct4_b.txt' overwrite into table complex_struct4_b_txt_n5;
-insert into table part_add_to_various_various_struct4 partition(part=2) select * from complex_struct4_b_txt;
+insert into table part_add_to_various_various_struct4_n5 partition(part=2) select * from complex_struct4_b_txt_n5;
-CREATE TABLE complex_struct4_c_txt(insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>)
+CREATE TABLE complex_struct4_c_txt_n5(insert_num int, b STRING, s3 STRUCT<c1:BOOLEAN, c2:TINYINT, c3:SMALLINT, c4:INT, c5:BIGINT, c6:FLOAT, c7:DOUBLE, c8:DECIMAL(38,18), c9:CHAR(25), c10:VARCHAR(25), c11:TIMESTAMP, c12:DATE, c13:BINARY>)
row format delimited fields terminated by '|'
collection items terminated by ','
map keys terminated by ':' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/complex_struct4_c.txt' overwrite into table complex_struct4_c_txt;
+load data local inpath '../../data/files/schema_evolution/complex_struct4_c.txt' overwrite into table complex_struct4_c_txt_n5;
-insert into table part_add_to_various_various_struct4 partition(part=1) select * from complex_struct4_c_txt;
+insert into table part_add_to_various_various_struct4_n5 partition(part=1) select * from complex_struct4_c_txt_n5;
explain vectorization detail
-select insert_num,part,b,s3 from part_add_to_various_various_struct4;
+select insert_num,part,b,s3 from part_add_to_various_various_struct4_n5;
-select insert_num,part,b,s3 from part_add_to_various_various_struct4;
+select insert_num,part,b,s3 from part_add_to_various_various_struct4_n5;
-drop table part_add_to_various_various_struct4;
+drop table part_add_to_various_various_struct4_n5;