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/25 00:57:42 UTC
[10/58] [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/9bf28a3c/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_llap_io.q
----------------------------------------------------------------------
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 52535dd..2d0015b 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
@@ -19,9 +19,9 @@ set hive.llap.io.encode.enabled=true;
-- FILE VARIATION: ORC, 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_n42(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_n42;
------------------------------------------------------------------------------------------
-- SECTION: ALTER TABLE ADD COLUMNS
@@ -30,51 +30,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_n12(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_n12 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_n12 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_n12 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_n12;
-- 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_n12;
+select insert_num,part,a,b,c from part_add_int_permute_select_n12;
+select insert_num,part,c from part_add_int_permute_select_n12;
-drop table part_add_int_permute_select;
+drop table part_add_int_permute_select_n12;
-- 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_n12(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_n12 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_n12 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_n12 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_n12;
-- 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_n12;
+select insert_num,part,a,b,c from part_add_int_string_permute_select_n12;
+select insert_num,part,a,b,c,d from part_add_int_string_permute_select_n12;
+select insert_num,part,a,c,d from part_add_int_string_permute_select_n12;
+select insert_num,part,a,d from part_add_int_string_permute_select_n12;
+select insert_num,part,c from part_add_int_string_permute_select_n12;
+select insert_num,part,d from part_add_int_string_permute_select_n12;
-drop table part_add_int_string_permute_select;
+drop table part_add_int_string_permute_select_n12;
@@ -85,21 +85,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_n12(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_n12 partition(part=1) SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n42;
-- 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_n12 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_n12 partition(part=1) SELECT insert_num, double1, double1, double1, 'new' FROM schema_evolution_data_n42 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_n12;
-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_n12;
-drop table part_change_string_group_double;
+drop table part_change_string_group_double_n12;
------------------------------------------------------------------------------------------
-- SECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP
@@ -108,21 +108,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_n12(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_n12 partition(part=1) SELECT insert_num, date1, date1, date1, date1, date1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, 'original' FROM schema_evolution_data_n42;
-- 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_n12 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_n12 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_n12;
-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_n12;
-drop table part_change_date_group_string_group_date_timestamp;
+drop table part_change_date_group_string_group_date_timestamp_n12;
@@ -138,39 +138,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_n12(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_n12 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_n42;
-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_n12;
-- 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_n12 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_n12 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_n12;
-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_n12;
-drop table part_change_numeric_group_string_group_multi_ints_string_group;
+drop table part_change_numeric_group_string_group_multi_ints_string_group_n12;
@@ -181,39 +181,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_n12(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_n12 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_n42;
-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_n12;
-- 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_n12 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_n12 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_n12;
-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_n12;
-drop table part_change_numeric_group_string_group_floating_string_group;
+drop table part_change_numeric_group_string_group_floating_string_group_n12;
@@ -225,37 +225,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_n12(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_n12 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_n42;
-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_n12;
-- 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_n12 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_n12 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_n12;
-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_n12;
-drop table part_change_string_group_string_group_string;
+drop table part_change_string_group_string_group_string_n12;
------------------------------------------------------------------------------------------
@@ -269,31 +269,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_n12(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_n12 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_n42;
-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_n12;
-- 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_n12 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_n12 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,
@@ -301,11 +301,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_n12;
-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_n12;
-drop table part_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+drop table part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n12;
@@ -314,26 +314,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_n12(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_n12 partition(part=1) SELECT insert_num,
decimal1, decimal1,
float1,
- 'original' FROM schema_evolution_data;
+ 'original' FROM schema_evolution_data_n42;
-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_n12;
-- 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_n12 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_n12 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_n12;
-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_n12;
-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_n12;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hive/blob/9bf28a3c/ql/src/test/queries/clientpositive/schema_evol_orc_vec_table.q
----------------------------------------------------------------------
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 617c76e..cf89ab1 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
@@ -16,9 +16,9 @@ set hive.llap.io.enabled=false;
-- FILE VARIATION: ORC, Vectorized, MapWork, Table
--
-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_n13(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_n13;
------------------------------------------------------------------------------------------
-- SECTION: ALTER TABLE ADD COLUMNS
@@ -27,51 +27,51 @@ load data local inpath '../../data/files/schema_evolution/schema_evolution_data.
-- SUBSECTION: ALTER TABLE ADD COLUMNS: INT PERMUTE SELECT
--
--
-CREATE TABLE table_add_int_permute_select(insert_num int, a INT, b STRING);
+CREATE TABLE table_add_int_permute_select_n3(insert_num int, a INT, b STRING);
-insert into table table_add_int_permute_select SELECT insert_num, int1, 'original' FROM schema_evolution_data;
+insert into table table_add_int_permute_select_n3 SELECT insert_num, int1, 'original' FROM schema_evolution_data_n13;
-- Table-Non-Cascade ADD COLUMNS ...
-alter table table_add_int_permute_select add columns(c int);
+alter table table_add_int_permute_select_n3 add columns(c int);
-insert into table table_add_int_permute_select VALUES (111, 80000, 'new', 80000);
+insert into table table_add_int_permute_select_n3 VALUES (111, 80000, 'new', 80000);
explain vectorization detail
-select insert_num,a,b from table_add_int_permute_select;
+select insert_num,a,b from table_add_int_permute_select_n3;
-- SELECT permutation columns to make sure NULL defaulting works right
-select insert_num,a,b from table_add_int_permute_select;
-select insert_num,a,b,c from table_add_int_permute_select;
-select insert_num,c from table_add_int_permute_select;
+select insert_num,a,b from table_add_int_permute_select_n3;
+select insert_num,a,b,c from table_add_int_permute_select_n3;
+select insert_num,c from table_add_int_permute_select_n3;
-drop table table_add_int_permute_select;
+drop table table_add_int_permute_select_n3;
-- SUBSECTION: ALTER TABLE ADD COLUMNS: INT, STRING, PERMUTE SELECT
--
--
-CREATE TABLE table_add_int_string_permute_select(insert_num int, a INT, b STRING);
+CREATE TABLE table_add_int_string_permute_select_n3(insert_num int, a INT, b STRING);
-insert into table table_add_int_string_permute_select SELECT insert_num, int1, 'original' FROM schema_evolution_data;
+insert into table table_add_int_string_permute_select_n3 SELECT insert_num, int1, 'original' FROM schema_evolution_data_n13;
-- Table-Non-Cascade ADD COLUMNS ...
-alter table table_add_int_string_permute_select add columns(c int, d string);
+alter table table_add_int_string_permute_select_n3 add columns(c int, d string);
-insert into table table_add_int_string_permute_select VALUES (111, 80000, 'new', 80000, 'filler');
+insert into table table_add_int_string_permute_select_n3 VALUES (111, 80000, 'new', 80000, 'filler');
explain vectorization detail
-select insert_num,a,b from table_add_int_string_permute_select;
+select insert_num,a,b from table_add_int_string_permute_select_n3;
-- SELECT permutation columns to make sure NULL defaulting works right
-select insert_num,a,b from table_add_int_string_permute_select;
-select insert_num,a,b,c from table_add_int_string_permute_select;
-select insert_num,a,b,c,d from table_add_int_string_permute_select;
-select insert_num,a,c,d from table_add_int_string_permute_select;
-select insert_num,a,d from table_add_int_string_permute_select;
-select insert_num,c from table_add_int_string_permute_select;
-select insert_num,d from table_add_int_string_permute_select;
+select insert_num,a,b from table_add_int_string_permute_select_n3;
+select insert_num,a,b,c from table_add_int_string_permute_select_n3;
+select insert_num,a,b,c,d from table_add_int_string_permute_select_n3;
+select insert_num,a,c,d from table_add_int_string_permute_select_n3;
+select insert_num,a,d from table_add_int_string_permute_select_n3;
+select insert_num,c from table_add_int_string_permute_select_n3;
+select insert_num,d from table_add_int_string_permute_select_n3;
-drop table table_add_int_string_permute_select;
+drop table table_add_int_string_permute_select_n3;
@@ -82,21 +82,21 @@ drop table table_add_int_string_permute_select;
--
-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> DOUBLE: (STRING, CHAR, VARCHAR)
--
-CREATE TABLE table_change_string_group_double(insert_num int, c1 STRING, c2 CHAR(50), c3 VARCHAR(50), b STRING);
+CREATE TABLE table_change_string_group_double_n3(insert_num int, c1 STRING, c2 CHAR(50), c3 VARCHAR(50), b STRING);
-insert into table table_change_string_group_double SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data;
+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 ...
-alter table table_change_string_group_double replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+alter table table_change_string_group_double_n3 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
-insert into table table_change_string_group_double VALUES (111, 789.321, 789.321, 789.321, 'new');
+insert into table table_change_string_group_double_n3 VALUES (111, 789.321, 789.321, 789.321, 'new');
explain vectorization detail
-select insert_num,c1,c2,c3,b from table_change_string_group_double;
+select insert_num,c1,c2,c3,b from table_change_string_group_double_n3;
-select insert_num,c1,c2,c3,b from table_change_string_group_double;
+select insert_num,c1,c2,c3,b from table_change_string_group_double_n3;
-drop table table_change_string_group_double;
+drop table table_change_string_group_double_n3;
------------------------------------------------------------------------------------------
-- SECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP
@@ -105,18 +105,18 @@ drop table table_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 table_change_date_group_string_group_date_group(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);
+CREATE TABLE table_change_date_group_string_group_date_group_n3(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);
-insert into table table_change_date_group_string_group_date_group SELECT insert_num, date1, date1, date1, date1, date1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, 'original' FROM schema_evolution_data;
+insert into table table_change_date_group_string_group_date_group_n3 SELECT insert_num, date1, date1, date1, date1, date1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, 'original' FROM schema_evolution_data_n13;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_date_group_string_group_date_group 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 table_change_date_group_string_group_date_group_n3 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 table_change_date_group_string_group_date_group VALUES (111, 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'new');
+insert into table table_change_date_group_string_group_date_group_n3 VALUES (111, 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'new');
-select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,b from table_change_date_group_string_group_date_group;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,b from table_change_date_group_string_group_date_group_n3;
-drop table table_change_date_group_string_group_date_group;
+drop table table_change_date_group_string_group_date_group_n3;
@@ -131,39 +131,39 @@ drop table table_change_date_group_string_group_date_group;
-- (TINYINT, SMALLINT, INT, BIGINT), VARCHAR and VARCHAR trunc
--
--
-CREATE TABLE table_change_numeric_group_string_group_multi_ints_string_group(insert_num int,
+CREATE TABLE table_change_numeric_group_string_group_multi_ints_string_group_n3(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);
-insert into table table_change_numeric_group_string_group_multi_ints_string_group SELECT insert_num,
+insert into table table_change_numeric_group_string_group_multi_ints_string_group_n3 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_n13;
-select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b from table_change_numeric_group_string_group_multi_ints_string_group;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b from table_change_numeric_group_string_group_multi_ints_string_group_n3;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_numeric_group_string_group_multi_ints_string_group replace columns (insert_num int,
+alter table table_change_numeric_group_string_group_multi_ints_string_group_n3 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 table_change_numeric_group_string_group_multi_ints_string_group VALUES (111,
+insert into table table_change_numeric_group_string_group_multi_ints_string_group_n3 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,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b from table_change_numeric_group_string_group_multi_ints_string_group;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b from table_change_numeric_group_string_group_multi_ints_string_group_n3;
-select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b from table_change_numeric_group_string_group_multi_ints_string_group;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b from table_change_numeric_group_string_group_multi_ints_string_group_n3;
-drop table table_change_numeric_group_string_group_multi_ints_string_group;
+drop table table_change_numeric_group_string_group_multi_ints_string_group_n3;
@@ -174,39 +174,39 @@ drop table table_change_numeric_group_string_group_multi_ints_string_group;
-- (DECIMAL, FLOAT, DOUBLE), VARCHAR and VARCHAR trunc
--
--
-CREATE TABLE table_change_numeric_group_string_group_floating_string_group(insert_num int,
+CREATE TABLE table_change_numeric_group_string_group_floating_string_group_n3(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);
-insert into table table_change_numeric_group_string_group_floating_string_group SELECT insert_num,
+insert into table table_change_numeric_group_string_group_floating_string_group_n3 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_n13;
-select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from table_change_numeric_group_string_group_floating_string_group;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from table_change_numeric_group_string_group_floating_string_group_n3;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_numeric_group_string_group_floating_string_group replace columns (insert_num int,
+alter table table_change_numeric_group_string_group_floating_string_group_n3 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 table_change_numeric_group_string_group_floating_string_group VALUES (111,
+insert into table table_change_numeric_group_string_group_floating_string_group_n3 VALUES (111,
'filler', 'filler', 'filler',
'filler', 'filler', 'filler', 'filler', 'filler', 'filler',
'filler', 'filler', 'filler', 'filler', 'filler', 'filler',
'new');
explain vectorization detail
-select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from table_change_numeric_group_string_group_floating_string_group;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from table_change_numeric_group_string_group_floating_string_group_n3;
-select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from table_change_numeric_group_string_group_floating_string_group;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from table_change_numeric_group_string_group_floating_string_group_n3;
-drop table table_change_numeric_group_string_group_floating_string_group;
+drop table table_change_numeric_group_string_group_floating_string_group_n3;
------------------------------------------------------------------------------------------
@@ -217,34 +217,34 @@ drop table table_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 table_change_string_group_string_group_string(insert_num int,
+CREATE TABLE table_change_string_group_string_group_string_n3(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);
-insert into table table_change_string_group_string_group_string SELECT insert_num,
+insert into table table_change_string_group_string_group_string_n3 SELECT insert_num,
string2, string2, string2, string2,
string2, string2, string2,
string2, string2, string2,
- 'original' FROM schema_evolution_data;
+ 'original' FROM schema_evolution_data_n13;
-select insert_num,c1,c2,c3,c4,b from table_change_string_group_string_group_string;
+select insert_num,c1,c2,c3,c4,b from table_change_string_group_string_group_string_n3;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_string_group_string_group_string replace columns (insert_num int,
+alter table table_change_string_group_string_group_string_n3 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 table_change_string_group_string_group_string VALUES (111,
+insert into table table_change_string_group_string_group_string_n3 VALUES (111,
'filler', 'filler', 'filler', 'filler',
'filler', 'filler', 'filler',
'filler', 'filler', 'filler',
'new');
-select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,b from table_change_string_group_string_group_string;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,b from table_change_string_group_string_group_string_n3;
-drop table table_change_string_group_string_group_string;
+drop table table_change_string_group_string_group_string_n3;
@@ -259,40 +259,40 @@ drop table table_change_string_group_string_group_string;
-- INT, (BIGINT, DECIMAL, FLOAT, DOUBLE) and
-- BIGINT, (DECIMAL, FLOAT, DOUBLE)
--
-CREATE TABLE table_change_lower_to_higher_numeric_group_tinyint_to_bigint(insert_num int,
+CREATE TABLE table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n3(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);
-insert into table table_change_lower_to_higher_numeric_group_tinyint_to_bigint SELECT insert_num,
+insert into table table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n3 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_n13;
-select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b from table_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b from table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n3;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_tinyint_to_bigint replace columns (insert_num int,
+alter table table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n3 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 table_change_lower_to_higher_numeric_group_tinyint_to_bigint VALUES (111,
+insert into table table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n3 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,
1234.5678, 9876.543, 789.321,
'new');
-select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b from table_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b from table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n3;
-drop table table_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+drop table table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n3;
@@ -301,23 +301,23 @@ drop table table_change_lower_to_higher_numeric_group_tinyint_to_bigint;
-- DECIMAL, (FLOAT, DOUBLE) and
-- FLOAT, (DOUBLE)
--
-CREATE TABLE table_change_lower_to_higher_numeric_group_decimal_to_float(insert_num int,
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal_to_float_n3(insert_num int,
c1 decimal(38,18), c2 decimal(38,18),
c3 float,
b STRING);
-insert into table table_change_lower_to_higher_numeric_group_decimal_to_float SELECT insert_num,
+insert into table table_change_lower_to_higher_numeric_group_decimal_to_float_n3 SELECT insert_num,
decimal1, decimal1,
float1,
- 'original' FROM schema_evolution_data;
+ 'original' FROM schema_evolution_data_n13;
-select insert_num,c1,c2,c3,b from table_change_lower_to_higher_numeric_group_decimal_to_float;
+select insert_num,c1,c2,c3,b from table_change_lower_to_higher_numeric_group_decimal_to_float_n3;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_decimal_to_float replace columns (insert_num int, c1 float, c2 double, c3 DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_decimal_to_float_n3 replace columns (insert_num int, c1 float, c2 double, c3 DOUBLE, b STRING) ;
-insert into table table_change_lower_to_higher_numeric_group_decimal_to_float VALUES (111, 1234.5678, 9876.543, 1234.5678, 'new');
+insert into table table_change_lower_to_higher_numeric_group_decimal_to_float_n3 VALUES (111, 1234.5678, 9876.543, 1234.5678, 'new');
-select insert_num,c1,c2,c3,b from table_change_lower_to_higher_numeric_group_decimal_to_float;
+select insert_num,c1,c2,c3,b from table_change_lower_to_higher_numeric_group_decimal_to_float_n3;
-drop table table_change_lower_to_higher_numeric_group_decimal_to_float;
+drop table table_change_lower_to_higher_numeric_group_decimal_to_float_n3;
http://git-wip-us.apache.org/repos/asf/hive/blob/9bf28a3c/ql/src/test/queries/clientpositive/schema_evol_orc_vec_table_llap_io.q
----------------------------------------------------------------------
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 ac206f0..230d57c 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
@@ -17,9 +17,9 @@ set hive.llap.io.encode.enabled=true;
-- FILE VARIATION: ORC, Vectorized, MapWork, Table
--
-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_n16(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_n16;
------------------------------------------------------------------------------------------
-- SECTION: ALTER TABLE ADD COLUMNS
@@ -28,51 +28,51 @@ load data local inpath '../../data/files/schema_evolution/schema_evolution_data.
-- SUBSECTION: ALTER TABLE ADD COLUMNS: INT PERMUTE SELECT
--
--
-CREATE TABLE table_add_int_permute_select(insert_num int, a INT, b STRING);
+CREATE TABLE table_add_int_permute_select_n5(insert_num int, a INT, b STRING);
-insert into table table_add_int_permute_select SELECT insert_num, int1, 'original' FROM schema_evolution_data;
+insert into table table_add_int_permute_select_n5 SELECT insert_num, int1, 'original' FROM schema_evolution_data_n16;
-- Table-Non-Cascade ADD COLUMNS ...
-alter table table_add_int_permute_select add columns(c int);
+alter table table_add_int_permute_select_n5 add columns(c int);
-insert into table table_add_int_permute_select VALUES (111, 80000, 'new', 80000);
+insert into table table_add_int_permute_select_n5 VALUES (111, 80000, 'new', 80000);
explain vectorization detail
-select insert_num,a,b from table_add_int_permute_select;
+select insert_num,a,b from table_add_int_permute_select_n5;
-- SELECT permutation columns to make sure NULL defaulting works right
-select insert_num,a,b from table_add_int_permute_select;
-select insert_num,a,b,c from table_add_int_permute_select;
-select insert_num,c from table_add_int_permute_select;
+select insert_num,a,b from table_add_int_permute_select_n5;
+select insert_num,a,b,c from table_add_int_permute_select_n5;
+select insert_num,c from table_add_int_permute_select_n5;
-drop table table_add_int_permute_select;
+drop table table_add_int_permute_select_n5;
-- SUBSECTION: ALTER TABLE ADD COLUMNS: INT, STRING, PERMUTE SELECT
--
--
-CREATE TABLE table_add_int_string_permute_select(insert_num int, a INT, b STRING);
+CREATE TABLE table_add_int_string_permute_select_n5(insert_num int, a INT, b STRING);
-insert into table table_add_int_string_permute_select SELECT insert_num, int1, 'original' FROM schema_evolution_data;
+insert into table table_add_int_string_permute_select_n5 SELECT insert_num, int1, 'original' FROM schema_evolution_data_n16;
-- Table-Non-Cascade ADD COLUMNS ...
-alter table table_add_int_string_permute_select add columns(c int, d string);
+alter table table_add_int_string_permute_select_n5 add columns(c int, d string);
-insert into table table_add_int_string_permute_select VALUES (111, 80000, 'new', 80000, 'filler');
+insert into table table_add_int_string_permute_select_n5 VALUES (111, 80000, 'new', 80000, 'filler');
explain vectorization detail
-select insert_num,a,b from table_add_int_string_permute_select;
+select insert_num,a,b from table_add_int_string_permute_select_n5;
-- SELECT permutation columns to make sure NULL defaulting works right
-select insert_num,a,b from table_add_int_string_permute_select;
-select insert_num,a,b,c from table_add_int_string_permute_select;
-select insert_num,a,b,c,d from table_add_int_string_permute_select;
-select insert_num,a,c,d from table_add_int_string_permute_select;
-select insert_num,a,d from table_add_int_string_permute_select;
-select insert_num,c from table_add_int_string_permute_select;
-select insert_num,d from table_add_int_string_permute_select;
+select insert_num,a,b from table_add_int_string_permute_select_n5;
+select insert_num,a,b,c from table_add_int_string_permute_select_n5;
+select insert_num,a,b,c,d from table_add_int_string_permute_select_n5;
+select insert_num,a,c,d from table_add_int_string_permute_select_n5;
+select insert_num,a,d from table_add_int_string_permute_select_n5;
+select insert_num,c from table_add_int_string_permute_select_n5;
+select insert_num,d from table_add_int_string_permute_select_n5;
-drop table table_add_int_string_permute_select;
+drop table table_add_int_string_permute_select_n5;
@@ -83,21 +83,21 @@ drop table table_add_int_string_permute_select;
--
-- SUBSECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> DOUBLE: (STRING, CHAR, VARCHAR)
--
-CREATE TABLE table_change_string_group_double(insert_num int, c1 STRING, c2 CHAR(50), c3 VARCHAR(50), b STRING);
+CREATE TABLE table_change_string_group_double_n5(insert_num int, c1 STRING, c2 CHAR(50), c3 VARCHAR(50), b STRING);
-insert into table table_change_string_group_double SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data;
+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 ...
-alter table table_change_string_group_double replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
+alter table table_change_string_group_double_n5 replace columns (insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING);
-insert into table table_change_string_group_double VALUES (111, 789.321, 789.321, 789.321, 'new');
+insert into table table_change_string_group_double_n5 VALUES (111, 789.321, 789.321, 789.321, 'new');
explain vectorization detail
-select insert_num,c1,c2,c3,b from table_change_string_group_double;
+select insert_num,c1,c2,c3,b from table_change_string_group_double_n5;
-select insert_num,c1,c2,c3,b from table_change_string_group_double;
+select insert_num,c1,c2,c3,b from table_change_string_group_double_n5;
-drop table table_change_string_group_double;
+drop table table_change_string_group_double_n5;
------------------------------------------------------------------------------------------
-- SECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP
@@ -106,18 +106,18 @@ drop table table_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 table_change_date_group_string_group_date_group(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);
+CREATE TABLE table_change_date_group_string_group_date_group_n5(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);
-insert into table table_change_date_group_string_group_date_group SELECT insert_num, date1, date1, date1, date1, date1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, 'original' FROM schema_evolution_data;
+insert into table table_change_date_group_string_group_date_group_n5 SELECT insert_num, date1, date1, date1, date1, date1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, 'original' FROM schema_evolution_data_n16;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_date_group_string_group_date_group 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 table_change_date_group_string_group_date_group_n5 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 table_change_date_group_string_group_date_group VALUES (111, 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'new');
+insert into table table_change_date_group_string_group_date_group_n5 VALUES (111, 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'filler', 'new');
-select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,b from table_change_date_group_string_group_date_group;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,b from table_change_date_group_string_group_date_group_n5;
-drop table table_change_date_group_string_group_date_group;
+drop table table_change_date_group_string_group_date_group_n5;
@@ -132,39 +132,39 @@ drop table table_change_date_group_string_group_date_group;
-- (TINYINT, SMALLINT, INT, BIGINT), VARCHAR and VARCHAR trunc
--
--
-CREATE TABLE table_change_numeric_group_string_group_multi_ints_string_group(insert_num int,
+CREATE TABLE table_change_numeric_group_string_group_multi_ints_string_group_n5(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);
-insert into table table_change_numeric_group_string_group_multi_ints_string_group SELECT insert_num,
+insert into table table_change_numeric_group_string_group_multi_ints_string_group_n5 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_n16;
-select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b from table_change_numeric_group_string_group_multi_ints_string_group;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b from table_change_numeric_group_string_group_multi_ints_string_group_n5;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_numeric_group_string_group_multi_ints_string_group replace columns (insert_num int,
+alter table table_change_numeric_group_string_group_multi_ints_string_group_n5 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 table_change_numeric_group_string_group_multi_ints_string_group VALUES (111,
+insert into table table_change_numeric_group_string_group_multi_ints_string_group_n5 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,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b from table_change_numeric_group_string_group_multi_ints_string_group;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b from table_change_numeric_group_string_group_multi_ints_string_group_n5;
-select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b from table_change_numeric_group_string_group_multi_ints_string_group;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,b from table_change_numeric_group_string_group_multi_ints_string_group_n5;
-drop table table_change_numeric_group_string_group_multi_ints_string_group;
+drop table table_change_numeric_group_string_group_multi_ints_string_group_n5;
@@ -175,39 +175,39 @@ drop table table_change_numeric_group_string_group_multi_ints_string_group;
-- (DECIMAL, FLOAT, DOUBLE), VARCHAR and VARCHAR trunc
--
--
-CREATE TABLE table_change_numeric_group_string_group_floating_string_group(insert_num int,
+CREATE TABLE table_change_numeric_group_string_group_floating_string_group_n5(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);
-insert into table table_change_numeric_group_string_group_floating_string_group SELECT insert_num,
+insert into table table_change_numeric_group_string_group_floating_string_group_n5 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_n16;
-select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from table_change_numeric_group_string_group_floating_string_group;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from table_change_numeric_group_string_group_floating_string_group_n5;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_numeric_group_string_group_floating_string_group replace columns (insert_num int,
+alter table table_change_numeric_group_string_group_floating_string_group_n5 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 table_change_numeric_group_string_group_floating_string_group VALUES (111,
+insert into table table_change_numeric_group_string_group_floating_string_group_n5 VALUES (111,
'filler', 'filler', 'filler',
'filler', 'filler', 'filler', 'filler', 'filler', 'filler',
'filler', 'filler', 'filler', 'filler', 'filler', 'filler',
'new');
explain vectorization detail
-select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from table_change_numeric_group_string_group_floating_string_group;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from table_change_numeric_group_string_group_floating_string_group_n5;
-select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from table_change_numeric_group_string_group_floating_string_group;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,b from table_change_numeric_group_string_group_floating_string_group_n5;
-drop table table_change_numeric_group_string_group_floating_string_group;
+drop table table_change_numeric_group_string_group_floating_string_group_n5;
------------------------------------------------------------------------------------------
@@ -218,34 +218,34 @@ drop table table_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 table_change_string_group_string_group_string(insert_num int,
+CREATE TABLE table_change_string_group_string_group_string_n5(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);
-insert into table table_change_string_group_string_group_string SELECT insert_num,
+insert into table table_change_string_group_string_group_string_n5 SELECT insert_num,
string2, string2, string2, string2,
string2, string2, string2,
string2, string2, string2,
- 'original' FROM schema_evolution_data;
+ 'original' FROM schema_evolution_data_n16;
-select insert_num,c1,c2,c3,c4,b from table_change_string_group_string_group_string;
+select insert_num,c1,c2,c3,c4,b from table_change_string_group_string_group_string_n5;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_string_group_string_group_string replace columns (insert_num int,
+alter table table_change_string_group_string_group_string_n5 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 table_change_string_group_string_group_string VALUES (111,
+insert into table table_change_string_group_string_group_string_n5 VALUES (111,
'filler', 'filler', 'filler', 'filler',
'filler', 'filler', 'filler',
'filler', 'filler', 'filler',
'new');
-select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,b from table_change_string_group_string_group_string;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,b from table_change_string_group_string_group_string_n5;
-drop table table_change_string_group_string_group_string;
+drop table table_change_string_group_string_group_string_n5;
@@ -260,40 +260,40 @@ drop table table_change_string_group_string_group_string;
-- INT, (BIGINT, DECIMAL, FLOAT, DOUBLE) and
-- BIGINT, (DECIMAL, FLOAT, DOUBLE)
--
-CREATE TABLE table_change_lower_to_higher_numeric_group_tinyint_to_bigint(insert_num int,
+CREATE TABLE table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n5(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);
-insert into table table_change_lower_to_higher_numeric_group_tinyint_to_bigint SELECT insert_num,
+insert into table table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n5 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_n16;
-select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b from table_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b from table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n5;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_tinyint_to_bigint replace columns (insert_num int,
+alter table table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n5 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 table_change_lower_to_higher_numeric_group_tinyint_to_bigint VALUES (111,
+insert into table table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n5 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,
1234.5678, 9876.543, 789.321,
'new');
-select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b from table_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+select insert_num,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b from table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n5;
-drop table table_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+drop table table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n5;
@@ -302,23 +302,23 @@ drop table table_change_lower_to_higher_numeric_group_tinyint_to_bigint;
-- DECIMAL, (FLOAT, DOUBLE) and
-- FLOAT, (DOUBLE)
--
-CREATE TABLE table_change_lower_to_higher_numeric_group_decimal_to_float(insert_num int,
+CREATE TABLE table_change_lower_to_higher_numeric_group_decimal_to_float_n5(insert_num int,
c1 decimal(38,18), c2 decimal(38,18),
c3 float,
b STRING);
-insert into table table_change_lower_to_higher_numeric_group_decimal_to_float SELECT insert_num,
+insert into table table_change_lower_to_higher_numeric_group_decimal_to_float_n5 SELECT insert_num,
decimal1, decimal1,
float1,
- 'original' FROM schema_evolution_data;
+ 'original' FROM schema_evolution_data_n16;
-select insert_num,c1,c2,c3,b from table_change_lower_to_higher_numeric_group_decimal_to_float;
+select insert_num,c1,c2,c3,b from table_change_lower_to_higher_numeric_group_decimal_to_float_n5;
-- Table-Non-Cascade CHANGE COLUMNS ...
-alter table table_change_lower_to_higher_numeric_group_decimal_to_float replace columns (insert_num int, c1 float, c2 double, c3 DOUBLE, b STRING) ;
+alter table table_change_lower_to_higher_numeric_group_decimal_to_float_n5 replace columns (insert_num int, c1 float, c2 double, c3 DOUBLE, b STRING) ;
-insert into table table_change_lower_to_higher_numeric_group_decimal_to_float VALUES (111, 1234.5678, 9876.543, 1234.5678, 'new');
+insert into table table_change_lower_to_higher_numeric_group_decimal_to_float_n5 VALUES (111, 1234.5678, 9876.543, 1234.5678, 'new');
-select insert_num,c1,c2,c3,b from table_change_lower_to_higher_numeric_group_decimal_to_float;
+select insert_num,c1,c2,c3,b from table_change_lower_to_higher_numeric_group_decimal_to_float_n5;
-drop table table_change_lower_to_higher_numeric_group_decimal_to_float;
+drop table table_change_lower_to_higher_numeric_group_decimal_to_float_n5;
http://git-wip-us.apache.org/repos/asf/hive/blob/9bf28a3c/ql/src/test/queries/clientpositive/schema_evol_par_vec_table_non_dictionary_encoding.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_par_vec_table_non_dictionary_encoding.q b/ql/src/test/queries/clientpositive/schema_evol_par_vec_table_non_dictionary_encoding.q
index 22a455c..a8a16d2 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_par_vec_table_non_dictionary_encoding.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_par_vec_table_non_dictionary_encoding.q
@@ -4,93 +4,93 @@ set parquet.enable.dictionary=false;
-- SORT_QUERY_RESULTS
-drop table test_alter;
-drop table test_alter2;
-drop table test_alter3;
+drop table test_alter_n0;
+drop table test_alter2_n0;
+drop table test_alter3_n0;
-create table test_alter (id string) stored as parquet;
-insert into test_alter values ('1'), ('2'), ('3');
-select * from test_alter;
+create table test_alter_n0 (id string) stored as parquet;
+insert into test_alter_n0 values ('1'), ('2'), ('3');
+select * from test_alter_n0;
-- add new column -> empty col values should return NULL
-alter table test_alter add columns (newCol string);
-select * from test_alter;
+alter table test_alter_n0 add columns (newCol string);
+select * from test_alter_n0;
-- insert data into new column -> New data should be returned
-insert into test_alter values ('4', '100');
-select * from test_alter;
+insert into test_alter_n0 values ('4', '100');
+select * from test_alter_n0;
-- remove the newly added column
-- this works in vectorized execution
-alter table test_alter replace columns (id string);
-select * from test_alter;
+alter table test_alter_n0 replace columns (id string);
+select * from test_alter_n0;
-- add column using replace column syntax
-alter table test_alter replace columns (id string, id2 string);
+alter table test_alter_n0 replace columns (id string, id2 string);
-- this surprisingly doesn't return the 100 added to 4th row above
-select * from test_alter;
-insert into test_alter values ('5', '100');
-select * from test_alter;
+select * from test_alter_n0;
+insert into test_alter_n0 values ('5', '100');
+select * from test_alter_n0;
-- use the same column name and datatype
-alter table test_alter replace columns (id string, id2 string);
-select * from test_alter;
+alter table test_alter_n0 replace columns (id string, id2 string);
+select * from test_alter_n0;
-- change string to char
-alter table test_alter replace columns (id char(10), id2 string);
-select * from test_alter;
+alter table test_alter_n0 replace columns (id char(10), id2 string);
+select * from test_alter_n0;
-- change string to varchar
-alter table test_alter replace columns (id string, id2 string);
-alter table test_alter replace columns (id varchar(10), id2 string);
-select * from test_alter;
+alter table test_alter_n0 replace columns (id string, id2 string);
+alter table test_alter_n0 replace columns (id varchar(10), id2 string);
+select * from test_alter_n0;
-- change columntype and column name
-alter table test_alter replace columns (id string, id2 string);
-alter table test_alter replace columns (idv varchar(10), id2 string);
-select * from test_alter;
+alter table test_alter_n0 replace columns (id string, id2 string);
+alter table test_alter_n0 replace columns (idv varchar(10), id2 string);
+select * from test_alter_n0;
-- test int to long type conversion
-create table test_alter2 (id int) stored as parquet;
-insert into test_alter2 values (1);
-alter table test_alter2 replace columns (id bigint);
-select * from test_alter2;
+create table test_alter2_n0 (id int) stored as parquet;
+insert into test_alter2_n0 values (1);
+alter table test_alter2_n0 replace columns (id bigint);
+select * from test_alter2_n0;
-- test float to double type conversion
-drop table test_alter2;
-create table test_alter2 (id float) stored as parquet;
-insert into test_alter2 values (1.5);
-alter table test_alter2 replace columns (id double);
-select * from test_alter2;
-
-drop table test_alter2;
-create table test_alter2 (ts timestamp) stored as parquet;
-insert into test_alter2 values ('2018-01-01 13:14:15.123456'), ('2018-01-02 14:15:16.123456'), ('2018-01-03 16:17:18.123456');
-select * from test_alter2;
-alter table test_alter2 replace columns (ts string);
-select * from test_alter2;
-
-drop table test_alter2;
-create table test_alter2 (ts timestamp) stored as parquet;
-insert into test_alter2 values ('2018-01-01 13:14:15.123456'), ('2018-01-02 14:15:16.123456'), ('2018-01-03 16:17:18.123456');
-select * from test_alter2;
-alter table test_alter2 replace columns (ts varchar(19));
+drop table test_alter2_n0;
+create table test_alter2_n0 (id float) stored as parquet;
+insert into test_alter2_n0 values (1.5);
+alter table test_alter2_n0 replace columns (id double);
+select * from test_alter2_n0;
+
+drop table test_alter2_n0;
+create table test_alter2_n0 (ts timestamp) stored as parquet;
+insert into test_alter2_n0 values ('2018-01-01 13:14:15.123456'), ('2018-01-02 14:15:16.123456'), ('2018-01-03 16:17:18.123456');
+select * from test_alter2_n0;
+alter table test_alter2_n0 replace columns (ts string);
+select * from test_alter2_n0;
+
+drop table test_alter2_n0;
+create table test_alter2_n0 (ts timestamp) stored as parquet;
+insert into test_alter2_n0 values ('2018-01-01 13:14:15.123456'), ('2018-01-02 14:15:16.123456'), ('2018-01-03 16:17:18.123456');
+select * from test_alter2_n0;
+alter table test_alter2_n0 replace columns (ts varchar(19));
-- this should truncate the microseconds
-select * from test_alter2;
+select * from test_alter2_n0;
-drop table test_alter2;
-create table test_alter2 (ts timestamp) stored as parquet;
-insert into test_alter2 values ('2018-01-01 13:14:15.123456'), ('2018-01-02 14:15:16.123456'), ('2018-01-03 16:17:18.123456');
-select * from test_alter2;
-alter table test_alter2 replace columns (ts char(25));
-select * from test_alter2;
+drop table test_alter2_n0;
+create table test_alter2_n0 (ts timestamp) stored as parquet;
+insert into test_alter2_n0 values ('2018-01-01 13:14:15.123456'), ('2018-01-02 14:15:16.123456'), ('2018-01-03 16:17:18.123456');
+select * from test_alter2_n0;
+alter table test_alter2_n0 replace columns (ts char(25));
+select * from test_alter2_n0;
-- test integer types upconversion
-create table test_alter3 (id1 tinyint, id2 smallint, id3 int, id4 bigint) stored as parquet;
-insert into test_alter3 values (10, 20, 30, 40);
-alter table test_alter3 replace columns (id1 smallint, id2 int, id3 bigint, id4 decimal(10,4));
+create table test_alter3_n0 (id1 tinyint, id2 smallint, id3 int, id4 bigint) stored as parquet;
+insert into test_alter3_n0 values (10, 20, 30, 40);
+alter table test_alter3_n0 replace columns (id1 smallint, id2 int, id3 bigint, id4 decimal(10,4));
-- this fails mostly due to bigint to decimal
--- select * from test_alter3;
-select id1, id2, id3 from test_alter3;
+-- select * from test_alter3_n0;
+select id1, id2, id3 from test_alter3_n0;
http://git-wip-us.apache.org/repos/asf/hive/blob/9bf28a3c/ql/src/test/queries/clientpositive/schema_evol_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_stats.q b/ql/src/test/queries/clientpositive/schema_evol_stats.q
index 210146b..6801818 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_stats.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_stats.q
@@ -2,50 +2,50 @@ set hive.mapred.mode=nonstrict;
SET hive.exec.schema.evolution=true;
set hive.llap.io.enabled=false;
-CREATE TABLE partitioned1(a INT, b STRING) PARTITIONED BY(part INT) STORED AS TEXTFILE;
+CREATE TABLE partitioned1_n0(a INT, b STRING) PARTITIONED BY(part INT) STORED AS TEXTFILE;
-insert into table partitioned1 partition(part=1) values(1, 'original'),(2, 'original'), (3, 'original'),(4, 'original');
+insert into table partitioned1_n0 partition(part=1) values(1, 'original'),(2, 'original'), (3, 'original'),(4, 'original');
-- Table-Non-Cascade ADD COLUMNS ...
-alter table partitioned1 add columns(c int, d string);
+alter table partitioned1_n0 add columns(c int, d string);
-insert into table partitioned1 partition(part=2) values(1, 'new', 10, 'ten'),(2, 'new', NULL, 'twenty'), (3, 'new', 30, 'thirty'),(4, 'new', 40, 'forty');
+insert into table partitioned1_n0 partition(part=2) values(1, 'new', 10, 'ten'),(2, 'new', NULL, 'twenty'), (3, 'new', 30, 'thirty'),(4, 'new', 40, 'forty');
-analyze table partitioned1 compute statistics for columns;
+analyze table partitioned1_n0 compute statistics for columns;
-desc formatted partitioned1;
+desc formatted partitioned1_n0;
-desc formatted partitioned1 PARTITION(part=1);
+desc formatted partitioned1_n0 PARTITION(part=1);
-desc formatted partitioned1 PARTITION(part=2);
+desc formatted partitioned1_n0 PARTITION(part=2);
set hive.compute.query.using.stats=true;
-explain select count(c) from partitioned1;
+explain select count(c) from partitioned1_n0;
-select count(c) from partitioned1;
+select count(c) from partitioned1_n0;
-drop table partitioned1;
+drop table partitioned1_n0;
-CREATE TABLE partitioned1(a INT, b STRING) PARTITIONED BY(part INT) STORED AS ORC;
+CREATE TABLE partitioned1_n0(a INT, b STRING) PARTITIONED BY(part INT) STORED AS ORC;
-insert into table partitioned1 partition(part=1) values(1, 'original'),(2, 'original'), (3, 'original'),(4, 'original');
+insert into table partitioned1_n0 partition(part=1) values(1, 'original'),(2, 'original'), (3, 'original'),(4, 'original');
-- Table-Non-Cascade ADD COLUMNS ...
-alter table partitioned1 add columns(c int, d string);
+alter table partitioned1_n0 add columns(c int, d string);
-insert into table partitioned1 partition(part=2) values(1, 'new', 10, 'ten'),(2, 'new', NULL, 'twenty'), (3, 'new', 30, 'thirty'),(4, 'new', 40, 'forty');
+insert into table partitioned1_n0 partition(part=2) values(1, 'new', 10, 'ten'),(2, 'new', NULL, 'twenty'), (3, 'new', 30, 'thirty'),(4, 'new', 40, 'forty');
-analyze table partitioned1 compute statistics for columns;
+analyze table partitioned1_n0 compute statistics for columns;
-desc formatted partitioned1;
+desc formatted partitioned1_n0;
-desc formatted partitioned1 PARTITION(part=1);
+desc formatted partitioned1_n0 PARTITION(part=1);
-desc formatted partitioned1 PARTITION(part=2);
+desc formatted partitioned1_n0 PARTITION(part=2);
set hive.compute.query.using.stats=true;
-explain select count(c) from partitioned1;
+explain select count(c) from partitioned1_n0;
-select count(c) from partitioned1;
+select count(c) from partitioned1_n0;