http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table.q 
b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table.q
index 3059604..5256597 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table.q
@@ -18,9 +18,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_n24(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_n24;
 
 
------------------------------------------------------------------------------------------
 -- 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_n8(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_n8 SELECT insert_num, int1, 
'original' FROM schema_evolution_data_n24;
 
 -- Table-Non-Cascade ADD COLUMNS ...
-alter table table_add_int_permute_select add columns(c int);
+alter table table_add_int_permute_select_n8 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_n8 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_n8;
 
 -- 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_n8;
+select insert_num,a,b,c from table_add_int_permute_select_n8;
+select insert_num,c from table_add_int_permute_select_n8;
 
-drop table table_add_int_permute_select;
+drop table table_add_int_permute_select_n8;
 
 
 -- 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_n8(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_n8 SELECT insert_num, 
int1, 'original' FROM schema_evolution_data_n24;
 
 -- 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_n8 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_n8 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_n8;
 
 -- 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_n8;
+select insert_num,a,b,c from table_add_int_string_permute_select_n8;
+select insert_num,a,b,c,d from table_add_int_string_permute_select_n8;
+select insert_num,a,c,d from table_add_int_string_permute_select_n8;
+select insert_num,a,d from table_add_int_string_permute_select_n8;
+select insert_num,c from table_add_int_string_permute_select_n8;
+select insert_num,d from table_add_int_string_permute_select_n8;
 
-drop table table_add_int_string_permute_select;
+drop table table_add_int_string_permute_select_n8;
 
 
 
@@ -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_n8(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_n8 SELECT insert_num, 
double_str, double_str, double_str, 'original' FROM schema_evolution_data_n24;
 
 -- 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_n8 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_n8 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_n8;
 
-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_n8;
 
-drop table table_change_string_group_double;
+drop table table_change_string_group_double_n8;
 
 
------------------------------------------------------------------------------------------
 -- 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_n8(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_n8 SELECT 
insert_num, date1, date1, date1, date1, date1, timestamp1, timestamp1, 
timestamp1, timestamp1, timestamp1, 'original' FROM schema_evolution_data_n24;
 
 -- 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_n8 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_n8 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_n8;
 
-drop table table_change_date_group_string_group_date_group;
+drop table table_change_date_group_string_group_date_group_n8;
 
 
 
@@ -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_n8(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_n8 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_n24;
 
-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_n8;
 
 -- 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_n8 
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_n8 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_n8;
 
-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_n8;
 
-drop table table_change_numeric_group_string_group_multi_ints_string_group;
+drop table table_change_numeric_group_string_group_multi_ints_string_group_n8;
 
 
 
@@ -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_n8(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_n8 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_n24;
 
-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_n8;
 
 -- 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_n8 
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_n8 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_n8;
 
-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_n8;
 
-drop table table_change_numeric_group_string_group_floating_string_group;
+drop table table_change_numeric_group_string_group_floating_string_group_n8;
 
 
 
------------------------------------------------------------------------------------------
@@ -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_n8(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_n8 SELECT 
insert_num,
            string2, string2, string2, string2,
            string2, string2, string2,
            string2, string2, string2,
-          'original' FROM schema_evolution_data;
+          'original' FROM schema_evolution_data_n24;
 
-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_n8;
 
 -- 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_n8 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_n8 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_n8;
 
-drop table table_change_string_group_string_group_string;
+drop table table_change_string_group_string_group_string_n8;
 
 
 
@@ -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_n8(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_n8 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_n24;
 
-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_n8;
 
 -- 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_n8 
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_n8 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_n8;
 
-drop table table_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+drop table table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n8;
 
 
 
@@ -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_n8(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_n8 SELECT 
insert_num,
            decimal1, decimal1,
            float1,
-          'original' FROM schema_evolution_data;
+          'original' FROM schema_evolution_data_n24;
 
-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_n8;
 
 -- 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_n8 
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_n8 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_n8;
 
-drop table table_change_lower_to_higher_numeric_group_decimal_to_float;
+drop table table_change_lower_to_higher_numeric_group_decimal_to_float_n8;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table_llap_io.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table_llap_io.q 
b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table_llap_io.q
index 3fa9388..9607896 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_table_llap_io.q
@@ -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 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_n37(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_n37;
 
 
------------------------------------------------------------------------------------------
 -- 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_n11(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_n11 SELECT insert_num, int1, 
'original' FROM schema_evolution_data_n37;
 
 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_n11;
 
-select insert_num,a,b from table_add_int_permute_select;
+select insert_num,a,b from table_add_int_permute_select_n11;
 
 -- Table-Non-Cascade ADD COLUMNS ...
-alter table table_add_int_permute_select add columns(c int);
+alter table table_add_int_permute_select_n11 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_n11 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_n11;
 
 -- 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_n11;
+--** select insert_num,a,b,c from table_add_int_permute_select_n11;
+--** select insert_num,c from table_add_int_permute_select_n11;
 
-drop table table_add_int_permute_select;
+drop table table_add_int_permute_select_n11;
 
 
 -- 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_n11(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_n11 SELECT insert_num, 
int1, 'original' FROM schema_evolution_data_n37;
 
 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_n11;
 
-select insert_num,a,b from table_add_int_string_permute_select;
+select insert_num,a,b from table_add_int_string_permute_select_n11;
 
 -- 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_n11 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_n11 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_n11;
 
 -- 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_n11;
+--** select insert_num,a,b,c from table_add_int_string_permute_select_n11;
+--** select insert_num,a,b,c,d from table_add_int_string_permute_select_n11;
+--** select insert_num,a,c,d from table_add_int_string_permute_select_n11;
+--** select insert_num,a,d from table_add_int_string_permute_select_n11;
+--** select insert_num,c from table_add_int_string_permute_select_n11;
+--** select insert_num,d from table_add_int_string_permute_select_n11;
 
-drop table table_add_int_string_permute_select;
+drop table table_add_int_string_permute_select_n11;
 
 
 
@@ -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_n11(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_n11 SELECT insert_num, 
double_str, double_str, double_str, 'original' FROM schema_evolution_data_n37;
 
 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_n11;
 
-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_n11;
 
 -- 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_n11 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_n11 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_n11;
 
---** 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_n11;
 
-drop table table_change_string_group_double;
+drop table table_change_string_group_double_n11;
 
 
------------------------------------------------------------------------------------------
 -- SECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP
@@ -122,26 +122,26 @@ 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_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);
 
-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_n11 SELECT 
insert_num, date1, date1, date1, date1, date1, timestamp1, timestamp1, 
timestamp1, timestamp1, timestamp1, 'original' FROM schema_evolution_data_n37;
 
 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_n11;
 
-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_n11;
 
 -- 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_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 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_n11 VALUES 
(111, '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,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_n11;
 
---** 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_n11;
 
-drop table table_change_date_group_string_group_date_group;
+drop table table_change_date_group_string_group_date_group_n11;
 
 
 
@@ -156,42 +156,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_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);
 
-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_n11 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_n37;
 
 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_n11;
 
-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_n11;
 
 -- 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_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 
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_n11 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_n11;
 
---** 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_n11;
 
-drop table table_change_numeric_group_string_group_multi_ints_string_group;
+drop table table_change_numeric_group_string_group_multi_ints_string_group_n11;
 
 
 
@@ -202,42 +202,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_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);
 
-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_n11 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_n37;
 
 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_n11;
 
-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_n11;
 
 -- 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_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 
table_change_numeric_group_string_group_floating_string_group VALUES (111,
+insert into table 
table_change_numeric_group_string_group_floating_string_group_n11 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_n11;
 
---** 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_n11;
 
-drop table table_change_numeric_group_string_group_floating_string_group;
+drop table table_change_numeric_group_string_group_floating_string_group_n11;
 
 
 
------------------------------------------------------------------------------------------
@@ -248,37 +248,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_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);
 
-insert into table table_change_string_group_string_group_string SELECT 
insert_num,
+insert into table table_change_string_group_string_group_string_n11 SELECT 
insert_num,
            string2, string2, string2, string2,
            string2, string2, string2,
            string2, string2, string2,
-          'original' FROM schema_evolution_data;
+          'original' FROM schema_evolution_data_n37;
 
 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_n11;
 
-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_n11;
 
 -- 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_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 table_change_string_group_string_group_string VALUES (111,
+insert into table table_change_string_group_string_group_string_n11 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_n11;
 
-drop table table_change_string_group_string_group_string;
+drop table table_change_string_group_string_group_string_n11;
 
 
 
@@ -293,43 +293,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_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);
 
-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_n11 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_n37;
 
 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_n11;
 
-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_n11;
 
 -- 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_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 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_n11 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_n11;
 
-drop table table_change_lower_to_higher_numeric_group_tinyint_to_bigint;
+drop table table_change_lower_to_higher_numeric_group_tinyint_to_bigint_n11;
 
 
 
@@ -338,26 +338,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_n11(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_n11 SELECT 
insert_num,
            decimal1, decimal1,
            float1,
-          'original' FROM schema_evolution_data;
+          'original' FROM schema_evolution_data_n37;
 
 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_n11;
 
-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_n11;
 
 -- 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_n11 
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_n11 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_n11;
 
-drop table table_change_lower_to_higher_numeric_group_decimal_to_float;
+drop table table_change_lower_to_higher_numeric_group_decimal_to_float_n11;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/schemeAuthority2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schemeAuthority2.q 
b/ql/src/test/queries/clientpositive/schemeAuthority2.q
index cfb4be8..562d07f 100644
--- a/ql/src/test/queries/clientpositive/schemeAuthority2.q
+++ b/ql/src/test/queries/clientpositive/schemeAuthority2.q
@@ -3,12 +3,12 @@ set hive.mapred.mode=nonstrict;
 dfs ${system:test.dfs.mkdir} file:///tmp/test;
 dfs ${system:test.dfs.mkdir} hdfs:///tmp/test;
 
-create external table dynPart (key string) partitioned by (value string, 
value2 string) row format delimited fields terminated by '\\t' stored as 
textfile;
+create external table dynPart_n0 (key string) partitioned by (value string, 
value2 string) row format delimited fields terminated by '\\t' stored as 
textfile;
 insert overwrite local directory "/tmp/test" select key from src where (key = 
10) order by key;
 insert overwrite directory "/tmp/test" select key from src where (key = 20) 
order by key;
-alter table dynPart add partition (value='0', value2='clusterA') location 
'file:///tmp/test';
-alter table dynPart add partition (value='0', value2='clusterB') location 
'hdfs:///tmp/test';
-select value2, key from dynPart where value='0';
+alter table dynPart_n0 add partition (value='0', value2='clusterA') location 
'file:///tmp/test';
+alter table dynPart_n0 add partition (value='0', value2='clusterB') location 
'hdfs:///tmp/test';
+select value2, key from dynPart_n0 where value='0';
 
 dfs -rmr file:///tmp/test;
 dfs -rmr hdfs:///tmp/test;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/scriptfile1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/scriptfile1.q 
b/ql/src/test/queries/clientpositive/scriptfile1.q
index 243c65c..073f540 100644
--- a/ql/src/test/queries/clientpositive/scriptfile1.q
+++ b/ql/src/test/queries/clientpositive/scriptfile1.q
@@ -7,7 +7,7 @@ set 
hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 
 -- NO_SESSION_REUSE
 
-CREATE TABLE dest1(key INT, value STRING);
+CREATE TABLE dest1_n22(key INT, value STRING);
 
 ADD FILE ../../ql/src/test/scripts/testgrep;
 
@@ -17,6 +17,6 @@ FROM (
          USING 'testgrep' AS (tkey, tvalue)
   CLUSTER BY tkey
 ) tmap
-INSERT OVERWRITE TABLE dest1 SELECT tmap.tkey, tmap.tvalue;
+INSERT OVERWRITE TABLE dest1_n22 SELECT tmap.tkey, tmap.tvalue;
 
-SELECT dest1.* FROM dest1;
+SELECT dest1_n22.* FROM dest1_n22;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/select_unquote_and.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/select_unquote_and.q 
b/ql/src/test/queries/clientpositive/select_unquote_and.q
index 79894ea..e647bc0 100644
--- a/ql/src/test/queries/clientpositive/select_unquote_and.q
+++ b/ql/src/test/queries/clientpositive/select_unquote_and.q
@@ -1,17 +1,17 @@
 --! qt:dataset:src
 set hive.mapred.mode=nonstrict;
-CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING);
+CREATE TABLE npe_test_n0 (key STRING, value STRING) PARTITIONED BY (ds STRING);
 
-INSERT OVERWRITE TABLE npe_test PARTITION(ds='2012-12-11')
+INSERT OVERWRITE TABLE npe_test_n0 PARTITION(ds='2012-12-11')
 SELECT src.key, src.value FROM src WHERE key < '200';
 
-INSERT OVERWRITE TABLE npe_test PARTITION(ds='2012-12-12')
+INSERT OVERWRITE TABLE npe_test_n0 PARTITION(ds='2012-12-12')
 SELECT src.key, src.value FROM src WHERE key > '200';
 
-SELECT count(*) FROM npe_test;
+SELECT count(*) FROM npe_test_n0;
 
-EXPLAIN SELECT * FROM npe_test WHERE ds > 2012-11-31 AND ds < 2012-12-15;
+EXPLAIN SELECT * FROM npe_test_n0 WHERE ds > 2012-11-31 AND ds < 2012-12-15;
 
-SELECT count(*) FROM npe_test WHERE ds > 2012-11-31 AND ds < 2012-12-15;
+SELECT count(*) FROM npe_test_n0 WHERE ds > 2012-11-31 AND ds < 2012-12-15;
 
-DROP TABLE npe_test;
+DROP TABLE npe_test_n0;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/select_unquote_not.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/select_unquote_not.q 
b/ql/src/test/queries/clientpositive/select_unquote_not.q
index ee5d304..463c154 100644
--- a/ql/src/test/queries/clientpositive/select_unquote_not.q
+++ b/ql/src/test/queries/clientpositive/select_unquote_not.q
@@ -1,17 +1,17 @@
 --! qt:dataset:src
 set hive.mapred.mode=nonstrict;
-CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING);
+CREATE TABLE npe_test_n1 (key STRING, value STRING) PARTITIONED BY (ds STRING);
 
-INSERT OVERWRITE TABLE npe_test PARTITION(ds='2012-12-11')
+INSERT OVERWRITE TABLE npe_test_n1 PARTITION(ds='2012-12-11')
 SELECT src.key, src.value FROM src WHERE key < '200';
 
-INSERT OVERWRITE TABLE npe_test PARTITION(ds='2012-12-12')
+INSERT OVERWRITE TABLE npe_test_n1 PARTITION(ds='2012-12-12')
 SELECT src.key, src.value FROM src WHERE key > '200';
 
-SELECT count(*) FROM npe_test;
+SELECT count(*) FROM npe_test_n1;
 
-EXPLAIN SELECT * FROM npe_test WHERE NOT ds < 2012-11-31;
+EXPLAIN SELECT * FROM npe_test_n1 WHERE NOT ds < 2012-11-31;
 
-SELECT count(*) FROM npe_test WHERE NOT ds < 2012-11-31;
+SELECT count(*) FROM npe_test_n1 WHERE NOT ds < 2012-11-31;
 
-DROP TABLE npe_test;
+DROP TABLE npe_test_n1;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/semijoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/semijoin.q 
b/ql/src/test/queries/clientpositive/semijoin.q
index 6c6135c..144069b 100644
--- a/ql/src/test/queries/clientpositive/semijoin.q
+++ b/ql/src/test/queries/clientpositive/semijoin.q
@@ -3,82 +3,82 @@ SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
-create table t1 as select cast(key as int) key, value from src where key <= 10;
+create table t1_n55 as select cast(key as int) key, value from src where key 
<= 10;
 
-select * from t1 sort by key;
+select * from t1_n55 sort by key;
 
-create table t2 as select cast(2*key as int) key, value from t1;
+create table t2_n33 as select cast(2*key as int) key, value from t1_n55;
 
-select * from t2 sort by key;
+select * from t2_n33 sort by key;
 
-create table t3 as select * from (select * from t1 union all select * from t2) 
b;
-select * from t3 sort by key, value;
+create table t3_n12 as select * from (select * from t1_n55 union all select * 
from t2_n33) b;
+select * from t3_n12 sort by key, value;
 
-create table t4 (key int, value string);
-select * from t4;
+create table t4_n5 (key int, value string);
+select * from t4_n5;
 
-explain select * from t1 a left semi join t2 b on a.key=b.key sort by a.key, 
a.value;
-select * from t1 a left semi join t2 b on a.key=b.key sort by a.key, a.value;
+explain select * from t1_n55 a left semi join t2_n33 b on a.key=b.key sort by 
a.key, a.value;
+select * from t1_n55 a left semi join t2_n33 b on a.key=b.key sort by a.key, 
a.value;
 
-explain select * from t2 a left semi join t1 b on b.key=a.key sort by a.key, 
a.value;
-select * from t2 a left semi join t1 b on b.key=a.key sort by a.key, a.value;
+explain select * from t2_n33 a left semi join t1_n55 b on b.key=a.key sort by 
a.key, a.value;
+select * from t2_n33 a left semi join t1_n55 b on b.key=a.key sort by a.key, 
a.value;
 
-explain select * from t1 a left semi join t4 b on b.key=a.key sort by a.key, 
a.value;
-select * from t1 a left semi join t4 b on b.key=a.key sort by a.key, a.value;
+explain select * from t1_n55 a left semi join t4_n5 b on b.key=a.key sort by 
a.key, a.value;
+select * from t1_n55 a left semi join t4_n5 b on b.key=a.key sort by a.key, 
a.value;
 
-explain select a.value from t1 a left semi join t3 b on (b.key = a.key and 
b.key < '15') sort by a.value;
-select a.value from t1 a left semi join t3 b on (b.key = a.key and b.key < 
'15') sort by a.value;
+explain select a.value from t1_n55 a left semi join t3_n12 b on (b.key = a.key 
and b.key < '15') sort by a.value;
+select a.value from t1_n55 a left semi join t3_n12 b on (b.key = a.key and 
b.key < '15') sort by a.value;
 
-explain select * from t1 a left semi join t2 b on a.key = b.key and b.value < 
"val_10" sort by a.key, a.value;
-select * from t1 a left semi join t2 b on a.key = b.key and b.value < "val_10" 
sort by a.key, a.value;
+explain select * from t1_n55 a left semi join t2_n33 b on a.key = b.key and 
b.value < "val_10" sort by a.key, a.value;
+select * from t1_n55 a left semi join t2_n33 b on a.key = b.key and b.value < 
"val_10" sort by a.key, a.value;
 
-explain select a.value from t1 a left semi join (select key from t3 where key 
> 5) b on a.key = b.key sort by a.value;
-select a.value from t1 a left semi join (select key from t3 where key > 5) b 
on a.key = b.key sort by a.value;
+explain select a.value from t1_n55 a left semi join (select key from t3_n12 
where key > 5) b on a.key = b.key sort by a.value;
+select a.value from t1_n55 a left semi join (select key from t3_n12 where key 
> 5) b on a.key = b.key sort by a.value;
 
-explain select a.value from t1 a left semi join (select key , value from t2 
where key > 5) b on a.key = b.key and b.value <= 'val_20' sort by a.value ;
-select a.value from t1 a left semi join (select key , value from t2 where key 
> 5) b on a.key = b.key and b.value <= 'val_20' sort by a.value ;
+explain select a.value from t1_n55 a left semi join (select key , value from 
t2_n33 where key > 5) b on a.key = b.key and b.value <= 'val_20' sort by 
a.value ;
+select a.value from t1_n55 a left semi join (select key , value from t2_n33 
where key > 5) b on a.key = b.key and b.value <= 'val_20' sort by a.value ;
 
-explain select * from t2 a left semi join (select key , value from t1 where 
key > 2) b on a.key = b.key sort by a.key, a.value;
-select * from t2 a left semi join (select key , value from t1 where key > 2) b 
on a.key = b.key sort by a.key, a.value;
+explain select * from t2_n33 a left semi join (select key , value from t1_n55 
where key > 2) b on a.key = b.key sort by a.key, a.value;
+select * from t2_n33 a left semi join (select key , value from t1_n55 where 
key > 2) b on a.key = b.key sort by a.key, a.value;
 
-explain select /*+ mapjoin(b) */ a.key from t3 a left semi join t1 b on a.key 
= b.key sort by a.key;
-select /*+ mapjoin(b) */ a.key from t3 a left semi join t1 b on a.key = b.key 
sort by a.key;
+explain select /*+ mapjoin(b) */ a.key from t3_n12 a left semi join t1_n55 b 
on a.key = b.key sort by a.key;
+select /*+ mapjoin(b) */ a.key from t3_n12 a left semi join t1_n55 b on a.key 
= b.key sort by a.key;
 
-explain select * from t1 a left semi join t2 b on a.key = 2*b.key sort by 
a.key, a.value;
-select * from t1 a left semi join t2 b on a.key = 2*b.key sort by a.key, 
a.value;
+explain select * from t1_n55 a left semi join t2_n33 b on a.key = 2*b.key sort 
by a.key, a.value;
+select * from t1_n55 a left semi join t2_n33 b on a.key = 2*b.key sort by 
a.key, a.value;
 
-explain select * from t1 a join t2 b on a.key = b.key left semi join t3 c on 
b.key = c.key sort by a.key, a.value;
-select * from t1 a join t2 b on a.key = b.key left semi join t3 c on b.key = 
c.key sort by a.key, a.value;
+explain select * from t1_n55 a join t2_n33 b on a.key = b.key left semi join 
t3_n12 c on b.key = c.key sort by a.key, a.value;
+select * from t1_n55 a join t2_n33 b on a.key = b.key left semi join t3_n12 c 
on b.key = c.key sort by a.key, a.value;
  
-explain select * from t3 a left semi join t1 b on a.key = b.key and 
a.value=b.value sort by a.key, a.value;
-select * from t3 a left semi join t1 b on a.key = b.key and a.value=b.value 
sort by a.key, a.value;
+explain select * from t3_n12 a left semi join t1_n55 b on a.key = b.key and 
a.value=b.value sort by a.key, a.value;
+select * from t3_n12 a left semi join t1_n55 b on a.key = b.key and 
a.value=b.value sort by a.key, a.value;
 
-explain select /*+ mapjoin(b, c) */ a.key from t3 a left semi join t1 b on 
a.key = b.key left semi join t2 c on a.key = c.key sort by a.key;
-select /*+ mapjoin(b, c) */ a.key from t3 a left semi join t1 b on a.key = 
b.key left semi join t2 c on a.key = c.key sort by a.key;
+explain select /*+ mapjoin(b, c) */ a.key from t3_n12 a left semi join t1_n55 
b on a.key = b.key left semi join t2_n33 c on a.key = c.key sort by a.key;
+select /*+ mapjoin(b, c) */ a.key from t3_n12 a left semi join t1_n55 b on 
a.key = b.key left semi join t2_n33 c on a.key = c.key sort by a.key;
 
-explain select a.key from t3 a left outer join t1 b on a.key = b.key left semi 
join t2 c on b.key = c.key sort by a.key;
-select a.key from t3 a left outer join t1 b on a.key = b.key left semi join t2 
c on b.key = c.key sort by a.key;
+explain select a.key from t3_n12 a left outer join t1_n55 b on a.key = b.key 
left semi join t2_n33 c on b.key = c.key sort by a.key;
+select a.key from t3_n12 a left outer join t1_n55 b on a.key = b.key left semi 
join t2_n33 c on b.key = c.key sort by a.key;
 
-explain select a.key from t1 a right outer join t3 b on a.key = b.key left 
semi join t2 c on b.key = c.key sort by a.key;
-select a.key from t1 a right outer join t3 b on a.key = b.key left semi join 
t2 c on b.key = c.key sort by a.key;
+explain select a.key from t1_n55 a right outer join t3_n12 b on a.key = b.key 
left semi join t2_n33 c on b.key = c.key sort by a.key;
+select a.key from t1_n55 a right outer join t3_n12 b on a.key = b.key left 
semi join t2_n33 c on b.key = c.key sort by a.key;
 
-explain select a.key from t1 a full outer join t3 b on a.key = b.key left semi 
join t2 c on b.key = c.key sort by a.key;
-select a.key from t1 a full outer join t3 b on a.key = b.key left semi join t2 
c on b.key = c.key sort by a.key;
+explain select a.key from t1_n55 a full outer join t3_n12 b on a.key = b.key 
left semi join t2_n33 c on b.key = c.key sort by a.key;
+select a.key from t1_n55 a full outer join t3_n12 b on a.key = b.key left semi 
join t2_n33 c on b.key = c.key sort by a.key;
 
-explain select a.key from t3 a left semi join t2 b on a.key = b.key left outer 
join t1 c on a.key = c.key sort by a.key;
-select a.key from t3 a left semi join t2 b on a.key = b.key left outer join t1 
c on a.key = c.key sort by a.key;
+explain select a.key from t3_n12 a left semi join t2_n33 b on a.key = b.key 
left outer join t1_n55 c on a.key = c.key sort by a.key;
+select a.key from t3_n12 a left semi join t2_n33 b on a.key = b.key left outer 
join t1_n55 c on a.key = c.key sort by a.key;
 
-explain select a.key from t3 a left semi join t2 b on a.key = b.key right 
outer join t1 c on a.key = c.key sort by a.key;
-select a.key from t3 a left semi join t2 b on a.key = b.key right outer join 
t1 c on a.key = c.key sort by a.key;
+explain select a.key from t3_n12 a left semi join t2_n33 b on a.key = b.key 
right outer join t1_n55 c on a.key = c.key sort by a.key;
+select a.key from t3_n12 a left semi join t2_n33 b on a.key = b.key right 
outer join t1_n55 c on a.key = c.key sort by a.key;
 
-explain select a.key from t3 a left semi join t1 b on a.key = b.key full outer 
join t2 c on a.key = c.key sort by a.key;
-select a.key from t3 a left semi join t1 b on a.key = b.key full outer join t2 
c on a.key = c.key sort by a.key;
+explain select a.key from t3_n12 a left semi join t1_n55 b on a.key = b.key 
full outer join t2_n33 c on a.key = c.key sort by a.key;
+select a.key from t3_n12 a left semi join t1_n55 b on a.key = b.key full outer 
join t2_n33 c on a.key = c.key sort by a.key;
 
-explain select a.key from t3 a left semi join t2 b on a.key = b.key left outer 
join t1 c on a.value = c.value sort by a.key;
-select a.key from t3 a left semi join t2 b on a.key = b.key left outer join t1 
c on a.value = c.value sort by a.key;
+explain select a.key from t3_n12 a left semi join t2_n33 b on a.key = b.key 
left outer join t1_n55 c on a.value = c.value sort by a.key;
+select a.key from t3_n12 a left semi join t2_n33 b on a.key = b.key left outer 
join t1_n55 c on a.value = c.value sort by a.key;
 
-explain select a.key from t3 a left semi join t2 b on a.value = b.value where 
a.key > 100;
-select a.key from t3 a left semi join t2 b on a.value = b.value where a.key > 
100;
+explain select a.key from t3_n12 a left semi join t2_n33 b on a.value = 
b.value where a.key > 100;
+select a.key from t3_n12 a left semi join t2_n33 b on a.value = b.value where 
a.key > 100;
 
 explain select key, value from src outr left semi join
     (select a.key, b.value from src a join (select distinct value from src) b 
on a.value > b.value group by a.key, b.value) inr

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/semijoin2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/semijoin2.q 
b/ql/src/test/queries/clientpositive/semijoin2.q
index 6f852c4..5579fb1 100644
--- a/ql/src/test/queries/clientpositive/semijoin2.q
+++ b/ql/src/test/queries/clientpositive/semijoin2.q
@@ -1,6 +1,6 @@
-CREATE TABLE table_1 (boolean_col_1 BOOLEAN, float_col_2 FLOAT, bigint_col_3 
BIGINT, varchar0111_col_4 VARCHAR(111), bigint_col_5 BIGINT, float_col_6 FLOAT, 
boolean_col_7 BOOLEAN, decimal0101_col_8 DECIMAL(1, 1), decimal0904_col_9 
DECIMAL(9, 4), char0112_col_10 CHAR(112), double_col_11 DOUBLE, boolean_col_12 
BOOLEAN, double_col_13 DOUBLE, varchar0142_col_14 VARCHAR(142), 
timestamp_col_15 TIMESTAMP, decimal0502_col_16 DECIMAL(5, 2), smallint_col_25 
SMALLINT, decimal3222_col_18 DECIMAL(32, 22), boolean_col_19 BOOLEAN, 
decimal2012_col_20 DECIMAL(20, 12), char0204_col_21 CHAR(204), double_col_61 
DOUBLE, timestamp_col_23 TIMESTAMP, int_col_24 INT, float_col_25 FLOAT, 
smallint_col_26 SMALLINT, double_col_27 DOUBLE, char0180_col_28 CHAR(180), 
decimal1503_col_29 DECIMAL(15, 3), timestamp_col_30 TIMESTAMP, smallint_col_31 
SMALLINT, decimal2020_col_32 DECIMAL(20, 20), timestamp_col_33 TIMESTAMP, 
boolean_col_34 BOOLEAN, decimal3025_col_35 DECIMAL(30, 25), decimal3117_col_36 
DECIMAL(31, 17), ti
 mestamp_col_37 TIMESTAMP, varchar0146_col_38 VARCHAR(146), boolean_col_39 
BOOLEAN, double_col_40 DOUBLE, float_col_41 FLOAT, timestamp_col_42 TIMESTAMP, 
double_col_43 DOUBLE, boolean_col_44 BOOLEAN, timestamp_col_45 TIMESTAMP, 
tinyint_col_8 TINYINT, int_col_47 INT, decimal0401_col_48 DECIMAL(4, 1), 
varchar0064_col_49 VARCHAR(64), string_col_50 STRING, double_col_51 DOUBLE, 
string_col_52 STRING, boolean_col_53 BOOLEAN, int_col_54 INT, boolean_col_55 
BOOLEAN, string_col_56 STRING, double_col_57 DOUBLE, varchar0131_col_58 
VARCHAR(131), boolean_col_59 BOOLEAN, bigint_col_22 BIGINT, char0184_col_61 
CHAR(184), varchar0173_col_62 VARCHAR(173), timestamp_col_63 TIMESTAMP, 
decimal1709_col_26 DECIMAL(20, 5), timestamp_col_65 TIMESTAMP, timestamp_col_66 
TIMESTAMP, timestamp_col_67 TIMESTAMP, boolean_col_68 BOOLEAN, 
decimal1208_col_20 DECIMAL(33, 11), decimal1605_col_70 DECIMAL(16, 5), 
varchar0010_col_71 VARCHAR(10), tinyint_col_72 TINYINT, timestamp_col_10 
TIMESTAMP, decimal2714_col_74 DECIMAL
 (27, 14), double_col_75 DOUBLE, boolean_col_76 BOOLEAN, double_col_77 DOUBLE, 
string_col_78 STRING, boolean_col_79 BOOLEAN, boolean_col_80 BOOLEAN, 
decimal0803_col_81 DECIMAL(8, 3), decimal1303_col_82 DECIMAL(13, 3), 
tinyint_col_83 TINYINT, decimal3424_col_84 DECIMAL(34, 24), float_col_85 FLOAT, 
boolean_col_86 BOOLEAN, char0233_col_87 CHAR(233));
+CREATE TABLE table_1_n0 (boolean_col_1 BOOLEAN, float_col_2 FLOAT, 
bigint_col_3 BIGINT, varchar0111_col_4 VARCHAR(111), bigint_col_5 BIGINT, 
float_col_6 FLOAT, boolean_col_7 BOOLEAN, decimal0101_col_8 DECIMAL(1, 1), 
decimal0904_col_9 DECIMAL(9, 4), char0112_col_10 CHAR(112), double_col_11 
DOUBLE, boolean_col_12 BOOLEAN, double_col_13 DOUBLE, varchar0142_col_14 
VARCHAR(142), timestamp_col_15 TIMESTAMP, decimal0502_col_16 DECIMAL(5, 2), 
smallint_col_25 SMALLINT, decimal3222_col_18 DECIMAL(32, 22), boolean_col_19 
BOOLEAN, decimal2012_col_20 DECIMAL(20, 12), char0204_col_21 CHAR(204), 
double_col_61 DOUBLE, timestamp_col_23 TIMESTAMP, int_col_24 INT, float_col_25 
FLOAT, smallint_col_26 SMALLINT, double_col_27 DOUBLE, char0180_col_28 
CHAR(180), decimal1503_col_29 DECIMAL(15, 3), timestamp_col_30 TIMESTAMP, 
smallint_col_31 SMALLINT, decimal2020_col_32 DECIMAL(20, 20), timestamp_col_33 
TIMESTAMP, boolean_col_34 BOOLEAN, decimal3025_col_35 DECIMAL(30, 25), 
decimal3117_col_36 DECIMAL(31, 17),
  timestamp_col_37 TIMESTAMP, varchar0146_col_38 VARCHAR(146), boolean_col_39 
BOOLEAN, double_col_40 DOUBLE, float_col_41 FLOAT, timestamp_col_42 TIMESTAMP, 
double_col_43 DOUBLE, boolean_col_44 BOOLEAN, timestamp_col_45 TIMESTAMP, 
tinyint_col_8 TINYINT, int_col_47 INT, decimal0401_col_48 DECIMAL(4, 1), 
varchar0064_col_49 VARCHAR(64), string_col_50 STRING, double_col_51 DOUBLE, 
string_col_52 STRING, boolean_col_53 BOOLEAN, int_col_54 INT, boolean_col_55 
BOOLEAN, string_col_56 STRING, double_col_57 DOUBLE, varchar0131_col_58 
VARCHAR(131), boolean_col_59 BOOLEAN, bigint_col_22 BIGINT, char0184_col_61 
CHAR(184), varchar0173_col_62 VARCHAR(173), timestamp_col_63 TIMESTAMP, 
decimal1709_col_26 DECIMAL(20, 5), timestamp_col_65 TIMESTAMP, timestamp_col_66 
TIMESTAMP, timestamp_col_67 TIMESTAMP, boolean_col_68 BOOLEAN, 
decimal1208_col_20 DECIMAL(33, 11), decimal1605_col_70 DECIMAL(16, 5), 
varchar0010_col_71 VARCHAR(10), tinyint_col_72 TINYINT, timestamp_col_10 
TIMESTAMP, decimal2714_col_74 DECI
 MAL(27, 14), double_col_75 DOUBLE, boolean_col_76 BOOLEAN, double_col_77 
DOUBLE, string_col_78 STRING, boolean_col_79 BOOLEAN, boolean_col_80 BOOLEAN, 
decimal0803_col_81 DECIMAL(8, 3), decimal1303_col_82 DECIMAL(13, 3), 
tinyint_col_83 TINYINT, decimal3424_col_84 DECIMAL(34, 24), float_col_85 FLOAT, 
boolean_col_86 BOOLEAN, char0233_col_87 CHAR(233));
 
-CREATE TABLE table_18 (timestamp_col_1 TIMESTAMP, double_col_2 DOUBLE, 
boolean_col_3 BOOLEAN, timestamp_col_4 TIMESTAMP, decimal2103_col_5 DECIMAL(21, 
3), char0221_col_6 CHAR(221), tinyint_col_7 TINYINT, float_col_8 FLOAT, 
int_col_2 INT, timestamp_col_10 TIMESTAMP, char0228_col_11 CHAR(228), 
timestamp_col_12 TIMESTAMP, double_col_13 DOUBLE, tinyint_col_6 TINYINT, 
tinyint_col_33 TINYINT, smallint_col_38 SMALLINT, boolean_col_17 BOOLEAN, 
double_col_18 DOUBLE, boolean_col_19 BOOLEAN, bigint_col_20 BIGINT, 
decimal0504_col_37 DECIMAL(37, 34), boolean_col_22 BOOLEAN, double_col_23 
DOUBLE, timestamp_col_24 TIMESTAMP, varchar0076_col_25 VARCHAR(76), 
timestamp_col_18 TIMESTAMP, boolean_col_27 BOOLEAN, decimal1611_col_22 
DECIMAL(37, 5), boolean_col_29 BOOLEAN);
+CREATE TABLE table_18_n0 (timestamp_col_1 TIMESTAMP, double_col_2 DOUBLE, 
boolean_col_3 BOOLEAN, timestamp_col_4 TIMESTAMP, decimal2103_col_5 DECIMAL(21, 
3), char0221_col_6 CHAR(221), tinyint_col_7 TINYINT, float_col_8 FLOAT, 
int_col_2 INT, timestamp_col_10 TIMESTAMP, char0228_col_11 CHAR(228), 
timestamp_col_12 TIMESTAMP, double_col_13 DOUBLE, tinyint_col_6 TINYINT, 
tinyint_col_33 TINYINT, smallint_col_38 SMALLINT, boolean_col_17 BOOLEAN, 
double_col_18 DOUBLE, boolean_col_19 BOOLEAN, bigint_col_20 BIGINT, 
decimal0504_col_37 DECIMAL(37, 34), boolean_col_22 BOOLEAN, double_col_23 
DOUBLE, timestamp_col_24 TIMESTAMP, varchar0076_col_25 VARCHAR(76), 
timestamp_col_18 TIMESTAMP, boolean_col_27 BOOLEAN, decimal1611_col_22 
DECIMAL(37, 5), boolean_col_29 BOOLEAN);
 
 set hive.cbo.enable = false;
 
@@ -10,12 +10,12 @@ COALESCE(498, LEAD(COALESCE(-973, -684, 515)) OVER 
(PARTITION BY (t2.int_col_2 +
 (t2.int_col_2) + (t1.smallint_col_25) AS int_col_1,
 FLOOR(t1.double_col_61) AS float_col,
 COALESCE(SUM(COALESCE(62, -380, -435)) OVER (PARTITION BY (t2.int_col_2 + 
t1.smallint_col_25) ORDER BY (t2.int_col_2 + t1.smallint_col_25) DESC, 
FLOOR(t1.double_col_61) DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 48 
FOLLOWING), 704) AS int_col_2
-FROM table_1 t1
-INNER JOIN table_18 t2 ON (((t2.tinyint_col_6) = (t1.bigint_col_22)) AND 
((t2.decimal0504_col_37) = (t1.decimal1709_col_26))) AND ((t2.tinyint_col_33) = 
(t1.tinyint_col_8))
+FROM table_1_n0 t1
+INNER JOIN table_18_n0 t2 ON (((t2.tinyint_col_6) = (t1.bigint_col_22)) AND 
((t2.decimal0504_col_37) = (t1.decimal1709_col_26))) AND ((t2.tinyint_col_33) = 
(t1.tinyint_col_8))
 WHERE
 (t2.smallint_col_38) IN (SELECT
 COALESCE(-92, -994) AS int_col
-FROM table_1 tt1
-INNER JOIN table_18 tt2 ON (tt2.decimal1611_col_22) = (tt1.decimal1208_col_20)
+FROM table_1_n0 tt1
+INNER JOIN table_18_n0 tt2 ON (tt2.decimal1611_col_22) = 
(tt1.decimal1208_col_20)
 WHERE
 (t1.timestamp_col_10) = (tt2.timestamp_col_18));

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/semijoin3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/semijoin3.q 
b/ql/src/test/queries/clientpositive/semijoin3.q
index 14442ac..d779272 100644
--- a/ql/src/test/queries/clientpositive/semijoin3.q
+++ b/ql/src/test/queries/clientpositive/semijoin3.q
@@ -1,7 +1,7 @@
 --! qt:dataset:src
-create table t1 as select cast(key as int) key, value from src;
+create table t1_n59 as select cast(key as int) key, value from src;
 
-create table t2 as select cast(key as int) key, value from src;
+create table t2_n37 as select cast(key as int) key, value from src;
 
 set hive.cbo.enable=false;
 
@@ -9,21 +9,21 @@ explain
 select count(1)
 from
   (select key
-  from t1
-  where key = 0) t1
+  from t1_n59
+  where key = 0) t1_n59
 left semi join
   (select key
-  from t2
-  where key = 0) t2
+  from t2_n37
+  where key = 0) t2_n37
 on 1 = 1;
 
 select count(1)
 from
   (select key
-  from t1
-  where key = 0) t1
+  from t1_n59
+  where key = 0) t1_n59
 left semi join
   (select key
-  from t2
-  where key = 0) t2
+  from t2_n37
+  where key = 0) t2_n37
 on 1 = 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/semijoin5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/semijoin5.q 
b/ql/src/test/queries/clientpositive/semijoin5.q
index 3e7c20a..19a64b3 100644
--- a/ql/src/test/queries/clientpositive/semijoin5.q
+++ b/ql/src/test/queries/clientpositive/semijoin5.q
@@ -1,6 +1,6 @@
-CREATE TABLE table_1 (timestamp_col_1 TIMESTAMP, decimal3003_col_2 DECIMAL(30, 
3), tinyint_col_3 TINYINT, decimal0101_col_4 DECIMAL(1, 1), boolean_col_5 
BOOLEAN, float_col_6 FLOAT, bigint_col_7 BIGINT, varchar0098_col_8 VARCHAR(98), 
timestamp_col_9 TIMESTAMP, bigint_col_10 BIGINT, decimal0903_col_11 DECIMAL(9, 
3), timestamp_col_12 TIMESTAMP, timestamp_col_13 TIMESTAMP, float_col_14 FLOAT, 
char0254_col_15 CHAR(254), double_col_16 DOUBLE, timestamp_col_17 TIMESTAMP, 
boolean_col_18 BOOLEAN, decimal2608_col_19 DECIMAL(26, 8), varchar0216_col_20 
VARCHAR(216), string_col_21 STRING, bigint_col_22 BIGINT, boolean_col_23 
BOOLEAN, timestamp_col_24 TIMESTAMP, boolean_col_25 BOOLEAN, decimal2016_col_26 
DECIMAL(20, 16), string_col_27 STRING, decimal0202_col_28 DECIMAL(2, 2), 
float_col_29 FLOAT, decimal2020_col_30 DECIMAL(20, 20), boolean_col_31 BOOLEAN, 
double_col_32 DOUBLE, varchar0148_col_33 VARCHAR(148), decimal2121_col_34 
DECIMAL(21, 21), tinyint_col_35 TINYINT, boolean_col_36 BOOLEAN, boole
 an_col_37 BOOLEAN, string_col_38 STRING, decimal3420_col_39 DECIMAL(34, 20), 
timestamp_col_40 TIMESTAMP, decimal1408_col_41 DECIMAL(14, 8), string_col_42 
STRING, decimal0902_col_43 DECIMAL(9, 2), varchar0204_col_44 VARCHAR(204), 
boolean_col_45 BOOLEAN, timestamp_col_46 TIMESTAMP, boolean_col_47 BOOLEAN, 
bigint_col_48 BIGINT, boolean_col_49 BOOLEAN, smallint_col_50 SMALLINT, 
decimal0704_col_51 DECIMAL(7, 4), timestamp_col_52 TIMESTAMP, boolean_col_53 
BOOLEAN, timestamp_col_54 TIMESTAMP, int_col_55 INT, decimal0505_col_56 
DECIMAL(5, 5), char0155_col_57 CHAR(155), boolean_col_58 BOOLEAN, bigint_col_59 
BIGINT, boolean_col_60 BOOLEAN, boolean_col_61 BOOLEAN, char0249_col_62 
CHAR(249), boolean_col_63 BOOLEAN, timestamp_col_64 TIMESTAMP, 
decimal1309_col_65 DECIMAL(13, 9), int_col_66 INT, float_col_67 FLOAT, 
timestamp_col_68 TIMESTAMP, timestamp_col_69 TIMESTAMP, boolean_col_70 BOOLEAN, 
timestamp_col_71 TIMESTAMP, double_col_72 DOUBLE, boolean_col_73 BOOLEAN, 
char0222_col_74 CHAR(222), floa
 t_col_75 FLOAT, string_col_76 STRING, decimal2612_col_77 DECIMAL(26, 12), 
timestamp_col_78 TIMESTAMP, char0128_col_79 CHAR(128), timestamp_col_80 
TIMESTAMP, double_col_81 DOUBLE, timestamp_col_82 TIMESTAMP, float_col_83 
FLOAT, decimal2622_col_84 DECIMAL(26, 22), double_col_85 DOUBLE, float_col_86 
FLOAT, decimal0907_col_87 DECIMAL(9, 7)) STORED AS orc;
+CREATE TABLE table_1_n1 (timestamp_col_1 TIMESTAMP, decimal3003_col_2 
DECIMAL(30, 3), tinyint_col_3 TINYINT, decimal0101_col_4 DECIMAL(1, 1), 
boolean_col_5 BOOLEAN, float_col_6 FLOAT, bigint_col_7 BIGINT, 
varchar0098_col_8 VARCHAR(98), timestamp_col_9 TIMESTAMP, bigint_col_10 BIGINT, 
decimal0903_col_11 DECIMAL(9, 3), timestamp_col_12 TIMESTAMP, timestamp_col_13 
TIMESTAMP, float_col_14 FLOAT, char0254_col_15 CHAR(254), double_col_16 DOUBLE, 
timestamp_col_17 TIMESTAMP, boolean_col_18 BOOLEAN, decimal2608_col_19 
DECIMAL(26, 8), varchar0216_col_20 VARCHAR(216), string_col_21 STRING, 
bigint_col_22 BIGINT, boolean_col_23 BOOLEAN, timestamp_col_24 TIMESTAMP, 
boolean_col_25 BOOLEAN, decimal2016_col_26 DECIMAL(20, 16), string_col_27 
STRING, decimal0202_col_28 DECIMAL(2, 2), float_col_29 FLOAT, 
decimal2020_col_30 DECIMAL(20, 20), boolean_col_31 BOOLEAN, double_col_32 
DOUBLE, varchar0148_col_33 VARCHAR(148), decimal2121_col_34 DECIMAL(21, 21), 
tinyint_col_35 TINYINT, boolean_col_36 BOOLEAN, bo
 olean_col_37 BOOLEAN, string_col_38 STRING, decimal3420_col_39 DECIMAL(34, 
20), timestamp_col_40 TIMESTAMP, decimal1408_col_41 DECIMAL(14, 8), 
string_col_42 STRING, decimal0902_col_43 DECIMAL(9, 2), varchar0204_col_44 
VARCHAR(204), boolean_col_45 BOOLEAN, timestamp_col_46 TIMESTAMP, 
boolean_col_47 BOOLEAN, bigint_col_48 BIGINT, boolean_col_49 BOOLEAN, 
smallint_col_50 SMALLINT, decimal0704_col_51 DECIMAL(7, 4), timestamp_col_52 
TIMESTAMP, boolean_col_53 BOOLEAN, timestamp_col_54 TIMESTAMP, int_col_55 INT, 
decimal0505_col_56 DECIMAL(5, 5), char0155_col_57 CHAR(155), boolean_col_58 
BOOLEAN, bigint_col_59 BIGINT, boolean_col_60 BOOLEAN, boolean_col_61 BOOLEAN, 
char0249_col_62 CHAR(249), boolean_col_63 BOOLEAN, timestamp_col_64 TIMESTAMP, 
decimal1309_col_65 DECIMAL(13, 9), int_col_66 INT, float_col_67 FLOAT, 
timestamp_col_68 TIMESTAMP, timestamp_col_69 TIMESTAMP, boolean_col_70 BOOLEAN, 
timestamp_col_71 TIMESTAMP, double_col_72 DOUBLE, boolean_col_73 BOOLEAN, 
char0222_col_74 CHAR(222), f
 loat_col_75 FLOAT, string_col_76 STRING, decimal2612_col_77 DECIMAL(26, 12), 
timestamp_col_78 TIMESTAMP, char0128_col_79 CHAR(128), timestamp_col_80 
TIMESTAMP, double_col_81 DOUBLE, timestamp_col_82 TIMESTAMP, float_col_83 
FLOAT, decimal2622_col_84 DECIMAL(26, 22), double_col_85 DOUBLE, float_col_86 
FLOAT, decimal0907_col_87 DECIMAL(9, 7)) STORED AS orc;
 
-CREATE TABLE table_18 (boolean_col_1 BOOLEAN, boolean_col_2 BOOLEAN, 
decimal2518_col_3 DECIMAL(25, 18), float_col_4 FLOAT, timestamp_col_5 
TIMESTAMP, double_col_6 DOUBLE, double_col_7 DOUBLE, char0035_col_8 CHAR(35), 
decimal2709_col_9 DECIMAL(27, 9), int_col_10 INT, timestamp_col_11 TIMESTAMP, 
decimal3604_col_12 DECIMAL(36, 4), string_col_13 STRING, int_col_14 INT, 
tinyint_col_15 TINYINT, decimal1911_col_16 DECIMAL(19, 11), float_col_17 FLOAT, 
timestamp_col_18 TIMESTAMP, smallint_col_19 SMALLINT, tinyint_col_20 TINYINT, 
timestamp_col_21 TIMESTAMP, boolean_col_22 BOOLEAN, int_col_23 INT) STORED AS 
orc;
+CREATE TABLE table_18_n1 (boolean_col_1 BOOLEAN, boolean_col_2 BOOLEAN, 
decimal2518_col_3 DECIMAL(25, 18), float_col_4 FLOAT, timestamp_col_5 
TIMESTAMP, double_col_6 DOUBLE, double_col_7 DOUBLE, char0035_col_8 CHAR(35), 
decimal2709_col_9 DECIMAL(27, 9), int_col_10 INT, timestamp_col_11 TIMESTAMP, 
decimal3604_col_12 DECIMAL(36, 4), string_col_13 STRING, int_col_14 INT, 
tinyint_col_15 TINYINT, decimal1911_col_16 DECIMAL(19, 11), float_col_17 FLOAT, 
timestamp_col_18 TIMESTAMP, smallint_col_19 SMALLINT, tinyint_col_20 TINYINT, 
timestamp_col_21 TIMESTAMP, boolean_col_22 BOOLEAN, int_col_23 INT) STORED AS 
orc;
 
 explain
 SELECT
@@ -8,14 +8,14 @@ SELECT
     (t2.int_col_10) + (t1.smallint_col_50) AS int_col_1,
     FLOOR(t1.double_col_16) AS float_col,
     COALESCE(SUM(COALESCE(62, -380, -435)) OVER (PARTITION BY (t2.int_col_10 + 
t1.smallint_col_50) ORDER BY (t2.int_col_10 + t1.smallint_col_50) DESC, 
FLOOR(t1.double_col_16) DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 48 
FOLLOWING), 704) AS int_col_2
-FROM table_1 t1
-INNER JOIN table_18 t2 ON (((t2.tinyint_col_15) = (t1.bigint_col_7)) AND
+FROM table_1_n1 t1
+INNER JOIN table_18_n1 t2 ON (((t2.tinyint_col_15) = (t1.bigint_col_7)) AND
                            ((t2.decimal2709_col_9) = (t1.decimal2016_col_26))) 
AND
                            ((t2.tinyint_col_20) = (t1.tinyint_col_3))
 WHERE (t2.smallint_col_19) IN (SELECT
     COALESCE(-92, -994) AS int_col
-    FROM table_1 tt1
-    INNER JOIN table_18 tt2 ON (tt2.decimal1911_col_16) = 
(tt1.decimal2612_col_77)
+    FROM table_1_n1 tt1
+    INNER JOIN table_18_n1 tt2 ON (tt2.decimal1911_col_16) = 
(tt1.decimal2612_col_77)
     WHERE (t1.timestamp_col_9) = (tt2.timestamp_col_18));
 
 SELECT
@@ -23,13 +23,13 @@ SELECT
     (t2.int_col_10) + (t1.smallint_col_50) AS int_col_1,
     FLOOR(t1.double_col_16) AS float_col,
     COALESCE(SUM(COALESCE(62, -380, -435)) OVER (PARTITION BY (t2.int_col_10 + 
t1.smallint_col_50) ORDER BY (t2.int_col_10 + t1.smallint_col_50) DESC, 
FLOOR(t1.double_col_16) DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 48 
FOLLOWING), 704) AS int_col_2
-FROM table_1 t1
-INNER JOIN table_18 t2 ON (((t2.tinyint_col_15) = (t1.bigint_col_7)) AND
+FROM table_1_n1 t1
+INNER JOIN table_18_n1 t2 ON (((t2.tinyint_col_15) = (t1.bigint_col_7)) AND
                            ((t2.decimal2709_col_9) = (t1.decimal2016_col_26))) 
AND
                            ((t2.tinyint_col_20) = (t1.tinyint_col_3))
 WHERE (t2.smallint_col_19) IN (SELECT
     COALESCE(-92, -994) AS int_col
-    FROM table_1 tt1
-    INNER JOIN table_18 tt2 ON (tt2.decimal1911_col_16) = 
(tt1.decimal2612_col_77)
+    FROM table_1_n1 tt1
+    INNER JOIN table_18_n1 tt2 ON (tt2.decimal1911_col_16) = 
(tt1.decimal2612_col_77)
     WHERE (t1.timestamp_col_9) = (tt2.timestamp_col_18));
 

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/semijoin6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/semijoin6.q 
b/ql/src/test/queries/clientpositive/semijoin6.q
index f90d757..86404f5 100644
--- a/ql/src/test/queries/clientpositive/semijoin6.q
+++ b/ql/src/test/queries/clientpositive/semijoin6.q
@@ -1,50 +1,50 @@
 set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 
-create table tx1 (a integer,b integer);
-insert into tx1        values (1, 105), (2, 203), (3, 300), (4, 400), (null, 
400), (null, null);
+create table tx1_n1 (a integer,b integer);
+insert into tx1_n1     values (1, 105), (2, 203), (3, 300), (4, 400), (null, 
400), (null, null);
 
-create table tx2 (a int, b int);
-insert into tx2 values (1, 105), (1, 1900), (2, 1995), (2, 1996), (4, 400), 
(4, null);
+create table tx2_n0 (a int, b int);
+insert into tx2_n0 values (1, 105), (1, 1900), (2, 1995), (2, 1996), (4, 400), 
(4, null);
 
 explain
-select * from tx1 u left semi join tx2 v on u.a=v.a;
+select * from tx1_n1 u left semi join tx2_n0 v on u.a=v.a;
 
-select * from tx1 u left semi join tx2 v on u.a=v.a;
+select * from tx1_n1 u left semi join tx2_n0 v on u.a=v.a;
 
 explain
-select * from tx1 u left semi join tx2 v on u.b <=> v.b;
+select * from tx1_n1 u left semi join tx2_n0 v on u.b <=> v.b;
 
-select * from tx1 u left semi join tx2 v on u.b <=> v.b;
+select * from tx1_n1 u left semi join tx2_n0 v on u.b <=> v.b;
 
 explain
-select * from tx1 u left semi join tx2 v on u.b <> v.b;
+select * from tx1_n1 u left semi join tx2_n0 v on u.b <> v.b;
 
-select * from tx1 u left semi join tx2 v on u.b <> v.b;
+select * from tx1_n1 u left semi join tx2_n0 v on u.b <> v.b;
 
 explain
-select * from tx1 u left semi join tx2 v on u.a=v.a and u.b <> v.b;
+select * from tx1_n1 u left semi join tx2_n0 v on u.a=v.a and u.b <> v.b;
 
-select * from tx1 u left semi join tx2 v on u.a=v.a and u.b <> v.b;
+select * from tx1_n1 u left semi join tx2_n0 v on u.a=v.a and u.b <> v.b;
 
 explain
-select * from tx1 u left semi join tx2 v on u.a=v.a or u.b <> v.b;
+select * from tx1_n1 u left semi join tx2_n0 v on u.a=v.a or u.b <> v.b;
 
-select * from tx1 u left semi join tx2 v on u.a=v.a or u.b <> v.b;
+select * from tx1_n1 u left semi join tx2_n0 v on u.a=v.a or u.b <> v.b;
 
 explain
-select * from tx1 u left semi join tx1 v on u.a=v.a;
+select * from tx1_n1 u left semi join tx1_n1 v on u.a=v.a;
 
-select * from tx1 u left semi join tx1 v on u.a=v.a;
+select * from tx1_n1 u left semi join tx1_n1 v on u.a=v.a;
 
 explain
-select * from tx1 u left semi join tx2 v
+select * from tx1_n1 u left semi join tx2_n0 v
 on (u.a + v.b > 400)
   and ((case when u.a > 3 then true when v.b > 1900 then true else false end)
       or (coalesce(u.a) + coalesce(v.b) > 1900))
   and u.a = v.a;
 
-select * from tx1 u left semi join tx2 v
+select * from tx1_n1 u left semi join tx2_n0 v
 on (u.a + v.b > 400)
   and ((case when u.a > 3 then true when v.b > 1900 then true else false end)
       or (coalesce(u.a) + coalesce(v.b) > 1900))

Reply via email to