http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/enforce_constraint_notnull.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/enforce_constraint_notnull.q 
b/ql/src/test/queries/clientpositive/enforce_constraint_notnull.q
index d29f213..c6eba88 100644
--- a/ql/src/test/queries/clientpositive/enforce_constraint_notnull.q
+++ b/ql/src/test/queries/clientpositive/enforce_constraint_notnull.q
@@ -1,109 +1,109 @@
 --! qt:dataset:src
 --  SIMPLE TABLE
 -- create table with first and last column with not null
-CREATE TABLE table1 (a STRING NOT NULL ENFORCED, b STRING, c STRING NOT NULL 
ENFORCED);
+CREATE TABLE table1_n7 (a STRING NOT NULL ENFORCED, b STRING, c STRING NOT 
NULL ENFORCED);
 
 -- insert value tuples
-explain INSERT INTO table1 values('not', 'null', 'constraint');
-INSERT INTO table1 values('not', 'null', 'constraint');
-SELECT * FROM table1;
+explain INSERT INTO table1_n7 values('not', 'null', 'constraint');
+INSERT INTO table1_n7 values('not', 'null', 'constraint');
+SELECT * FROM table1_n7;
 
 -- insert with column specified
-explain insert into table1(a,c) values('1','2');
-insert into table1(a,c) values('1','2');
+explain insert into table1_n7(a,c) values('1','2');
+insert into table1_n7(a,c) values('1','2');
 
 -- insert from select
-explain INSERT INTO table1 select key, src.value, value from src;
-INSERT INTO table1 select key, src.value, value from src;
-SELECT * FROM table1;
+explain INSERT INTO table1_n7 select key, src.value, value from src;
+INSERT INTO table1_n7 select key, src.value, value from src;
+SELECT * FROM table1_n7;
 
 -- insert overwrite
-explain INSERT OVERWRITE TABLE table1 select src.*, value from src;
-INSERT OVERWRITE TABLE table1 select src.*, value from src;
-SELECT * FROM table1;
+explain INSERT OVERWRITE TABLE table1_n7 select src.*, value from src;
+INSERT OVERWRITE TABLE table1_n7 select src.*, value from src;
+SELECT * FROM table1_n7;
 
 -- insert overwrite with if not exists
-explain INSERT OVERWRITE TABLE table1 if not exists select src.key, src.key, 
src.value from src;
-INSERT OVERWRITE TABLE table1 if not exists select src.key, src.key, src.value 
from src;
-SELECT * FROM table1;
+explain INSERT OVERWRITE TABLE table1_n7 if not exists select src.key, 
src.key, src.value from src;
+INSERT OVERWRITE TABLE table1_n7 if not exists select src.key, src.key, 
src.value from src;
+SELECT * FROM table1_n7;
 
-DROP TABLE table1;
+DROP TABLE table1_n7;
 
 -- multi insert
-create table src_multi1 (a STRING NOT NULL ENFORCED, b STRING);
-create table src_multi2 (i STRING, j STRING NOT NULL ENABLE);
+create table src_multi1_n0 (a STRING NOT NULL ENFORCED, b STRING);
+create table src_multi2_n1 (i STRING, j STRING NOT NULL ENABLE);
 
 explain
 from src
-insert overwrite table src_multi1 select * where key < 10
-insert overwrite table src_multi2 select * where key > 10 and key < 20;
+insert overwrite table src_multi1_n0 select * where key < 10
+insert overwrite table src_multi2_n1 select * where key > 10 and key < 20;
 
 
 from src
-insert overwrite table src_multi1 select * where key < 10
-insert overwrite table src_multi2 select * where key > 10 and key < 20;
+insert overwrite table src_multi1_n0 select * where key < 10
+insert overwrite table src_multi2_n1 select * where key > 10 and key < 20;
 
 explain
 from src
-insert into table src_multi1 select * where src.key < 10
-insert into table src_multi2 select src.* where key > 10 and key < 20;
+insert into table src_multi1_n0 select * where src.key < 10
+insert into table src_multi2_n1 select src.* where key > 10 and key < 20;
 
 from src
-insert into table src_multi1 select * where src.key < 10
-insert into table src_multi2 select src.* where key > 10 and key < 20;
+insert into table src_multi1_n0 select * where src.key < 10
+insert into table src_multi2_n1 select src.* where key > 10 and key < 20;
 
 --  ACID TABLE
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 
 -- SORT_QUERY_RESULTS
-create table acid_uami(i int,
+create table acid_uami_n1(i int,
                  de decimal(5,2) constraint nn1 not null enforced,
                  vc varchar(128) constraint nn2 not null enforced) clustered 
by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true');
 
 -- insert into values
-explain insert into table acid_uami values
+explain insert into table acid_uami_n1 values
     (1, 109.23, 'mary had a little lamb'),
     (6553, 923.19, 'its fleece was white as snow');
-insert into table acid_uami values
+insert into table acid_uami_n1 values
     (1, 109.23, 'mary had a little lamb'),
     (6553, 923.19, 'its fleece was white as snow');
-select * from acid_uami;
+select * from acid_uami_n1;
 
  --insert into select
-explain insert into table acid_uami select cast(key as int), cast (key as 
decimal(5,2)), value from src;
-insert into table acid_uami select cast(key as int), cast (key as 
decimal(5,2)), value from src;
+explain insert into table acid_uami_n1 select cast(key as int), cast (key as 
decimal(5,2)), value from src;
+insert into table acid_uami_n1 select cast(key as int), cast (key as 
decimal(5,2)), value from src;
 
 -- select with limit
-explain insert into table acid_uami select cast(key as int), cast (key as 
decimal(5,2)), value from src limit 2;
+explain insert into table acid_uami_n1 select cast(key as int), cast (key as 
decimal(5,2)), value from src limit 2;
 
 -- select with order by
-explain insert into table acid_uami select cast(key as int), cast (key as 
decimal(5,2)), value from src
+explain insert into table acid_uami_n1 select cast(key as int), cast (key as 
decimal(5,2)), value from src
         order by key limit 2;
 
 -- select with group by
-explain insert into table acid_uami select cast(key as int), cast (key as 
decimal(5,2)), value from src
+explain insert into table acid_uami_n1 select cast(key as int), cast (key as 
decimal(5,2)), value from src
         group by key, value order by key limit 2;
 
  --overwrite
-explain insert into table acid_uami select cast(key as int), cast (key as 
decimal(5,2)), value from src;
-insert into table acid_uami select cast(key as int), cast (key as 
decimal(5,2)), value from src;
+explain insert into table acid_uami_n1 select cast(key as int), cast (key as 
decimal(5,2)), value from src;
+insert into table acid_uami_n1 select cast(key as int), cast (key as 
decimal(5,2)), value from src;
 
 -- update
-explain update acid_uami set de = 3.14 where de = 109.23 or de = 119.23;
-update acid_uami set de = 3.14 where de = 109.23 or de = 119.23;
+explain update acid_uami_n1 set de = 3.14 where de = 109.23 or de = 119.23;
+update acid_uami_n1 set de = 3.14 where de = 109.23 or de = 119.23;
 
-ALTER table acid_uami drop constraint nn1;
-ALTER table acid_uami CHANGE i i int constraint nn0 not null enforced;
+ALTER table acid_uami_n1 drop constraint nn1;
+ALTER table acid_uami_n1 CHANGE i i int constraint nn0 not null enforced;
 
-explain update acid_uami set de = 3.14159 where de = 3.14 ;
-update acid_uami set de = 3.14159 where de = 3.14 ;
+explain update acid_uami_n1 set de = 3.14159 where de = 3.14 ;
+update acid_uami_n1 set de = 3.14159 where de = 3.14 ;
 
 -- multi insert
 explain
 from src
-insert overwrite table acid_uami select cast(key as int), cast(key as 
decimal(5,2)), value where key < 10
-insert overwrite table src_multi2 select * where key > 10 and key < 20;
+insert overwrite table acid_uami_n1 select cast(key as int), cast(key as 
decimal(5,2)), value where key < 10
+insert overwrite table src_multi2_n1 select * where key > 10 and key < 20;
 
 set hive.exec.dynamic.partition.mode=nonstrict;
 -- Table with partition
@@ -124,58 +124,58 @@ select * from tablePartitioned;
 explain
 from src
 INSERT INTO tablePartitioned partition(p1, p2) select key, value, value, 
'yesterday' as p1, 3 as p2
-insert overwrite table src_multi2 select * where key > 10 and key < 20;
+insert overwrite table src_multi2_n1 select * where key > 10 and key < 20;
 
-DROP TABLE src_multi1;
-DROP TABLE src_multi2;
-DROP TABLE acid_uami;
+DROP TABLE src_multi1_n0;
+DROP TABLE src_multi2_n1;
+DROP TABLE acid_uami_n1;
 
 -- MERGE statements
 set hive.mapred.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 
-create table nonacid (key int, a1 string, value string) stored as orc;
+create table nonacid_n2 (key int, a1 string, value string) stored as orc;
 
-create table masking_test (key int NOT NULL enable, a1 string, value string)
+create table masking_test_n4 (key int NOT NULL enable, a1 string, value string)
 clustered by (value) into 2 buckets stored as orc
 tblproperties ("transactional"="true");
 
 -- with cardinality check off
 set hive.merge.cardinality.check=false;
-explain MERGE INTO masking_test as t using nonacid as s ON t.key = s.key
+explain MERGE INTO masking_test_n4 as t using nonacid_n2 as s ON t.key = s.key
 WHEN MATCHED AND s.key < 5 THEN DELETE
 WHEN MATCHED AND s.key < 3 THEN UPDATE set a1 = '1'
 WHEN NOT MATCHED THEN INSERT VALUES (s.key, s.a1, s.value);
 
 -- with cardinality check on
 set hive.merge.cardinality.check=true;
-explain MERGE INTO masking_test as t using nonacid as s ON t.key = s.key
+explain MERGE INTO masking_test_n4 as t using nonacid_n2 as s ON t.key = s.key
 WHEN MATCHED AND s.key < 5 THEN DELETE
 WHEN MATCHED AND s.key < 3 THEN UPDATE set a1 = '1'
 WHEN NOT MATCHED THEN INSERT VALUES (s.key, s.a1, s.value);
 
-explain MERGE INTO masking_test as t using nonacid as s ON t.key = s.key
+explain MERGE INTO masking_test_n4 as t using nonacid_n2 as s ON t.key = s.key
 WHEN MATCHED AND s.key < 5 THEN DELETE
 WHEN NOT MATCHED THEN INSERT VALUES (s.key, s.a1, s.value);
 
-explain MERGE INTO masking_test as t using nonacid as s ON t.key = s.key
+explain MERGE INTO masking_test_n4 as t using nonacid_n2 as s ON t.key = s.key
 WHEN MATCHED AND s.key < 3 THEN UPDATE set a1 = '1'
 WHEN NOT MATCHED THEN INSERT VALUES (s.key, s.a1, s.value);
 
 -- shouldn't have constraint enforcement
-explain MERGE INTO masking_test as t using nonacid as s ON t.key = s.key
+explain MERGE INTO masking_test_n4 as t using nonacid_n2 as s ON t.key = s.key
 WHEN MATCHED AND s.key < 5 THEN DELETE;
 
-DROP TABLE masking_test;
-DROP TABLE nonacid;
+DROP TABLE masking_test_n4;
+DROP TABLE nonacid_n2;
 
 -- Test drop constraint
-create table table2(i int constraint nn5 not null enforced, j int);
-explain insert into table2 values(2, 3);
-alter table table2 drop constraint nn5;
-explain insert into table2 values(2, 3);
-DROP TABLE table2;
+create table table2_n3(i int constraint nn5 not null enforced, j int);
+explain insert into table2_n3 values(2, 3);
+alter table table2_n3 drop constraint nn5;
+explain insert into table2_n3 values(2, 3);
+DROP TABLE table2_n3;
 
 -- temporary table
 create temporary table tttemp(i int not null enforced);
@@ -188,10 +188,10 @@ set hive.create.as.insert.only=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
-create table part_mm(key int not null enforced) partitioned by (key_mm int) 
stored as orc tblproperties ("transactional"="true", 
"transactional_properties"="insert_only");
-explain insert into table part_mm partition(key_mm=455) select key from src 
order by value limit 3;
-insert into table part_mm partition(key_mm=455) select key from src order by 
value limit 3;
+create table part_mm_n1(key int not null enforced) partitioned by (key_mm int) 
stored as orc tblproperties ("transactional"="true", 
"transactional_properties"="insert_only");
+explain insert into table part_mm_n1 partition(key_mm=455) select key from src 
order by value limit 3;
+insert into table part_mm_n1 partition(key_mm=455) select key from src order 
by value limit 3;
 select key from src order by value limit 3;
-select * from part_mm;
-drop table part_mm;
+select * from part_mm_n1;
+drop table part_mm_n1;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/escape1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/escape1.q 
b/ql/src/test/queries/clientpositive/escape1.q
index bda2088..cebc1ee 100644
--- a/ql/src/test/queries/clientpositive/escape1.q
+++ b/ql/src/test/queries/clientpositive/escape1.q
@@ -5,17 +5,17 @@ set hive.exec.dynamic.partition=true;
 set hive.exec.max.dynamic.partitions.pernode=200;
 
 DROP TABLE escape1;
-DROP TABLE escape_raw;
+DROP TABLE escape_raw_n0;
 
-CREATE TABLE escape_raw (s STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../../data/files/escapetest.txt' INTO TABLE  
escape_raw;
+CREATE TABLE escape_raw_n0 (s STRING) STORED AS TEXTFILE;
+LOAD DATA LOCAL INPATH '../../data/files/escapetest.txt' INTO TABLE  
escape_raw_n0;
 
-SELECT count(*) from escape_raw;
-SELECT * from escape_raw;
+SELECT count(*) from escape_raw_n0;
+SELECT * from escape_raw_n0;
 
 CREATE TABLE escape1 (a STRING) PARTITIONED BY (ds STRING, part STRING);
 INSERT OVERWRITE TABLE escape1 PARTITION (ds='1', part) SELECT '1', s from 
-escape_raw;
+escape_raw_n0;
 
 SELECT count(*) from escape1;
 SELECT * from escape1;
@@ -25,4 +25,4 @@ ALTER TABLE escape1 DROP PARTITION (ds='1');
 SHOW PARTITIONS escape1;
 
 DROP TABLE escape1;
-DROP TABLE escape_raw;
+DROP TABLE escape_raw_n0;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/escape_crlf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/escape_crlf.q 
b/ql/src/test/queries/clientpositive/escape_crlf.q
index 46c3605..0b7b77c 100644
--- a/ql/src/test/queries/clientpositive/escape_crlf.q
+++ b/ql/src/test/queries/clientpositive/escape_crlf.q
@@ -2,22 +2,22 @@
 set hive.vectorized.execution.enabled=false;
 set hive.test.vectorized.execution.enabled.override=disable;
 
-DROP TABLE IF EXISTS base_tab;
-CREATE TABLE base_tab(a STRING, b STRING)
+DROP TABLE IF EXISTS base_tab_n0;
+CREATE TABLE base_tab_n0(a STRING, b STRING)
 ROW FORMAT DELIMITED
     FIELDS TERMINATED BY '|';
-DESCRIBE EXTENDED base_tab;
+DESCRIBE EXTENDED base_tab_n0;
 
-LOAD DATA LOCAL INPATH '../../data/files/escape_crlf.txt' OVERWRITE INTO TABLE 
base_tab;
+LOAD DATA LOCAL INPATH '../../data/files/escape_crlf.txt' OVERWRITE INTO TABLE 
base_tab_n0;
 -- No crlf escaping
-SELECT * FROM base_tab;
+SELECT * FROM base_tab_n0;
 
 -- Crlf escaping
-ALTER TABLE base_tab SET SERDEPROPERTIES ('escape.delim'='\\', 
'serialization.escape.crlf'='true');
-SELECT * FROM base_tab;
+ALTER TABLE base_tab_n0 SET SERDEPROPERTIES ('escape.delim'='\\', 
'serialization.escape.crlf'='true');
+SELECT * FROM base_tab_n0;
 
 SET hive.fetch.task.conversion=none;
 -- Make sure intermediate serde works correctly
-SELECT * FROM base_tab;
+SELECT * FROM base_tab_n0;
 
-DROP TABLE base_tab;
+DROP TABLE base_tab_n0;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/except_all.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/except_all.q 
b/ql/src/test/queries/clientpositive/except_all.q
index 13bb7fb..a87c524 100644
--- a/ql/src/test/queries/clientpositive/except_all.q
+++ b/ql/src/test/queries/clientpositive/except_all.q
@@ -2,49 +2,49 @@
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 
-create table a(key int);
+create table a_n15(key int);
 
-insert into table a values (0),(1),(2),(2),(2),(2),(3),(NULL),(NULL);
+insert into table a_n15 values (0),(1),(2),(2),(2),(2),(3),(NULL),(NULL);
 
-create table b(key bigint);
+create table b_n11(key bigint);
 
-insert into table b values (1),(2),(2),(3),(5),(5),(NULL),(NULL),(NULL);
+insert into table b_n11 values (1),(2),(2),(3),(5),(5),(NULL),(NULL),(NULL);
 
-select * from a except all select * from b;
+select * from a_n15 except all select * from b_n11;
 
-drop table a;
+drop table a_n15;
 
-drop table b;
+drop table b_n11;
 
-create table a(key int, value int);
+create table a_n15(key int, value int);
 
-insert into table a values (1,2),(1,2),(1,3),(2,3),(2,2);
+insert into table a_n15 values (1,2),(1,2),(1,3),(2,3),(2,2);
 
-create table b(key int, value int);
+create table b_n11(key int, value int);
 
-insert into table b values (1,2),(2,3),(2,2),(2,2),(2,20);
+insert into table b_n11 values (1,2),(2,3),(2,2),(2,2),(2,20);
 
-select * from a except all select * from b;
+select * from a_n15 except all select * from b_n11;
 
-select * from b except all select * from a;
+select * from b_n11 except all select * from a_n15;
 
-select * from b except all select * from a intersect distinct select * from b;
+select * from b_n11 except all select * from a_n15 intersect distinct select * 
from b_n11;
 
-select * from b except all select * from a except distinct select * from b;
+select * from b_n11 except all select * from a_n15 except distinct select * 
from b_n11;
 
-select * from a except all select * from b union all select * from a except 
distinct select * from b;
+select * from a_n15 except all select * from b_n11 union all select * from 
a_n15 except distinct select * from b_n11;
 
-select * from a except all select * from b union select * from a except 
distinct select * from b;
+select * from a_n15 except all select * from b_n11 union select * from a_n15 
except distinct select * from b_n11;
 
-select * from a except all select * from b except distinct select * from a 
except distinct select * from b;
+select * from a_n15 except all select * from b_n11 except distinct select * 
from a_n15 except distinct select * from b_n11;
 
-select * from (select a.key, b.value from a join b on a.key=b.key)sub1 
+select * from (select a_n15.key, b_n11.value from a_n15 join b_n11 on 
a_n15.key=b_n11.key)sub1 
 except all 
-select * from (select a.key, b.value from a join b on a.key=b.key)sub2; 
+select * from (select a_n15.key, b_n11.value from a_n15 join b_n11 on 
a_n15.key=b_n11.key)sub2; 
 
-select * from (select a.key, b.value from a join b on a.key=b.key)sub1
+select * from (select a_n15.key, b_n11.value from a_n15 join b_n11 on 
a_n15.key=b_n11.key)sub1
 except all
-select * from (select b.value as key, a.key as value from a join b on 
a.key=b.key)sub2;
+select * from (select b_n11.value as key, a_n15.key as value from a_n15 join 
b_n11 on a_n15.key=b_n11.key)sub2;
 
 explain select * from src except all select * from src;
 
@@ -54,6 +54,6 @@ explain select * from src except all select * from src except 
distinct select *
 
 select * from src except all select * from src except distinct select * from 
src except distinct select * from src;
 
-explain select value from a group by value except distinct select key from b 
group by key;
+explain select value from a_n15 group by value except distinct select key from 
b_n11 group by key;
 
-select value from a group by value except distinct select key from b group by 
key;
+select value from a_n15 group by value except distinct select key from b_n11 
group by key;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/except_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/except_distinct.q 
b/ql/src/test/queries/clientpositive/except_distinct.q
index 6fb0071..a4a7af0 100644
--- a/ql/src/test/queries/clientpositive/except_distinct.q
+++ b/ql/src/test/queries/clientpositive/except_distinct.q
@@ -2,49 +2,49 @@
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 
-create table a(key int);
+create table a_n16(key int);
 
-insert into table a values (0),(1),(2),(2),(2),(2),(3),(NULL),(NULL);
+insert into table a_n16 values (0),(1),(2),(2),(2),(2),(3),(NULL),(NULL);
 
-create table b(key bigint);
+create table b_n12(key bigint);
 
-insert into table b values (1),(2),(2),(3),(5),(5),(NULL),(NULL),(NULL);
+insert into table b_n12 values (1),(2),(2),(3),(5),(5),(NULL),(NULL),(NULL);
 
-select * from a except distinct select * from b;
+select * from a_n16 except distinct select * from b_n12;
 
-drop table a;
+drop table a_n16;
 
-drop table b;
+drop table b_n12;
 
-create table a(key int, value int);
+create table a_n16(key int, value int);
 
-insert into table a values (1,2),(1,2),(1,3),(2,3),(2,2);
+insert into table a_n16 values (1,2),(1,2),(1,3),(2,3),(2,2);
 
-create table b(key int, value int);
+create table b_n12(key int, value int);
 
-insert into table b values (1,2),(2,3),(2,2),(2,2),(2,20);
+insert into table b_n12 values (1,2),(2,3),(2,2),(2,2),(2,20);
 
-select * from a except distinct select * from b;
+select * from a_n16 except distinct select * from b_n12;
 
-select * from b except distinct select * from a;
+select * from b_n12 except distinct select * from a_n16;
 
-select * from b except distinct select * from a intersect distinct select * 
from b;
+select * from b_n12 except distinct select * from a_n16 intersect distinct 
select * from b_n12;
 
-select * from b except distinct select * from a except distinct select * from 
b;
+select * from b_n12 except distinct select * from a_n16 except distinct select 
* from b_n12;
 
-select * from a except distinct select * from b union all select * from a 
except distinct select * from b;
+select * from a_n16 except distinct select * from b_n12 union all select * 
from a_n16 except distinct select * from b_n12;
 
-select * from a except distinct select * from b union select * from a except 
distinct select * from b;
+select * from a_n16 except distinct select * from b_n12 union select * from 
a_n16 except distinct select * from b_n12;
 
-select * from a except distinct select * from b except distinct select * from 
a except distinct select * from b;
+select * from a_n16 except distinct select * from b_n12 except distinct select 
* from a_n16 except distinct select * from b_n12;
 
-select * from (select a.key, b.value from a join b on a.key=b.key)sub1 
+select * from (select a_n16.key, b_n12.value from a_n16 join b_n12 on 
a_n16.key=b_n12.key)sub1 
 except distinct 
-select * from (select a.key, b.value from a join b on a.key=b.key)sub2; 
+select * from (select a_n16.key, b_n12.value from a_n16 join b_n12 on 
a_n16.key=b_n12.key)sub2; 
 
-select * from (select a.key, b.value from a join b on a.key=b.key)sub1
+select * from (select a_n16.key, b_n12.value from a_n16 join b_n12 on 
a_n16.key=b_n12.key)sub1
 except distinct
-select * from (select b.value as key, a.key as value from a join b on 
a.key=b.key)sub2;
+select * from (select b_n12.value as key, a_n16.key as value from a_n16 join 
b_n12 on a_n16.key=b_n12.key)sub2;
 
 explain select * from src except distinct select * from src;
 
@@ -54,6 +54,6 @@ explain select * from src except distinct select * from src 
except distinct sele
 
 select * from src except distinct select * from src except distinct select * 
from src except distinct select * from src;
 
-explain select value from a group by value except distinct select key from b 
group by key;
+explain select value from a_n16 group by value except distinct select key from 
b_n12 group by key;
 
-select value from a group by value except distinct select key from b group by 
key;
+select value from a_n16 group by value except distinct select key from b_n12 
group by key;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exchange_partition3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exchange_partition3.q 
b/ql/src/test/queries/clientpositive/exchange_partition3.q
index 7c076ce..26af541 100644
--- a/ql/src/test/queries/clientpositive/exchange_partition3.q
+++ b/ql/src/test/queries/clientpositive/exchange_partition3.q
@@ -1,15 +1,15 @@
-CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr 
STRING);
-CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING, hr 
STRING);
-SHOW PARTITIONS exchange_part_test1;
-SHOW PARTITIONS exchange_part_test2;
+CREATE TABLE exchange_part_test1_n0 (f1 string) PARTITIONED BY (ds STRING, hr 
STRING);
+CREATE TABLE exchange_part_test2_n0 (f1 string) PARTITIONED BY (ds STRING, hr 
STRING);
+SHOW PARTITIONS exchange_part_test1_n0;
+SHOW PARTITIONS exchange_part_test2_n0;
 
-ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2014-01-03', hr='1');
-ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05', hr='1');
-ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05', hr='2');
-SHOW PARTITIONS exchange_part_test1;
-SHOW PARTITIONS exchange_part_test2;
+ALTER TABLE exchange_part_test1_n0 ADD PARTITION (ds='2014-01-03', hr='1');
+ALTER TABLE exchange_part_test2_n0 ADD PARTITION (ds='2013-04-05', hr='1');
+ALTER TABLE exchange_part_test2_n0 ADD PARTITION (ds='2013-04-05', hr='2');
+SHOW PARTITIONS exchange_part_test1_n0;
+SHOW PARTITIONS exchange_part_test2_n0;
 
 -- This will exchange both partitions hr=1 and hr=2
-ALTER TABLE exchange_part_test1 EXCHANGE PARTITION (ds='2013-04-05') WITH 
TABLE exchange_part_test2;
-SHOW PARTITIONS exchange_part_test1;
-SHOW PARTITIONS exchange_part_test2;
+ALTER TABLE exchange_part_test1_n0 EXCHANGE PARTITION (ds='2013-04-05') WITH 
TABLE exchange_part_test2_n0;
+SHOW PARTITIONS exchange_part_test1_n0;
+SHOW PARTITIONS exchange_part_test2_n0;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exchgpartition2lel.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exchgpartition2lel.q 
b/ql/src/test/queries/clientpositive/exchgpartition2lel.q
index 96e99bc..567ff8a 100644
--- a/ql/src/test/queries/clientpositive/exchgpartition2lel.q
+++ b/ql/src/test/queries/clientpositive/exchgpartition2lel.q
@@ -1,33 +1,33 @@
 --! qt:dataset:src
-DROP TABLE IF EXISTS t1;
-DROP TABLE IF EXISTS t2;
-DROP TABLE IF EXISTS t3;
-DROP TABLE IF EXISTS t4;
+DROP TABLE IF EXISTS t1_n72;
+DROP TABLE IF EXISTS t2_n44;
+DROP TABLE IF EXISTS t3_n15;
+DROP TABLE IF EXISTS t4_n7;
 
-CREATE TABLE t1 (a int) PARTITIONED BY (d1 int);
-CREATE TABLE t2 (a int) PARTITIONED BY (d1 int);
-CREATE TABLE t3 (a int) PARTITIONED BY (d1 int, d2 int);
-CREATE TABLE t4 (a int) PARTITIONED BY (d1 int, d2 int);
-CREATE TABLE t5 (a int) PARTITIONED BY (d1 int, d2 int, d3 int);
-CREATE TABLE t6 (a int) PARTITIONED BY (d1 int, d2 int, d3 int);
+CREATE TABLE t1_n72 (a int) PARTITIONED BY (d1 int);
+CREATE TABLE t2_n44 (a int) PARTITIONED BY (d1 int);
+CREATE TABLE t3_n15 (a int) PARTITIONED BY (d1 int, d2 int);
+CREATE TABLE t4_n7 (a int) PARTITIONED BY (d1 int, d2 int);
+CREATE TABLE t5_n3 (a int) PARTITIONED BY (d1 int, d2 int, d3 int);
+CREATE TABLE t6_n2 (a int) PARTITIONED BY (d1 int, d2 int, d3 int);
 set hive.mapred.mode=nonstrict;
-INSERT OVERWRITE TABLE t1 PARTITION (d1 = 1) SELECT key FROM src where key = 
100 limit 1;
-INSERT OVERWRITE TABLE t3 PARTITION (d1 = 1, d2 = 1) SELECT key FROM src where 
key = 100 limit 1;
-INSERT OVERWRITE TABLE t5 PARTITION (d1 = 1, d2 = 1, d3=1) SELECT key FROM src 
where key = 100 limit 1;
+INSERT OVERWRITE TABLE t1_n72 PARTITION (d1 = 1) SELECT key FROM src where key 
= 100 limit 1;
+INSERT OVERWRITE TABLE t3_n15 PARTITION (d1 = 1, d2 = 1) SELECT key FROM src 
where key = 100 limit 1;
+INSERT OVERWRITE TABLE t5_n3 PARTITION (d1 = 1, d2 = 1, d3=1) SELECT key FROM 
src where key = 100 limit 1;
 
-SELECT * FROM t1;
+SELECT * FROM t1_n72;
 
-SELECT * FROM t3;
+SELECT * FROM t3_n15;
 
-ALTER TABLE t2 EXCHANGE PARTITION (d1 = 1) WITH TABLE t1;
-SELECT * FROM t1;
-SELECT * FROM t2;
+ALTER TABLE t2_n44 EXCHANGE PARTITION (d1 = 1) WITH TABLE t1_n72;
+SELECT * FROM t1_n72;
+SELECT * FROM t2_n44;
 
-ALTER TABLE t4 EXCHANGE PARTITION (d1 = 1, d2 = 1) WITH TABLE t3;
-SELECT * FROM t3;
-SELECT * FROM t4;
+ALTER TABLE t4_n7 EXCHANGE PARTITION (d1 = 1, d2 = 1) WITH TABLE t3_n15;
+SELECT * FROM t3_n15;
+SELECT * FROM t4_n7;
 
-ALTER TABLE t6 EXCHANGE PARTITION (d1 = 1, d2 = 1, d3 = 1) WITH TABLE t5;
-SELECT * FROM t5;
-SELECT * FROM t6;
+ALTER TABLE t6_n2 EXCHANGE PARTITION (d1 = 1, d2 = 1, d3 = 1) WITH TABLE t5_n3;
+SELECT * FROM t5_n3;
+SELECT * FROM t6_n2;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exec_parallel_column_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exec_parallel_column_stats.q 
b/ql/src/test/queries/clientpositive/exec_parallel_column_stats.q
index 75e6e71..7c5e7e9 100644
--- a/ql/src/test/queries/clientpositive/exec_parallel_column_stats.q
+++ b/ql/src/test/queries/clientpositive/exec_parallel_column_stats.q
@@ -1,8 +1,8 @@
 --! qt:dataset:src
 set hive.exec.parallel=true;
 
-create table t as select * from src;
+create table t_n25 as select * from src;
 
-explain analyze table t compute statistics for columns;
+explain analyze table t_n25 compute statistics for columns;
 
-analyze table t compute statistics for columns;
+analyze table t_n25 compute statistics for columns;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q 
b/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q
index 8288bbf..e2c1a3f 100644
--- a/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q
+++ b/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q
@@ -3,24 +3,24 @@ set 
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.Sessi
 
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department_n0,exim_employee;
 
-create table exim_department ( dep_id int comment "department id")     
+create table exim_department_n0 ( dep_id int comment "department id")  
        stored as textfile      
        tblproperties("creator"="krishna");
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_department/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
+export table exim_department_n0 to 'ql/test/data/exports/exim_department';
+drop table exim_department_n0;
 
 create database importer;
 use importer;
 
 import from 'ql/test/data/exports/exim_department';
-describe extended exim_department;
-show table extended like exim_department;
+describe extended exim_department_n0;
+show table extended like exim_department_n0;
 dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-select * from exim_department;
-drop table exim_department;
+select * from exim_department_n0;
+drop table exim_department_n0;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_01_nonpart.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_01_nonpart.q 
b/ql/src/test/queries/clientpositive/exim_01_nonpart.q
index 1e2eed8..85ff811 100644
--- a/ql/src/test/queries/clientpositive/exim_01_nonpart.q
+++ b/ql/src/test/queries/clientpositive/exim_01_nonpart.q
@@ -1,24 +1,24 @@
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department_n7,exim_employee;
 
-create table exim_department ( dep_id int comment "department id")     
+create table exim_department_n7 ( dep_id int comment "department id")  
        stored as textfile      
        tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department; 
        
+load data local inpath "../../data/files/test.dat" into table 
exim_department_n7;              
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_department/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
+export table exim_department_n7 to 'ql/test/data/exports/exim_department';
+drop table exim_department_n7;
 
 create database importer;
 use importer;
 
 import from 'ql/test/data/exports/exim_department';
-describe extended exim_department;
-show table extended like exim_department;
+describe extended exim_department_n7;
+show table extended like exim_department_n7;
 dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-select * from exim_department;
-drop table exim_department;
+select * from exim_department_n7;
+drop table exim_department_n7;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q 
b/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q
index 495306b..4eac16e 100644
--- a/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q
+++ b/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q
@@ -1,26 +1,26 @@
 set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department,exim_employee_n9;
 
-create table exim_employee ( emp_id int comment "employee id")         
+create table exim_employee_n9 ( emp_id int comment "employee id")      
        comment "employee table"
        partitioned by (emp_country string comment "two char iso code", 
emp_state string comment "free text")
        stored as textfile      
        tblproperties("creator"="krishna");
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_employee/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-export table exim_employee to 'ql/test/data/exports/exim_employee';
-drop table exim_employee;
+export table exim_employee_n9 to 'ql/test/data/exports/exim_employee';
+drop table exim_employee_n9;
 
 create database importer;
 use importer;
 
 import from 'ql/test/data/exports/exim_employee';
-describe extended exim_employee;
-show table extended like exim_employee;
+describe extended exim_employee_n9;
+show table extended like exim_employee_n9;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-select * from exim_employee;
-drop table exim_employee;
+select * from exim_employee_n9;
+drop table exim_employee_n9;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_03_nonpart_over_compat.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_03_nonpart_over_compat.q 
b/ql/src/test/queries/clientpositive/exim_03_nonpart_over_compat.q
index 47d949a..90e7b1f 100644
--- a/ql/src/test/queries/clientpositive/exim_03_nonpart_over_compat.q
+++ b/ql/src/test/queries/clientpositive/exim_03_nonpart_over_compat.q
@@ -1,26 +1,26 @@
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department_n5,exim_employee;
 
-create table exim_department ( dep_id int comment "department id")     
+create table exim_department_n5 ( dep_id int comment "department id")  
        stored as textfile      
        tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department;
+load data local inpath "../../data/files/test.dat" into table 
exim_department_n5;
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_department/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
+export table exim_department_n5 to 'ql/test/data/exports/exim_department';
+drop table exim_department_n5;
 
 create database importer;
 use importer;
 
-create table exim_department ( dep_id int comment "department identifier")     
+create table exim_department_n5 ( dep_id int comment "department identifier")  
        stored as textfile      
        tblproperties("maker"="krishna");
 import from 'ql/test/data/exports/exim_department';
-describe extended exim_department;
-select * from exim_department;
-drop table exim_department;
+describe extended exim_department_n5;
+select * from exim_department_n5;
+drop table exim_department_n5;
 dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_04_all_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_04_all_part.q 
b/ql/src/test/queries/clientpositive/exim_04_all_part.q
index 8fb7aa0..a46c712a 100644
--- a/ql/src/test/queries/clientpositive/exim_04_all_part.q
+++ b/ql/src/test/queries/clientpositive/exim_04_all_part.q
@@ -1,34 +1,34 @@
 set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department,exim_employee_n5;
 
-create table exim_employee ( emp_id int comment "employee id")         
+create table exim_employee_n5 ( emp_id int comment "employee id")      
        comment "employee table"
        partitioned by (emp_country string comment "two char iso code", 
emp_state string comment "free text")
        stored as textfile      
        tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="tn");  
+       into table exim_employee_n5 partition (emp_country="in", 
emp_state="tn");       
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="ka");  
+       into table exim_employee_n5 partition (emp_country="in", 
emp_state="ka");       
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="tn");  
+       into table exim_employee_n5 partition (emp_country="us", 
emp_state="tn");       
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="ka");  
        
+       into table exim_employee_n5 partition (emp_country="us", 
emp_state="ka");               
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_employee/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-export table exim_employee to 'ql/test/data/exports/exim_employee';
-drop table exim_employee;
+export table exim_employee_n5 to 'ql/test/data/exports/exim_employee';
+drop table exim_employee_n5;
 
 create database importer;
 use importer;
 
 import from 'ql/test/data/exports/exim_employee';
-describe extended exim_employee;
-show table extended like exim_employee;
+describe extended exim_employee_n5;
+show table extended like exim_employee_n5;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-select * from exim_employee;
-drop table exim_employee;
+select * from exim_employee_n5;
+drop table exim_employee_n5;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q 
b/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q
index 6acac7b..aa989c7 100644
--- a/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q
+++ b/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q
@@ -1,43 +1,43 @@
 set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department,exim_employee_n12;
 
-create table exim_employee (emp_id int comment 'employee id', emp_name string, 
emp_dob string comment 'employee date of birth', emp_sex string comment 'M/F') 
+create table exim_employee_n12 (emp_id int comment 'employee id', emp_name 
string, emp_dob string comment 'employee date of birth', emp_sex string comment 
'M/F') 
  comment 'employee table' 
  partitioned by (emp_country string comment '2-char code', emp_state string 
comment '2-char code')
  clustered by (emp_sex) sorted by (emp_id ASC) into 10 buckets
  row format serde "org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe" with 
serdeproperties ('serialization.format'='1')
  stored as rcfile;
 
-alter table exim_employee add columns (emp_dept int);
-alter table exim_employee clustered by (emp_sex, emp_dept) sorted by (emp_id 
desc) into 5 buckets;
-alter table exim_employee add partition (emp_country='in', emp_state='tn');
+alter table exim_employee_n12 add columns (emp_dept int);
+alter table exim_employee_n12 clustered by (emp_sex, emp_dept) sorted by 
(emp_id desc) into 5 buckets;
+alter table exim_employee_n12 add partition (emp_country='in', emp_state='tn');
 
-alter table exim_employee set fileformat 
+alter table exim_employee_n12 set fileformat 
        inputformat  "org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat" 
        outputformat "org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat"
         serde        
"org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe";
     
 ;
-alter table exim_employee set serde 
"org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe" with serdeproperties 
('serialization.format'='2');
+alter table exim_employee_n12 set serde 
"org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe" with serdeproperties 
('serialization.format'='2');
 
-alter table exim_employee add partition (emp_country='in', emp_state='ka');
+alter table exim_employee_n12 add partition (emp_country='in', emp_state='ka');
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_employee/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-export table exim_employee to 'ql/test/data/exports/exim_employee';
-drop table exim_employee;
+export table exim_employee_n12 to 'ql/test/data/exports/exim_employee';
+drop table exim_employee_n12;
 
 create database importer;
 use importer;
 
 import from 'ql/test/data/exports/exim_employee';
-describe extended exim_employee;
-describe extended exim_employee partition (emp_country='in', emp_state='tn');
-describe extended exim_employee partition (emp_country='in', emp_state='ka');
-show table extended like exim_employee;
+describe extended exim_employee_n12;
+describe extended exim_employee_n12 partition (emp_country='in', 
emp_state='tn');
+describe extended exim_employee_n12 partition (emp_country='in', 
emp_state='ka');
+show table extended like exim_employee_n12;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-select * from exim_employee;
-drop table exim_employee;
+select * from exim_employee_n12;
+drop table exim_employee_n12;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_05_some_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_05_some_part.q 
b/ql/src/test/queries/clientpositive/exim_05_some_part.q
index 9e07a9e..235ab81 100644
--- a/ql/src/test/queries/clientpositive/exim_05_some_part.q
+++ b/ql/src/test/queries/clientpositive/exim_05_some_part.q
@@ -1,34 +1,34 @@
 set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department,exim_employee_n15;
 
-create table exim_employee ( emp_id int comment "employee id")         
+create table exim_employee_n15 ( emp_id int comment "employee id")     
        comment "employee table"
        partitioned by (emp_country string comment "two char iso code", 
emp_state string comment "free text")
        stored as textfile      
        tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="tn");  
+       into table exim_employee_n15 partition (emp_country="in", 
emp_state="tn");      
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="ka");  
+       into table exim_employee_n15 partition (emp_country="in", 
emp_state="ka");      
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="tn");  
+       into table exim_employee_n15 partition (emp_country="us", 
emp_state="tn");      
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="ka");  
        
+       into table exim_employee_n15 partition (emp_country="us", 
emp_state="ka");              
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_employee/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-export table exim_employee partition (emp_state="ka") to 
'ql/test/data/exports/exim_employee';
-drop table exim_employee;
+export table exim_employee_n15 partition (emp_state="ka") to 
'ql/test/data/exports/exim_employee';
+drop table exim_employee_n15;
 
 create database importer;
 use importer;
 
 import from 'ql/test/data/exports/exim_employee';
-describe extended exim_employee;
-show table extended like exim_employee;
+describe extended exim_employee_n15;
+show table extended like exim_employee_n15;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-select * from exim_employee;
-drop table exim_employee;
+select * from exim_employee_n15;
+drop table exim_employee_n15;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_06_one_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_06_one_part.q 
b/ql/src/test/queries/clientpositive/exim_06_one_part.q
index 0dcdaa1..d83dfe8 100644
--- a/ql/src/test/queries/clientpositive/exim_06_one_part.q
+++ b/ql/src/test/queries/clientpositive/exim_06_one_part.q
@@ -1,34 +1,34 @@
 set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department,exim_employee_n3;
 
-create table exim_employee ( emp_id int comment "employee id")         
+create table exim_employee_n3 ( emp_id int comment "employee id")      
        comment "employee table"
        partitioned by (emp_country string comment "two char iso code", 
emp_state string comment "free text")
        stored as textfile      
        tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="tn");  
+       into table exim_employee_n3 partition (emp_country="in", 
emp_state="tn");       
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="ka");  
+       into table exim_employee_n3 partition (emp_country="in", 
emp_state="ka");       
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="tn");  
+       into table exim_employee_n3 partition (emp_country="us", 
emp_state="tn");       
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="ka");  
        
+       into table exim_employee_n3 partition (emp_country="us", 
emp_state="ka");               
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_employee/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-export table exim_employee partition (emp_country="in",emp_state="ka") to 
'ql/test/data/exports/exim_employee';
-drop table exim_employee;
+export table exim_employee_n3 partition (emp_country="in",emp_state="ka") to 
'ql/test/data/exports/exim_employee';
+drop table exim_employee_n3;
 
 create database importer;
 use importer;
 
 import from 'ql/test/data/exports/exim_employee';
-describe extended exim_employee;
-show table extended like exim_employee;
+describe extended exim_employee_n3;
+show table extended like exim_employee_n3;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-select * from exim_employee;
-drop table exim_employee;
+select * from exim_employee_n3;
+drop table exim_employee_n3;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q 
b/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q
index e897ee7..04f68d4 100644
--- a/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q
+++ b/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q
@@ -1,40 +1,40 @@
 set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department,exim_employee_n8;
 
-create table exim_employee ( emp_id int comment "employee id")         
+create table exim_employee_n8 ( emp_id int comment "employee id")      
        comment "employee table"
        partitioned by (emp_country string comment "two char iso code", 
emp_state string comment "free text")
        stored as textfile      
        tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="tn");  
+       into table exim_employee_n8 partition (emp_country="in", 
emp_state="tn");       
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="ka");  
+       into table exim_employee_n8 partition (emp_country="in", 
emp_state="ka");       
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="tn");  
+       into table exim_employee_n8 partition (emp_country="us", 
emp_state="tn");       
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="ka");  
        
+       into table exim_employee_n8 partition (emp_country="us", 
emp_state="ka");               
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_employee/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-export table exim_employee to 'ql/test/data/exports/exim_employee';
-drop table exim_employee;
+export table exim_employee_n8 to 'ql/test/data/exports/exim_employee';
+drop table exim_employee_n8;
 
 create database importer;
 use importer;
 
-create table exim_employee ( emp_id int comment "employee id")         
+create table exim_employee_n8 ( emp_id int comment "employee id")      
        comment "table of employees"
        partitioned by (emp_country string comment "iso code", emp_state string 
comment "free-form text")
        stored as textfile      
        tblproperties("maker"="krishna");
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="al");  
                
+       into table exim_employee_n8 partition (emp_country="us", 
emp_state="al");                       
 import from 'ql/test/data/exports/exim_employee';
-describe extended exim_employee;
-select * from exim_employee;
-drop table exim_employee;
+describe extended exim_employee_n8;
+select * from exim_employee_n8;
+drop table exim_employee_n8;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_08_nonpart_rename.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_08_nonpart_rename.q 
b/ql/src/test/queries/clientpositive/exim_08_nonpart_rename.q
index 8a1d945..c8e075d 100644
--- a/ql/src/test/queries/clientpositive/exim_08_nonpart_rename.q
+++ b/ql/src/test/queries/clientpositive/exim_08_nonpart_rename.q
@@ -1,28 +1,28 @@
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set 
hive.test.mode.nosamplelist=exim_department,exim_employee,exim_imported_dept;
+set 
hive.test.mode.nosamplelist=exim_department_n9,exim_employee,exim_imported_dept;
 
-create table exim_department ( dep_id int comment "department id")     
+create table exim_department_n9 ( dep_id int comment "department id")  
        stored as textfile      
        tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department; 
        
+load data local inpath "../../data/files/test.dat" into table 
exim_department_n9;              
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_department/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
+export table exim_department_n9 to 'ql/test/data/exports/exim_department';
+drop table exim_department_n9;
 
 create database importer;
 use importer;
-create table exim_department ( dep_id int comment "department id")     
+create table exim_department_n9 ( dep_id int comment "department id")  
        partitioned by (emp_org string)
        stored as textfile      
        tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department 
partition (emp_org="hr");
+load data local inpath "../../data/files/test.dat" into table 
exim_department_n9 partition (emp_org="hr");
 import table exim_imported_dept from 'ql/test/data/exports/exim_department';
 describe extended exim_imported_dept;
 select * from exim_imported_dept;
 drop table exim_imported_dept;
-drop table exim_department;
+drop table exim_department_n9;
 dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q 
b/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q
index 4a94418..1f8cc34 100644
--- a/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q
+++ b/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q
@@ -1,41 +1,41 @@
 set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department,exim_employee_n10;
 
-create table exim_employee ( emp_id int comment "employee id")         
+create table exim_employee_n10 ( emp_id int comment "employee id")     
        comment "employee table"
        partitioned by (emp_country string comment "two char iso code", 
emp_state string comment "free text")
        stored as textfile      
        tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="tn");  
+       into table exim_employee_n10 partition (emp_country="in", 
emp_state="tn");      
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="ka");  
+       into table exim_employee_n10 partition (emp_country="in", 
emp_state="ka");      
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="tn");  
+       into table exim_employee_n10 partition (emp_country="us", 
emp_state="tn");      
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="ka");  
        
+       into table exim_employee_n10 partition (emp_country="us", 
emp_state="ka");              
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_employee/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-export table exim_employee to 'ql/test/data/exports/exim_employee';
-drop table exim_employee;
+export table exim_employee_n10 to 'ql/test/data/exports/exim_employee';
+drop table exim_employee_n10;
 
 create database importer;
 use importer;
-create table exim_employee ( emp_id int comment "employee id")         
+create table exim_employee_n10 ( emp_id int comment "employee id")     
        comment "employee table"
        partitioned by (emp_country string comment "two char iso code", 
emp_state string comment "free text")
        stored as textfile      
        tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="tn");  
+       into table exim_employee_n10 partition (emp_country="in", 
emp_state="tn");      
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="ka");  
-import table exim_employee partition (emp_country="us", emp_state="tn") from 
'ql/test/data/exports/exim_employee';
-describe extended exim_employee;
-select * from exim_employee;
-drop table exim_employee;
+       into table exim_employee_n10 partition (emp_country="in", 
emp_state="ka");      
+import table exim_employee_n10 partition (emp_country="us", emp_state="tn") 
from 'ql/test/data/exports/exim_employee';
+describe extended exim_employee_n10;
+select * from exim_employee_n10;
+drop table exim_employee_n10;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_10_external_managed.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_10_external_managed.q 
b/ql/src/test/queries/clientpositive/exim_10_external_managed.q
index 54859ee..5aadbb3 100644
--- a/ql/src/test/queries/clientpositive/exim_10_external_managed.q
+++ b/ql/src/test/queries/clientpositive/exim_10_external_managed.q
@@ -1,27 +1,27 @@
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department_n4,exim_employee;
 
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/tablestore/exim_department/temp;
 dfs -rmr target/tmp/ql/test/data/tablestore/exim_department;
-create external table exim_department ( dep_id int comment "department id")    
+create external table exim_department_n4 ( dep_id int comment "department id") 
        
        stored as textfile      
        location 'ql/test/data/tablestore/exim_department'
        tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department; 
        
+load data local inpath "../../data/files/test.dat" into table 
exim_department_n4;              
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_department/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
+export table exim_department_n4 to 'ql/test/data/exports/exim_department';
+drop table exim_department_n4;
 dfs -rmr target/tmp/ql/test/data/tablestore/exim_department;
 
 create database importer;
 use importer;
 
 import from 'ql/test/data/exports/exim_department';
-describe extended exim_department;
-select * from exim_department;
-drop table exim_department;
+describe extended exim_department_n4;
+select * from exim_department_n4;
+drop table exim_department_n4;
 dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_12_external_location.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_12_external_location.q 
b/ql/src/test/queries/clientpositive/exim_12_external_location.q
index e4d50ff..5c6ed08 100644
--- a/ql/src/test/queries/clientpositive/exim_12_external_location.q
+++ b/ql/src/test/queries/clientpositive/exim_12_external_location.q
@@ -1,15 +1,15 @@
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department_n8,exim_employee;
 
-create table exim_department ( dep_id int comment "department id")     
+create table exim_department_n8 ( dep_id int comment "department id")  
        stored as textfile      
        tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department; 
        
+load data local inpath "../../data/files/test.dat" into table 
exim_department_n8;              
 dfs ${system:test.dfs.mkdir} 
${system:test.tmp.dir}/ql/test/data/exports/exim_department/temp;
 dfs -rmr ${system:test.tmp.dir}/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
+export table exim_department_n8 to 'ql/test/data/exports/exim_department';
+drop table exim_department_n8;
 
 create database importer;
 use importer;
@@ -17,13 +17,13 @@ use importer;
 dfs ${system:test.dfs.mkdir} 
${system:test.tmp.dir}/ql/test/data/tablestore/exim_department/temp;
 dfs -rmr ${system:test.tmp.dir}/ql/test/data/tablestore/exim_department;
 
-import external table exim_department from 
'ql/test/data/exports/exim_department' 
+import external table exim_department_n8 from 
'ql/test/data/exports/exim_department' 
        location 'ql/test/data/tablestore/exim_department';
-describe extended exim_department;
+describe extended exim_department_n8;
 dfs -rmr ${system:test.tmp.dir}/ql/test/data/exports/exim_department;
-select * from exim_department;
+select * from exim_department_n8;
 dfs -rmr ${system:test.tmp.dir}/ql/test/data/tablestore/exim_department;
-select * from exim_department;
-drop table exim_department;
+select * from exim_department_n8;
+drop table exim_department_n8;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_13_managed_location.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_13_managed_location.q 
b/ql/src/test/queries/clientpositive/exim_13_managed_location.q
index 909d237..ae3e045 100644
--- a/ql/src/test/queries/clientpositive/exim_13_managed_location.q
+++ b/ql/src/test/queries/clientpositive/exim_13_managed_location.q
@@ -1,15 +1,15 @@
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department_n2,exim_employee;
 
-create table exim_department ( dep_id int comment "department id")     
+create table exim_department_n2 ( dep_id int comment "department id")  
        stored as textfile      
        tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department; 
        
+load data local inpath "../../data/files/test.dat" into table 
exim_department_n2;              
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_department/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
+export table exim_department_n2 to 'ql/test/data/exports/exim_department';
+drop table exim_department_n2;
 
 create database importer;
 use importer;
@@ -17,13 +17,13 @@ use importer;
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/tablestore/exim_department/temp;
 dfs -rmr target/tmp/ql/test/data/tablestore/exim_department;
 
-import table exim_department from 'ql/test/data/exports/exim_department' 
+import table exim_department_n2 from 'ql/test/data/exports/exim_department' 
        location 'ql/test/data/tablestore/exim_department';
-describe extended exim_department;
+describe extended exim_department_n2;
 dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-select * from exim_department;
+select * from exim_department_n2;
 dfs -rmr target/tmp/ql/test/data/tablestore/exim_department;
-select * from exim_department;
-drop table exim_department;
+select * from exim_department_n2;
+drop table exim_department_n2;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_14_managed_location_over_existing.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/exim_14_managed_location_over_existing.q 
b/ql/src/test/queries/clientpositive/exim_14_managed_location_over_existing.q
index dbb5fd9..3d16880 100644
--- 
a/ql/src/test/queries/clientpositive/exim_14_managed_location_over_existing.q
+++ 
b/ql/src/test/queries/clientpositive/exim_14_managed_location_over_existing.q
@@ -1,15 +1,15 @@
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department_n10,exim_employee;
 
-create table exim_department ( dep_id int comment "department id")     
+create table exim_department_n10 ( dep_id int comment "department id")         
        stored as textfile      
        tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department; 
        
+load data local inpath "../../data/files/test.dat" into table 
exim_department_n10;             
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_department/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
+export table exim_department_n10 to 'ql/test/data/exports/exim_department';
+drop table exim_department_n10;
 
 create database importer;
 use importer;
@@ -17,17 +17,17 @@ use importer;
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/tablestore/exim_department/temp;
 dfs -rmr target/tmp/ql/test/data/tablestore/exim_department;
 
-create table exim_department ( dep_id int comment "department id")     
+create table exim_department_n10 ( dep_id int comment "department id")         
        stored as textfile
        location 'ql/test/data/tablestore/exim_department'
        tblproperties("creator"="krishna");
-import table exim_department from 'ql/test/data/exports/exim_department'
+import table exim_department_n10 from 'ql/test/data/exports/exim_department'
        location 'ql/test/data/tablestore/exim_department';
-describe extended exim_department;
+describe extended exim_department_n10;
 dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-select * from exim_department;
+select * from exim_department_n10;
 dfs -rmr target/tmp/ql/test/data/tablestore/exim_department;
-select * from exim_department; 
-drop table exim_department;
+select * from exim_department_n10;     
+drop table exim_department_n10;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_15_external_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_15_external_part.q 
b/ql/src/test/queries/clientpositive/exim_15_external_part.q
index f1f2c38..a4fd56a 100644
--- a/ql/src/test/queries/clientpositive/exim_15_external_part.q
+++ b/ql/src/test/queries/clientpositive/exim_15_external_part.q
@@ -1,25 +1,25 @@
 set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department,exim_employee_n0;
 
-create table exim_employee ( emp_id int comment "employee id")         
+create table exim_employee_n0 ( emp_id int comment "employee id")      
        comment "employee table"
        partitioned by (emp_country string comment "two char iso code", 
emp_state string comment "free text")
        stored as textfile      
        tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="tn");  
+       into table exim_employee_n0 partition (emp_country="in", 
emp_state="tn");       
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="ka");  
+       into table exim_employee_n0 partition (emp_country="in", 
emp_state="ka");       
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="tn");  
+       into table exim_employee_n0 partition (emp_country="us", 
emp_state="tn");       
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="ka");  
        
+       into table exim_employee_n0 partition (emp_country="us", 
emp_state="ka");               
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_employee/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-export table exim_employee to 'ql/test/data/exports/exim_employee';
-drop table exim_employee;
+export table exim_employee_n0 to 'ql/test/data/exports/exim_employee';
+drop table exim_employee_n0;
 
 create database importer;
 use importer;
@@ -27,25 +27,25 @@ use importer;
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/tablestore/exim_employee/temp;
 dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
 
-create external table exim_employee ( emp_id int comment "employee id")        
+create external table exim_employee_n0 ( emp_id int comment "employee id")     
        comment "employee table"
        partitioned by (emp_country string comment "two char iso code", 
emp_state string comment "free text")
        stored as textfile      
        location 'ql/test/data/tablestore/exim_employee'
        tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="tn");  
+       into table exim_employee_n0 partition (emp_country="in", 
emp_state="tn");       
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="ka");  
-import external table exim_employee partition (emp_country="us", 
emp_state="tn") 
+       into table exim_employee_n0 partition (emp_country="in", 
emp_state="ka");       
+import external table exim_employee_n0 partition (emp_country="us", 
emp_state="tn") 
        from 'ql/test/data/exports/exim_employee';
-describe extended exim_employee;
-select * from exim_employee;   
+describe extended exim_employee_n0;
+select * from exim_employee_n0;        
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-select * from exim_employee;
+select * from exim_employee_n0;
 dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
-select * from exim_employee;
-drop table exim_employee;
+select * from exim_employee_n0;
+drop table exim_employee_n0;
 
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_16_part_external.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_16_part_external.q 
b/ql/src/test/queries/clientpositive/exim_16_part_external.q
index 60dbe9e..b56832a 100644
--- a/ql/src/test/queries/clientpositive/exim_16_part_external.q
+++ b/ql/src/test/queries/clientpositive/exim_16_part_external.q
@@ -1,25 +1,25 @@
 set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department,exim_employee_n11;
 
-create table exim_employee ( emp_id int comment "employee id")         
+create table exim_employee_n11 ( emp_id int comment "employee id")     
        comment "employee table"
        partitioned by (emp_country string comment "two char iso code", 
emp_state string comment "free text")
        stored as textfile      
        tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="tn");  
+       into table exim_employee_n11 partition (emp_country="in", 
emp_state="tn");      
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="ka");  
+       into table exim_employee_n11 partition (emp_country="in", 
emp_state="ka");      
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="tn");  
+       into table exim_employee_n11 partition (emp_country="us", 
emp_state="tn");      
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="ka");  
        
+       into table exim_employee_n11 partition (emp_country="us", 
emp_state="ka");              
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_employee/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-export table exim_employee to 'ql/test/data/exports/exim_employee';
-drop table exim_employee;
+export table exim_employee_n11 to 'ql/test/data/exports/exim_employee';
+drop table exim_employee_n11;
 
 create database importer;
 use importer;
@@ -29,22 +29,22 @@ dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/tablestore2/exim_employee/temp;
 dfs -rmr target/tmp/ql/test/data/tablestore2/exim_employee;
 
-create external table exim_employee ( emp_id int comment "employee id")        
+create external table exim_employee_n11 ( emp_id int comment "employee id")    
        comment "employee table"
        partitioned by (emp_country string comment "two char iso code", 
emp_state string comment "free text")
        stored as textfile      
        location 'ql/test/data/tablestore2/exim_employee'
        tblproperties("creator"="krishna");
-import table exim_employee partition (emp_country="us", emp_state="tn") 
+import table exim_employee_n11 partition (emp_country="us", emp_state="tn") 
        from 'ql/test/data/exports/exim_employee'
        location 'ql/test/data/tablestore/exim_employee';
-show table extended like exim_employee;
-show table extended like exim_employee partition (emp_country="us", 
emp_state="tn");           
+show table extended like exim_employee_n11;
+show table extended like exim_employee_n11 partition (emp_country="us", 
emp_state="tn");               
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-select * from exim_employee;
+select * from exim_employee_n11;
 dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
-select * from exim_employee;
-drop table exim_employee;
+select * from exim_employee_n11;
+drop table exim_employee_n11;
 dfs -rmr target/tmp/ql/test/data/tablestore2/exim_employee;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_17_part_managed.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_17_part_managed.q 
b/ql/src/test/queries/clientpositive/exim_17_part_managed.q
index 6cb912f..0c6036b 100644
--- a/ql/src/test/queries/clientpositive/exim_17_part_managed.q
+++ b/ql/src/test/queries/clientpositive/exim_17_part_managed.q
@@ -1,25 +1,25 @@
 set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department,exim_employee_n4;
 
-create table exim_employee ( emp_id int comment "employee id")         
+create table exim_employee_n4 ( emp_id int comment "employee id")      
        comment "employee table"
        partitioned by (emp_country string comment "two char iso code", 
emp_state string comment "free text")
        stored as textfile      
        tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="tn");  
+       into table exim_employee_n4 partition (emp_country="in", 
emp_state="tn");       
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="ka");  
+       into table exim_employee_n4 partition (emp_country="in", 
emp_state="ka");       
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="tn");  
+       into table exim_employee_n4 partition (emp_country="us", 
emp_state="tn");       
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="ka");  
        
+       into table exim_employee_n4 partition (emp_country="us", 
emp_state="ka");               
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_employee/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-export table exim_employee to 'ql/test/data/exports/exim_employee';
-drop table exim_employee;
+export table exim_employee_n4 to 'ql/test/data/exports/exim_employee';
+drop table exim_employee_n4;
 
 create database importer;
 use importer;
@@ -27,23 +27,23 @@ use importer;
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/tablestore/exim_employee/temp;
 dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
 
-create table exim_employee ( emp_id int comment "employee id")         
+create table exim_employee_n4 ( emp_id int comment "employee id")      
        comment "employee table"
        partitioned by (emp_country string comment "two char iso code", 
emp_state string comment "free text")
        stored as textfile      
        tblproperties("creator"="krishna");
-import table exim_employee partition (emp_country="us", emp_state="tn") 
+import table exim_employee_n4 partition (emp_country="us", emp_state="tn") 
        from 'ql/test/data/exports/exim_employee'
        location 'ql/test/data/tablestore/exim_employee';
-alter table exim_employee add partition        (emp_country="us", 
emp_state="ap")
+alter table exim_employee_n4 add partition     (emp_country="us", 
emp_state="ap")
        location 'ql/test/data/tablestore2/exim_employee';
-show table extended like exim_employee;
-show table extended like exim_employee partition (emp_country="us", 
emp_state="tn");
-show table extended like exim_employee partition (emp_country="us", 
emp_state="ap");   
+show table extended like exim_employee_n4;
+show table extended like exim_employee_n4 partition (emp_country="us", 
emp_state="tn");
+show table extended like exim_employee_n4 partition (emp_country="us", 
emp_state="ap");        
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-select * from exim_employee;
+select * from exim_employee_n4;
 dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
-select * from exim_employee;
-drop table exim_employee;
+select * from exim_employee_n4;
+drop table exim_employee_n4;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_18_part_external.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exim_18_part_external.q 
b/ql/src/test/queries/clientpositive/exim_18_part_external.q
index 4e6974c..1a259da 100644
--- a/ql/src/test/queries/clientpositive/exim_18_part_external.q
+++ b/ql/src/test/queries/clientpositive/exim_18_part_external.q
@@ -1,37 +1,37 @@
 set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department,exim_employee_n14;
 
-create table exim_employee ( emp_id int comment "employee id")         
+create table exim_employee_n14 ( emp_id int comment "employee id")     
        comment "employee table"
        partitioned by (emp_country string comment "two char iso code", 
emp_state string comment "free text")
        stored as textfile      
        tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="tn");  
+       into table exim_employee_n14 partition (emp_country="in", 
emp_state="tn");      
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="ka");  
+       into table exim_employee_n14 partition (emp_country="in", 
emp_state="ka");      
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="tn");  
+       into table exim_employee_n14 partition (emp_country="us", 
emp_state="tn");      
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="ka");  
        
+       into table exim_employee_n14 partition (emp_country="us", 
emp_state="ka");              
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_employee/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-export table exim_employee to 'ql/test/data/exports/exim_employee';
-drop table exim_employee;
+export table exim_employee_n14 to 'ql/test/data/exports/exim_employee';
+drop table exim_employee_n14;
 
 create database importer;
 use importer;
 
-import external table exim_employee partition (emp_country="us", 
emp_state="tn") 
+import external table exim_employee_n14 partition (emp_country="us", 
emp_state="tn") 
        from 'ql/test/data/exports/exim_employee';
-describe extended exim_employee;       
-show table extended like exim_employee;
-show table extended like exim_employee partition (emp_country="us", 
emp_state="tn");
-select * from exim_employee;
+describe extended exim_employee_n14;   
+show table extended like exim_employee_n14;
+show table extended like exim_employee_n14 partition (emp_country="us", 
emp_state="tn");
+select * from exim_employee_n14;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-select * from exim_employee;
-drop table exim_employee;
+select * from exim_employee_n14;
+drop table exim_employee_n14;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q 
b/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q
index e7bfdcf..eecfd70 100644
--- a/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q
+++ b/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q
@@ -1,21 +1,21 @@
 set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department,exim_employee_n2;
 
-create table exim_employee ( emp_id int comment "employee id")         
+create table exim_employee_n2 ( emp_id int comment "employee id")      
        comment "employee table"
        partitioned by (emp_country string comment "two char iso code", 
emp_state string comment "free text")
        stored as textfile      
        tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="tn");  
+       into table exim_employee_n2 partition (emp_country="in", 
emp_state="tn");       
 load data local inpath "../../data/files/test2.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="ka");  
+       into table exim_employee_n2 partition (emp_country="in", 
emp_state="ka");       
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_employee/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-export table exim_employee to 'ql/test/data/exports/exim_employee';
-drop table exim_employee;
+export table exim_employee_n2 to 'ql/test/data/exports/exim_employee';
+drop table exim_employee_n2;
 
 create database importer;
 use importer;
@@ -23,17 +23,17 @@ use importer;
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/tablestore/exim_employee/temp;
 dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
 
-import external table exim_employee 
+import external table exim_employee_n2 
        from 'ql/test/data/exports/exim_employee'
        location 'ql/test/data/tablestore/exim_employee';
-describe extended exim_employee;       
-show table extended like exim_employee;
-show table extended like exim_employee partition (emp_country="in", 
emp_state="tn");
-show table extended like exim_employee partition (emp_country="in", 
emp_state="ka");
+describe extended exim_employee_n2;    
+show table extended like exim_employee_n2;
+show table extended like exim_employee_n2 partition (emp_country="in", 
emp_state="tn");
+show table extended like exim_employee_n2 partition (emp_country="in", 
emp_state="ka");
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-select * from exim_employee;
+select * from exim_employee_n2;
 dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
-select * from exim_employee;
-drop table exim_employee;
+select * from exim_employee_n2;
+drop table exim_employee_n2;
 
 drop database importer;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/exim_19_part_external_location.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/exim_19_part_external_location.q 
b/ql/src/test/queries/clientpositive/exim_19_part_external_location.q
index 389b983..8f8d7eb 100644
--- a/ql/src/test/queries/clientpositive/exim_19_part_external_location.q
+++ b/ql/src/test/queries/clientpositive/exim_19_part_external_location.q
@@ -1,25 +1,25 @@
 set hive.mapred.mode=nonstrict;
 set hive.test.mode=true;
 set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
+set hive.test.mode.nosamplelist=exim_department,exim_employee_n13;
 
-create table exim_employee ( emp_id int comment "employee id")         
+create table exim_employee_n13 ( emp_id int comment "employee id")     
        comment "employee table"
        partitioned by (emp_country string comment "two char iso code", 
emp_state string comment "free text")
        stored as textfile      
        tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="tn");  
+       into table exim_employee_n13 partition (emp_country="in", 
emp_state="tn");      
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="in", emp_state="ka");  
+       into table exim_employee_n13 partition (emp_country="in", 
emp_state="ka");      
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="tn");  
+       into table exim_employee_n13 partition (emp_country="us", 
emp_state="tn");      
 load data local inpath "../../data/files/test.dat" 
-       into table exim_employee partition (emp_country="us", emp_state="ka");  
        
+       into table exim_employee_n13 partition (emp_country="us", 
emp_state="ka");              
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/exports/exim_employee/temp;
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-export table exim_employee to 'ql/test/data/exports/exim_employee';
-drop table exim_employee;
+export table exim_employee_n13 to 'ql/test/data/exports/exim_employee';
+drop table exim_employee_n13;
 
 create database importer;
 use importer;
@@ -27,16 +27,16 @@ use importer;
 dfs ${system:test.dfs.mkdir} 
target/tmp/ql/test/data/tablestore/exim_employee/temp;
 dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
 
-import external table exim_employee partition (emp_country="us", 
emp_state="tn") 
+import external table exim_employee_n13 partition (emp_country="us", 
emp_state="tn") 
        from 'ql/test/data/exports/exim_employee'
        location 'ql/test/data/tablestore/exim_employee';
-describe extended exim_employee;       
-show table extended like exim_employee;
-show table extended like exim_employee partition (emp_country="us", 
emp_state="tn");
+describe extended exim_employee_n13;   
+show table extended like exim_employee_n13;
+show table extended like exim_employee_n13 partition (emp_country="us", 
emp_state="tn");
 dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-select * from exim_employee;
+select * from exim_employee_n13;
 dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
-select * from exim_employee;
-drop table exim_employee;
+select * from exim_employee_n13;
+drop table exim_employee_n13;
 
 drop database importer;

Reply via email to