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:42 UTC

[05/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_text_vec_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vec_table.q b/ql/src/test/queries/clientpositive/schema_evol_text_vec_table.q
index 166b34a..3088a8d 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vec_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vec_table.q
@@ -18,9 +18,9 @@ set hive.llap.io.enabled=false;
 --  vectorized reading of TEXTFILE format files using the vector SERDE methods.
 --
 
-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_n15(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_n15;
 
 ------------------------------------------------------------------------------------------
 -- 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 table_add_int_permute_select(insert_num int, a INT, b STRING);
+CREATE TABLE table_add_int_permute_select_n4(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_n4 SELECT insert_num, int1, 'original' FROM schema_evolution_data_n15;
 
 -- Table-Non-Cascade ADD COLUMNS ...
-alter table table_add_int_permute_select add columns(c int);
+alter table table_add_int_permute_select_n4 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_n4 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_n4;
 
 -- 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_n4;
+select insert_num,a,b,c from table_add_int_permute_select_n4;
+select insert_num,c from table_add_int_permute_select_n4;
 
-drop table table_add_int_permute_select;
+drop table table_add_int_permute_select_n4;
 
 
 -- 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_n4(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_n4 SELECT insert_num, int1, 'original' FROM schema_evolution_data_n15;
 
 -- 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_n4 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_n4 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_n4;
 
 -- 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_n4;
+select insert_num,a,b,c from table_add_int_string_permute_select_n4;
+select insert_num,a,b,c,d from table_add_int_string_permute_select_n4;
+select insert_num,a,c,d from table_add_int_string_permute_select_n4;
+select insert_num,a,d from table_add_int_string_permute_select_n4;
+select insert_num,c from table_add_int_string_permute_select_n4;
+select insert_num,d from table_add_int_string_permute_select_n4;
 
-drop table table_add_int_string_permute_select;
+drop table table_add_int_string_permute_select_n4;
 
 
 
@@ -84,21 +84,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_n4(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_n4 SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n15;
 
 -- 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_n4 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_n4 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_n4;
 
-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_n4;
 
-drop table table_change_string_group_double;
+drop table table_change_string_group_double_n4;
 
 ------------------------------------------------------------------------------------------
 -- SECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP
@@ -107,18 +107,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_n4(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_n4 SELECT insert_num, date1, date1, date1, date1, date1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, 'original' FROM schema_evolution_data_n15;
 
 -- 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_n4 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_n4 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_n4;
 
-drop table table_change_date_group_string_group_date_group;
+drop table table_change_date_group_string_group_date_group_n4;
 
 
 
@@ -133,39 +133,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_n4(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_n4 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_n15;
 
-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_n4;
 
 -- 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_n4 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_n4 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_n4;
 
-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_n4;
 
-drop table table_change_numeric_group_string_group_multi_ints_string_group;
+drop table table_change_numeric_group_string_group_multi_ints_string_group_n4;
 
 
 
@@ -176,39 +176,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_n4(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_n4 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_n15;
 
-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_n4;
 
 -- 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_n4 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_n4 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_n4;
 
-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_n4;
 
-drop table table_change_numeric_group_string_group_floating_string_group;
+drop table table_change_numeric_group_string_group_floating_string_group_n4;
 
 
 ------------------------------------------------------------------------------------------
@@ -219,34 +219,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_n4(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_n4 SELECT insert_num,
            string2, string2, string2, string2,
            string2, string2, string2,
            string2, string2, string2,
-          'original' FROM schema_evolution_data;
+          'original' FROM schema_evolution_data_n15;
 
-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_n4;
 
 -- 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_n4 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_n4 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_n4;
 
-drop table table_change_string_group_string_group_string;
+drop table table_change_string_group_string_group_string_n4;
 
 
 
@@ -261,40 +261,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_n4(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_n4 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_n15;
 
-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_n4;
 
 -- 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_n4 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_n4 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_n4;
 
-drop table table_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+drop table table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n4;
 
 
 
@@ -303,23 +303,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_n4(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_n4 SELECT insert_num,
            decimal1, decimal1,
            float1,
-          'original' FROM schema_evolution_data;
+          'original' FROM schema_evolution_data_n15;
 
-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_n4;
 
 -- 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_n4 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_n4 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_n4;
 
-drop table table_change_lower_to_higher_numeric_group_decimal_to_float;
+drop table table_change_lower_to_higher_numeric_group_decimal_to_float_n4;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/schema_evol_text_vec_table_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vec_table_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_text_vec_table_llap_io.q
index cdd4dd4..5777f39 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vec_table_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vec_table_llap_io.q
@@ -18,9 +18,9 @@ set hive.llap.io.enabled=true;set hive.llap.io.encode.enabled=true;
 --  vectorized reading of TEXTFILE format files using the vector SERDE methods.
 --
 
-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_n5(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_n5;
 
 ------------------------------------------------------------------------------------------
 -- SECTION: ALTER TABLE ADD COLUMNS
@@ -29,61 +29,61 @@ 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_n1(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_n1 SELECT insert_num, int1, 'original' FROM schema_evolution_data_n5;
 
 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_n1;
 
-select insert_num,a,b from table_add_int_permute_select;
+select insert_num,a,b from table_add_int_permute_select_n1;
 
 -- Table-Non-Cascade ADD COLUMNS ...
-alter table table_add_int_permute_select add columns(c int);
+alter table table_add_int_permute_select_n1 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_n1 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_n1;
 
 -- 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_n1;
+--** select insert_num,a,b,c from table_add_int_permute_select_n1;
+--** select insert_num,c from table_add_int_permute_select_n1;
 
-drop table table_add_int_permute_select;
+drop table table_add_int_permute_select_n1;
 
 
 -- 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_n1(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_n1 SELECT insert_num, int1, 'original' FROM schema_evolution_data_n5;
 
 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_n1;
 
-select insert_num,a,b from table_add_int_string_permute_select;
+select insert_num,a,b from table_add_int_string_permute_select_n1;
 
 -- 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_n1 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_n1 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_n1;
 
 -- 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_n1;
+--** select insert_num,a,b,c from table_add_int_string_permute_select_n1;
+--** select insert_num,a,b,c,d from table_add_int_string_permute_select_n1;
+--** select insert_num,a,c,d from table_add_int_string_permute_select_n1;
+--** select insert_num,a,d from table_add_int_string_permute_select_n1;
+--** select insert_num,c from table_add_int_string_permute_select_n1;
+--** select insert_num,d from table_add_int_string_permute_select_n1;
 
-drop table table_add_int_string_permute_select;
+drop table table_add_int_string_permute_select_n1;
 
 
 
@@ -94,26 +94,26 @@ 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_n1(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_n1 SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n5;
 
 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_n1;
 
-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_n1;
 
 -- 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_n1 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_n1 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_n1;
 
---** 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_n1;
 
-drop table table_change_string_group_double;
+drop table table_change_string_group_double_n1;
 
 ------------------------------------------------------------------------------------------
 -- SECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP
@@ -122,23 +122,23 @@ 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_n1(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_n1 SELECT insert_num, date1, date1, date1, date1, date1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, 'original' FROM schema_evolution_data_n5;
 
 explain vectorization detail
-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_n1;
 
---** 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_n1;
 
 -- 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_n1 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_n1 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_n1;
 
-drop table table_change_date_group_string_group_date_group;
+drop table table_change_date_group_string_group_date_group_n1;
 
 
 
@@ -153,42 +153,42 @@ 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_n1(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_n1 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_n5;
 
 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_n1;
 
---** 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_n1;
 
 -- 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_n1 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_n1 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_n1;
 
---** 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_n1;
 
-drop table table_change_numeric_group_string_group_multi_ints_string_group;
+drop table table_change_numeric_group_string_group_multi_ints_string_group_n1;
 
 
 
@@ -199,42 +199,42 @@ 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_n1(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_n1 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_n5;
 
 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_n1;
 
---** 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_n1;
 
 -- 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_n1 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_n1 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_n1;
 
---** 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_n1;
 
-drop table table_change_numeric_group_string_group_floating_string_group;
+drop table table_change_numeric_group_string_group_floating_string_group_n1;
 
 
 ------------------------------------------------------------------------------------------
@@ -245,37 +245,37 @@ 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_n1(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_n1 SELECT insert_num,
            string2, string2, string2, string2,
            string2, string2, string2,
            string2, string2, string2,
-          'original' FROM schema_evolution_data;
+          'original' FROM schema_evolution_data_n5;
 
 explain vectorization detail
-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_n1;
 
---** 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_n1;
 
 -- 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_n1 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_n1 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_n1;
 
-drop table table_change_string_group_string_group_string;
+drop table table_change_string_group_string_group_string_n1;
 
 
 
@@ -290,43 +290,43 @@ 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_n1(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_n1 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_n5;
 
 explain vectorization detail
-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_n1;
 
---** 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_n1;
 
 -- 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_n1 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_n1 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_n1;
 
-drop table table_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+drop table table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n1;
 
 
 
@@ -335,26 +335,26 @@ 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_n1(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_n1 SELECT insert_num,
            decimal1, decimal1,
            float1,
-          'original' FROM schema_evolution_data;
+          'original' FROM schema_evolution_data_n5;
 
 explain vectorization detail
-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_n1;
 
---** 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_n1;
 
 -- 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_n1 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_n1 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_n1;
 
-drop table table_change_lower_to_higher_numeric_group_decimal_to_float;
+drop table table_change_lower_to_higher_numeric_group_decimal_to_float_n1;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part.q b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part.q
index 0668513..fa39e40 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part.q
@@ -20,9 +20,9 @@ set hive.llap.io.enabled=false;
 --  vectorized reading of TEXTFILE format files using the row SERDE methods.
 --
 
-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_n33(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_n33;
 
 ------------------------------------------------------------------------------------------
 -- SECTION: ALTER TABLE ADD COLUMNS
@@ -31,51 +31,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_n11(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_n11 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_n11 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_n11 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_n11;
 
 -- 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_n11;
+select insert_num,part,a,b,c from part_add_int_permute_select_n11;
+select insert_num,part,c from part_add_int_permute_select_n11;
 
-drop table part_add_int_permute_select;
+drop table part_add_int_permute_select_n11;
 
 
 -- 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_n11(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_n11 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_n11 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_n11 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_n11;
 
 -- 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_n11;
+select insert_num,part,a,b,c from part_add_int_string_permute_select_n11;
+select insert_num,part,a,b,c,d from part_add_int_string_permute_select_n11;
+select insert_num,part,a,c,d from part_add_int_string_permute_select_n11;
+select insert_num,part,a,d from part_add_int_string_permute_select_n11;
+select insert_num,part,c from part_add_int_string_permute_select_n11;
+select insert_num,part,d from part_add_int_string_permute_select_n11;
 
-drop table part_add_int_string_permute_select;
+drop table part_add_int_string_permute_select_n11;
 
 
 
@@ -86,21 +86,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_n11(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_n11 partition(part=1) SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n33;
 
 -- 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_n11 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_n11 partition(part=1) SELECT insert_num, double1, double1, double1, 'new' FROM schema_evolution_data_n33 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_n11;
 
-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_n11;
 
-drop table part_change_string_group_double;
+drop table part_change_string_group_double_n11;
 
 ------------------------------------------------------------------------------------------
 -- SECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP
@@ -109,21 +109,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_n11(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_n11 partition(part=1) SELECT insert_num, date1, date1, date1, date1, date1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, 'original' FROM schema_evolution_data_n33;
 
 -- 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_n11 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_n11 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_n11;
 
-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_n11;
 
-drop table part_change_date_group_string_group_date_timestamp;
+drop table part_change_date_group_string_group_date_timestamp_n11;
 
 
 
@@ -139,39 +139,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_n11(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_n11 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_n33;
 
-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_n11;
 
 -- 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_n11 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_n11 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_n11;
 
-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_n11;
 
-drop table part_change_numeric_group_string_group_multi_ints_string_group;
+drop table part_change_numeric_group_string_group_multi_ints_string_group_n11;
 
 
 
@@ -182,39 +182,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_n11(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_n11 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_n33;
 
-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_n11;
 
 -- 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_n11 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_n11 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_n11;
 
-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_n11;
 
-drop table part_change_numeric_group_string_group_floating_string_group;
+drop table part_change_numeric_group_string_group_floating_string_group_n11;
 
 
 
@@ -226,37 +226,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_n11(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_n11 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_n33;
 
-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_n11;
 
 -- 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_n11 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_n11 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_n11;
 
-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_n11;
 
-drop table part_change_string_group_string_group_string;
+drop table part_change_string_group_string_group_string_n11;
 
 
 ------------------------------------------------------------------------------------------
@@ -270,31 +270,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_n11(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_n11 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_n33;
 
-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_n11;
 
 -- 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_n11 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_n11 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,
@@ -302,11 +302,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_n11;
 
-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_n11;
 
-drop table part_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+drop table part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n11;
 
 
 
@@ -315,26 +315,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_n11(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_n11 partition(part=1) SELECT insert_num,
            decimal1, decimal1,
            float1,
-          'original' FROM schema_evolution_data;
+          'original' FROM schema_evolution_data_n33;
 
-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_n11;
 
 -- 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_n11 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_n11 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_n11;
 
-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_n11;
 
-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_n11;
\ No newline at end of file