http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/create_like.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_like.q 
b/ql/src/test/queries/clientpositive/create_like.q
index b362627..9ad4425 100644
--- a/ql/src/test/queries/clientpositive/create_like.q
+++ b/ql/src/test/queries/clientpositive/create_like.q
@@ -3,43 +3,43 @@
 
 
 
-CREATE TABLE table1 (a STRING, b STRING) STORED AS TEXTFILE;
-DESCRIBE FORMATTED table1;
+CREATE TABLE table1_n17 (a STRING, b STRING) STORED AS TEXTFILE;
+DESCRIBE FORMATTED table1_n17;
 
-CREATE TABLE table2 LIKE table1;
-DESCRIBE FORMATTED table2;
+CREATE TABLE table2_n12 LIKE table1_n17;
+DESCRIBE FORMATTED table2_n12;
 
-CREATE TABLE IF NOT EXISTS table2 LIKE table1;
+CREATE TABLE IF NOT EXISTS table2_n12 LIKE table1_n17;
 
-CREATE EXTERNAL TABLE IF NOT EXISTS table2 LIKE table1;
+CREATE EXTERNAL TABLE IF NOT EXISTS table2_n12 LIKE table1_n17;
 
-CREATE EXTERNAL TABLE IF NOT EXISTS table3 LIKE table1;
-DESCRIBE FORMATTED table3;
+CREATE EXTERNAL TABLE IF NOT EXISTS table3_n3 LIKE table1_n17;
+DESCRIBE FORMATTED table3_n3;
 
-INSERT OVERWRITE TABLE table1 SELECT key, value FROM src WHERE key = 86;
-INSERT OVERWRITE TABLE table2 SELECT key, value FROM src WHERE key = 100;
+INSERT OVERWRITE TABLE table1_n17 SELECT key, value FROM src WHERE key = 86;
+INSERT OVERWRITE TABLE table2_n12 SELECT key, value FROM src WHERE key = 100;
 
-SELECT * FROM table1;
-SELECT * FROM table2;
+SELECT * FROM table1_n17;
+SELECT * FROM table2_n12;
 
 dfs -cp ${system:hive.root}/data/files/ext_test 
${system:test.tmp.dir}/ext_test;
 
-CREATE EXTERNAL TABLE table4 (a INT) LOCATION 
'${system:test.tmp.dir}/ext_test';
-CREATE EXTERNAL TABLE table5 LIKE table4 LOCATION 
'${system:test.tmp.dir}/ext_test';
+CREATE EXTERNAL TABLE table4_n1 (a INT) LOCATION 
'${system:test.tmp.dir}/ext_test';
+CREATE EXTERNAL TABLE table5_n5 LIKE table4_n1 LOCATION 
'${system:test.tmp.dir}/ext_test';
 
-SELECT * FROM table4;
-SELECT * FROM table5;
+SELECT * FROM table4_n1;
+SELECT * FROM table5_n5;
 
-DROP TABLE table5;
-SELECT * FROM table4;
-DROP TABLE table4;
+DROP TABLE table5_n5;
+SELECT * FROM table4_n1;
+DROP TABLE table4_n1;
 
-CREATE EXTERNAL TABLE table4 (a INT) LOCATION 
'${system:test.tmp.dir}/ext_test';
-SELECT * FROM table4;
+CREATE EXTERNAL TABLE table4_n1 (a INT) LOCATION 
'${system:test.tmp.dir}/ext_test';
+SELECT * FROM table4_n1;
 
-CREATE TABLE doctors STORED AS AVRO TBLPROPERTIES ('avro.schema.literal'='{
+CREATE TABLE doctors_n2 STORED AS AVRO TBLPROPERTIES ('avro.schema.literal'='{
   "namespace": "testing.hive.avro.serde",
-  "name": "doctors",
+  "name": "doctors_n2",
   "type": "record",
   "fields": [
     {
@@ -60,10 +60,10 @@ CREATE TABLE doctors STORED AS AVRO TBLPROPERTIES 
('avro.schema.literal'='{
   ]
 }');
 
-alter table doctors set tblproperties ('k1'='v1', 'k2'='v2');
-DESCRIBE FORMATTED doctors;
+alter table doctors_n2 set tblproperties ('k1'='v1', 'k2'='v2');
+DESCRIBE FORMATTED doctors_n2;
 
-CREATE TABLE doctors2 like doctors;
+CREATE TABLE doctors2 like doctors_n2;
 DESCRIBE FORMATTED doctors2;
 
 CREATE TABLE PropertiedParquetTable(a INT, b STRING) STORED AS PARQUET 
TBLPROPERTIES("parquet.compression"="LZO");
@@ -71,28 +71,28 @@ CREATE TABLE LikePropertiedParquetTable LIKE 
PropertiedParquetTable;
 
 DESCRIBE FORMATTED LikePropertiedParquetTable;
 
-CREATE TABLE table5(col1 int, col2 string) stored as TEXTFILE;
-DESCRIBE FORMATTED table5;
+CREATE TABLE table5_n5(col1 int, col2 string) stored as TEXTFILE;
+DESCRIBE FORMATTED table5_n5;
 
-CREATE TABLE table6 like table5 stored as RCFILE;
-DESCRIBE FORMATTED table6;
+CREATE TABLE table6_n4 like table5_n5 stored as RCFILE;
+DESCRIBE FORMATTED table6_n4;
 
-drop table table6;
+drop table table6_n4;
 
-CREATE  TABLE table6 like table5 ROW FORMAT SERDE 
'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe' STORED AS 
INPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileInputFormat' OUTPUTFORMAT   
'org.apache.hadoop.hive.ql.io.RCFileOutputFormat' LOCATION 
'${system:hive.root}/data/files/table6';
-DESCRIBE FORMATTED table6;
+CREATE  TABLE table6_n4 like table5_n5 ROW FORMAT SERDE 
'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe' STORED AS 
INPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileInputFormat' OUTPUTFORMAT   
'org.apache.hadoop.hive.ql.io.RCFileOutputFormat' LOCATION 
'${system:hive.root}/data/files/table6';
+DESCRIBE FORMATTED table6_n4;
 
-drop table table5;
+drop table table5_n5;
 
-create table orc_table (
+create table orc_table_n0 (
 `time` string)
 stored as ORC tblproperties ("orc.compress"="SNAPPY");
 
-create table orc_table_using_like like orc_table;
+create table orc_table_using_like like orc_table_n0;
 
 describe formatted orc_table_using_like;
 
 drop table orc_table_using_like;
 
-drop table orc_table;
+drop table orc_table_n0;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/create_like2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_like2.q 
b/ql/src/test/queries/clientpositive/create_like2.q
index 146467b..7cc10c0 100644
--- a/ql/src/test/queries/clientpositive/create_like2.q
+++ b/ql/src/test/queries/clientpositive/create_like2.q
@@ -1,9 +1,9 @@
 -- Tests the copying over of Table Parameters according to a HiveConf setting
 -- when doing a CREATE TABLE LIKE.
 
-CREATE TABLE table1(a INT, b STRING);
-ALTER TABLE table1 SET TBLPROPERTIES ('a'='1', 'b'='2', 'c'='3', 'd' = '4');
+CREATE TABLE table1_n20(a INT, b STRING);
+ALTER TABLE table1_n20 SET TBLPROPERTIES ('a'='1', 'b'='2', 'c'='3', 'd' = 
'4');
 
 SET hive.ddl.createtablelike.properties.whitelist=a,c,D;
-CREATE TABLE table2 LIKE table1;
-DESC FORMATTED table2;
+CREATE TABLE table2_n14 LIKE table1_n20;
+DESC FORMATTED table2_n14;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/create_like_tbl_props.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_like_tbl_props.q 
b/ql/src/test/queries/clientpositive/create_like_tbl_props.q
index 7e1e115..3dfef82 100644
--- a/ql/src/test/queries/clientpositive/create_like_tbl_props.q
+++ b/ql/src/test/queries/clientpositive/create_like_tbl_props.q
@@ -1,36 +1,36 @@
 --! qt:dataset:src
 -- Test that CREATE TABLE LIKE commands can take explicit table properties
 
-CREATE TABLE test_table LIKE src TBLPROPERTIES('key'='value');
+CREATE TABLE test_table_n15 LIKE src TBLPROPERTIES('key'='value');
 
-DESC FORMATTED test_table;
+DESC FORMATTED test_table_n15;
 
 set hive.table.parameters.default=key1=value1;
 
 --Test that CREATE TABLE LIKE commands can take default table properties
 
-CREATE TABLE test_table1 LIKE src;
+CREATE TABLE test_table1_n18 LIKE src;
 
-DESC FORMATTED test_table1;
+DESC FORMATTED test_table1_n18;
 
 -- Test that CREATE TABLE LIKE commands can take default and explicit table 
properties
 
-CREATE TABLE test_table2 LIKE src TBLPROPERTIES('key2' = 'value2');
+CREATE TABLE test_table2_n17 LIKE src TBLPROPERTIES('key2' = 'value2');
 
-DESC FORMATTED test_table2;
+DESC FORMATTED test_table2_n17;
 
 set hive.ddl.createtablelike.properties.whitelist=key2;
 
 -- Test that properties inherited are overwritten by explicitly set ones
 
-CREATE TABLE test_table3 LIKE test_table2 TBLPROPERTIES('key2' = 'value3');
+CREATE TABLE test_table3_n9 LIKE test_table2_n17 TBLPROPERTIES('key2' = 
'value3');
 
-DESC FORMATTED test_table3;
+DESC FORMATTED test_table3_n9;
 
 --Test that CREATE TALBE LIKE on a view can take explicit table properties
 
 CREATE VIEW test_view (key, value) AS SELECT * FROM src;
 
-CREATE TABLE test_table4 LIKE test_view TBLPROPERTIES('key'='value');
+CREATE TABLE test_table4_n2 LIKE test_view TBLPROPERTIES('key'='value');
 
-DESC FORMATTED test_table4;
+DESC FORMATTED test_table4_n2;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/create_like_view.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_like_view.q 
b/ql/src/test/queries/clientpositive/create_like_view.q
index 874389f..5db1192 100644
--- a/ql/src/test/queries/clientpositive/create_like_view.q
+++ b/ql/src/test/queries/clientpositive/create_like_view.q
@@ -2,42 +2,42 @@
 --! qt:dataset:src
 -- SORT_QUERY_RESULTS
 
-DROP TABLE IF EXISTS table1;
-DROP TABLE IF EXISTS table2;
-DROP TABLE IF EXISTS table3;
-DROP VIEW IF EXISTS view1;
+DROP TABLE IF EXISTS table1_n14;
+DROP TABLE IF EXISTS table2_n9;
+DROP TABLE IF EXISTS table3_n2;
+DROP VIEW IF EXISTS view1_n1;
 
-CREATE TABLE table1 (a STRING, b STRING) STORED AS TEXTFILE;
-DESCRIBE table1;
-DESCRIBE FORMATTED table1;
+CREATE TABLE table1_n14 (a STRING, b STRING) STORED AS TEXTFILE;
+DESCRIBE table1_n14;
+DESCRIBE FORMATTED table1_n14;
 
-CREATE VIEW view1 AS SELECT * FROM table1;
+CREATE VIEW view1_n1 AS SELECT * FROM table1_n14;
 
-CREATE TABLE table2 LIKE view1;
-DESCRIBE table2;
-DESCRIBE FORMATTED table2;
+CREATE TABLE table2_n9 LIKE view1_n1;
+DESCRIBE table2_n9;
+DESCRIBE FORMATTED table2_n9;
 
-CREATE TABLE IF NOT EXISTS table2 LIKE view1;
+CREATE TABLE IF NOT EXISTS table2_n9 LIKE view1_n1;
 
-CREATE EXTERNAL TABLE IF NOT EXISTS table2 LIKE view1;
+CREATE EXTERNAL TABLE IF NOT EXISTS table2_n9 LIKE view1_n1;
 
-CREATE EXTERNAL TABLE IF NOT EXISTS table3 LIKE view1;
-DESCRIBE table3;
-DESCRIBE FORMATTED table3;
+CREATE EXTERNAL TABLE IF NOT EXISTS table3_n2 LIKE view1_n1;
+DESCRIBE table3_n2;
+DESCRIBE FORMATTED table3_n2;
 
-INSERT OVERWRITE TABLE table1 SELECT key, value FROM src WHERE key = 86;
-INSERT OVERWRITE TABLE table2 SELECT key, value FROM src WHERE key = 100;
+INSERT OVERWRITE TABLE table1_n14 SELECT key, value FROM src WHERE key = 86;
+INSERT OVERWRITE TABLE table2_n9 SELECT key, value FROM src WHERE key = 100;
 
-SELECT * FROM table1;
-SELECT * FROM table2;
+SELECT * FROM table1_n14;
+SELECT * FROM table2_n9;
 
-DROP TABLE table1;
-DROP TABLE table2;
-DROP VIEW view1;
+DROP TABLE table1_n14;
+DROP TABLE table2_n9;
+DROP VIEW view1_n1;
 
 -- check partitions
-create view view1 partitioned on (ds, hr) as select * from srcpart;
-create table table1 like view1;
-describe formatted table1;
-DROP TABLE table1;
-DROP VIEW view1;
\ No newline at end of file
+create view view1_n1 partitioned on (ds, hr) as select * from srcpart;
+create table table1_n14 like view1_n1;
+describe formatted table1_n14;
+DROP TABLE table1_n14;
+DROP VIEW view1_n1;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/create_merge_compressed.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_merge_compressed.q 
b/ql/src/test/queries/clientpositive/create_merge_compressed.q
index 995401b..c4ac823 100644
--- a/ql/src/test/queries/clientpositive/create_merge_compressed.q
+++ b/ql/src/test/queries/clientpositive/create_merge_compressed.q
@@ -1,26 +1,26 @@
 set hive.strict.checks.bucketing=false;
 
-create table src_rc_merge_test(key int, value string) stored as rcfile;
+create table src_rc_merge_test_n1(key int, value string) stored as rcfile;
 
-load data local inpath '../../data/files/smbbucket_1.rc' into table 
src_rc_merge_test;
+load data local inpath '../../data/files/smbbucket_1.rc' into table 
src_rc_merge_test_n1;
 
 set hive.exec.compress.output = true;
 
-create table tgt_rc_merge_test(key int, value string) stored as rcfile;
-insert into table tgt_rc_merge_test select * from src_rc_merge_test;
-insert into table tgt_rc_merge_test select * from src_rc_merge_test;
+create table tgt_rc_merge_test_n1(key int, value string) stored as rcfile;
+insert into table tgt_rc_merge_test_n1 select * from src_rc_merge_test_n1;
+insert into table tgt_rc_merge_test_n1 select * from src_rc_merge_test_n1;
 
-show table extended like `tgt_rc_merge_test`;
+show table extended like `tgt_rc_merge_test_n1`;
 
-select count(1) from tgt_rc_merge_test;
-select sum(hash(key)), sum(hash(value)) from tgt_rc_merge_test;
+select count(1) from tgt_rc_merge_test_n1;
+select sum(hash(key)), sum(hash(value)) from tgt_rc_merge_test_n1;
 
-alter table tgt_rc_merge_test concatenate;
+alter table tgt_rc_merge_test_n1 concatenate;
 
-show table extended like `tgt_rc_merge_test`;
+show table extended like `tgt_rc_merge_test_n1`;
 
-select count(1) from tgt_rc_merge_test;
-select sum(hash(key)), sum(hash(value)) from tgt_rc_merge_test;
+select count(1) from tgt_rc_merge_test_n1;
+select sum(hash(key)), sum(hash(value)) from tgt_rc_merge_test_n1;
 
-drop table src_rc_merge_test;
-drop table tgt_rc_merge_test;
\ No newline at end of file
+drop table src_rc_merge_test_n1;
+drop table tgt_rc_merge_test_n1;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/create_nested_type.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_nested_type.q 
b/ql/src/test/queries/clientpositive/create_nested_type.q
index 735b139..fc2ee8d 100644
--- a/ql/src/test/queries/clientpositive/create_nested_type.q
+++ b/ql/src/test/queries/clientpositive/create_nested_type.q
@@ -1,16 +1,16 @@
 
 
-CREATE TABLE table1 (
+CREATE TABLE table1_n2 (
        a STRING,
        b ARRAY<STRING>,
        c ARRAY<MAP<STRING,STRING>>,
        d MAP<STRING,ARRAY<STRING>>
        ) STORED AS TEXTFILE;
-DESCRIBE table1;
-DESCRIBE EXTENDED table1;
+DESCRIBE table1_n2;
+DESCRIBE EXTENDED table1_n2;
 
-LOAD DATA LOCAL INPATH '../../data/files/create_nested_type.txt' OVERWRITE 
INTO TABLE table1;
+LOAD DATA LOCAL INPATH '../../data/files/create_nested_type.txt' OVERWRITE 
INTO TABLE table1_n2;
 
-SELECT * from table1;
+SELECT * from table1_n2;
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/create_table_like_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_table_like_stats.q 
b/ql/src/test/queries/clientpositive/create_table_like_stats.q
index a59c0a6..65c4816 100644
--- a/ql/src/test/queries/clientpositive/create_table_like_stats.q
+++ b/ql/src/test/queries/clientpositive/create_table_like_stats.q
@@ -4,29 +4,29 @@ set hive.mapred.mode=nonstrict;
 
 dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/t;
 
-drop table a;
+drop table a_n13;
 
-create table a like src;
+create table a_n13 like src;
 
-desc formatted a;
+desc formatted a_n13;
 
-drop table a;
+drop table a_n13;
 
-create table a like src location '${system:test.tmp.dir}/t';
+create table a_n13 like src location '${system:test.tmp.dir}/t';
 
-desc formatted a;
+desc formatted a_n13;
 
-drop table a;
+drop table a_n13;
 
-create table a (key STRING COMMENT 'default', value STRING COMMENT 'default')
+create table a_n13 (key STRING COMMENT 'default', value STRING COMMENT 
'default')
 PARTITIONED BY (ds STRING, hr STRING)
 STORED AS TEXTFILE;
 
-desc formatted a;
+desc formatted a_n13;
 
-drop table a;
+drop table a_n13;
 
-create table a like srcpart;
+create table a_n13 like srcpart;
 
-desc formatted a;
+desc formatted a_n13;
  

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/create_udaf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_udaf.q 
b/ql/src/test/queries/clientpositive/create_udaf.q
index ee310aa..b8fe5e6 100644
--- a/ql/src/test/queries/clientpositive/create_udaf.q
+++ b/ql/src/test/queries/clientpositive/create_udaf.q
@@ -4,11 +4,11 @@ CREATE TEMPORARY FUNCTION test_max AS 
'org.apache.hadoop.hive.ql.udf.UDAFTestMax
 
 CREATE TEMPORARY FUNCTION test_max AS 
'org.apache.hadoop.hive.ql.udf.UDAFTestMax';
 
-CREATE TABLE dest1(col INT);
+CREATE TABLE dest1_n34(col INT);
 
-FROM src INSERT OVERWRITE TABLE dest1 SELECT test_max(length(src.value));
+FROM src INSERT OVERWRITE TABLE dest1_n34 SELECT test_max(length(src.value));
 
-SELECT dest1.* FROM dest1;
+SELECT dest1_n34.* FROM dest1_n34;
 
 -- cover all the other value types:
 SELECT test_max(CAST(length(src.value) AS SMALLINT)) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/create_view.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_view.q 
b/ql/src/test/queries/clientpositive/create_view.q
index b04b5d8..b3534e2 100644
--- a/ql/src/test/queries/clientpositive/create_view.q
+++ b/ql/src/test/queries/clientpositive/create_view.q
@@ -56,28 +56,28 @@ ALTER VIEW view3 SET TBLPROPERTIES ("biggest" = "loser");
 DESCRIBE EXTENDED view3;
 DESCRIBE FORMATTED view3;
 
-CREATE TABLE table1 (key int);
+CREATE TABLE table1_n4 (key int);
 
 -- use DESCRIBE EXTENDED on a base table and an external table as points
 -- of comparison for view descriptions
-DESCRIBE EXTENDED table1;
+DESCRIBE EXTENDED table1_n4;
 DESCRIBE EXTENDED src1;
 
 -- use DESCRIBE EXTENDED on a base table as a point of comparison for
 -- view descriptions
-DESCRIBE EXTENDED table1;
+DESCRIBE EXTENDED table1_n4;
 
 
-INSERT OVERWRITE TABLE table1 SELECT key FROM src WHERE key = 86;
+INSERT OVERWRITE TABLE table1_n4 SELECT key FROM src WHERE key = 86;
 
-SELECT * FROM table1;
-CREATE VIEW view4 AS SELECT * FROM table1;
+SELECT * FROM table1_n4;
+CREATE VIEW view4 AS SELECT * FROM table1_n4;
 SELECT * FROM view4;
 DESCRIBE view4;
-ALTER TABLE table1 ADD COLUMNS (value STRING);
-SELECT * FROM table1;
+ALTER TABLE table1_n4 ADD COLUMNS (value STRING);
+SELECT * FROM table1_n4;
 SELECT * FROM view4;
-DESCRIBE table1;
+DESCRIBE table1_n4;
 DESCRIBE view4;
 
 CREATE VIEW view5 AS SELECT v1.key as key1, v2.key as key2
@@ -116,7 +116,7 @@ CREATE TEMPORARY FUNCTION test_translate AS
 'org.apache.hadoop.hive.ql.udf.generic.GenericUDFTestTranslate';
 CREATE VIEW view8(c) AS
 SELECT test_translate('abc', 'a', 'b')
-FROM table1;
+FROM table1_n4;
 DESCRIBE EXTENDED view8;
 DESCRIBE FORMATTED view8;
 SELECT * FROM view8;
@@ -154,7 +154,7 @@ CREATE TEMPORARY FUNCTION test_explode AS
 'org.apache.hadoop.hive.ql.udf.generic.GenericUDTFExplode';
 CREATE VIEW view11 AS
 SELECT test_explode(array(1,2,3)) AS (boom)
-FROM table1;
+FROM table1_n4;
 DESCRIBE EXTENDED view11;
 DESCRIBE FORMATTED view11;
 SELECT * FROM view11;
@@ -223,8 +223,8 @@ DROP TABLE IF EXISTS view16;
 DESCRIBE view16;
 
 -- Likewise, DROP VIEW IF EXISTS should ignore a matching table name
-DROP VIEW IF EXISTS table1;
-DESCRIBE table1;
+DROP VIEW IF EXISTS table1_n4;
+DESCRIBE table1_n4;
 
 -- this should work since currently we don't track view->table
 -- dependencies for implementing RESTRICT

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/create_view_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_view_partitioned.q 
b/ql/src/test/queries/clientpositive/create_view_partitioned.q
index 5116b13..691a0f5 100644
--- a/ql/src/test/queries/clientpositive/create_view_partitioned.q
+++ b/ql/src/test/queries/clientpositive/create_view_partitioned.q
@@ -87,11 +87,11 @@ DROP VIEW vp3;
 
 -- HIVE-16828
 set hive.security.authorization.enabled=true;
-CREATE TABLE table1 (id int) PARTITIONED BY (year int);
+CREATE TABLE table1_n12 (id int) PARTITIONED BY (year int);
 -- create partitioned view
-CREATE VIEW view1 partitioned on (year) as select id, year from table1;
+CREATE VIEW view1_n0 partitioned on (year) as select id, year from table1_n12;
 
-select year from view1;
+select year from view1_n0;
 
-Drop view view1;
-drop table table1;
\ No newline at end of file
+Drop view view1_n0;
+drop table table1_n12;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/create_view_translate.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_view_translate.q 
b/ql/src/test/queries/clientpositive/create_view_translate.q
index f4704c7..59545c4 100644
--- a/ql/src/test/queries/clientpositive/create_view_translate.q
+++ b/ql/src/test/queries/clientpositive/create_view_translate.q
@@ -1,16 +1,16 @@
 --! qt:dataset:src
-drop view if exists v;
+drop view if exists v_n7;
 drop view if exists w;
 
-create view v as select cast(key as string) from src;
-describe formatted v;
+create view v_n7 as select cast(key as string) from src;
+describe formatted v_n7;
 
 create view w as select key, value from (
   select key, value from src
 ) a;
 describe formatted w;
 
-drop view v;
+drop view v_n7;
 drop view w;
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/create_with_constraints.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_with_constraints.q 
b/ql/src/test/queries/clientpositive/create_with_constraints.q
index 10712ca..084ca8d 100644
--- a/ql/src/test/queries/clientpositive/create_with_constraints.q
+++ b/ql/src/test/queries/clientpositive/create_with_constraints.q
@@ -1,22 +1,22 @@
-CREATE TABLE table1 (a STRING, b STRING, PRIMARY KEY (a) DISABLE);
-CREATE TABLE table2 (a STRING, b STRING, CONSTRAINT pk1 PRIMARY KEY (a) 
DISABLE);
-CREATE TABLE table3 (x string NOT NULL DISABLE, PRIMARY KEY (x) DISABLE, 
CONSTRAINT fk1 FOREIGN KEY (x) REFERENCES table2(a) DISABLE); 
-CREATE TABLE table4 (x string CONSTRAINT nn4_1 NOT NULL DISABLE, y string 
CONSTRAINT nn4_2 NOT NULL DISABLE, UNIQUE (x) DISABLE, CONSTRAINT fk2 FOREIGN 
KEY (x) REFERENCES table2(a) DISABLE, 
-CONSTRAINT fk3 FOREIGN KEY (y) REFERENCES table2(a) DISABLE);
-CREATE TABLE table5 (x string, PRIMARY KEY (x) DISABLE, FOREIGN KEY (x) 
REFERENCES table2(a) DISABLE);
-CREATE TABLE table6 (x string, y string, PRIMARY KEY (x) DISABLE, FOREIGN KEY 
(x) REFERENCES table2(a) DISABLE,
-CONSTRAINT fk4 FOREIGN KEY (y) REFERENCES table1(a) DISABLE);
-CREATE TABLE table7 (a STRING, b STRING, PRIMARY KEY (a) DISABLE RELY);
+CREATE TABLE table1_n13 (a STRING, b STRING, PRIMARY KEY (a) DISABLE);
+CREATE TABLE table2_n8 (a STRING, b STRING, CONSTRAINT pk1 PRIMARY KEY (a) 
DISABLE);
+CREATE TABLE table3_n1 (x string NOT NULL DISABLE, PRIMARY KEY (x) DISABLE, 
CONSTRAINT fk1 FOREIGN KEY (x) REFERENCES table2_n8(a) DISABLE); 
+CREATE TABLE table4_n0 (x string CONSTRAINT nn4_1 NOT NULL DISABLE, y string 
CONSTRAINT nn4_2 NOT NULL DISABLE, UNIQUE (x) DISABLE, CONSTRAINT fk2 FOREIGN 
KEY (x) REFERENCES table2_n8(a) DISABLE, 
+CONSTRAINT fk3 FOREIGN KEY (y) REFERENCES table2_n8(a) DISABLE);
+CREATE TABLE table5_n4 (x string, PRIMARY KEY (x) DISABLE, FOREIGN KEY (x) 
REFERENCES table2_n8(a) DISABLE);
+CREATE TABLE table6_n3 (x string, y string, PRIMARY KEY (x) DISABLE, FOREIGN 
KEY (x) REFERENCES table2_n8(a) DISABLE,
+CONSTRAINT fk4 FOREIGN KEY (y) REFERENCES table1_n13(a) DISABLE);
+CREATE TABLE table7_n3 (a STRING, b STRING, PRIMARY KEY (a) DISABLE RELY);
 CREATE TABLE table8 (a STRING, b STRING, CONSTRAINT pk8 PRIMARY KEY (a) 
DISABLE NORELY);
 CREATE TABLE table9 (a STRING, b STRING, PRIMARY KEY (a, b) DISABLE RELY);
 CREATE TABLE table10 (a STRING, b STRING, CONSTRAINT pk10 PRIMARY KEY (a) 
DISABLE NORELY, FOREIGN KEY (a, b) REFERENCES table9(a, b) DISABLE);
 CREATE TABLE table11 (a STRING, b STRING, c STRING, CONSTRAINT pk11 PRIMARY 
KEY (a) DISABLE RELY, CONSTRAINT fk11_1 FOREIGN KEY (a, b) REFERENCES table9(a, 
b) DISABLE,
-CONSTRAINT fk11_2 FOREIGN KEY (c) REFERENCES table4(x) DISABLE);
+CONSTRAINT fk11_2 FOREIGN KEY (c) REFERENCES table4_n0(x) DISABLE);
 CREATE TABLE table12 (a STRING CONSTRAINT nn12_1 NOT NULL DISABLE NORELY, b 
STRING);
 CREATE TABLE table13 (b STRING) PARTITIONED BY (a STRING NOT NULL DISABLE 
RELY);
 CREATE TABLE table14 (a STRING CONSTRAINT nn14_1 NOT NULL DISABLE RELY, b 
STRING);
-CREATE TABLE table15 (a STRING REFERENCES table4(x) DISABLE, b STRING);
-CREATE TABLE table16 (a STRING CONSTRAINT nn16_1 REFERENCES table4(x) DISABLE 
RELY, b STRING);
+CREATE TABLE table15 (a STRING REFERENCES table4_n0(x) DISABLE, b STRING);
+CREATE TABLE table16 (a STRING CONSTRAINT nn16_1 REFERENCES table4_n0(x) 
DISABLE RELY, b STRING);
 CREATE TABLE table17 (a STRING CONSTRAINT uk17_1 UNIQUE DISABLE RELY, b 
STRING);
 CREATE TABLE table18 (a STRING, CONSTRAINT uk18_1 UNIQUE (b) DISABLE RELY) 
PARTITIONED BY (b STRING);
 CREATE TABLE table19 (a STRING, b STRING, CONSTRAINT pk19_1 PRIMARY KEY (b) 
DISABLE RELY, CONSTRAINT fk19_2 FOREIGN KEY (a) REFERENCES table19(b) DISABLE 
RELY);
@@ -25,13 +25,13 @@ CREATE TABLE table21 (a STRING, CONSTRAINT uk21_1 UNIQUE 
(a,b) DISABLE) PARTITIO
 CREATE TABLE table22 (a STRING, b STRING, CONSTRAINT fk22_1 FOREIGN KEY (a,b) 
REFERENCES table21(a,b) DISABLE);
 
 
-DESCRIBE EXTENDED table1;
-DESCRIBE EXTENDED table2;
-DESCRIBE EXTENDED table3;
-DESCRIBE EXTENDED table4;
-DESCRIBE EXTENDED table5;
-DESCRIBE EXTENDED table6;
-DESCRIBE EXTENDED table7;
+DESCRIBE EXTENDED table1_n13;
+DESCRIBE EXTENDED table2_n8;
+DESCRIBE EXTENDED table3_n1;
+DESCRIBE EXTENDED table4_n0;
+DESCRIBE EXTENDED table5_n4;
+DESCRIBE EXTENDED table6_n3;
+DESCRIBE EXTENDED table7_n3;
 DESCRIBE EXTENDED table8;
 DESCRIBE EXTENDED table9;
 DESCRIBE EXTENDED table10;
@@ -48,13 +48,13 @@ DESCRIBE EXTENDED table20;
 DESCRIBE EXTENDED table21;
 DESCRIBE EXTENDED table22;
 
-DESCRIBE FORMATTED table1;
-DESCRIBE FORMATTED table2;
-DESCRIBE FORMATTED table3;
-DESCRIBE FORMATTED table4;
-DESCRIBE FORMATTED table5;
-DESCRIBE FORMATTED table6;
-DESCRIBE FORMATTED table7;
+DESCRIBE FORMATTED table1_n13;
+DESCRIBE FORMATTED table2_n8;
+DESCRIBE FORMATTED table3_n1;
+DESCRIBE FORMATTED table4_n0;
+DESCRIBE FORMATTED table5_n4;
+DESCRIBE FORMATTED table6_n3;
+DESCRIBE FORMATTED table7_n3;
 DESCRIBE FORMATTED table8;
 DESCRIBE FORMATTED table9;
 DESCRIBE FORMATTED table10;
@@ -71,40 +71,40 @@ DESCRIBE FORMATTED table20;
 DESCRIBE FORMATTED table21;
 DESCRIBE FORMATTED table22;
 
-ALTER TABLE table2 DROP CONSTRAINT pk1;
-ALTER TABLE table3 DROP CONSTRAINT fk1;
-ALTER TABLE table4 DROP CONSTRAINT nn4_1;
-ALTER TABLE table6 DROP CONSTRAINT fk4;
+ALTER TABLE table2_n8 DROP CONSTRAINT pk1;
+ALTER TABLE table3_n1 DROP CONSTRAINT fk1;
+ALTER TABLE table4_n0 DROP CONSTRAINT nn4_1;
+ALTER TABLE table6_n3 DROP CONSTRAINT fk4;
 ALTER TABLE table8 DROP CONSTRAINT pk8;
 ALTER TABLE table16 DROP CONSTRAINT nn16_1;
 ALTER TABLE table18 DROP CONSTRAINT uk18_1;
 
-DESCRIBE EXTENDED table2;
-DESCRIBE EXTENDED table3;
-DESCRIBE EXTENDED table4;
-DESCRIBE EXTENDED table6;
+DESCRIBE EXTENDED table2_n8;
+DESCRIBE EXTENDED table3_n1;
+DESCRIBE EXTENDED table4_n0;
+DESCRIBE EXTENDED table6_n3;
 DESCRIBE EXTENDED table8;
 DESCRIBE EXTENDED table16;
 DESCRIBE EXTENDED table18;
 
-DESCRIBE FORMATTED table2;
-DESCRIBE FORMATTED table3;
-DESCRIBE FORMATTED table4;
-DESCRIBE FORMATTED table6;
+DESCRIBE FORMATTED table2_n8;
+DESCRIBE FORMATTED table3_n1;
+DESCRIBE FORMATTED table4_n0;
+DESCRIBE FORMATTED table6_n3;
 DESCRIBE FORMATTED table8;
 DESCRIBE FORMATTED table16;
 DESCRIBE FORMATTED table18;
 
-ALTER TABLE table2 ADD CONSTRAINT pkt2 PRIMARY KEY (a) DISABLE NOVALIDATE;
-ALTER TABLE table3 ADD CONSTRAINT fk1 FOREIGN KEY (x) REFERENCES table2(a) 
DISABLE NOVALIDATE RELY;
-ALTER TABLE table6 ADD CONSTRAINT fk4 FOREIGN KEY (y) REFERENCES table1(a) 
DISABLE NOVALIDATE;
+ALTER TABLE table2_n8 ADD CONSTRAINT pkt2 PRIMARY KEY (a) DISABLE NOVALIDATE;
+ALTER TABLE table3_n1 ADD CONSTRAINT fk1 FOREIGN KEY (x) REFERENCES 
table2_n8(a) DISABLE NOVALIDATE RELY;
+ALTER TABLE table6_n3 ADD CONSTRAINT fk4 FOREIGN KEY (y) REFERENCES 
table1_n13(a) DISABLE NOVALIDATE;
 ALTER TABLE table8 ADD CONSTRAINT pk8_2 PRIMARY KEY (a, b) DISABLE NOVALIDATE 
RELY;
-ALTER TABLE table16 CHANGE a a STRING REFERENCES table4(x) DISABLE NOVALIDATE;
+ALTER TABLE table16 CHANGE a a STRING REFERENCES table4_n0(x) DISABLE 
NOVALIDATE;
 ALTER TABLE table18 ADD CONSTRAINT uk18_2 UNIQUE (a, b) DISABLE NOVALIDATE;
 
-DESCRIBE FORMATTED table2;
-DESCRIBE FORMATTED table3;
-DESCRIBE FORMATTED table6;
+DESCRIBE FORMATTED table2_n8;
+DESCRIBE FORMATTED table3_n1;
+DESCRIBE FORMATTED table6_n3;
 DESCRIBE FORMATTED table8;
 DESCRIBE FORMATTED table16;
 DESCRIBE FORMATTED table18;
@@ -134,7 +134,7 @@ DESCRIBE FORMATTED DbConstraint.Table2;
 
 ALTER TABLE DbConstraint.Table2 ADD CONSTRAINT Pk1 PRIMARY KEY (a) DISABLE 
NOVALIDATE;
 DESCRIBE FORMATTED DbConstraint.Table2;
-ALTER TABLE DbConstraint.Table2 ADD CONSTRAINT fkx FOREIGN KEY (b) REFERENCES 
table1(a) DISABLE NOVALIDATE;
+ALTER TABLE DbConstraint.Table2 ADD CONSTRAINT fkx FOREIGN KEY (b) REFERENCES 
table1_n13(a) DISABLE NOVALIDATE;
 DESCRIBE FORMATTED DbConstraint.Table2;
 
 CREATE TABLE table23 (a STRING) PARTITIONED BY (b STRING);
@@ -145,10 +145,10 @@ ALTER TABLE table23 ADD CONSTRAINT pk23_1 PRIMARY KEY (b) 
DISABLE RELY;
 DESCRIBE FORMATTED table23;
 
 set hive.metastore.try.direct.sql=false;
-CREATE TABLE numericDataType(a TINYINT, b SMALLINT NOT NULL ENABLE, c INT,
+CREATE TABLE numericDataType_n0(a TINYINT, b SMALLINT NOT NULL ENABLE, c INT,
  d BIGINT , e DOUBLE , f DECIMAL(9,2));
-INSERT INTO numericDataType values(2,45,5667,67890,5.6,678.5);
+INSERT INTO numericDataType_n0 values(2,45,5667,67890,5.6,678.5);
 
-ALTER TABLE numericDataType ADD CONSTRAINT uk1 UNIQUE(a,b) DISABLE NOVALIDATE;
-DESC FORMATTED numericDataType;
-DROP TABLE numericDataType;
+ALTER TABLE numericDataType_n0 ADD CONSTRAINT uk1 UNIQUE(a,b) DISABLE 
NOVALIDATE;
+DESC FORMATTED numericDataType_n0;
+DROP TABLE numericDataType_n0;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/create_with_constraints2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_with_constraints2.q 
b/ql/src/test/queries/clientpositive/create_with_constraints2.q
index 22ea23d..f423b64 100644
--- a/ql/src/test/queries/clientpositive/create_with_constraints2.q
+++ b/ql/src/test/queries/clientpositive/create_with_constraints2.q
@@ -1,8 +1,8 @@
-CREATE TABLE table1 (a STRING, b STRING, PRIMARY KEY (a) NOT ENFORCED);
-CREATE TABLE table2 (a STRING, b STRING, PRIMARY KEY (a) NOT ENFORCED RELY);
+CREATE TABLE table1_n11 (a STRING, b STRING, PRIMARY KEY (a) NOT ENFORCED);
+CREATE TABLE table2_n7 (a STRING, b STRING, PRIMARY KEY (a) NOT ENFORCED RELY);
 
-DESCRIBE EXTENDED table1;
-DESCRIBE EXTENDED table2;
+DESCRIBE EXTENDED table1_n11;
+DESCRIBE EXTENDED table2_n7;
 
-DESCRIBE FORMATTED table1;
-DESCRIBE FORMATTED table2;
+DESCRIBE FORMATTED table1_n11;
+DESCRIBE FORMATTED table2_n7;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/cross_prod_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cross_prod_1.q 
b/ql/src/test/queries/clientpositive/cross_prod_1.q
index 82c80ae..c88bf7b 100644
--- a/ql/src/test/queries/clientpositive/cross_prod_1.q
+++ b/ql/src/test/queries/clientpositive/cross_prod_1.q
@@ -3,33 +3,33 @@ set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.tez.cartesian-product.enabled=true;
 
-create table X as
+create table X_n0 as
 select distinct * from src order by key limit 10;
 
-explain select * from X as A, X as B order by A.key, B.key;
-select * from X as A, X as B order by A.key, B.key;
+explain select * from X_n0 as A, X_n0 as B order by A.key, B.key;
+select * from X_n0 as A, X_n0 as B order by A.key, B.key;
 
-explain select * from X as A join X as B on A.key<B.key;
-select * from X as A join X as B on A.key<B.key order by A.key, B.key;
+explain select * from X_n0 as A join X_n0 as B on A.key<B.key;
+select * from X_n0 as A join X_n0 as B on A.key<B.key order by A.key, B.key;
 
-explain select * from X as A join X as B on A.key between "103" and "105";
-select * from X as A join X as B on A.key between "103" and "105" order by 
A.key, B.key;
+explain select * from X_n0 as A join X_n0 as B on A.key between "103" and 
"105";
+select * from X_n0 as A join X_n0 as B on A.key between "103" and "105" order 
by A.key, B.key;
 
-explain select * from X as A, X as B, X as C;
-select * from X as A, X as B, X as C order by A.key, B.key, C.key;
+explain select * from X_n0 as A, X_n0 as B, X_n0 as C;
+select * from X_n0 as A, X_n0 as B, X_n0 as C order by A.key, B.key, C.key;
 
-explain select * from X as A join X as B on A.key in ("103", "104", "105");
-select * from X as A join X as B on A.key in ("103", "104", "105") order by 
A.key, B.key;
+explain select * from X_n0 as A join X_n0 as B on A.key in ("103", "104", 
"105");
+select * from X_n0 as A join X_n0 as B on A.key in ("103", "104", "105") order 
by A.key, B.key;
 
-explain select A.key, count(*)  from X as A, X as B group by A.key;
-select A.key, count(*)  from X as A, X as B group by A.key order by A.key;
+explain select A.key, count(*)  from X_n0 as A, X_n0 as B group by A.key;
+select A.key, count(*)  from X_n0 as A, X_n0 as B group by A.key order by 
A.key;
 
-explain select * from X as A left outer join X as B on (A.key = B.key or 
A.value between "val_103" and "val_105");
-explain select * from X as A right outer join X as B on (A.key = B.key or 
A.value between "val_103" and "val_105");
-explain select * from X as A full outer join X as B on (A.key = B.key or 
A.value between "val_103" and "val_105");
+explain select * from X_n0 as A left outer join X_n0 as B on (A.key = B.key or 
A.value between "val_103" and "val_105");
+explain select * from X_n0 as A right outer join X_n0 as B on (A.key = B.key 
or A.value between "val_103" and "val_105");
+explain select * from X_n0 as A full outer join X_n0 as B on (A.key = B.key or 
A.value between "val_103" and "val_105");
 
-explain select * from (select X.key, count(*) from X group by X.key) as A, 
(select X.key, count(*) from X group by X.key) as B;
-select * from (select X.key, count(*) from X group by X.key) as A, (select 
X.key, count(*) from X group by X.key) as B order by A.key, B.key;
+explain select * from (select X_n0.key, count(*) from X_n0 group by X_n0.key) 
as A, (select X_n0.key, count(*) from X_n0 group by X_n0.key) as B;
+select * from (select X_n0.key, count(*) from X_n0 group by X_n0.key) as A, 
(select X_n0.key, count(*) from X_n0 group by X_n0.key) as B order by A.key, 
B.key;
 
-explain select * from (select * from X union all select * from X as y) a join 
X;
-select * from (select * from X union all select * from X as y) a join X order 
by a.key, X.key;
\ No newline at end of file
+explain select * from (select * from X_n0 union all select * from X_n0 as y) a 
join X_n0;
+select * from (select * from X_n0 union all select * from X_n0 as y) a join 
X_n0 order by a.key, X_n0.key;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/cross_prod_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cross_prod_3.q 
b/ql/src/test/queries/clientpositive/cross_prod_3.q
index 22761e8..a1024f4 100644
--- a/ql/src/test/queries/clientpositive/cross_prod_3.q
+++ b/ql/src/test/queries/clientpositive/cross_prod_3.q
@@ -5,10 +5,10 @@ set hive.tez.cartesian-product.enabled=true;
 set hive.auto.convert.join=true;
 set hive.convert.join.bucket.mapjoin.tez=true;
 
-create table X (key string, value string) clustered by (key) into 2 buckets;
-insert overwrite table X select distinct * from src order by key limit 10;
+create table X_n2 (key string, value string) clustered by (key) into 2 buckets;
+insert overwrite table X_n2 select distinct * from src order by key limit 10;
 
-create table Y as
+create table Y_n0 as
 select * from src order by key limit 1;
 
-explain select * from Y, (select * from X as A join X as B on A.key=B.key) as 
C where Y.key=C.key;
+explain select * from Y_n0, (select * from X_n2 as A join X_n2 as B on 
A.key=B.key) as C where Y_n0.key=C.key;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/cross_prod_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cross_prod_4.q 
b/ql/src/test/queries/clientpositive/cross_prod_4.q
index 64f9605..4a4d42d 100644
--- a/ql/src/test/queries/clientpositive/cross_prod_4.q
+++ b/ql/src/test/queries/clientpositive/cross_prod_4.q
@@ -4,8 +4,8 @@ set hive.explain.user=false;
 set hive.auto.convert.join=true;
 set hive.tez.cartesian-product.enabled=true;
 
-create table X as
+create table X_n1 as
 select distinct * from src order by key limit 10;
 
-explain select * from X as A, X as B;
-select * from X as A, X as B order by A.key, B.key;
\ No newline at end of file
+explain select * from X_n1 as A, X_n1 as B;
+select * from X_n1 as A, X_n1 as B order by A.key, B.key;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/cross_product_check_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cross_product_check_1.q 
b/ql/src/test/queries/clientpositive/cross_product_check_1.q
index efcafd3..23c6638 100644
--- a/ql/src/test/queries/clientpositive/cross_product_check_1.q
+++ b/ql/src/test/queries/clientpositive/cross_product_check_1.q
@@ -3,28 +3,28 @@ set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- SORT_QUERY_RESULTS
 
-create table A as
+create table A_n8 as
 select * from src;
 
-create table B as
+create table B_n6 as
 select * from src
 limit 10;
 
 set hive.auto.convert.join.noconditionaltask.size=100;
 
-explain select * from A join B;
+explain select * from A_n8 join B_n6;
 
-explain select * from B d1 join B d2 on d1.key = d2.key join A;
+explain select * from B_n6 d1 join B_n6 d2 on d1.key = d2.key join A_n8;
 
-explain select * from A join 
+explain select * from A_n8 join 
          (select d1.key 
-          from B d1 join B d2 on d1.key = d2.key
+          from B_n6 d1 join B_n6 d2 on d1.key = d2.key
           where 1 = 1 group by d1.key) od1;
 
-explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1  
group by d1.key) od1;
+explain select * from A_n8 join (select d1.key from B_n6 d1 join B_n6 d2 where 
1 = 1  group by d1.key) od1;
 
 explain select * from 
-(select A.key from A  group by key) ss join
-(select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by 
d1.key) od1;
+(select A_n8.key from A_n8  group by key) ss join
+(select d1.key from B_n6 d1 join B_n6 d2 on d1.key = d2.key where 1 = 1 group 
by d1.key) od1;
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/cross_product_check_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cross_product_check_2.q 
b/ql/src/test/queries/clientpositive/cross_product_check_2.q
index 60ec9e1..329e878 100644
--- a/ql/src/test/queries/clientpositive/cross_product_check_2.q
+++ b/ql/src/test/queries/clientpositive/cross_product_check_2.q
@@ -3,10 +3,10 @@ set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- SORT_QUERY_RESULTS
 
-create table A as
+create table A_n2 as
 select * from src;
 
-create table B as
+create table B_n2 as
 select * from src order by key
 limit 10;
 
@@ -14,19 +14,19 @@ set hive.auto.convert.join=true;
 set hive.auto.convert.join.noconditionaltask=true;
 set hive.auto.convert.join.noconditionaltask.size=10000000;
 
-explain select * from A join B;
+explain select * from A_n2 join B_n2;
 
-explain select * from B d1 join B d2 on d1.key = d2.key join A;
+explain select * from B_n2 d1 join B_n2 d2 on d1.key = d2.key join A_n2;
 
-explain select * from A join 
+explain select * from A_n2 join 
          (select d1.key 
-          from B d1 join B d2 on d1.key = d2.key 
+          from B_n2 d1 join B_n2 d2 on d1.key = d2.key 
           where 1 = 1 group by d1.key) od1;
 
-explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 
group by d1.key) od1;
+explain select * from A_n2 join (select d1.key from B_n2 d1 join B_n2 d2 where 
1 = 1 group by d1.key) od1;
 
 explain select * from 
-(select A.key from A group by key) ss join 
-(select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by 
d1.key) od1;
+(select A_n2.key from A_n2 group by key) ss join 
+(select d1.key from B_n2 d1 join B_n2 d2 on d1.key = d2.key where 1 = 1 group 
by d1.key) od1;
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/cteViews.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cteViews.q 
b/ql/src/test/queries/clientpositive/cteViews.q
index d80357f..782873d 100644
--- a/ql/src/test/queries/clientpositive/cteViews.q
+++ b/ql/src/test/queries/clientpositive/cteViews.q
@@ -4,48 +4,48 @@ with src1 as (select key from src order by key limit 5)
 select * from src1;
 
 use default;
-drop view v;
-create view v as with cte as (select key, value from src order by key limit 5)
+drop view v_n0;
+create view v_n0 as with cte as (select key, value from src order by key limit 
5)
 select key from cte;
 
-describe extended v;
+describe extended v_n0;
 
 create database bug;
 use bug;
-select * from default.v;
+select * from default.v_n0;
 drop database bug;
 
 use default;
-drop view v;
-create view v as with cte as (select * from src  order by key limit 5)
+drop view v_n0;
+create view v_n0 as with cte as (select * from src  order by key limit 5)
 select * from cte;
 
-describe extended v;
+describe extended v_n0;
 
 create database bug;
 use bug;
-select * from default.v;
+select * from default.v_n0;
 drop database bug;
 
 
 use default;
-drop view v;
-create view v as with src1 as (select key from src order by key limit 5)
+drop view v_n0;
+create view v_n0 as with src1 as (select key from src order by key limit 5)
 select * from src1;
 
-describe extended v;
+describe extended v_n0;
 
 create database bug;
 use bug;
-select * from default.v;
+select * from default.v_n0;
 use default;
-drop view v;
+drop view v_n0;
 
-create view v as with src1 as (select key from src order by key limit 5)
+create view v_n0 as with src1 as (select key from src order by key limit 5)
 select * from src1 a where a.key is not null;
 
-describe extended v;
-select * from v;
-drop view v;
+describe extended v_n0;
+select * from v_n0;
+drop view v_n0;
 
 drop database bug;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/cte_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cte_2.q 
b/ql/src/test/queries/clientpositive/cte_2.q
index 899a080..d2d4a93 100644
--- a/ql/src/test/queries/clientpositive/cte_2.q
+++ b/ql/src/test/queries/clientpositive/cte_2.q
@@ -3,19 +3,19 @@
 
 -- union test
 with q1 as (select * from src where key= '5'),
-q2 as (select * from src s2 where key = '4')
+q2 as (select * from src s2_n0 where key = '4')
 select * from q1 union all select * from q2
 ;
 
 -- insert test
-create table s1 like src;
+create table s1_n1 like src;
 with q1 as ( select key, value from src where key = '5')
 from q1
-insert overwrite table s1
+insert overwrite table s1_n1
 select *
 ;
-select * from s1;
-drop table s1;
+select * from s1_n1;
+drop table s1_n1;
 
 -- from style
 with q1 as (select * from src where key= '5')
@@ -24,36 +24,36 @@ select *
 ;
 
 -- ctas
-create table s2 as
+create table s2_n0 as
 with q1 as ( select key from src where key = '4')
 select * from q1
 ;
 
-select * from s2;
-drop table s2;
+select * from s2_n0;
+drop table s2_n0;
 
 -- view test
-create view v1 as
+create view v1_n15 as
 with q1 as ( select key from src where key = '5')
 select * from q1
 ;
 
-select * from v1;
+select * from v1_n15;
 
-drop view v1;
+drop view v1_n15;
 
 
 -- view test, name collision
-create view v1 as
+create view v1_n15 as
 with q1 as ( select key from src where key = '5')
 select * from q1
 ;
 
 with q1 as ( select key from src where key = '4')
-select * from v1
+select * from v1_n15
 ;
 
-drop view v1;
+drop view v1_n15;
 
 drop view if exists view_3;
 create view view_3 as select cstring2, AVG(cint) from alltypesorc group by 
cstring2 limit 10;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/cte_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cte_4.q 
b/ql/src/test/queries/clientpositive/cte_4.q
index 17db131..cc01f95 100644
--- a/ql/src/test/queries/clientpositive/cte_4.q
+++ b/ql/src/test/queries/clientpositive/cte_4.q
@@ -9,14 +9,14 @@ select * from q1 union all select * from q2
 ;
 
 -- insert test
-create table s1 like src;
+create table s1_n0 like src;
 with q1 as ( select key, value from src where key = '5')
 from q1
-insert overwrite table s1
+insert overwrite table s1_n0
 select *
 ;
-select * from s1;
-drop table s1;
+select * from s1_n0;
+drop table s1_n0;
 
 -- from style
 with q1 as (select * from src where key= '5')
@@ -34,24 +34,24 @@ select * from s2;
 drop table s2;
 
 -- view test
-create view v1 as
+create view v1_n4 as
 with q1 as ( select key from src where key = '5')
 select * from q1
 ;
 
-select * from v1;
+select * from v1_n4;
 
-drop view v1;
+drop view v1_n4;
 
 
 -- view test, name collision
-create view v1 as
+create view v1_n4 as
 with q1 as ( select key from src where key = '5')
 select * from q1
 ;
 
 with q1 as ( select key from src where key = '4')
-select * from v1
+select * from v1_n4
 ;
 
-drop view v1;
+drop view v1_n4;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/cte_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cte_5.q 
b/ql/src/test/queries/clientpositive/cte_5.q
index 6ab2fa6..8494475 100644
--- a/ql/src/test/queries/clientpositive/cte_5.q
+++ b/ql/src/test/queries/clientpositive/cte_5.q
@@ -5,20 +5,20 @@ set hive.explain.user=true;
 
 create database mydb;
 use mydb;
-create table q1 (colnum int, colstring string);
-insert into q1 values (5, 'A');
+create table q1_n0 (colnum int, colstring string);
+insert into q1_n0 values (5, 'A');
 
 use default;
 
 show tables in mydb;
 
 explain
-with q1 as (select * from src where key= '5')
+with q1_n0 as (select * from src where key= '5')
 select a.colnum
-from mydb.q1 as a join q1 as b
+from mydb.q1_n0 as a join q1_n0 as b
 on a.colnum=b.key;
 
-with q1 as (select * from src where key= '5')
+with q1_n0 as (select * from src where key= '5')
 select a.colnum
-from mydb.q1 as a join q1 as b
+from mydb.q1_n0 as a join q1_n0 as b
 on a.colnum=b.key;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/cte_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cte_7.q 
b/ql/src/test/queries/clientpositive/cte_7.q
index 02a6813..59c9321 100644
--- a/ql/src/test/queries/clientpositive/cte_7.q
+++ b/ql/src/test/queries/clientpositive/cte_7.q
@@ -1,14 +1,14 @@
 set hive.cbo.enable=false;
 
-create table t (i int,a string,b string);
+create table t_n1 (i int,a string,b string);
 
-insert into t values (1,'hello','world'),(2,'bye',null);
+insert into t_n1 values (1,'hello','world'),(2,'bye',null);
 
-select * from t where t.b is null;
+select * from t_n1 where t_n1.b is null;
 
-with cte as (select t.a as a,t.a as b,t.a as c from t where t.b is null) 
select * from cte;
+with cte as (select t_n1.a as a,t_n1.a as b,t_n1.a as c from t_n1 where t_n1.b 
is null) select * from cte;
 
-select t.a as a,t.a as b,t.a as c from t where t.b is null;
+select t_n1.a as a,t_n1.a as b,t_n1.a as c from t_n1 where t_n1.b is null;
 
-with cte as (select t.a as a,t.a as b,t.a as c from t where t.b is not null) 
select * from cte;
+with cte as (select t_n1.a as a,t_n1.a as b,t_n1.a as c from t_n1 where t_n1.b 
is not null) select * from cte;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/database.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/database.q 
b/ql/src/test/queries/clientpositive/database.q
index 77d211a..36c3c0b 100644
--- a/ql/src/test/queries/clientpositive/database.q
+++ b/ql/src/test/queries/clientpositive/database.q
@@ -49,33 +49,33 @@ USE test_db;
 SHOW DATABASES;
 
 -- CREATE table in non-default DB
-CREATE TABLE test_table (col1 STRING) STORED AS TEXTFILE;
+CREATE TABLE test_table_n2 (col1 STRING) STORED AS TEXTFILE;
 SHOW TABLES;
 
 -- DESCRIBE table in non-default DB
-DESCRIBE test_table;
+DESCRIBE test_table_n2;
 
 -- DESCRIBE EXTENDED in non-default DB
-DESCRIBE EXTENDED test_table;
+DESCRIBE EXTENDED test_table_n2;
 
 -- CREATE LIKE in non-default DB
-CREATE TABLE test_table_like LIKE test_table;
+CREATE TABLE test_table_like LIKE test_table_n2;
 SHOW TABLES;
 DESCRIBE EXTENDED test_table_like;
 
 -- LOAD and SELECT
 LOAD DATA LOCAL INPATH '../../data/files/test.dat'
-OVERWRITE INTO TABLE test_table;
-SELECT * FROM test_table;
+OVERWRITE INTO TABLE test_table_n2;
+SELECT * FROM test_table_n2;
 
 -- DROP and CREATE w/o LOAD
-DROP TABLE test_table;
+DROP TABLE test_table_n2;
 SHOW TABLES;
 
-CREATE TABLE test_table (col1 STRING) STORED AS TEXTFILE;
+CREATE TABLE test_table_n2 (col1 STRING) STORED AS TEXTFILE;
 SHOW TABLES;
 
-SELECT * FROM test_table;
+SELECT * FROM test_table_n2;
 
 -- CREATE table that already exists in DEFAULT
 USE test_db;
@@ -91,7 +91,7 @@ SELECT * FROM src LIMIT 10;
 USE test_db;
 
 DROP TABLE src;
-DROP TABLE test_table;
+DROP TABLE test_table_n2;
 DROP TABLE test_table_like;
 SHOW TABLES;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/database_drop.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/database_drop.q 
b/ql/src/test/queries/clientpositive/database_drop.q
index cf33ea9..b8a95d9 100644
--- a/ql/src/test/queries/clientpositive/database_drop.q
+++ b/ql/src/test/queries/clientpositive/database_drop.q
@@ -15,15 +15,15 @@ dfs -rmr ${system:test.tmp.dir}/dbcascade;
 dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade;
 
 -- add a table, view
-CREATE TABLE temp_tbl (id INT, name STRING);
-LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE temp_tbl;
-CREATE VIEW temp_tbl_view AS SELECT * FROM temp_tbl;
+CREATE TABLE temp_tbl_n0 (id INT, name STRING);
+LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE temp_tbl_n0;
+CREATE VIEW temp_tbl_view AS SELECT * FROM temp_tbl_n0;
 
 dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/temp_tbl2;
 -- add a table, view with a different storage location
-CREATE TABLE temp_tbl2 (id INT, name STRING) LOCATION 
'file:${system:test.tmp.dir}/dbcascade/temp_tbl2';
-LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' into table temp_tbl2;
-CREATE VIEW temp_tbl2_view AS SELECT * FROM temp_tbl2;
+CREATE TABLE temp_tbl2_n0 (id INT, name STRING) LOCATION 
'file:${system:test.tmp.dir}/dbcascade/temp_tbl2';
+LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' into table temp_tbl2_n0;
+CREATE VIEW temp_tbl2_view AS SELECT * FROM temp_tbl2_n0;
 
 -- add a partitioned table, view
 CREATE TABLE part_tab (id INT, name STRING)  PARTITIONED BY (ds string);

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/database_location.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/database_location.q 
b/ql/src/test/queries/clientpositive/database_location.q
index e131b5f..8571958 100644
--- a/ql/src/test/queries/clientpositive/database_location.q
+++ b/ql/src/test/queries/clientpositive/database_location.q
@@ -2,9 +2,9 @@ CREATE DATABASE db1;
 DESCRIBE DATABASE EXTENDED db1;
 
 USE db1;
-CREATE TABLE table_db1 (name STRING, value INT);
+CREATE TABLE table_db1_n0 (name STRING, value INT);
 
-DESCRIBE FORMATTED table_db1;
+DESCRIBE FORMATTED table_db1_n0;
 SHOW TABLES;
 
 CREATE DATABASE db2

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/dbtxnmgr_compact1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dbtxnmgr_compact1.q 
b/ql/src/test/queries/clientpositive/dbtxnmgr_compact1.q
index b86c6f9..b4dc10d 100644
--- a/ql/src/test/queries/clientpositive/dbtxnmgr_compact1.q
+++ b/ql/src/test/queries/clientpositive/dbtxnmgr_compact1.q
@@ -1,10 +1,10 @@
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 
-create table T1(key string, val string) clustered by (val) into 2 buckets 
stored as ORC TBLPROPERTIES ('transactional'='true');
+create table T1_n153(key string, val string) clustered by (val) into 2 buckets 
stored as ORC TBLPROPERTIES ('transactional'='true');
 
-alter table T1 compact 'major';
+alter table T1_n153 compact 'major';
 
-alter table T1 compact 'minor';
+alter table T1_n153 compact 'minor';
 
-drop table T1;
+drop table T1_n153;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/dbtxnmgr_compact2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dbtxnmgr_compact2.q 
b/ql/src/test/queries/clientpositive/dbtxnmgr_compact2.q
index dca954e..6e560dd 100644
--- a/ql/src/test/queries/clientpositive/dbtxnmgr_compact2.q
+++ b/ql/src/test/queries/clientpositive/dbtxnmgr_compact2.q
@@ -1,13 +1,13 @@
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 
-create table T1(key string, val string) partitioned by (ds string) clustered 
by (val) into 2 buckets stored as ORC TBLPROPERTIES ('transactional'='true');
+create table T1_n105(key string, val string) partitioned by (ds string) 
clustered by (val) into 2 buckets stored as ORC TBLPROPERTIES 
('transactional'='true');
 
-alter table T1 add partition (ds = 'today');
-alter table T1 add partition (ds = 'yesterday');
+alter table T1_n105 add partition (ds = 'today');
+alter table T1_n105 add partition (ds = 'yesterday');
 
-alter table T1 partition (ds = 'today') compact 'major';
+alter table T1_n105 partition (ds = 'today') compact 'major';
 
-alter table T1 partition (ds = 'yesterday') compact 'minor';
+alter table T1_n105 partition (ds = 'yesterday') compact 'minor';
 
-drop table T1;
+drop table T1_n105;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/dbtxnmgr_compact3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dbtxnmgr_compact3.q 
b/ql/src/test/queries/clientpositive/dbtxnmgr_compact3.q
index 8c7bc25..c9e0a80 100644
--- a/ql/src/test/queries/clientpositive/dbtxnmgr_compact3.q
+++ b/ql/src/test/queries/clientpositive/dbtxnmgr_compact3.q
@@ -5,10 +5,10 @@ create database D1;
 
 use D1;
 
-create table T1(key string, val string) clustered by (val) into 2 buckets 
stored as ORC TBLPROPERTIES ('transactional'='true');
+create table T1_n71(key string, val string) clustered by (val) into 2 buckets 
stored as ORC TBLPROPERTIES ('transactional'='true');
 
-alter table T1 compact 'major';
+alter table T1_n71 compact 'major';
 
-alter table T1 compact 'minor';
+alter table T1_n71 compact 'minor';
 
-drop table T1;
+drop table T1_n71;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/dbtxnmgr_ddl1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dbtxnmgr_ddl1.q 
b/ql/src/test/queries/clientpositive/dbtxnmgr_ddl1.q
index a1be063..f33e946 100644
--- a/ql/src/test/queries/clientpositive/dbtxnmgr_ddl1.q
+++ b/ql/src/test/queries/clientpositive/dbtxnmgr_ddl1.q
@@ -7,54 +7,54 @@ alter database D1 set dbproperties('test'='yesthisis');
 
 drop database D1;
 
-create table T1(key string, val string) stored as textfile;
+create table T1_n50(key string, val string) stored as textfile;
 
-create table T2 like T1;
+create table T2_n31 like T1_n50;
 
-LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1_n50;
 
-select * from T1;
+select * from T1_n50;
 
-create table T3 as select * from T1;
+create table T3_n11 as select * from T1_n50;
 
-create table T4 (key char(10), val decimal(5,2), b int)
+create table T4_n4 (key char(10), val decimal(5,2), b int)
     partitioned by (ds string)
     clustered by (b) into 10 buckets
     stored as orc;
 
-alter table T3 rename to newT3;
+alter table T3_n11 rename to newT3_n11;
 
-alter table T2 set tblproperties ('test'='thisisatest');
+alter table T2_n31 set tblproperties ('test'='thisisatest');
 
-alter table T2 set serde 'org.apache.hadoop.hive.ql.io.orc.OrcSerde';
-alter table T2 set serdeproperties ('test'='thisisatest');
+alter table T2_n31 set serde 'org.apache.hadoop.hive.ql.io.orc.OrcSerde';
+alter table T2_n31 set serdeproperties ('test'='thisisatest');
 
-alter table T2 clustered by (key) into 32 buckets;
+alter table T2_n31 clustered by (key) into 32 buckets;
 
-alter table T4 add partition (ds='today'); 
+alter table T4_n4 add partition (ds='today'); 
 
-alter table T4 partition (ds='today') rename to partition(ds='yesterday');
+alter table T4_n4 partition (ds='today') rename to partition(ds='yesterday');
 
-alter table T4 drop partition (ds='yesterday');
+alter table T4_n4 drop partition (ds='yesterday');
 
-alter table T4 add partition (ds='tomorrow'); 
+alter table T4_n4 add partition (ds='tomorrow'); 
 
-create table T5 (a string, b int);
-alter table T5 set fileformat orc;
+create table T5_n1 (a string, b int);
+alter table T5_n1 set fileformat orc;
 
-create table T7 (a string, b int);
-alter table T7 set location 'file:///tmp';
-alter table T4 partition (ds='tomorrow') set location 'file:///tmp';
+create table T7_n2 (a string, b int);
+alter table T7_n2 set location 'file:///tmp';
+alter table T4_n4 partition (ds='tomorrow') set location 'file:///tmp';
 
-alter table T2 touch;
-alter table T4 touch partition (ds='tomorrow');
+alter table T2_n31 touch;
+alter table T4_n4 touch partition (ds='tomorrow');
 
-create view V1 as select key from T1;
-alter view V1 set tblproperties ('test'='thisisatest');
-drop view V1;
+create view V1_n5 as select key from T1_n50;
+alter view V1_n5 set tblproperties ('test'='thisisatest');
+drop view V1_n5;
 
 
 
-drop table T1;
-drop table T2;
-drop table newT3;
+drop table T1_n50;
+drop table T2_n31;
+drop table newT3_n11;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/dbtxnmgr_query1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dbtxnmgr_query1.q 
b/ql/src/test/queries/clientpositive/dbtxnmgr_query1.q
index 970069a..c037c8e 100644
--- a/ql/src/test/queries/clientpositive/dbtxnmgr_query1.q
+++ b/ql/src/test/queries/clientpositive/dbtxnmgr_query1.q
@@ -1,17 +1,17 @@
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 
-create table T1(key string, val string) stored as textfile;
+create table T1_n20(key string, val string) stored as textfile;
 
-LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1_n20;
 
-select * from T1;
+select * from T1_n20;
 
-create table T2(key string, val string) stored as textfile;
+create table T2_n12(key string, val string) stored as textfile;
 
-insert into table T2 select * from T1;
+insert into table T2_n12 select * from T1_n20;
 
-select * from T2;
+select * from T2_n12;
 
-drop table T1;
-drop table T2;
+drop table T1_n20;
+drop table T2_n12;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/dbtxnmgr_query2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dbtxnmgr_query2.q 
b/ql/src/test/queries/clientpositive/dbtxnmgr_query2.q
index 00942e5..cb47ee3 100644
--- a/ql/src/test/queries/clientpositive/dbtxnmgr_query2.q
+++ b/ql/src/test/queries/clientpositive/dbtxnmgr_query2.q
@@ -1,17 +1,17 @@
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 
-create table T1(key string, val string) stored as textfile;
+create table T1_n74(key string, val string) stored as textfile;
 
-LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1_n74;
 
-select * from T1;
+select * from T1_n74;
 
-create table T2(key string, val string) stored as textfile;
+create table T2_n45(key string, val string) stored as textfile;
 
-insert overwrite table T2 select * from T1;
+insert overwrite table T2_n45 select * from T1_n74;
 
-select * from T2;
+select * from T2_n45;
 
-drop table T1;
-drop table T2;
+drop table T1_n74;
+drop table T2_n45;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/dbtxnmgr_query3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dbtxnmgr_query3.q 
b/ql/src/test/queries/clientpositive/dbtxnmgr_query3.q
index 448256c..1c70538 100644
--- a/ql/src/test/queries/clientpositive/dbtxnmgr_query3.q
+++ b/ql/src/test/queries/clientpositive/dbtxnmgr_query3.q
@@ -2,21 +2,21 @@ set hive.mapred.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 
-create table T1(key string, val string) stored as textfile;
+create table T1_n111(key string, val string) stored as textfile;
 
-LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1_n111;
 
-select * from T1;
+select * from T1_n111;
 
-create table T2(key string, val string) partitioned by (pval string) stored as 
textfile;
+create table T2_n67(key string, val string) partitioned by (pval string) 
stored as textfile;
 
-insert into table T2 partition (pval = '1') select * from T1;
+insert into table T2_n67 partition (pval = '1') select * from T1_n111;
 
-select * from T2;
+select * from T2_n67;
 
-insert overwrite table T2 partition (pval = '1') select * from T1;
+insert overwrite table T2_n67 partition (pval = '1') select * from T1_n111;
 
-select * from T2;
+select * from T2_n67;
 
-drop table T1;
-drop table T2;
+drop table T1_n111;
+drop table T2_n67;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/dbtxnmgr_query4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dbtxnmgr_query4.q 
b/ql/src/test/queries/clientpositive/dbtxnmgr_query4.q
index ce5956f..694ec5f 100644
--- a/ql/src/test/queries/clientpositive/dbtxnmgr_query4.q
+++ b/ql/src/test/queries/clientpositive/dbtxnmgr_query4.q
@@ -4,17 +4,17 @@ set 
hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.exec.dynamic.partition=true;
 
-create table T1(key string, val string) stored as textfile;
+create table T1_n163(key string, val string) stored as textfile;
 
-LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1_n163;
 
-select * from T1;
+select * from T1_n163;
 
-create table T2(key string) partitioned by (val string) stored as textfile;
+create table T2_n95(key string) partitioned by (val string) stored as textfile;
 
-insert overwrite table T2 partition (val) select key, val from T1;
+insert overwrite table T2_n95 partition (val) select key, val from T1_n163;
 
-select * from T2;
+select * from T2_n95;
 
-drop table T1;
-drop table T2;
+drop table T1_n163;
+drop table T2_n95;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/dbtxnmgr_query5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dbtxnmgr_query5.q 
b/ql/src/test/queries/clientpositive/dbtxnmgr_query5.q
index d22b98f..d8d640b 100644
--- a/ql/src/test/queries/clientpositive/dbtxnmgr_query5.q
+++ b/ql/src/test/queries/clientpositive/dbtxnmgr_query5.q
@@ -5,19 +5,19 @@ create database foo;
 
 use foo;
 
-create table T1(key string, val string) partitioned by (ds string) stored as 
textfile;
+create table T1_n40(key string, val string) partitioned by (ds string) stored 
as textfile;
 
-alter table T1 add partition (ds='today');
+alter table T1_n40 add partition (ds='today');
 
-create view V1 as select key from T1;
+create view V1_n3 as select key from T1_n40;
 
 show tables;
 
-describe T1;
+describe T1_n40;
 
-drop view V1;
+drop view V1_n3;
 
-drop table T1;
+drop table T1_n40;
 
 show databases;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/decimal_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_1.q 
b/ql/src/test/queries/clientpositive/decimal_1.q
index bed8868..8f2872e 100644
--- a/ql/src/test/queries/clientpositive/decimal_1.q
+++ b/ql/src/test/queries/clientpositive/decimal_1.q
@@ -1,23 +1,23 @@
 --! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
-drop table if exists decimal_1;
+drop table if exists decimal_1_n0;
 
-create table decimal_1 (t decimal(4,2), u decimal(5), v decimal);
-alter table decimal_1 set serde 
'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe';
+create table decimal_1_n0 (t decimal(4,2), u decimal(5), v decimal);
+alter table decimal_1_n0 set serde 
'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe';
 
-desc decimal_1;
+desc decimal_1_n0;
 
-insert overwrite table decimal_1
+insert overwrite table decimal_1_n0
   select cast('17.29' as decimal(4,2)), 3.1415926BD, 3115926.54321BD from src 
tablesample (1 rows);
-select cast(t as boolean) from decimal_1;
-select cast(t as tinyint) from decimal_1;
-select cast(t as smallint) from decimal_1;
-select cast(t as int) from decimal_1;
-select cast(t as bigint) from decimal_1;
-select cast(t as float) from decimal_1;
-select cast(t as double) from decimal_1;
-select cast(t as string) from decimal_1;
-select cast(t as timestamp) from decimal_1;
+select cast(t as boolean) from decimal_1_n0;
+select cast(t as tinyint) from decimal_1_n0;
+select cast(t as smallint) from decimal_1_n0;
+select cast(t as int) from decimal_1_n0;
+select cast(t as bigint) from decimal_1_n0;
+select cast(t as float) from decimal_1_n0;
+select cast(t as double) from decimal_1_n0;
+select cast(t as string) from decimal_1_n0;
+select cast(t as timestamp) from decimal_1_n0;
 
-drop table decimal_1;
+drop table decimal_1_n0;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/decimal_10_0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_10_0.q 
b/ql/src/test/queries/clientpositive/decimal_10_0.q
index 713eacf..c7f15c8 100644
--- a/ql/src/test/queries/clientpositive/decimal_10_0.q
+++ b/ql/src/test/queries/clientpositive/decimal_10_0.q
@@ -1,9 +1,9 @@
-DROP TABLE IF EXISTS `DECIMAL`;
+DROP TABLE IF EXISTS `DECIMAL_n0`;
 
-CREATE TABLE `DECIMAL` (`dec` decimal);
+CREATE TABLE `DECIMAL_n0` (`dec` decimal);
 
-LOAD DATA LOCAL INPATH '../../data/files/decimal_10_0.txt' OVERWRITE INTO 
TABLE `DECIMAL`;
+LOAD DATA LOCAL INPATH '../../data/files/decimal_10_0.txt' OVERWRITE INTO 
TABLE `DECIMAL_n0`;
 
-SELECT `dec` FROM `DECIMAL`;
+SELECT `dec` FROM `DECIMAL_n0`;
 
-DROP TABLE `DECIMAL`;
+DROP TABLE `DECIMAL_n0`;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/decimal_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_2.q 
b/ql/src/test/queries/clientpositive/decimal_2.q
index 164dffd..97df667 100644
--- a/ql/src/test/queries/clientpositive/decimal_2.q
+++ b/ql/src/test/queries/clientpositive/decimal_2.q
@@ -1,43 +1,43 @@
 --! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
-drop table decimal_2;
+drop table decimal_2_n1;
 
-create table decimal_2 (t decimal(18,9));
-alter table decimal_2 set serde 
'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe';
+create table decimal_2_n1 (t decimal(18,9));
+alter table decimal_2_n1 set serde 
'org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe';
 
-insert overwrite table decimal_2
+insert overwrite table decimal_2_n1
   select cast('17.29' as decimal(4,2)) from src tablesample (1 rows);
 
-select cast(t as boolean) from decimal_2;
-select cast(t as tinyint) from decimal_2;
-select cast(t as smallint) from decimal_2;
-select cast(t as int) from decimal_2;
-select cast(t as bigint) from decimal_2;
-select cast(t as float) from decimal_2;
-select cast(t as double) from decimal_2;
-select cast(t as string) from decimal_2;
+select cast(t as boolean) from decimal_2_n1;
+select cast(t as tinyint) from decimal_2_n1;
+select cast(t as smallint) from decimal_2_n1;
+select cast(t as int) from decimal_2_n1;
+select cast(t as bigint) from decimal_2_n1;
+select cast(t as float) from decimal_2_n1;
+select cast(t as double) from decimal_2_n1;
+select cast(t as string) from decimal_2_n1;
 
-insert overwrite table decimal_2
+insert overwrite table decimal_2_n1
   select cast('3404045.5044003' as decimal(18,9)) from src tablesample (1 
rows);
 
-select cast(t as boolean) from decimal_2;
-select cast(t as tinyint) from decimal_2;
-select cast(t as smallint) from decimal_2;
-select cast(t as int) from decimal_2;
-select cast(t as bigint) from decimal_2;
-select cast(t as float) from decimal_2;
-select cast(t as double) from decimal_2;
-select cast(t as string) from decimal_2;
+select cast(t as boolean) from decimal_2_n1;
+select cast(t as tinyint) from decimal_2_n1;
+select cast(t as smallint) from decimal_2_n1;
+select cast(t as int) from decimal_2_n1;
+select cast(t as bigint) from decimal_2_n1;
+select cast(t as float) from decimal_2_n1;
+select cast(t as double) from decimal_2_n1;
+select cast(t as string) from decimal_2_n1;
 
-select cast(3.14 as decimal(4,2)) from decimal_2;
-select cast(cast(3.14 as float) as decimal(4,2)) from decimal_2;
-select cast(cast('2012-12-19 11:12:19.1234567' as timestamp) as decimal(30,8)) 
from decimal_2;
-select cast(true as decimal) from decimal_2;
-select cast(3Y as decimal) from decimal_2;
-select cast(3S as decimal) from decimal_2;
-select cast(cast(3 as int) as decimal) from decimal_2;
-select cast(3L as decimal) from decimal_2;
-select cast(0.99999999999999999999 as decimal(20,19)) from decimal_2;
-select cast('0.99999999999999999999' as decimal(20,20)) from decimal_2;
-drop table decimal_2;
+select cast(3.14 as decimal(4,2)) from decimal_2_n1;
+select cast(cast(3.14 as float) as decimal(4,2)) from decimal_2_n1;
+select cast(cast('2012-12-19 11:12:19.1234567' as timestamp) as decimal(30,8)) 
from decimal_2_n1;
+select cast(true as decimal) from decimal_2_n1;
+select cast(3Y as decimal) from decimal_2_n1;
+select cast(3S as decimal) from decimal_2_n1;
+select cast(cast(3 as int) as decimal) from decimal_2_n1;
+select cast(3L as decimal) from decimal_2_n1;
+select cast(0.99999999999999999999 as decimal(20,19)) from decimal_2_n1;
+select cast('0.99999999999999999999' as decimal(20,20)) from decimal_2_n1;
+drop table decimal_2_n1;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/decimal_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_5.q 
b/ql/src/test/queries/clientpositive/decimal_5.q
index 7bf19d1..fedf2b1 100644
--- a/ql/src/test/queries/clientpositive/decimal_5.q
+++ b/ql/src/test/queries/clientpositive/decimal_5.q
@@ -1,19 +1,19 @@
 set hive.mapred.mode=nonstrict;
-DROP TABLE IF EXISTS DECIMAL_5;
+DROP TABLE IF EXISTS DECIMAL_5_n0;
 
-CREATE TABLE DECIMAL_5(key decimal(10,5), value int)
+CREATE TABLE DECIMAL_5_n0(key decimal(10,5), value int)
 ROW FORMAT DELIMITED
    FIELDS TERMINATED BY ' '
 STORED AS TEXTFILE;
 
-LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_5;
+LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_5_n0;
 
-SELECT key FROM DECIMAL_5 ORDER BY key;
+SELECT key FROM DECIMAL_5_n0 ORDER BY key;
 
-SELECT DISTINCT key FROM DECIMAL_5 ORDER BY key;
+SELECT DISTINCT key FROM DECIMAL_5_n0 ORDER BY key;
 
-SELECT cast(key as decimal) FROM DECIMAL_5;
+SELECT cast(key as decimal) FROM DECIMAL_5_n0;
 
-SELECT cast(key as decimal(6,3)) FROM DECIMAL_5;
+SELECT cast(key as decimal(6,3)) FROM DECIMAL_5_n0;
 
-DROP TABLE DECIMAL_5;
+DROP TABLE DECIMAL_5_n0;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/decimal_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_6.q 
b/ql/src/test/queries/clientpositive/decimal_6.q
index dd7f680..f8cf0d3 100644
--- a/ql/src/test/queries/clientpositive/decimal_6.q
+++ b/ql/src/test/queries/clientpositive/decimal_6.q
@@ -1,28 +1,28 @@
 set hive.mapred.mode=nonstrict;
-DROP TABLE IF EXISTS DECIMAL_6_1;
-DROP TABLE IF EXISTS DECIMAL_6_2;
-DROP TABLE IF EXISTS DECIMAL_6_3;
+DROP TABLE IF EXISTS DECIMAL_6_1_n0;
+DROP TABLE IF EXISTS DECIMAL_6_2_n0;
+DROP TABLE IF EXISTS DECIMAL_6_3_n0;
 
-CREATE TABLE DECIMAL_6_1(key decimal(10,5), value int)
+CREATE TABLE DECIMAL_6_1_n0(key decimal(10,5), value int)
 ROW FORMAT DELIMITED
    FIELDS TERMINATED BY ' '
 STORED AS TEXTFILE;
 
-CREATE TABLE DECIMAL_6_2(key decimal(17,4), value int)
+CREATE TABLE DECIMAL_6_2_n0(key decimal(17,4), value int)
 ROW FORMAT DELIMITED
    FIELDS TERMINATED BY ' '
 STORED AS TEXTFILE;
 
-LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_1;
-LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_2;
+LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_1_n0;
+LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_2_n0;
 
 SELECT T.key from (
-  SELECT key, value from DECIMAL_6_1
+  SELECT key, value from DECIMAL_6_1_n0
   UNION ALL
-  SELECT key, value from DECIMAL_6_2
+  SELECT key, value from DECIMAL_6_2_n0
 ) T order by T.key;
 
-CREATE TABLE DECIMAL_6_3 AS SELECT key + 5.5 AS k, value * 11 AS v from 
DECIMAL_6_1 ORDER BY v;
+CREATE TABLE DECIMAL_6_3_n0 AS SELECT key + 5.5 AS k, value * 11 AS v from 
DECIMAL_6_1_n0 ORDER BY v;
 
-desc DECIMAL_6_3;
+desc DECIMAL_6_3_n0;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/decimal_join2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_join2.q 
b/ql/src/test/queries/clientpositive/decimal_join2.q
index 1d3cb9a..20a04eb 100644
--- a/ql/src/test/queries/clientpositive/decimal_join2.q
+++ b/ql/src/test/queries/clientpositive/decimal_join2.q
@@ -1,6 +1,6 @@
 set hive.mapred.mode=nonstrict;
 DROP TABLE IF EXISTS DECIMAL_3_txt;
-DROP TABLE IF EXISTS DECIMAL_3;
+DROP TABLE IF EXISTS DECIMAL_3_n0;
 
 CREATE TABLE DECIMAL_3_txt(key decimal(38,18), value int)
 ROW FORMAT DELIMITED
@@ -9,19 +9,19 @@ STORED AS TEXTFILE;
 
 LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_3_txt;
 
-CREATE TABLE DECIMAL_3 STORED AS ORC AS SELECT * FROM DECIMAL_3_txt;
+CREATE TABLE DECIMAL_3_n0 STORED AS ORC AS SELECT * FROM DECIMAL_3_txt;
 
 set hive.auto.convert.join=false;
 EXPLAIN
-SELECT * FROM DECIMAL_3 a JOIN DECIMAL_3 b ON (a.key = b.key) ORDER BY a.key, 
a.value, b.key, b.value;
+SELECT * FROM DECIMAL_3_n0 a JOIN DECIMAL_3_n0 b ON (a.key = b.key) ORDER BY 
a.key, a.value, b.key, b.value;
 
-SELECT * FROM DECIMAL_3 a JOIN DECIMAL_3 b ON (a.key = b.key) ORDER BY a.key, 
a.value, b.key, b.value;
+SELECT * FROM DECIMAL_3_n0 a JOIN DECIMAL_3_n0 b ON (a.key = b.key) ORDER BY 
a.key, a.value, b.key, b.value;
 
 set hive.auto.convert.join=true;
 EXPLAIN
-SELECT * FROM DECIMAL_3 a JOIN DECIMAL_3 b ON (a.key = b.key) ORDER BY a.key, 
a.value, b.key, b.value;
+SELECT * FROM DECIMAL_3_n0 a JOIN DECIMAL_3_n0 b ON (a.key = b.key) ORDER BY 
a.key, a.value, b.key, b.value;
 
-SELECT * FROM DECIMAL_3 a JOIN DECIMAL_3 b ON (a.key = b.key) ORDER BY a.key, 
a.value, b.key, b.value;
+SELECT * FROM DECIMAL_3_n0 a JOIN DECIMAL_3_n0 b ON (a.key = b.key) ORDER BY 
a.key, a.value, b.key, b.value;
 
 DROP TABLE DECIMAL_3_txt;
-DROP TABLE DECIMAL_3;
+DROP TABLE DECIMAL_3_n0;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/decimal_precision.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_precision.q 
b/ql/src/test/queries/clientpositive/decimal_precision.q
index 7ebfcaf..11eccd5 100644
--- a/ql/src/test/queries/clientpositive/decimal_precision.q
+++ b/ql/src/test/queries/clientpositive/decimal_precision.q
@@ -1,36 +1,36 @@
 set hive.mapred.mode=nonstrict;
-DROP TABLE IF EXISTS DECIMAL_PRECISION;
+DROP TABLE IF EXISTS DECIMAL_PRECISION_n0;
 
-CREATE TABLE DECIMAL_PRECISION(`dec` decimal(20,10))
+CREATE TABLE DECIMAL_PRECISION_n0(`dec` decimal(20,10))
 ROW FORMAT DELIMITED
    FIELDS TERMINATED BY ' '
 STORED AS TEXTFILE;
 
-LOAD DATA LOCAL INPATH '../../data/files/kv8.txt' INTO TABLE DECIMAL_PRECISION;
+LOAD DATA LOCAL INPATH '../../data/files/kv8.txt' INTO TABLE 
DECIMAL_PRECISION_n0;
 
-SELECT * FROM DECIMAL_PRECISION ORDER BY `dec`;
+SELECT * FROM DECIMAL_PRECISION_n0 ORDER BY `dec`;
 
-SELECT `dec`, `dec` + 1, `dec` - 1 FROM DECIMAL_PRECISION ORDER BY `dec`;
-SELECT `dec`, `dec` * 2, `dec` / 3  FROM DECIMAL_PRECISION ORDER BY `dec`;
-SELECT `dec`, `dec` / 9 FROM DECIMAL_PRECISION ORDER BY `dec`;
-SELECT `dec`, `dec` / 27 FROM DECIMAL_PRECISION ORDER BY `dec`;
-SELECT `dec`, `dec` * `dec` FROM DECIMAL_PRECISION ORDER BY `dec`;
+SELECT `dec`, `dec` + 1, `dec` - 1 FROM DECIMAL_PRECISION_n0 ORDER BY `dec`;
+SELECT `dec`, `dec` * 2, `dec` / 3  FROM DECIMAL_PRECISION_n0 ORDER BY `dec`;
+SELECT `dec`, `dec` / 9 FROM DECIMAL_PRECISION_n0 ORDER BY `dec`;
+SELECT `dec`, `dec` / 27 FROM DECIMAL_PRECISION_n0 ORDER BY `dec`;
+SELECT `dec`, `dec` * `dec` FROM DECIMAL_PRECISION_n0 ORDER BY `dec`;
 
-EXPLAIN SELECT avg(`dec`), sum(`dec`) FROM DECIMAL_PRECISION;
-SELECT avg(`dec`), sum(`dec`) FROM DECIMAL_PRECISION;
+EXPLAIN SELECT avg(`dec`), sum(`dec`) FROM DECIMAL_PRECISION_n0;
+SELECT avg(`dec`), sum(`dec`) FROM DECIMAL_PRECISION_n0;
 
-SELECT `dec` * cast('12345678901234567890.12345678' as decimal(38,18)) FROM 
DECIMAL_PRECISION LIMIT 1;
-SELECT * from DECIMAL_PRECISION WHERE `dec` > 
cast('1234567890123456789012345678.12345678' as decimal(38,18)) LIMIT 1;
-SELECT `dec` * 12345678901234567890.12345678 FROM DECIMAL_PRECISION LIMIT 1;
+SELECT `dec` * cast('12345678901234567890.12345678' as decimal(38,18)) FROM 
DECIMAL_PRECISION_n0 LIMIT 1;
+SELECT * from DECIMAL_PRECISION_n0 WHERE `dec` > 
cast('1234567890123456789012345678.12345678' as decimal(38,18)) LIMIT 1;
+SELECT `dec` * 12345678901234567890.12345678 FROM DECIMAL_PRECISION_n0 LIMIT 1;
 
-SELECT MIN(cast('12345678901234567890.12345678' as decimal(38,18))) FROM 
DECIMAL_PRECISION;
-SELECT COUNT(cast('12345678901234567890.12345678' as decimal(38,18))) FROM 
DECIMAL_PRECISION;
+SELECT MIN(cast('12345678901234567890.12345678' as decimal(38,18))) FROM 
DECIMAL_PRECISION_n0;
+SELECT COUNT(cast('12345678901234567890.12345678' as decimal(38,18))) FROM 
DECIMAL_PRECISION_n0;
 
-DROP TABLE DECIMAL_PRECISION;
+DROP TABLE DECIMAL_PRECISION_n0;
 
 -- Expect overflow and return null as the value
-CREATE TABLE DECIMAL_PRECISION(`dec` decimal(38,18));
-INSERT INTO DECIMAL_PRECISION VALUES(98765432109876543210.12345), 
(98765432109876543210.12345);
-SELECT SUM(`dec`) FROM DECIMAL_PRECISION;
+CREATE TABLE DECIMAL_PRECISION_n0(`dec` decimal(38,18));
+INSERT INTO DECIMAL_PRECISION_n0 VALUES(98765432109876543210.12345), 
(98765432109876543210.12345);
+SELECT SUM(`dec`) FROM DECIMAL_PRECISION_n0;
 
-DROP TABLE DECIMAL_PRECISION;
+DROP TABLE DECIMAL_PRECISION_n0;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/decimal_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_stats.q 
b/ql/src/test/queries/clientpositive/decimal_stats.q
index ab87ad6..7167624 100644
--- a/ql/src/test/queries/clientpositive/decimal_stats.q
+++ b/ql/src/test/queries/clientpositive/decimal_stats.q
@@ -1,17 +1,17 @@
 --! qt:dataset:src
 set hive.stats.fetch.column.stats=true;
-drop table if exists decimal_1;
+drop table if exists decimal_1_n1;
 
-create table decimal_1 (t decimal(4,2), u decimal(5), v decimal);
+create table decimal_1_n1 (t decimal(4,2), u decimal(5), v decimal);
 
-desc decimal_1;
+desc decimal_1_n1;
 
-insert overwrite table decimal_1
+insert overwrite table decimal_1_n1
   select cast('17.29' as decimal(4,2)), 3.1415926BD, null from src;
 
-analyze table decimal_1 compute statistics for columns;
+analyze table decimal_1_n1 compute statistics for columns;
 
-desc formatted decimal_1 v;
+desc formatted decimal_1_n1 v;
 
-explain select * from decimal_1 order by t limit 100;
-drop table decimal_1;
+explain select * from decimal_1_n1 order by t limit 100;
+drop table decimal_1_n1;

http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/decimal_trailing.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_trailing.q 
b/ql/src/test/queries/clientpositive/decimal_trailing.q
index fca69c4..5a8e8fc 100644
--- a/ql/src/test/queries/clientpositive/decimal_trailing.q
+++ b/ql/src/test/queries/clientpositive/decimal_trailing.q
@@ -1,7 +1,7 @@
 set hive.mapred.mode=nonstrict;
-DROP TABLE IF EXISTS DECIMAL_TRAILING;
+DROP TABLE IF EXISTS DECIMAL_TRAILING_n0;
 
-CREATE TABLE DECIMAL_TRAILING (
+CREATE TABLE DECIMAL_TRAILING_n0 (
   id int,
   a decimal(10,4),
   b decimal(15,8)
@@ -10,8 +10,8 @@ ROW FORMAT DELIMITED
    FIELDS TERMINATED BY ','
 STORED AS TEXTFILE;
 
-LOAD DATA LOCAL INPATH '../../data/files/kv10.txt' INTO TABLE DECIMAL_TRAILING;
+LOAD DATA LOCAL INPATH '../../data/files/kv10.txt' INTO TABLE 
DECIMAL_TRAILING_n0;
 
-SELECT * FROM DECIMAL_TRAILING ORDER BY id;
+SELECT * FROM DECIMAL_TRAILING_n0 ORDER BY id;
 
-DROP TABLE DECIMAL_TRAILING;
+DROP TABLE DECIMAL_TRAILING_n0;

Reply via email to