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

[08/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_text_nonvec_part_all_primitive_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_primitive_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_primitive_llap_io.q
index 2a15910..5bb3580 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_primitive_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_primitive_llap_io.q
@@ -22,13 +22,13 @@ set hive.llap.io.encode.enabled=true;
 --
 --
 
-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_n8(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_n8;
 
-CREATE TABLE schema_evolution_data_2(insert_num int, boolean1 boolean, tinyint1 tinyint, smallint1 smallint, int1 int, bigint1 bigint, decimal1 decimal(38,18), float1 float, double1 double, string1 string, string2 string, date1 date, timestamp1 timestamp, boolean_str string, tinyint_str string, smallint_str string, int_str string, bigint_str string, decimal_str string, float_str string, double_str string, date_str string, timestamp_str string, filler string)
+CREATE TABLE schema_evolution_data_2_n2(insert_num int, boolean1 boolean, tinyint1 tinyint, smallint1 smallint, int1 int, bigint1 bigint, decimal1 decimal(38,18), float1 float, double1 double, string1 string, string2 string, date1 date, timestamp1 timestamp, boolean_str string, tinyint_str string, smallint_str string, int_str string, bigint_str string, decimal_str string, float_str string, double_str string, date_str string, timestamp_str string, filler string)
 row format delimited fields terminated by '|' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/schema_evolution_data_2.txt' overwrite into table schema_evolution_data_2;
+load data local inpath '../../data/files/schema_evolution/schema_evolution_data_2.txt' overwrite into table schema_evolution_data_2_n2;
 
 --
 -- SUBSECTION: ALTER TABLE CHANGE COLUMNS for Various --> Various:
@@ -38,7 +38,7 @@ load data local inpath '../../data/files/schema_evolution/schema_evolution_data_
 --            (BOOLEAN, TINYINT, SMALLINT, LONG, FLOAT, DOUBLE, DECIMAL, STRING, CHAR, VARCHAR, TIMESTAMP) --> INT    –2147483648 to 2147483647 and
 --            (BOOLEAN, TINYINT, SMALLINT, INT, FLOAT, DOUBLE, DECIMAL, STRING, CHAR, VARCHAR, TIMESTAMP) --> BIGINT   -9223372036854775808 to 9223372036854775807
 --
-CREATE TABLE part_change_various_various_boolean_to_bigint(insert_num int,
+CREATE TABLE part_change_various_various_boolean_to_bigint_n1(insert_num int,
               c1 TINYINT, c2 SMALLINT, c3 INT, c4 BIGINT, c5 FLOAT, c6 DOUBLE, c7 DECIMAL(38,18), c8 STRING, c9 TIMESTAMP,
               c10 BOOLEAN, c11 SMALLINT, c12 INT, c13 BIGINT, c14 FLOAT, c15 DOUBLE, c16 DECIMAL(38,18), c17 STRING, c18 CHAR(25), c19 VARCHAR(25), c20 TIMESTAMP,
               c21 BOOLEAN, c22 TINYINT, c23 INT, c24 BIGINT, c25 FLOAT, c26 DOUBLE, c27 DECIMAL(38,18), c28 STRING, c29 CHAR(25), c30 VARCHAR(25), c31 TIMESTAMP,
@@ -46,21 +46,21 @@ CREATE TABLE part_change_various_various_boolean_to_bigint(insert_num int,
               c43 BOOLEAN, c44 TINYINT, c45 SMALLINT, c46 INT, c47 FLOAT, c48 DOUBLE, c49 DECIMAL(38,18), c50 STRING, c51 CHAR(25), c52 VARCHAR(25), c53 TIMESTAMP,
               b STRING) PARTITIONED BY(part INT);
 
-insert into table part_change_various_various_boolean_to_bigint partition(part=1) SELECT insert_num,
+insert into table part_change_various_various_boolean_to_bigint_n1 partition(part=1) SELECT insert_num,
              tinyint1, smallint1, int1, bigint1, float1, double1, decimal1, boolean_str, timestamp1,
              boolean1, smallint1, int1, bigint1, float1, double1, decimal1, tinyint_str, tinyint_str, tinyint_str, timestamp1,
              boolean1, tinyint1, int1, bigint1, float1, double1, decimal1, smallint_str, smallint_str, smallint_str, timestamp1,
              boolean1, tinyint1, smallint1, bigint1, float1, double1, decimal1, int_str, int_str, int_str, timestamp1,
              boolean1, tinyint1, smallint1, int1, float1, double1, decimal1, bigint_str, bigint_str, bigint_str, timestamp1,
-             'original' FROM schema_evolution_data;
+             'original' FROM schema_evolution_data_n8;
 
 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,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,c34,c35,c36,c37,c38,c39,c40,c41,c42,c43,c44,c45,c46,c47,c48,c49,c50,c51,c52,c53,b from part_change_various_various_boolean_to_bigint;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,c34,c35,c36,c37,c38,c39,c40,c41,c42,c43,c44,c45,c46,c47,c48,c49,c50,c51,c52,c53,b from part_change_various_various_boolean_to_bigint_n1;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,c34,c35,c36,c37,c38,c39,c40,c41,c42,c43,c44,c45,c46,c47,c48,c49,c50,c51,c52,c53,b from part_change_various_various_boolean_to_bigint;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,c34,c35,c36,c37,c38,c39,c40,c41,c42,c43,c44,c45,c46,c47,c48,c49,c50,c51,c52,c53,b from part_change_various_various_boolean_to_bigint_n1;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_various_various_boolean_to_bigint replace columns (insert_num int,
+alter table part_change_various_various_boolean_to_bigint_n1 replace columns (insert_num int,
              c1 BOOLEAN, c2 BOOLEAN, c3 BOOLEAN, c4 BOOLEAN, c5 BOOLEAN, c6 BOOLEAN, c7 BOOLEAN, c8 BOOLEAN, c9 BOOLEAN,
              c10 TINYINT, c11 TINYINT, c12 TINYINT, c13 TINYINT, c14 TINYINT, c15 TINYINT, c16 TINYINT, c17 TINYINT, c18 TINYINT, c19 TINYINT, c20 TINYINT,
              c21 SMALLINT, c22 SMALLINT, c23 SMALLINT, c24 SMALLINT, c25 SMALLINT, c26 SMALLINT, c27 SMALLINT, c28 SMALLINT, c29 SMALLINT, c30 SMALLINT, c31 SMALLINT,
@@ -68,20 +68,20 @@ alter table part_change_various_various_boolean_to_bigint replace columns (inser
              c43 BIGINT, c44 BIGINT, c45 BIGINT, c46 BIGINT, c47 BIGINT, c48 BIGINT, c49 BIGINT, c50 BIGINT, c51 BIGINT, c52 BIGINT, c53 BIGINT,
              b STRING);
 
-insert into table part_change_various_various_boolean_to_bigint partition(part=1) SELECT insert_num,
+insert into table part_change_various_various_boolean_to_bigint_n1 partition(part=1) SELECT insert_num,
              boolean1, boolean1, boolean1, boolean1, boolean1, boolean1, boolean1, boolean1, boolean1,
              tinyint1, tinyint1, tinyint1, tinyint1, tinyint1, tinyint1, tinyint1, tinyint1, tinyint1, tinyint1, tinyint1,
              smallint1, smallint1, smallint1, smallint1, smallint1, smallint1, smallint1, smallint1, smallint1, smallint1, smallint1,
              int1, int1, int1, int1, int1, int1, int1, int1, int1, int1, int1,
              bigint1, bigint1, bigint1, bigint1, bigint1, bigint1, bigint1, bigint1, bigint1, bigint1, bigint1, 
-              'new' FROM schema_evolution_data;
+              'new' FROM schema_evolution_data_n8;
 
 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,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,c34,c35,c36,c37,c38,c39,c40,c41,c42,c43,c44,c45,c46,c47,c48,c49,c50,c51,c52,c53,b from part_change_various_various_boolean_to_bigint;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,c34,c35,c36,c37,c38,c39,c40,c41,c42,c43,c44,c45,c46,c47,c48,c49,c50,c51,c52,c53,b from part_change_various_various_boolean_to_bigint_n1;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,c34,c35,c36,c37,c38,c39,c40,c41,c42,c43,c44,c45,c46,c47,c48,c49,c50,c51,c52,c53,b from part_change_various_various_boolean_to_bigint;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,c34,c35,c36,c37,c38,c39,c40,c41,c42,c43,c44,c45,c46,c47,c48,c49,c50,c51,c52,c53,b from part_change_various_various_boolean_to_bigint_n1;
 
-drop table part_change_various_various_boolean_to_bigint;
+drop table part_change_various_various_boolean_to_bigint_n1;
 
 
 
@@ -91,42 +91,42 @@ drop table part_change_various_various_boolean_to_bigint;
 --          (BOOLEAN, TINYINT, SMALLINT, INT, LONG, DOUBLE, DECIMAL, STRING, CHAR, VARCHAR, TIMESTAMP) --> FLOAT and
 --          (BOOLEAN, TINYINT, SMALLINT, INT, LONG, FLOAT, DECIMAL, STRING, CHAR, VARCHAR, TIMESTAMP) --> DOUBLE and
 --
-CREATE TABLE part_change_various_various_decimal_to_double(insert_num int,
+CREATE TABLE part_change_various_various_decimal_to_double_n1(insert_num int,
             c1 BOOLEAN, c2 TINYINT, c3 SMALLINT, c4 INT, c5 BIGINT, c6 FLOAT, c7 DOUBLE, c8 STRING, c9 CHAR(25), c10 VARCHAR(25), c11 TIMESTAMP,
             c12 BOOLEAN, c13 TINYINT, c14 SMALLINT, c15 INT, c16 BIGINT, c17 DECIMAL(38,18), c18 DOUBLE, c19 STRING, c20 CHAR(25), c21 VARCHAR(25), c22 TIMESTAMP,
             c23 BOOLEAN, c24 TINYINT, c25 SMALLINT, c26 INT, c27 BIGINT, c28 DECIMAL(38,18), c29 FLOAT, c30 STRING, c31 CHAR(25), c32 VARCHAR(25), c33 TIMESTAMP,
             b STRING) PARTITIONED BY(part INT);
 
-insert into table part_change_various_various_decimal_to_double partition(part=1) SELECT insert_num,
+insert into table part_change_various_various_decimal_to_double_n1 partition(part=1) SELECT insert_num,
             boolean1, tinyint1, smallint1, int1, bigint1, float1, double1, decimal_str, decimal_str, decimal_str, timestamp1,
             boolean1, tinyint1, smallint1, int1, bigint1, decimal1, double1, float_str, float_str, float_str, timestamp1,
             boolean1, tinyint1, smallint1, int1, bigint1, decimal1, float1, double_str, double_str, double_str, timestamp1,
-            'original' FROM schema_evolution_data;
+            'original' FROM schema_evolution_data_n8;
 
 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,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,b from part_change_various_various_decimal_to_double;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,b from part_change_various_various_decimal_to_double_n1;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,b from part_change_various_various_decimal_to_double;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,b from part_change_various_various_decimal_to_double_n1;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_various_various_decimal_to_double replace columns (insert_num int,
+alter table part_change_various_various_decimal_to_double_n1 replace columns (insert_num int,
              c1 DECIMAL(38,18), c2 DECIMAL(38,18), c3 DECIMAL(38,18), c4 DECIMAL(38,18), c5 DECIMAL(38,18), c6 DECIMAL(38,18), c7 DECIMAL(38,18), c8 DECIMAL(38,18), c9 DECIMAL(38,18), c10 DECIMAL(38,18), c11 DECIMAL(38,18), 
              c12 FLOAT, c13 FLOAT, c14 FLOAT, c15 FLOAT, c16 FLOAT, c17 FLOAT, c18 FLOAT, c19 FLOAT, c20 FLOAT, c21 FLOAT, c22 FLOAT,
              c23 DOUBLE, c24 DOUBLE, c25 DOUBLE, c26 DOUBLE, c27 DOUBLE, c28 DOUBLE, c29 DOUBLE, c30 DOUBLE, c31 DOUBLE, c32 DOUBLE, c33 DOUBLE,
              b STRING);
 
-insert into table part_change_various_various_decimal_to_double partition(part=1) SELECT insert_num,
+insert into table part_change_various_various_decimal_to_double_n1 partition(part=1) SELECT insert_num,
              decimal1, decimal1, decimal1, decimal1, decimal1, decimal1, decimal1, decimal1, decimal1, decimal1, decimal1,
              float1, float1, float1, float1, float1, float1, float1, float1, float1, float1, float1,
              double1, double1, double1, double1, double1, double1, double1, double1, double1, double1, double1,
-             'new' FROM schema_evolution_data_2 WHERE insert_num=111;
+             'new' FROM schema_evolution_data_2_n2 WHERE insert_num=111;
 
 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,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,b from part_change_various_various_decimal_to_double;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,b from part_change_various_various_decimal_to_double_n1;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,b from part_change_various_various_decimal_to_double;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,b from part_change_various_various_decimal_to_double_n1;
 
-drop table part_change_various_various_decimal_to_double;
+drop table part_change_various_various_decimal_to_double_n1;
 
 
 
@@ -134,89 +134,89 @@ drop table part_change_various_various_decimal_to_double;
 --
 -- SUBSECTION: ALTER TABLE CHANGE COLUMNS for Various --> Various: (BOOLEAN, TINYINT, SMALLINT, INT, LONG, FLOAT, DOUBLE, DECIMAL(38,18), STRING, CHAR, VARCHAR, DATE) --> TIMESTAMP
 --
-CREATE TABLE part_change_various_various_timestamp(insert_num int, c1 BOOLEAN, c2 TINYINT, c3 SMALLINT, c4 INT, c5 BIGINT, c6 FLOAT, c7 DOUBLE, c8 DECIMAL(38,18), c9 STRING, c10 CHAR(25), c11 VARCHAR(25), c12 DATE, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_various_various_timestamp_n1(insert_num int, c1 BOOLEAN, c2 TINYINT, c3 SMALLINT, c4 INT, c5 BIGINT, c6 FLOAT, c7 DOUBLE, c8 DECIMAL(38,18), c9 STRING, c10 CHAR(25), c11 VARCHAR(25), c12 DATE, b STRING) PARTITIONED BY(part INT);
 
-insert into table part_change_various_various_timestamp partition(part=1) SELECT insert_num, boolean1, tinyint1, smallint1, int1, bigint1, float1, double1, decimal1, timestamp_str, timestamp_str, timestamp_str, date1, 'original' FROM schema_evolution_data;
+insert into table part_change_various_various_timestamp_n1 partition(part=1) SELECT insert_num, boolean1, tinyint1, smallint1, int1, bigint1, float1, double1, decimal1, timestamp_str, timestamp_str, timestamp_str, date1, 'original' FROM schema_evolution_data_n8;
 
 explain vectorization detail
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,b from part_change_various_various_timestamp;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,b from part_change_various_various_timestamp_n1;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,b from part_change_various_various_timestamp;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,b from part_change_various_various_timestamp_n1;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_various_various_timestamp replace columns (insert_num int, c1 TIMESTAMP, c2 TIMESTAMP, c3 TIMESTAMP, c4 TIMESTAMP, c5 TIMESTAMP, c6 TIMESTAMP, c7 TIMESTAMP, c8 TIMESTAMP, c9 TIMESTAMP, c10 TIMESTAMP, c11 TIMESTAMP, c12 TIMESTAMP, b STRING);
+alter table part_change_various_various_timestamp_n1 replace columns (insert_num int, c1 TIMESTAMP, c2 TIMESTAMP, c3 TIMESTAMP, c4 TIMESTAMP, c5 TIMESTAMP, c6 TIMESTAMP, c7 TIMESTAMP, c8 TIMESTAMP, c9 TIMESTAMP, c10 TIMESTAMP, c11 TIMESTAMP, c12 TIMESTAMP, b STRING);
 
-insert into table part_change_various_various_timestamp partition(part=1) SELECT insert_num, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, 'new' FROM schema_evolution_data_2 WHERE insert_num=111;
+insert into table part_change_various_various_timestamp_n1 partition(part=1) SELECT insert_num, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, 'new' FROM schema_evolution_data_2_n2 WHERE insert_num=111;
 
 explain vectorization detail
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,b from part_change_various_various_timestamp;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,b from part_change_various_various_timestamp_n1;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,b from part_change_various_various_timestamp;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,b from part_change_various_various_timestamp_n1;
 
-drop table part_change_various_various_timestamp;
+drop table part_change_various_various_timestamp_n1;
 
 --
 -- SUBSECTION: ALTER TABLE CHANGE COLUMNS for Various --> Various: (STRING, CHAR, VARCHAR, TIMESTAMP --> DATE
 --
-CREATE TABLE part_change_various_various_date(insert_num int, c1 STRING, c2 CHAR(25), c3 VARCHAR(25), c4 TIMESTAMP, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_various_various_date_n1(insert_num int, c1 STRING, c2 CHAR(25), c3 VARCHAR(25), c4 TIMESTAMP, b STRING) PARTITIONED BY(part INT);
 
-insert into table part_change_various_various_date partition(part=1) SELECT insert_num, date_str, date_str, date_str, timestamp1, 'original' FROM schema_evolution_data;
+insert into table part_change_various_various_date_n1 partition(part=1) SELECT insert_num, date_str, date_str, date_str, timestamp1, 'original' FROM schema_evolution_data_n8;
 
 explain vectorization detail
-select insert_num,part,c1,c2,c3,c4,b from part_change_various_various_date;
+select insert_num,part,c1,c2,c3,c4,b from part_change_various_various_date_n1;
 
-select insert_num,part,c1,c2,c3,c4,b from part_change_various_various_date;
+select insert_num,part,c1,c2,c3,c4,b from part_change_various_various_date_n1;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_various_various_date replace columns (insert_num int, c1 DATE, c2 DATE, c3 DATE, c4 DATE, b STRING);
+alter table part_change_various_various_date_n1 replace columns (insert_num int, c1 DATE, c2 DATE, c3 DATE, c4 DATE, b STRING);
 
-insert into table part_change_various_various_date partition(part=1) SELECT insert_num, date1, date1, date1, date1, 'new' FROM schema_evolution_data_2 WHERE insert_num=111;
+insert into table part_change_various_various_date_n1 partition(part=1) SELECT insert_num, date1, date1, date1, date1, 'new' FROM schema_evolution_data_2_n2 WHERE insert_num=111;
 
 explain vectorization detail
-select insert_num,part,c1,c2,c3,c4,b from part_change_various_various_date;
+select insert_num,part,c1,c2,c3,c4,b from part_change_various_various_date_n1;
 
-select insert_num,part,c1,c2,c3,c4,b from part_change_various_various_date;
+select insert_num,part,c1,c2,c3,c4,b from part_change_various_various_date_n1;
 
-drop table part_change_various_various_date;
+drop table part_change_various_various_date_n1;
 
 
 --
 -- SUBSECTION: ALTER TABLE CHANGE COLUMNS for Same Type (CHAR, VARCHAR, DECIMAL) --> Different maxLength or precision/scale
 --
-CREATE TABLE part_change_same_type_different_params(insert_num int, c1 CHAR(12), c2 CHAR(25), c3 VARCHAR(25), c4 VARCHAR(10), c5 DECIMAL(12,4), c6 DECIMAL(20,10), b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_same_type_different_params_n1(insert_num int, c1 CHAR(12), c2 CHAR(25), c3 VARCHAR(25), c4 VARCHAR(10), c5 DECIMAL(12,4), c6 DECIMAL(20,10), b STRING) PARTITIONED BY(part INT);
 
-CREATE TABLE same_type1_a_txt(insert_num int, c1 CHAR(12), c2 CHAR(25), c3 VARCHAR(25), c4 VARCHAR(10), c5 DECIMAL(12,4), c6 DECIMAL(20,10), b STRING)
+CREATE TABLE same_type1_a_txt_n1(insert_num int, c1 CHAR(12), c2 CHAR(25), c3 VARCHAR(25), c4 VARCHAR(10), c5 DECIMAL(12,4), c6 DECIMAL(20,10), b STRING)
 row format delimited fields terminated by '|'
 stored as textfile;
-load data local inpath '../../data/files/schema_evolution/same_type1_a.txt' overwrite into table same_type1_a_txt;
+load data local inpath '../../data/files/schema_evolution/same_type1_a.txt' overwrite into table same_type1_a_txt_n1;
 
-insert into table part_change_same_type_different_params partition(part=1) select * from same_type1_a_txt;
+insert into table part_change_same_type_different_params_n1 partition(part=1) select * from same_type1_a_txt_n1;
 
 explain vectorization detail
-select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_same_type_different_params;
+select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_same_type_different_params_n1;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_same_type_different_params;
+select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_same_type_different_params_n1;
 
 -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_same_type_different_params replace columns (insert_num int, c1 CHAR(8), c2 CHAR(32), c3 VARCHAR(15), c4 VARCHAR(18), c5 DECIMAL(10,2), c6 DECIMAL(25,15), b STRING);
+alter table part_change_same_type_different_params_n1 replace columns (insert_num int, c1 CHAR(8), c2 CHAR(32), c3 VARCHAR(15), c4 VARCHAR(18), c5 DECIMAL(10,2), c6 DECIMAL(25,15), b STRING);
 
-CREATE TABLE same_type1_b_txt(insert_num int, c1 CHAR(8), c2 CHAR(32), c3 VARCHAR(15), c4 VARCHAR(18), c5 DECIMAL(10,2), c6 DECIMAL(25,15), b STRING)
+CREATE TABLE same_type1_b_txt_n1(insert_num int, c1 CHAR(8), c2 CHAR(32), c3 VARCHAR(15), c4 VARCHAR(18), c5 DECIMAL(10,2), c6 DECIMAL(25,15), b STRING)
 row format delimited fields terminated by '|'
 stored as textfile;
-load data local inpath '../../data/files/schema_evolution/same_type1_b.txt' overwrite into table same_type1_b_txt;
+load data local inpath '../../data/files/schema_evolution/same_type1_b.txt' overwrite into table same_type1_b_txt_n1;
 
-insert into table part_change_same_type_different_params partition(part=1) select * from same_type1_b_txt;
+insert into table part_change_same_type_different_params_n1 partition(part=1) select * from same_type1_b_txt_n1;
 
-CREATE TABLE same_type1_c_txt(insert_num int, c1 CHAR(8), c2 CHAR(32), c3 VARCHAR(15), c4 VARCHAR(18), c5 DECIMAL(10,2), c6 DECIMAL(25,15), b STRING)
+CREATE TABLE same_type1_c_txt_n1(insert_num int, c1 CHAR(8), c2 CHAR(32), c3 VARCHAR(15), c4 VARCHAR(18), c5 DECIMAL(10,2), c6 DECIMAL(25,15), b STRING)
 row format delimited fields terminated by '|'
 stored as textfile;
-load data local inpath '../../data/files/schema_evolution/same_type1_c.txt' overwrite into table same_type1_c_txt;
+load data local inpath '../../data/files/schema_evolution/same_type1_c.txt' overwrite into table same_type1_c_txt_n1;
 
-insert into table part_change_same_type_different_params partition(part=2) select * from same_type1_c_txt;
+insert into table part_change_same_type_different_params_n1 partition(part=2) select * from same_type1_c_txt_n1;
 
 explain vectorization detail
-select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_same_type_different_params;
+select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_same_type_different_params_n1;
 
-select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_same_type_different_params;
+select insert_num,part,c1,c2,c3,c4,c5,c6,b from part_change_same_type_different_params_n1;
 
-drop table part_change_same_type_different_params;
+drop table part_change_same_type_different_params_n1;

http://git-wip-us.apache.org/repos/asf/hive/blob/9bf28a3c/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_llap_io.q
index ca2cfda..f739f2b 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_llap_io.q
@@ -18,9 +18,9 @@ set hive.llap.io.encode.enabled=true;
 -- FILE VARIATION: TEXTFILE, Non-Vectorized, MapWork, Partitioned
 --
 
-CREATE TABLE schema_evolution_data(insert_num int, boolean1 boolean, tinyint1 tinyint, smallint1 smallint, int1 int, bigint1 bigint, decimal1 decimal(38,18), float1 float, double1 double, string1 string, string2 string, date1 date, timestamp1 timestamp, boolean_str string, tinyint_str string, smallint_str string, int_str string, bigint_str string, decimal_str string, float_str string, double_str string, date_str string, timestamp_str string, filler string)
+CREATE TABLE schema_evolution_data_n6(insert_num int, boolean1 boolean, tinyint1 tinyint, smallint1 smallint, int1 int, bigint1 bigint, decimal1 decimal(38,18), float1 float, double1 double, string1 string, string2 string, date1 date, timestamp1 timestamp, boolean_str string, tinyint_str string, smallint_str string, int_str string, bigint_str string, decimal_str string, float_str string, double_str string, date_str string, timestamp_str string, filler string)
 row format delimited fields terminated by '|' stored as textfile;
-load data local inpath '../../data/files/schema_evolution/schema_evolution_data.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_n6;
 
 ------------------------------------------------------------------------------------------
 -- SECTION: ALTER TABLE ADD COLUMNS
@@ -29,51 +29,51 @@ load data local inpath '../../data/files/schema_evolution/schema_evolution_data.
 -- SUBSECTION: ALTER TABLE ADD COLUMNS: INT PERMUTE SELECT
 --
 --
-CREATE TABLE part_add_int_permute_select(insert_num int, a INT, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_add_int_permute_select_n1(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_n1 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_n1 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_n1 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_n1;
 
 -- 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_n1;
+select insert_num,part,a,b,c from part_add_int_permute_select_n1;
+select insert_num,part,c from part_add_int_permute_select_n1;
 
-drop table part_add_int_permute_select;
+drop table part_add_int_permute_select_n1;
 
 
 -- 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_n1(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_n1 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_n1 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_n1 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_n1;
 
 -- 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_n1;
+select insert_num,part,a,b,c from part_add_int_string_permute_select_n1;
+select insert_num,part,a,b,c,d from part_add_int_string_permute_select_n1;
+select insert_num,part,a,c,d from part_add_int_string_permute_select_n1;
+select insert_num,part,a,d from part_add_int_string_permute_select_n1;
+select insert_num,part,c from part_add_int_string_permute_select_n1;
+select insert_num,part,d from part_add_int_string_permute_select_n1;
 
-drop table part_add_int_string_permute_select;
+drop table part_add_int_string_permute_select_n1;
 
 
 
@@ -84,21 +84,21 @@ drop table part_add_int_string_permute_select;
 --
 -- SUBSECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> DOUBLE: (STRING, CHAR, VARCHAR)
 --
-CREATE TABLE part_change_string_group_double(insert_num int, c1 STRING, c2 CHAR(50), c3 VARCHAR(50), b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_string_group_double_n1(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_n1 partition(part=1) SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n6;
 
 -- 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_n1 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_n1 partition(part=1) SELECT insert_num, double1, double1, double1, 'new' FROM schema_evolution_data_n6 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_n1;
 
-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_n1;
 
-drop table part_change_string_group_double;
+drop table part_change_string_group_double_n1;
 
 ------------------------------------------------------------------------------------------
 -- SECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP
@@ -107,21 +107,21 @@ drop table part_change_string_group_double;
 --
 -- SUBSECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP: DATE,TIMESTAMP, (STRING, CHAR, CHAR trunc, VARCHAR, VARCHAR trunc)
 --
-CREATE TABLE part_change_date_group_string_group_date_timestamp(insert_num int, c1 DATE, c2 DATE, c3 DATE, c4 DATE, c5 DATE, c6 TIMESTAMP, c7 TIMESTAMP, c8 TIMESTAMP, c9 TIMESTAMP, c10 TIMESTAMP, b STRING) PARTITIONED BY(part INT);
+CREATE TABLE part_change_date_group_string_group_date_timestamp_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) 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_n1 partition(part=1) SELECT insert_num, date1, date1, date1, date1, date1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, 'original' FROM schema_evolution_data_n6;
 
 -- 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_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 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_n1 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_n1;
 
-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_n1;
 
-drop table part_change_date_group_string_group_date_timestamp;
+drop table part_change_date_group_string_group_date_timestamp_n1;
 
 
 
@@ -137,39 +137,39 @@ drop table part_change_date_group_string_group_date_timestamp;
 --           (TINYINT, SMALLINT, INT, BIGINT), VARCHAR and VARCHAR trunc
 --
 --
-CREATE TABLE part_change_numeric_group_string_group_multi_ints_string_group(insert_num int,
+CREATE TABLE part_change_numeric_group_string_group_multi_ints_string_group_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) 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_n1 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_n6;
 
-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_n1;
 
 -- 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_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 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_n1 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_n1;
 
-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_n1;
 
-drop table part_change_numeric_group_string_group_multi_ints_string_group;
+drop table part_change_numeric_group_string_group_multi_ints_string_group_n1;
 
 
 
@@ -180,39 +180,39 @@ drop table part_change_numeric_group_string_group_multi_ints_string_group;
 --            (DECIMAL, FLOAT, DOUBLE), VARCHAR and VARCHAR trunc
 --
 --
-CREATE TABLE part_change_numeric_group_string_group_floating_string_group(insert_num int,
+CREATE TABLE part_change_numeric_group_string_group_floating_string_group_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) 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_n1 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_n6;
 
-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_n1;
 
 -- 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_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 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_n1 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_n1;
 
-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_n1;
 
-drop table part_change_numeric_group_string_group_floating_string_group;
+drop table part_change_numeric_group_string_group_floating_string_group_n1;
 
 
 
@@ -224,37 +224,37 @@ drop table part_change_numeric_group_string_group_floating_string_group;
 -- SUBSECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> STRING_GROUP: STRING, (CHAR, CHAR trunc, VARCHAR, VARCHAR trunc) and
 --      CHAR, (VARCHAR, VARCHAR trunc, STRING) and VARCHAR, (CHAR, CHAR trunc, STRING)
 --
-CREATE TABLE part_change_string_group_string_group_string(insert_num int,
+CREATE TABLE part_change_string_group_string_group_string_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) 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_n1 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_n6;
 
-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_n1;
 
 -- 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_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 part_change_string_group_string_group_string partition(part=1) VALUES (111,
+insert into table part_change_string_group_string_group_string_n1 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_n1;
 
-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_n1;
 
-drop table part_change_string_group_string_group_string;
+drop table part_change_string_group_string_group_string_n1;
 
 
 ------------------------------------------------------------------------------------------
@@ -268,31 +268,31 @@ drop table part_change_string_group_string_group_string;
 --          INT, (BIGINT, DECIMAL, FLOAT, DOUBLE) and
 --          BIGINT, (DECIMAL, FLOAT, DOUBLE)
 --
-CREATE TABLE part_change_lower_to_higher_numeric_group_tinyint_to_bigint(insert_num int,
+CREATE TABLE part_change_lower_to_higher_numeric_group_tinyint_to_bigint_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) 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_n1 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_n6;
 
-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_n1;
 
 -- 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_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 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_n1 partition(part=1) VALUES (111,
             7000, 80000, 90000000, 1234.5678, 9876.543, 789.321,
             80000, 90000000, 1234.5678, 9876.543, 789.321,
             90000000, 1234.5678, 9876.543, 789.321,
@@ -300,11 +300,11 @@ insert into table part_change_lower_to_higher_numeric_group_tinyint_to_bigint pa
            'new');
 
 explain vectorization detail
-select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b from part_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+select insert_num,part,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,b from part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n1;
 
-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_n1;
 
-drop table part_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+drop table part_change_lower_to_higher_numeric_group_tinyint_to_bigint_n1;
 
 
 
@@ -313,26 +313,26 @@ drop table part_change_lower_to_higher_numeric_group_tinyint_to_bigint;
 --          DECIMAL, (FLOAT, DOUBLE) and
 --          FLOAT, (DOUBLE)
 --
-CREATE TABLE part_change_lower_to_higher_numeric_group_decimal_to_float(insert_num int,
+CREATE TABLE part_change_lower_to_higher_numeric_group_decimal_to_float_n1(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_n1 partition(part=1) SELECT insert_num,
            decimal1, decimal1,
            float1,
-          'original' FROM schema_evolution_data;
+          'original' FROM schema_evolution_data_n6;
 
-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_n1;
 
 -- 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_n1 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_n1 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_n1;
 
-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_n1;
 
-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_n1;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/9bf28a3c/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_table.q b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_table.q
index ae0e001..c940e0d 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_table.q
@@ -16,9 +16,9 @@ set hive.llap.io.enabled=false;
 -- FILE VARIATION: TEXTFILE, Non-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_n32(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_n32;
 
 ------------------------------------------------------------------------------------------
 -- 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_n9(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_n9 SELECT insert_num, int1, 'original' FROM schema_evolution_data_n32;
 
 -- Table-Non-Cascade ADD COLUMNS ...
-alter table table_add_int_permute_select add columns(c int);
+alter table table_add_int_permute_select_n9 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_n9 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_n9;
 
 -- 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_n9;
+select insert_num,a,b,c from table_add_int_permute_select_n9;
+select insert_num,c from table_add_int_permute_select_n9;
 
-drop table table_add_int_permute_select;
+drop table table_add_int_permute_select_n9;
 
 
 -- 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_n9(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_n9 SELECT insert_num, int1, 'original' FROM schema_evolution_data_n32;
 
 -- 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_n9 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_n9 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_n9;
 
 -- 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_n9;
+select insert_num,a,b,c from table_add_int_string_permute_select_n9;
+select insert_num,a,b,c,d from table_add_int_string_permute_select_n9;
+select insert_num,a,c,d from table_add_int_string_permute_select_n9;
+select insert_num,a,d from table_add_int_string_permute_select_n9;
+select insert_num,c from table_add_int_string_permute_select_n9;
+select insert_num,d from table_add_int_string_permute_select_n9;
 
-drop table table_add_int_string_permute_select;
+drop table table_add_int_string_permute_select_n9;
 
 
 
@@ -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_n9(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_n9 SELECT insert_num, double_str, double_str, double_str, 'original' FROM schema_evolution_data_n32;
 
 -- 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_n9 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_n9 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_n9;
 
-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_n9;
 
-drop table table_change_string_group_double;
+drop table table_change_string_group_double_n9;
 
 ------------------------------------------------------------------------------------------
 -- 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_n9(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_n9 SELECT insert_num, date1, date1, date1, date1, date1, timestamp1, timestamp1, timestamp1, timestamp1, timestamp1, 'original' FROM schema_evolution_data_n32;
 
 -- 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_n9 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_n9 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_n9;
 
-drop table table_change_date_group_string_group_date_group;
+drop table table_change_date_group_string_group_date_group_n9;
 
 
 
@@ -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_n9(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_n9 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_n32;
 
-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_n9;
 
 -- 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_n9 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_n9 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_n9;
 
-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_n9;
 
-drop table table_change_numeric_group_string_group_multi_ints_string_group;
+drop table table_change_numeric_group_string_group_multi_ints_string_group_n9;
 
 
 
@@ -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_n9(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_n9 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_n32;
 
-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_n9;
 
 -- 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_n9 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_n9 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_n9;
 
-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_n9;
 
-drop table table_change_numeric_group_string_group_floating_string_group;
+drop table table_change_numeric_group_string_group_floating_string_group_n9;
 
 
 ------------------------------------------------------------------------------------------
@@ -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_n9(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_n9 SELECT insert_num,
            string2, string2, string2, string2,
            string2, string2, string2,
            string2, string2, string2,
-          'original' FROM schema_evolution_data;
+          'original' FROM schema_evolution_data_n32;
 
-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_n9;
 
 -- 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_n9 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_n9 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_n9;
 
-drop table table_change_string_group_string_group_string;
+drop table table_change_string_group_string_group_string_n9;
 
 
 
@@ -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_n9(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_n9 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_n32;
 
-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_n9;
 
 -- 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_n9 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_n9 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_n9;
 
-drop table table_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+drop table table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n9;
 
 
 
@@ -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_n9(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_n9 SELECT insert_num,
            decimal1, decimal1,
            float1,
-          'original' FROM schema_evolution_data;
+          'original' FROM schema_evolution_data_n32;
 
-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_n9;
 
 -- 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_n9 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_n9 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_n9;
 
-drop table table_change_lower_to_higher_numeric_group_decimal_to_float;
+drop table table_change_lower_to_higher_numeric_group_decimal_to_float_n9;