You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jc...@apache.org on 2018/05/21 20:25:12 UTC
[35/51] [abbrv] [partial] hive git commit: HIVE-19617: Rename test
tables to avoid collisions during execution in batches (Jesus Camacho
Rodriguez, reviewed by Gunther Hagleitner)
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/explainuser_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explainuser_3.q b/ql/src/test/queries/clientpositive/explainuser_3.q
index 0f63070..0c110ae 100644
--- a/ql/src/test/queries/clientpositive/explainuser_3.q
+++ b/ql/src/test/queries/clientpositive/explainuser_3.q
@@ -14,10 +14,10 @@ set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
set hive.exec.dynamic.partition.mode=nonstrict;
set hive.vectorized.execution.enabled=true;
-CREATE TABLE acid_vectorized(a INT, b STRING) CLUSTERED BY(a) INTO 2 BUCKETS STORED AS ORC TBLPROPERTIES ('transactional'='true');
-insert into table acid_vectorized select cint, cstring1 from alltypesorc where cint is not null order by cint limit 10;
-analyze table acid_vectorized compute statistics for columns;
-explain select a, b from acid_vectorized order by a, b;
+CREATE TABLE acid_vectorized_n0(a INT, b STRING) CLUSTERED BY(a) INTO 2 BUCKETS STORED AS ORC TBLPROPERTIES ('transactional'='true');
+insert into table acid_vectorized_n0 select cint, cstring1 from alltypesorc where cint is not null order by cint limit 10;
+analyze table acid_vectorized_n0 compute statistics for columns;
+explain select a, b from acid_vectorized_n0 order by a, b;
explain select key, value
FROM srcpart LATERAL VIEW explode(array(1,2,3)) myTable AS myCol;
@@ -36,13 +36,13 @@ explain use newDB;
use newDB;
-create table tab (name string);
+create table tab_n1 (name string);
-explain alter table tab rename to newName;
+explain alter table tab_n1 rename to newName;
-explain drop table tab;
+explain drop table tab_n1;
-drop table tab;
+drop table tab_n1;
explain use default;
@@ -63,24 +63,24 @@ EXPLAIN SELECT SIGMOID(2) FROM src LIMIT 1;
explain DROP TEMPORARY MACRO SIGMOID;
DROP TEMPORARY MACRO SIGMOID;
-explain create table src_autho_test as select * from src;
-create table src_autho_test as select * from src;
+explain create table src_autho_test_n3 as select * from src;
+create table src_autho_test_n3 as select * from src;
set hive.security.authorization.enabled=true;
-explain grant select on table src_autho_test to user hive_test_user;
-grant select on table src_autho_test to user hive_test_user;
+explain grant select on table src_autho_test_n3 to user hive_test_user;
+grant select on table src_autho_test_n3 to user hive_test_user;
-explain show grant user hive_test_user on table src_autho_test;
-explain show grant user hive_test_user on table src_autho_test(key);
+explain show grant user hive_test_user on table src_autho_test_n3;
+explain show grant user hive_test_user on table src_autho_test_n3(key);
-select key from src_autho_test order by key limit 20;
+select key from src_autho_test_n3 order by key limit 20;
-explain revoke select on table src_autho_test from user hive_test_user;
+explain revoke select on table src_autho_test_n3 from user hive_test_user;
-explain grant select(key) on table src_autho_test to user hive_test_user;
+explain grant select(key) on table src_autho_test_n3 to user hive_test_user;
-explain revoke select(key) on table src_autho_test from user hive_test_user;
+explain revoke select(key) on table src_autho_test_n3 from user hive_test_user;
explain
create role sRc_roLE;
@@ -98,19 +98,19 @@ explain drop role sRc_roLE;
drop role sRc_roLE;
set hive.security.authorization.enabled=false;
-drop table src_autho_test;
+drop table src_autho_test_n3;
-explain drop view v;
+explain drop view v_n1;
-explain create view v as with cte as (select * from src order by key limit 5)
+explain create view v_n1 as with cte as (select * from src order by key limit 5)
select * from cte;
explain with cte as (select * from src order by key limit 5)
select * from cte;
-create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc;
+create table orc_merge5_n0 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc;
-load data local inpath '../../data/files/orc_split_elim.orc' into table orc_merge5;
+load data local inpath '../../data/files/orc_split_elim.orc' into table orc_merge5_n0;
SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
SET mapred.min.split.size=1000;
@@ -129,40 +129,40 @@ set hive.merge.tezfiles=true;
set hive.merge.mapfiles=true;
set hive.merge.mapredfiles=true;
-explain insert overwrite table orc_merge5 select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13;
+explain insert overwrite table orc_merge5_n0 select userid,string1,subtype,decimal1,ts from orc_merge5_n0 where userid<=13;
-drop table orc_merge5;
+drop table orc_merge5_n0;
set hive.auto.convert.join=true;
set hive.auto.convert.join.noconditionaltask=true;
set hive.auto.convert.join.noconditionaltask.size=10000;
-CREATE TABLE srcbucket_mapjoin(key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
-CREATE TABLE tab_part (key int, value string) PARTITIONED BY(ds STRING) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
-CREATE TABLE srcbucket_mapjoin_part (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE srcbucket_mapjoin_n3(key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE tab_part_n2 (key int, value string) PARTITIONED BY(ds STRING) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE srcbucket_mapjoin_part_n3 (key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
-load data local inpath '../../data/files/bmj/000000_0' INTO TABLE srcbucket_mapjoin partition(ds='2008-04-08');
-load data local inpath '../../data/files/bmj1/000001_0' INTO TABLE srcbucket_mapjoin partition(ds='2008-04-08');
+load data local inpath '../../data/files/bmj/000000_0' INTO TABLE srcbucket_mapjoin_n3 partition(ds='2008-04-08');
+load data local inpath '../../data/files/bmj1/000001_0' INTO TABLE srcbucket_mapjoin_n3 partition(ds='2008-04-08');
-load data local inpath '../../data/files/bmj/000000_0' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08');
-load data local inpath '../../data/files/bmj/000001_0' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08');
-load data local inpath '../../data/files/bmj/000002_0' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08');
-load data local inpath '../../data/files/bmj/000003_0' INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08');
+load data local inpath '../../data/files/bmj/000000_0' INTO TABLE srcbucket_mapjoin_part_n3 partition(ds='2008-04-08');
+load data local inpath '../../data/files/bmj/000001_0' INTO TABLE srcbucket_mapjoin_part_n3 partition(ds='2008-04-08');
+load data local inpath '../../data/files/bmj/000002_0' INTO TABLE srcbucket_mapjoin_part_n3 partition(ds='2008-04-08');
+load data local inpath '../../data/files/bmj/000003_0' INTO TABLE srcbucket_mapjoin_part_n3 partition(ds='2008-04-08');
set hive.optimize.bucketingsorting=false;
-insert overwrite table tab_part partition (ds='2008-04-08')
-select key,value from srcbucket_mapjoin_part;
+insert overwrite table tab_part_n2 partition (ds='2008-04-08')
+select key,value from srcbucket_mapjoin_part_n3;
-CREATE TABLE tab(key int, value string) PARTITIONED BY(ds STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
-insert overwrite table tab partition (ds='2008-04-08')
-select key,value from srcbucket_mapjoin;
+CREATE TABLE tab_n1(key int, value string) PARTITIONED BY(ds STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+insert overwrite table tab_n1 partition (ds='2008-04-08')
+select key,value from srcbucket_mapjoin_n3;
set hive.convert.join.bucket.mapjoin.tez = true;
explain
select a.key, a.value, b.value
-from tab a join tab_part b on a.key = b.key;
+from tab_n1 a join tab_part_n2 b on a.key = b.key;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/extrapolate_part_stats_date.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/extrapolate_part_stats_date.q b/ql/src/test/queries/clientpositive/extrapolate_part_stats_date.q
index 1f38a65..ad78071 100644
--- a/ql/src/test/queries/clientpositive/extrapolate_part_stats_date.q
+++ b/ql/src/test/queries/clientpositive/extrapolate_part_stats_date.q
@@ -1,14 +1,14 @@
set hive.exec.dynamic.partition.mode=nonstrict;
set hive.stats.fetch.column.stats=true;
-create table date_dim (d_date date) partitioned by (d_date_sk bigint) stored as orc;
-insert into date_dim partition(d_date_sk=2416945) values('1905-04-09');
-insert into date_dim partition(d_date_sk=2416946) values('1905-04-10');
-insert into date_dim partition(d_date_sk=2416947) values('1905-04-11');
-analyze table date_dim partition(d_date_sk) compute statistics for columns;
+create table date_dim_n1 (d_date date) partitioned by (d_date_sk bigint) stored as orc;
+insert into date_dim_n1 partition(d_date_sk=2416945) values('1905-04-09');
+insert into date_dim_n1 partition(d_date_sk=2416946) values('1905-04-10');
+insert into date_dim_n1 partition(d_date_sk=2416947) values('1905-04-11');
+analyze table date_dim_n1 partition(d_date_sk) compute statistics for columns;
-explain select count(*) from date_dim where d_date > date "1900-01-02" and d_date_sk= 2416945;
+explain select count(*) from date_dim_n1 where d_date > date "1900-01-02" and d_date_sk= 2416945;
-insert into date_dim partition(d_date_sk=2416948) values('1905-04-12');
+insert into date_dim_n1 partition(d_date_sk=2416948) values('1905-04-12');
-explain extended select d_date from date_dim;
+explain extended select d_date from date_dim_n1;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial.q b/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial.q
index 5a412a3..4298a5e 100644
--- a/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial.q
+++ b/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial.q
@@ -5,57 +5,57 @@ set hive.exec.dynamic.partition.mode=nonstrict;
set hive.metastore.aggregate.stats.cache.enabled=false;
-create table if not exists ext_loc (
+create table if not exists ext_loc_n1 (
state string,
locid int,
zip int,
year string
) row format delimited fields terminated by '|' stored as textfile;
-LOAD DATA LOCAL INPATH '../../data/files/extrapolate_stats_partial.txt' OVERWRITE INTO TABLE ext_loc;
+LOAD DATA LOCAL INPATH '../../data/files/extrapolate_stats_partial.txt' OVERWRITE INTO TABLE ext_loc_n1;
-create table if not exists loc_orc_1d (
+create table if not exists loc_orc_1d_n1 (
state string,
locid int,
zip int
) partitioned by(year string) stored as orc;
-insert overwrite table loc_orc_1d partition(year) select * from ext_loc;
+insert overwrite table loc_orc_1d_n1 partition(year) select * from ext_loc_n1;
-analyze table loc_orc_1d partition(year='2001') compute statistics for columns state,locid;
+analyze table loc_orc_1d_n1 partition(year='2001') compute statistics for columns state,locid;
-analyze table loc_orc_1d partition(year='2002') compute statistics for columns state,locid;
+analyze table loc_orc_1d_n1 partition(year='2002') compute statistics for columns state,locid;
-describe formatted loc_orc_1d PARTITION(year='2001') state;
+describe formatted loc_orc_1d_n1 PARTITION(year='2001') state;
-describe formatted loc_orc_1d PARTITION(year='2002') state;
+describe formatted loc_orc_1d_n1 PARTITION(year='2002') state;
-- basicStatState: COMPLETE colStatState: PARTIAL
-explain extended select state from loc_orc_1d;
+explain extended select state from loc_orc_1d_n1;
-- column statistics for __HIVE_DEFAULT_PARTITION__ is not supported yet. Hence colStatState reports PARTIAL
-- basicStatState: COMPLETE colStatState: PARTIAL
-explain extended select state,locid from loc_orc_1d;
+explain extended select state,locid from loc_orc_1d_n1;
-analyze table loc_orc_1d partition(year='2000') compute statistics for columns state;
+analyze table loc_orc_1d_n1 partition(year='2000') compute statistics for columns state;
-analyze table loc_orc_1d partition(year='2003') compute statistics for columns state;
+analyze table loc_orc_1d_n1 partition(year='2003') compute statistics for columns state;
-explain extended select state from loc_orc_1d;
+explain extended select state from loc_orc_1d_n1;
-explain extended select state,locid from loc_orc_1d;
+explain extended select state,locid from loc_orc_1d_n1;
-create table if not exists loc_orc_2d (
+create table if not exists loc_orc_2d_n1 (
state string,
locid int
) partitioned by(zip int, year string) stored as orc;
-insert overwrite table loc_orc_2d partition(zip, year) select * from ext_loc;
+insert overwrite table loc_orc_2d_n1 partition(zip, year) select * from ext_loc_n1;
-analyze table loc_orc_2d partition(zip=94086, year='2001') compute statistics for columns state,locid;
+analyze table loc_orc_2d_n1 partition(zip=94086, year='2001') compute statistics for columns state,locid;
-analyze table loc_orc_2d partition(zip=94087, year='2002') compute statistics for columns state,locid;
+analyze table loc_orc_2d_n1 partition(zip=94087, year='2002') compute statistics for columns state,locid;
-explain extended select state from loc_orc_2d;
+explain extended select state from loc_orc_2d_n1;
-explain extended select state,locid from loc_orc_2d;
+explain extended select state,locid from loc_orc_2d_n1;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial_ndv.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial_ndv.q b/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial_ndv.q
index a80c86c..12853ef 100644
--- a/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial_ndv.q
+++ b/ql/src/test/queries/clientpositive/extrapolate_part_stats_partial_ndv.q
@@ -6,9 +6,9 @@ set hive.exec.dynamic.partition.mode=nonstrict;
set hive.metastore.aggregate.stats.cache.enabled=false;
-drop table if exists ext_loc;
+drop table if exists ext_loc_n0;
-create table ext_loc (
+create table ext_loc_n0 (
state string,
locid double,
cnt decimal,
@@ -16,87 +16,87 @@ create table ext_loc (
year string
) row format delimited fields terminated by '|' stored as textfile;
-LOAD DATA LOCAL INPATH '../../data/files/extrapolate_stats_partial_ndv.txt' OVERWRITE INTO TABLE ext_loc;
+LOAD DATA LOCAL INPATH '../../data/files/extrapolate_stats_partial_ndv.txt' OVERWRITE INTO TABLE ext_loc_n0;
-drop table if exists loc_orc_1d;
+drop table if exists loc_orc_1d_n0;
-create table loc_orc_1d (
+create table loc_orc_1d_n0 (
state string,
locid double,
cnt decimal,
zip int
) partitioned by(year string) stored as orc;
-insert overwrite table loc_orc_1d partition(year) select * from ext_loc;
+insert overwrite table loc_orc_1d_n0 partition(year) select * from ext_loc_n0;
-analyze table loc_orc_1d partition(year='2001') compute statistics for columns state,locid,cnt,zip;
+analyze table loc_orc_1d_n0 partition(year='2001') compute statistics for columns state,locid,cnt,zip;
-analyze table loc_orc_1d partition(year='2002') compute statistics for columns state,locid,cnt,zip;
+analyze table loc_orc_1d_n0 partition(year='2002') compute statistics for columns state,locid,cnt,zip;
-describe formatted loc_orc_1d PARTITION(year='2001') state;
+describe formatted loc_orc_1d_n0 PARTITION(year='2001') state;
-describe formatted loc_orc_1d PARTITION(year='2002') state;
+describe formatted loc_orc_1d_n0 PARTITION(year='2002') state;
-describe formatted loc_orc_1d PARTITION(year='2001') locid;
+describe formatted loc_orc_1d_n0 PARTITION(year='2001') locid;
-describe formatted loc_orc_1d PARTITION(year='2002') locid;
+describe formatted loc_orc_1d_n0 PARTITION(year='2002') locid;
-describe formatted loc_orc_1d PARTITION(year='2001') cnt;
+describe formatted loc_orc_1d_n0 PARTITION(year='2001') cnt;
-describe formatted loc_orc_1d PARTITION(year='2002') cnt;
+describe formatted loc_orc_1d_n0 PARTITION(year='2002') cnt;
-describe formatted loc_orc_1d PARTITION(year='2001') zip;
+describe formatted loc_orc_1d_n0 PARTITION(year='2001') zip;
-describe formatted loc_orc_1d PARTITION(year='2002') zip;
+describe formatted loc_orc_1d_n0 PARTITION(year='2002') zip;
-explain extended select state,locid,cnt,zip from loc_orc_1d;
+explain extended select state,locid,cnt,zip from loc_orc_1d_n0;
-analyze table loc_orc_1d partition(year='2000') compute statistics for columns state,locid,cnt,zip;
+analyze table loc_orc_1d_n0 partition(year='2000') compute statistics for columns state,locid,cnt,zip;
-analyze table loc_orc_1d partition(year='2003') compute statistics for columns state,locid,cnt,zip;
+analyze table loc_orc_1d_n0 partition(year='2003') compute statistics for columns state,locid,cnt,zip;
-describe formatted loc_orc_1d PARTITION(year='2000') state;
+describe formatted loc_orc_1d_n0 PARTITION(year='2000') state;
-describe formatted loc_orc_1d PARTITION(year='2003') state;
+describe formatted loc_orc_1d_n0 PARTITION(year='2003') state;
-describe formatted loc_orc_1d PARTITION(year='2000') locid;
+describe formatted loc_orc_1d_n0 PARTITION(year='2000') locid;
-describe formatted loc_orc_1d PARTITION(year='2003') locid;
+describe formatted loc_orc_1d_n0 PARTITION(year='2003') locid;
-describe formatted loc_orc_1d PARTITION(year='2000') cnt;
+describe formatted loc_orc_1d_n0 PARTITION(year='2000') cnt;
-describe formatted loc_orc_1d PARTITION(year='2003') cnt;
+describe formatted loc_orc_1d_n0 PARTITION(year='2003') cnt;
-describe formatted loc_orc_1d PARTITION(year='2000') zip;
+describe formatted loc_orc_1d_n0 PARTITION(year='2000') zip;
-describe formatted loc_orc_1d PARTITION(year='2003') zip;
+describe formatted loc_orc_1d_n0 PARTITION(year='2003') zip;
-explain extended select state,locid,cnt,zip from loc_orc_1d;
+explain extended select state,locid,cnt,zip from loc_orc_1d_n0;
-drop table if exists loc_orc_2d;
+drop table if exists loc_orc_2d_n0;
-create table loc_orc_2d (
+create table loc_orc_2d_n0 (
state string,
locid int,
cnt decimal
) partitioned by(zip int, year string) stored as orc;
-insert overwrite table loc_orc_2d partition(zip, year) select * from ext_loc;
+insert overwrite table loc_orc_2d_n0 partition(zip, year) select * from ext_loc_n0;
-analyze table loc_orc_2d partition(zip=94086, year='2001') compute statistics for columns state,locid,cnt;
+analyze table loc_orc_2d_n0 partition(zip=94086, year='2001') compute statistics for columns state,locid,cnt;
-analyze table loc_orc_2d partition(zip=94087, year='2002') compute statistics for columns state,locid,cnt;
+analyze table loc_orc_2d_n0 partition(zip=94087, year='2002') compute statistics for columns state,locid,cnt;
-describe formatted loc_orc_2d partition(zip=94086, year='2001') state;
+describe formatted loc_orc_2d_n0 partition(zip=94086, year='2001') state;
-describe formatted loc_orc_2d partition(zip=94087, year='2002') state;
+describe formatted loc_orc_2d_n0 partition(zip=94087, year='2002') state;
-describe formatted loc_orc_2d partition(zip=94086, year='2001') locid;
+describe formatted loc_orc_2d_n0 partition(zip=94086, year='2001') locid;
-describe formatted loc_orc_2d partition(zip=94087, year='2002') locid;
+describe formatted loc_orc_2d_n0 partition(zip=94087, year='2002') locid;
-describe formatted loc_orc_2d partition(zip=94086, year='2001') cnt;
+describe formatted loc_orc_2d_n0 partition(zip=94086, year='2001') cnt;
-describe formatted loc_orc_2d partition(zip=94087, year='2002') cnt;
+describe formatted loc_orc_2d_n0 partition(zip=94087, year='2002') cnt;
-explain extended select state,locid,cnt,zip from loc_orc_2d;
+explain extended select state,locid,cnt,zip from loc_orc_2d_n0;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/fileformat_sequencefile.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/fileformat_sequencefile.q b/ql/src/test/queries/clientpositive/fileformat_sequencefile.q
index 29a69da..0059a13 100644
--- a/ql/src/test/queries/clientpositive/fileformat_sequencefile.q
+++ b/ql/src/test/queries/clientpositive/fileformat_sequencefile.q
@@ -1,18 +1,18 @@
--! qt:dataset:src
EXPLAIN
-CREATE TABLE dest1(key INT, value STRING) STORED AS
+CREATE TABLE dest1_n85(key INT, value STRING) STORED AS
INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat'
OUTPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileOutputFormat';
-CREATE TABLE dest1(key INT, value STRING) STORED AS
+CREATE TABLE dest1_n85(key INT, value STRING) STORED AS
INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat'
OUTPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileOutputFormat';
-DESCRIBE EXTENDED dest1;
+DESCRIBE EXTENDED dest1_n85;
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT src.key, src.value WHERE src.key < 10;
+INSERT OVERWRITE TABLE dest1_n85 SELECT src.key, src.value WHERE src.key < 10;
-SELECT dest1.* FROM dest1;
+SELECT dest1_n85.* FROM dest1_n85;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/fileformat_text.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/fileformat_text.q b/ql/src/test/queries/clientpositive/fileformat_text.q
index 4b4e557..d80b9d3 100644
--- a/ql/src/test/queries/clientpositive/fileformat_text.q
+++ b/ql/src/test/queries/clientpositive/fileformat_text.q
@@ -1,18 +1,18 @@
--! qt:dataset:src
EXPLAIN
-CREATE TABLE dest1(key INT, value STRING) STORED AS
+CREATE TABLE dest1_n107(key INT, value STRING) STORED AS
INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat'
OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat';
-CREATE TABLE dest1(key INT, value STRING) STORED AS
+CREATE TABLE dest1_n107(key INT, value STRING) STORED AS
INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat'
OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat';
-DESCRIBE EXTENDED dest1;
+DESCRIBE EXTENDED dest1_n107;
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT src.key, src.value WHERE src.key < 10;
+INSERT OVERWRITE TABLE dest1_n107 SELECT src.key, src.value WHERE src.key < 10;
-SELECT dest1.* FROM dest1;
+SELECT dest1_n107.* FROM dest1_n107;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/filter_join_breaktask2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/filter_join_breaktask2.q b/ql/src/test/queries/clientpositive/filter_join_breaktask2.q
index 78a19eb..9382bc7 100644
--- a/ql/src/test/queries/clientpositive/filter_join_breaktask2.q
+++ b/ql/src/test/queries/clientpositive/filter_join_breaktask2.q
@@ -2,35 +2,35 @@
set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
-create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string)
+create table T1_n85(c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string)
partitioned by (ds string);
-create table T2(c1 string, c2 string, c3 string, c0 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string) partitioned by (ds string);
+create table T2_n53(c1 string, c2 string, c3 string, c0 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string) partitioned by (ds string);
-create table T3 (c0 bigint, c1 bigint, c2 int) partitioned by (ds string);
+create table T3_n18 (c0 bigint, c1 bigint, c2 int) partitioned by (ds string);
-create table T4 (c0 bigint, c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string, c26 string, c27 string, c28 string, c29 string, c30 string, c31 string, c32 string, c33 string, c34 string, c35 string, c36 string, c37 string, c38 string, c39 string, c40 string, c41 string, c42 string, c43 string, c44 string, c45 string, c46 string, c47 string, c48 string, c49 string, c50 string, c51 string, c52 string, c53 string, c54 string, c55 string, c56 string, c57 string, c58 string, c59 string, c60 string, c61 string, c62 string, c63 string, c64 string, c65 string, c66 string, c67 bigint, c68 string, c69 string, c70 bigint, c71 bigint, c72 bigint, c73 string, c74 string, c75 string, c76 string, c77 string, c78 string, c79 string, c80 string, c81 bigint, c82 bi
gint, c83 bigint) partitioned by (ds string);
+create table T4_n8 (c0 bigint, c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string, c26 string, c27 string, c28 string, c29 string, c30 string, c31 string, c32 string, c33 string, c34 string, c35 string, c36 string, c37 string, c38 string, c39 string, c40 string, c41 string, c42 string, c43 string, c44 string, c45 string, c46 string, c47 string, c48 string, c49 string, c50 string, c51 string, c52 string, c53 string, c54 string, c55 string, c56 string, c57 string, c58 string, c59 string, c60 string, c61 string, c62 string, c63 string, c64 string, c65 string, c66 string, c67 bigint, c68 string, c69 string, c70 bigint, c71 bigint, c72 bigint, c73 string, c74 string, c75 string, c76 string, c77 string, c78 string, c79 string, c80 string, c81 bigint, c82
bigint, c83 bigint) partitioned by (ds string);
-insert overwrite table T1 partition (ds='2010-04-17') select '5', '1', '1', '1', 0, 0,4 from src tablesample (1 rows);
+insert overwrite table T1_n85 partition (ds='2010-04-17') select '5', '1', '1', '1', 0, 0,4 from src tablesample (1 rows);
-insert overwrite table T2 partition(ds='2010-04-17') select '5','name', NULL, '2', 'kavin',NULL, '9', 'c', '8', '0', '0', '7', '1','2', '0', '3','2', NULL, '1', NULL, '3','2','0','0','5','10' from src tablesample (1 rows);
+insert overwrite table T2_n53 partition(ds='2010-04-17') select '5','name', NULL, '2', 'kavin',NULL, '9', 'c', '8', '0', '0', '7', '1','2', '0', '3','2', NULL, '1', NULL, '3','2','0','0','5','10' from src tablesample (1 rows);
-insert overwrite table T3 partition (ds='2010-04-17') select 4,5,0 from src tablesample (1 rows);
+insert overwrite table T3_n18 partition (ds='2010-04-17') select 4,5,0 from src tablesample (1 rows);
-insert overwrite table T4 partition(ds='2010-04-17')
+insert overwrite table T4_n8 partition(ds='2010-04-17')
select 4,'1','1','8','4','5','1','0','9','U','2','2', '0','2','1','1','J','C','A','U', '2','s', '2',NULL, NULL, NULL,NULL, NULL, NULL,'1','j', 'S', '6',NULL,'1', '2', 'J', 'g', '1', 'e', '2', '1', '2', 'U', 'P', 'p', '3', '0', '0', '0', '1', '1', '1', '0', '0', '0', '6', '2', 'j',NULL, NULL, NULL,NULL,NULL, NULL, '5',NULL, 'j', 'j', 2, 2, 1, '2', '2', '1', '1', '1', '1', '1', '1', 1, 1, 32,NULL from src limit 1;
-select * from T2;
-select * from T1;
-select * from T3;
-select * from T4;
+select * from T2_n53;
+select * from T1_n85;
+select * from T3_n18;
+select * from T4_n8;
SELECT a.c1 as a_c1, b.c1 b_c1, d.c0 as d_c0
-FROM T1 a JOIN T2 b
+FROM T1_n85 a JOIN T2_n53 b
ON (a.c1 = b.c1 AND a.ds='2010-04-17' AND b.ds='2010-04-17')
- JOIN T3 c
+ JOIN T3_n18 c
ON (a.c1 = c.c1 AND a.ds='2010-04-17' AND c.ds='2010-04-17')
- JOIN T4 d
+ JOIN T4_n8 d
ON (c.c0 = d.c0 AND c.ds='2010-04-17' AND d.ds='2010-04-17');
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/floor_time.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/floor_time.q b/ql/src/test/queries/clientpositive/floor_time.q
index d73267d..d239d9b 100644
--- a/ql/src/test/queries/clientpositive/floor_time.q
+++ b/ql/src/test/queries/clientpositive/floor_time.q
@@ -1,47 +1,47 @@
--! qt:dataset:src
-drop table extract_udf;
+drop table extract_udf_n0;
-create table extract_udf (t timestamp);
+create table extract_udf_n0 (t timestamp);
from (select * from src tablesample (1 rows)) s
- insert overwrite table extract_udf
+ insert overwrite table extract_udf_n0
select '2011-05-06 07:08:09.1234567';
select t
-from extract_udf;
+from extract_udf_n0;
explain
select floor_day(t)
-from extract_udf;
+from extract_udf_n0;
select floor_day(t)
-from extract_udf;
+from extract_udf_n0;
-- new syntax
explain
select floor(t to day)
-from extract_udf;
+from extract_udf_n0;
select floor(t to day)
-from extract_udf;
+from extract_udf_n0;
select floor(t to second)
-from extract_udf;
+from extract_udf_n0;
select floor(t to minute)
-from extract_udf;
+from extract_udf_n0;
select floor(t to hour)
-from extract_udf;
+from extract_udf_n0;
select floor(t to week)
-from extract_udf;
+from extract_udf_n0;
select floor(t to month)
-from extract_udf;
+from extract_udf_n0;
select floor(t to quarter)
-from extract_udf;
+from extract_udf_n0;
select floor(t to year)
-from extract_udf;
+from extract_udf_n0;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/fm-sketch.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/fm-sketch.q b/ql/src/test/queries/clientpositive/fm-sketch.q
index 3120517..e6e647e 100644
--- a/ql/src/test/queries/clientpositive/fm-sketch.q
+++ b/ql/src/test/queries/clientpositive/fm-sketch.q
@@ -2,58 +2,58 @@
set hive.mapred.mode=nonstrict;
set hive.stats.ndv.algo=fm;
-create table n(key int);
+create table n_n0(key int);
-insert overwrite table n select null from src;
+insert overwrite table n_n0 select null from src;
-explain analyze table n compute statistics for columns;
+explain analyze table n_n0 compute statistics for columns;
-analyze table n compute statistics for columns;
+analyze table n_n0 compute statistics for columns;
-desc formatted n key;
+desc formatted n_n0 key;
-create table i(key int);
+create table i_n1(key int);
-insert overwrite table i select key from src;
+insert overwrite table i_n1 select key from src;
-explain analyze table i compute statistics for columns;
+explain analyze table i_n1 compute statistics for columns;
-analyze table i compute statistics for columns;
+analyze table i_n1 compute statistics for columns;
-desc formatted i key;
+desc formatted i_n1 key;
-drop table i;
+drop table i_n1;
-create table i(key double);
+create table i_n1(key double);
-insert overwrite table i select key from src;
+insert overwrite table i_n1 select key from src;
-analyze table i compute statistics for columns;
+analyze table i_n1 compute statistics for columns;
-desc formatted i key;
+desc formatted i_n1 key;
-drop table i;
+drop table i_n1;
-create table i(key decimal);
+create table i_n1(key decimal);
-insert overwrite table i select key from src;
+insert overwrite table i_n1 select key from src;
-analyze table i compute statistics for columns;
+analyze table i_n1 compute statistics for columns;
-desc formatted i key;
+desc formatted i_n1 key;
-drop table i;
+drop table i_n1;
-create table i(key date);
+create table i_n1(key date);
-insert into i values ('2012-08-17');
-insert into i values ('2012-08-17');
-insert into i values ('2013-08-17');
-insert into i values ('2012-03-17');
-insert into i values ('2012-05-17');
+insert into i_n1 values ('2012-08-17');
+insert into i_n1 values ('2012-08-17');
+insert into i_n1 values ('2013-08-17');
+insert into i_n1 values ('2012-03-17');
+insert into i_n1 values ('2012-05-17');
-analyze table i compute statistics for columns;
+analyze table i_n1 compute statistics for columns;
-desc formatted i key;
+desc formatted i_n1 key;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/gen_udf_example_add10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/gen_udf_example_add10.q b/ql/src/test/queries/clientpositive/gen_udf_example_add10.q
index 69178c9..6732ac5 100644
--- a/ql/src/test/queries/clientpositive/gen_udf_example_add10.q
+++ b/ql/src/test/queries/clientpositive/gen_udf_example_add10.q
@@ -2,12 +2,12 @@ add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:h
create temporary function example_add10 as 'org.apache.hadoop.hive.contrib.genericudf.example.GenericUDFAdd10';
-create table t1(x int,y double);
-load data local inpath '../../data/files/T1.txt' into table t1;
+create table t1_n102(x int,y double);
+load data local inpath '../../data/files/T1.txt' into table t1_n102;
-explain select example_add10(x) as a,example_add10(y) as b from t1 order by a desc,b limit 10;
+explain select example_add10(x) as a,example_add10(y) as b from t1_n102 order by a desc,b limit 10;
-select example_add10(x) as a,example_add10(y) as b from t1 order by a desc,b limit 10;
+select example_add10(x) as a,example_add10(y) as b from t1_n102 order by a desc,b limit 10;
-drop table t1;
+drop table t1_n102;
drop temporary function example_add10;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby10.q b/ql/src/test/queries/clientpositive/groupby10.q
index 5e78831..d26e069 100644
--- a/ql/src/test/queries/clientpositive/groupby10.q
+++ b/ql/src/test/queries/clientpositive/groupby10.q
@@ -4,7 +4,7 @@ set hive.groupby.skewindata=true;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest1(key INT, val1 INT, val2 INT);
+CREATE TABLE dest1_n0(key INT, val1 INT, val2 INT);
CREATE TABLE dest2(key INT, val1 INT, val2 INT);
CREATE TABLE INPUT(key INT, value STRING) STORED AS TEXTFILE;
@@ -12,28 +12,28 @@ LOAD DATA LOCAL INPATH '../../data/files/kv5.txt' INTO TABLE INPUT;
EXPLAIN
FROM INPUT
-INSERT OVERWRITE TABLE dest1 SELECT INPUT.key, count(substr(INPUT.value,5)), count(distinct substr(INPUT.value,5)) GROUP BY INPUT.key
+INSERT OVERWRITE TABLE dest1_n0 SELECT INPUT.key, count(substr(INPUT.value,5)), count(distinct substr(INPUT.value,5)) GROUP BY INPUT.key
INSERT OVERWRITE TABLE dest2 SELECT INPUT.key, sum(substr(INPUT.value,5)), sum(distinct substr(INPUT.value,5)) GROUP BY INPUT.key;
FROM INPUT
-INSERT OVERWRITE TABLE dest1 SELECT INPUT.key, count(substr(INPUT.value,5)), count(distinct substr(INPUT.value,5)) GROUP BY INPUT.key
+INSERT OVERWRITE TABLE dest1_n0 SELECT INPUT.key, count(substr(INPUT.value,5)), count(distinct substr(INPUT.value,5)) GROUP BY INPUT.key
INSERT OVERWRITE TABLE dest2 SELECT INPUT.key, sum(substr(INPUT.value,5)), sum(distinct substr(INPUT.value,5)) GROUP BY INPUT.key;
-SELECT * from dest1;
+SELECT * from dest1_n0;
SELECT * from dest2;
set hive.multigroupby.singlereducer=true;
EXPLAIN
FROM INPUT
-INSERT OVERWRITE TABLE dest1 SELECT INPUT.key, count(substr(INPUT.value,5)), count(distinct substr(INPUT.value,5)) GROUP BY INPUT.key
+INSERT OVERWRITE TABLE dest1_n0 SELECT INPUT.key, count(substr(INPUT.value,5)), count(distinct substr(INPUT.value,5)) GROUP BY INPUT.key
INSERT OVERWRITE TABLE dest2 SELECT INPUT.key, sum(substr(INPUT.value,5)), sum(distinct substr(INPUT.value,5)) GROUP BY INPUT.key;
FROM INPUT
-INSERT OVERWRITE TABLE dest1 SELECT INPUT.key, count(substr(INPUT.value,5)), count(distinct substr(INPUT.value,5)) GROUP BY INPUT.key
+INSERT OVERWRITE TABLE dest1_n0 SELECT INPUT.key, count(substr(INPUT.value,5)), count(distinct substr(INPUT.value,5)) GROUP BY INPUT.key
INSERT OVERWRITE TABLE dest2 SELECT INPUT.key, sum(substr(INPUT.value,5)), sum(distinct substr(INPUT.value,5)) GROUP BY INPUT.key;
-SELECT * from dest1;
+SELECT * from dest1_n0;
SELECT * from dest2;
set hive.groupby.skewindata=false;
@@ -41,12 +41,12 @@ set hive.groupby.skewindata=false;
EXPLAIN
FROM INPUT
-INSERT OVERWRITE TABLE dest1 SELECT INPUT.key, sum(distinct substr(INPUT.value,5)), count(distinct substr(INPUT.value,5)) GROUP BY INPUT.key
+INSERT OVERWRITE TABLE dest1_n0 SELECT INPUT.key, sum(distinct substr(INPUT.value,5)), count(distinct substr(INPUT.value,5)) GROUP BY INPUT.key
INSERT OVERWRITE TABLE dest2 SELECT INPUT.key, sum(distinct substr(INPUT.value,5)), avg(distinct substr(INPUT.value,5)) GROUP BY INPUT.key;
FROM INPUT
-INSERT OVERWRITE TABLE dest1 SELECT INPUT.key, sum(distinct substr(INPUT.value,5)), count(distinct substr(INPUT.value,5)) GROUP BY INPUT.key
+INSERT OVERWRITE TABLE dest1_n0 SELECT INPUT.key, sum(distinct substr(INPUT.value,5)), count(distinct substr(INPUT.value,5)) GROUP BY INPUT.key
INSERT OVERWRITE TABLE dest2 SELECT INPUT.key, sum(distinct substr(INPUT.value,5)), avg(distinct substr(INPUT.value,5)) GROUP BY INPUT.key;
-SELECT * from dest1;
+SELECT * from dest1_n0;
SELECT * from dest2;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby11.q b/ql/src/test/queries/clientpositive/groupby11.q
index 630f6c6..e0a5314 100644
--- a/ql/src/test/queries/clientpositive/groupby11.q
+++ b/ql/src/test/queries/clientpositive/groupby11.q
@@ -5,24 +5,24 @@ set hive.groupby.skewindata=true;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest1(key STRING, val1 INT, val2 INT) partitioned by (ds string);
-CREATE TABLE dest2(key STRING, val1 INT, val2 INT) partitioned by (ds string);
+CREATE TABLE dest1_n137(key STRING, val1 INT, val2 INT) partitioned by (ds string);
+CREATE TABLE dest2_n36(key STRING, val1 INT, val2 INT) partitioned by (ds string);
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest1 partition(ds='111')
+INSERT OVERWRITE TABLE dest1_n137 partition(ds='111')
SELECT src.value, count(src.key), count(distinct src.key) GROUP BY src.value
-INSERT OVERWRITE TABLE dest2 partition(ds='111')
+INSERT OVERWRITE TABLE dest2_n36 partition(ds='111')
SELECT substr(src.value, 5), count(src.key), count(distinct src.key) GROUP BY substr(src.value, 5);
FROM src
-INSERT OVERWRITE TABLE dest1 partition(ds='111')
+INSERT OVERWRITE TABLE dest1_n137 partition(ds='111')
SELECT src.value, count(src.key), count(distinct src.key) GROUP BY src.value
-INSERT OVERWRITE TABLE dest2 partition(ds='111')
+INSERT OVERWRITE TABLE dest2_n36 partition(ds='111')
SELECT substr(src.value, 5), count(src.key), count(distinct src.key) GROUP BY substr(src.value, 5);
-SELECT * from dest1;
-SELECT * from dest2;
+SELECT * from dest1_n137;
+SELECT * from dest2_n36;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby12.q b/ql/src/test/queries/clientpositive/groupby12.q
index aa65457..879b213 100644
--- a/ql/src/test/queries/clientpositive/groupby12.q
+++ b/ql/src/test/queries/clientpositive/groupby12.q
@@ -1,14 +1,14 @@
--! qt:dataset:src
set hive.map.aggr=false;
-CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
+CREATE TABLE dest1_n106(key INT, value STRING) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT COUNT(src.key), COUNT(DISTINCT value) GROUP BY src.key;
+INSERT OVERWRITE TABLE dest1_n106 SELECT COUNT(src.key), COUNT(DISTINCT value) GROUP BY src.key;
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT COUNT(src.key), COUNT(DISTINCT value) GROUP BY src.key;
+INSERT OVERWRITE TABLE dest1_n106 SELECT COUNT(src.key), COUNT(DISTINCT value) GROUP BY src.key;
-SELECT dest1.* FROM dest1;
+SELECT dest1_n106.* FROM dest1_n106;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby1_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby1_limit.q b/ql/src/test/queries/clientpositive/groupby1_limit.q
index 379017d..8d97f97 100644
--- a/ql/src/test/queries/clientpositive/groupby1_limit.q
+++ b/ql/src/test/queries/clientpositive/groupby1_limit.q
@@ -5,11 +5,11 @@ set mapred.reduce.tasks=31;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest1(key INT, value DOUBLE) STORED AS TEXTFILE;
+CREATE TABLE dest1_n125(key INT, value DOUBLE) STORED AS TEXTFILE;
EXPLAIN
-FROM src INSERT OVERWRITE TABLE dest1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key LIMIT 5;
+FROM src INSERT OVERWRITE TABLE dest1_n125 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key LIMIT 5;
-FROM src INSERT OVERWRITE TABLE dest1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key ORDER BY src.key LIMIT 5;
+FROM src INSERT OVERWRITE TABLE dest1_n125 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key ORDER BY src.key LIMIT 5;
-SELECT dest1.* FROM dest1;
+SELECT dest1_n125.* FROM dest1_n125;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby1_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby1_map.q b/ql/src/test/queries/clientpositive/groupby1_map.q
index 4f0a031..0e71e87 100644
--- a/ql/src/test/queries/clientpositive/groupby1_map.q
+++ b/ql/src/test/queries/clientpositive/groupby1_map.q
@@ -6,11 +6,11 @@ set mapred.reduce.tasks=31;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest1(key INT, value DOUBLE) STORED AS TEXTFILE;
+CREATE TABLE dest1_n61(key INT, value DOUBLE) STORED AS TEXTFILE;
EXPLAIN
-FROM src INSERT OVERWRITE TABLE dest1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key;
+FROM src INSERT OVERWRITE TABLE dest1_n61 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key;
-FROM src INSERT OVERWRITE TABLE dest1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key;
+FROM src INSERT OVERWRITE TABLE dest1_n61 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key;
-SELECT dest1.* FROM dest1;
+SELECT dest1_n61.* FROM dest1_n61;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby1_map_nomap.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby1_map_nomap.q b/ql/src/test/queries/clientpositive/groupby1_map_nomap.q
index 926aed6..ad42e75 100644
--- a/ql/src/test/queries/clientpositive/groupby1_map_nomap.q
+++ b/ql/src/test/queries/clientpositive/groupby1_map_nomap.q
@@ -6,11 +6,11 @@ set hive.groupby.mapaggr.checkinterval=20;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest1(key INT, value DOUBLE) STORED AS TEXTFILE;
+CREATE TABLE dest1_n67(key INT, value DOUBLE) STORED AS TEXTFILE;
EXPLAIN
-FROM src INSERT OVERWRITE TABLE dest1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key;
+FROM src INSERT OVERWRITE TABLE dest1_n67 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key;
-FROM src INSERT OVERWRITE TABLE dest1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key;
+FROM src INSERT OVERWRITE TABLE dest1_n67 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key;
-SELECT dest1.* FROM dest1;
+SELECT dest1_n67.* FROM dest1_n67;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby1_map_skew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby1_map_skew.q b/ql/src/test/queries/clientpositive/groupby1_map_skew.q
index 64cadb3..f0ff6d1 100644
--- a/ql/src/test/queries/clientpositive/groupby1_map_skew.q
+++ b/ql/src/test/queries/clientpositive/groupby1_map_skew.q
@@ -6,11 +6,11 @@ set mapred.reduce.tasks=31;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest1(key INT, value DOUBLE) STORED AS TEXTFILE;
+CREATE TABLE dest1_n175(key INT, value DOUBLE) STORED AS TEXTFILE;
EXPLAIN
-FROM src INSERT OVERWRITE TABLE dest1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key;
+FROM src INSERT OVERWRITE TABLE dest1_n175 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key;
-FROM src INSERT OVERWRITE TABLE dest1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key;
+FROM src INSERT OVERWRITE TABLE dest1_n175 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key;
-SELECT dest1.* FROM dest1;
+SELECT dest1_n175.* FROM dest1_n175;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby1_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby1_noskew.q b/ql/src/test/queries/clientpositive/groupby1_noskew.q
index 6e83829..0a519f5 100644
--- a/ql/src/test/queries/clientpositive/groupby1_noskew.q
+++ b/ql/src/test/queries/clientpositive/groupby1_noskew.q
@@ -6,11 +6,11 @@ set mapred.reduce.tasks=31;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest_g1(key INT, value DOUBLE) STORED AS TEXTFILE;
+CREATE TABLE dest_g1_n0(key INT, value DOUBLE) STORED AS TEXTFILE;
EXPLAIN
-FROM src INSERT OVERWRITE TABLE dest_g1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key;
+FROM src INSERT OVERWRITE TABLE dest_g1_n0 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key;
-FROM src INSERT OVERWRITE TABLE dest_g1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key;
+FROM src INSERT OVERWRITE TABLE dest_g1_n0 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key;
-SELECT dest_g1.* FROM dest_g1;
+SELECT dest_g1_n0.* FROM dest_g1_n0;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2.q b/ql/src/test/queries/clientpositive/groupby2.q
old mode 100755
new mode 100644
index 6a8722a..9ab0461
--- a/ql/src/test/queries/clientpositive/groupby2.q
+++ b/ql/src/test/queries/clientpositive/groupby2.q
@@ -5,15 +5,15 @@ set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
set hive.map.aggr=false;
set hive.groupby.skewindata=true;
-CREATE TABLE dest_g2(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE;
+CREATE TABLE dest_g2_n2(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1);
+INSERT OVERWRITE TABLE dest_g2_n2 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1);
FROM src
-INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1);
+INSERT OVERWRITE TABLE dest_g2_n2 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1);
-- SORT_QUERY_RESULTS
-SELECT dest_g2.* FROM dest_g2;
+SELECT dest_g2_n2.* FROM dest_g2_n2;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby2_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2_map.q b/ql/src/test/queries/clientpositive/groupby2_map.q
index 457e401..8c3bbbf 100644
--- a/ql/src/test/queries/clientpositive/groupby2_map.q
+++ b/ql/src/test/queries/clientpositive/groupby2_map.q
@@ -6,13 +6,13 @@ set mapred.reduce.tasks=31;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE;
+CREATE TABLE dest1_n16(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1);
+INSERT OVERWRITE TABLE dest1_n16 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1);
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1);
+INSERT OVERWRITE TABLE dest1_n16 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1);
-SELECT dest1.* FROM dest1;
+SELECT dest1_n16.* FROM dest1_n16;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby2_map_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2_map_multi_distinct.q b/ql/src/test/queries/clientpositive/groupby2_map_multi_distinct.q
index f4f241c..730027e 100644
--- a/ql/src/test/queries/clientpositive/groupby2_map_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/groupby2_map_multi_distinct.q
@@ -6,24 +6,24 @@ set mapred.reduce.tasks=31;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest1(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE;
+CREATE TABLE dest1_n38(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY substr(src.key,1,1);
+INSERT OVERWRITE TABLE dest1_n38 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY substr(src.key,1,1);
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY substr(src.key,1,1);
+INSERT OVERWRITE TABLE dest1_n38 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY substr(src.key,1,1);
-SELECT dest1.* FROM dest1;
+SELECT dest1_n38.* FROM dest1_n38;
-- HIVE-5560 when group by key is used in distinct funtion, invalid result are returned
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT substr(src.key,1,1), count(DISTINCT substr(src.key,1,1)), concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY substr(src.key,1,1);
+INSERT OVERWRITE TABLE dest1_n38 SELECT substr(src.key,1,1), count(DISTINCT substr(src.key,1,1)), concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY substr(src.key,1,1);
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT substr(src.key,1,1), count(DISTINCT substr(src.key,1,1)), concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY substr(src.key,1,1);
+INSERT OVERWRITE TABLE dest1_n38 SELECT substr(src.key,1,1), count(DISTINCT substr(src.key,1,1)), concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY substr(src.key,1,1);
-SELECT dest1.* FROM dest1;
+SELECT dest1_n38.* FROM dest1_n38;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby2_map_skew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2_map_skew.q b/ql/src/test/queries/clientpositive/groupby2_map_skew.q
index 4fef7d1..4130ba6 100644
--- a/ql/src/test/queries/clientpositive/groupby2_map_skew.q
+++ b/ql/src/test/queries/clientpositive/groupby2_map_skew.q
@@ -4,13 +4,13 @@ set hive.map.aggr=true;
set hive.groupby.skewindata=true;
set mapred.reduce.tasks=31;
-CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE;
+CREATE TABLE dest1_n10(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1);
+INSERT OVERWRITE TABLE dest1_n10 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1);
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1);
+INSERT OVERWRITE TABLE dest1_n10 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1);
-SELECT dest1.* FROM dest1 order by key;
+SELECT dest1_n10.* FROM dest1_n10 order by key;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby2_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2_noskew.q b/ql/src/test/queries/clientpositive/groupby2_noskew.q
index f467fba..0906046 100644
--- a/ql/src/test/queries/clientpositive/groupby2_noskew.q
+++ b/ql/src/test/queries/clientpositive/groupby2_noskew.q
@@ -6,13 +6,13 @@ set mapred.reduce.tasks=31;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest_g2(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE;
+CREATE TABLE dest_g2_n1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1);
+INSERT OVERWRITE TABLE dest_g2_n1 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1);
FROM src
-INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1);
+INSERT OVERWRITE TABLE dest_g2_n1 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1);
-SELECT dest_g2.* FROM dest_g2;
+SELECT dest_g2_n1.* FROM dest_g2_n1;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby2_noskew_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2_noskew_multi_distinct.q b/ql/src/test/queries/clientpositive/groupby2_noskew_multi_distinct.q
index 69b617b..dbc96f5 100644
--- a/ql/src/test/queries/clientpositive/groupby2_noskew_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/groupby2_noskew_multi_distinct.q
@@ -6,13 +6,13 @@ set mapred.reduce.tasks=31;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest_g2(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE;
+CREATE TABLE dest_g2_n3(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY substr(src.key,1,1);
+INSERT OVERWRITE TABLE dest_g2_n3 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY substr(src.key,1,1);
FROM src
-INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY substr(src.key,1,1);
+INSERT OVERWRITE TABLE dest_g2_n3 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY substr(src.key,1,1);
-SELECT dest_g2.* FROM dest_g2;
+SELECT dest_g2_n3.* FROM dest_g2_n3;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby3.q b/ql/src/test/queries/clientpositive/groupby3.q
old mode 100755
new mode 100644
index 0d6f00f..f399b3a
--- a/ql/src/test/queries/clientpositive/groupby3.q
+++ b/ql/src/test/queries/clientpositive/groupby3.q
@@ -5,11 +5,11 @@ set hive.explain.user=false;
set hive.map.aggr=false;
set hive.groupby.skewindata=true;
-CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE) STORED AS TEXTFILE;
+CREATE TABLE dest1_n119(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT
+INSERT OVERWRITE TABLE dest1_n119 SELECT
sum(substr(src.value,5)),
avg(substr(src.value,5)),
avg(DISTINCT substr(src.value,5)),
@@ -21,7 +21,7 @@ INSERT OVERWRITE TABLE dest1 SELECT
var_samp(substr(src.value,5));
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT
+INSERT OVERWRITE TABLE dest1_n119 SELECT
sum(substr(src.value,5)),
avg(substr(src.value,5)),
avg(DISTINCT substr(src.value,5)),
@@ -32,6 +32,6 @@ INSERT OVERWRITE TABLE dest1 SELECT
variance(substr(src.value,5)),
var_samp(substr(src.value,5));
-SELECT dest1.* FROM dest1;
+SELECT dest1_n119.* FROM dest1_n119;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby3_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby3_map.q b/ql/src/test/queries/clientpositive/groupby3_map.q
index ebfb696..0a0a7ce 100644
--- a/ql/src/test/queries/clientpositive/groupby3_map.q
+++ b/ql/src/test/queries/clientpositive/groupby3_map.q
@@ -4,11 +4,11 @@ set hive.map.aggr=true;
set hive.groupby.skewindata=false;
set mapred.reduce.tasks=31;
-CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE) STORED AS TEXTFILE;
+CREATE TABLE dest1_n53(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT
+INSERT OVERWRITE TABLE dest1_n53 SELECT
sum(substr(src.value,5)),
avg(substr(src.value,5)),
avg(DISTINCT substr(src.value,5)),
@@ -20,7 +20,7 @@ INSERT OVERWRITE TABLE dest1 SELECT
var_samp(substr(src.value,5));
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT
+INSERT OVERWRITE TABLE dest1_n53 SELECT
sum(substr(src.value,5)),
avg(substr(src.value,5)),
avg(DISTINCT substr(src.value,5)),
@@ -41,6 +41,6 @@ round(c6, 11) c6,
round(c7, 11) c7,
round(c8, 5) c8,
round(c9, 9) c9
-FROM dest1;
+FROM dest1_n53;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby3_map_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby3_map_multi_distinct.q b/ql/src/test/queries/clientpositive/groupby3_map_multi_distinct.q
index a72b6fb..9e8270b 100644
--- a/ql/src/test/queries/clientpositive/groupby3_map_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/groupby3_map_multi_distinct.q
@@ -4,11 +4,11 @@ set hive.map.aggr=true;
set hive.groupby.skewindata=false;
set mapred.reduce.tasks=31;
-CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE, c10 DOUBLE, c11 DOUBLE) STORED AS TEXTFILE;
+CREATE TABLE dest1_n68(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE, c10 DOUBLE, c11 DOUBLE) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT
+INSERT OVERWRITE TABLE dest1_n68 SELECT
sum(substr(src.value,5)),
avg(substr(src.value,5)),
avg(DISTINCT substr(src.value,5)),
@@ -22,7 +22,7 @@ INSERT OVERWRITE TABLE dest1 SELECT
count(DISTINCT substr(src.value, 5));
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT
+INSERT OVERWRITE TABLE dest1_n68 SELECT
sum(substr(src.value,5)),
avg(substr(src.value,5)),
avg(DISTINCT substr(src.value,5)),
@@ -35,4 +35,4 @@ INSERT OVERWRITE TABLE dest1 SELECT
sum(DISTINCT substr(src.value, 5)),
count(DISTINCT substr(src.value, 5));
-SELECT dest1.* FROM dest1;
+SELECT dest1_n68.* FROM dest1_n68;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby3_map_skew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby3_map_skew.q b/ql/src/test/queries/clientpositive/groupby3_map_skew.q
index 01b616c..3371582 100644
--- a/ql/src/test/queries/clientpositive/groupby3_map_skew.q
+++ b/ql/src/test/queries/clientpositive/groupby3_map_skew.q
@@ -5,11 +5,11 @@ set hive.map.aggr=true;
set hive.groupby.skewindata=true;
set mapred.reduce.tasks=31;
-CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE) STORED AS TEXTFILE;
+CREATE TABLE dest1_n131(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT
+INSERT OVERWRITE TABLE dest1_n131 SELECT
sum(substr(src.value,5)),
avg(substr(src.value,5)),
avg(DISTINCT substr(src.value,5)),
@@ -21,7 +21,7 @@ INSERT OVERWRITE TABLE dest1 SELECT
var_samp(substr(src.value,5));
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT
+INSERT OVERWRITE TABLE dest1_n131 SELECT
sum(substr(src.value,5)),
avg(substr(src.value,5)),
avg(DISTINCT substr(src.value,5)),
@@ -33,4 +33,4 @@ INSERT OVERWRITE TABLE dest1 SELECT
var_samp(substr(src.value,5));
SELECT ROUND(c1, 1), ROUND(c2, 3), ROUND(c3, 5), ROUND(c4, 1), ROUND(c5, 1), ROUND(c6, 5),
-ROUND(c7,5), ROUND(c8, 5), ROUND(c9, 5) FROM dest1;
+ROUND(c7,5), ROUND(c8, 5), ROUND(c9, 5) FROM dest1_n131;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby3_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby3_noskew.q b/ql/src/test/queries/clientpositive/groupby3_noskew.q
index cd049ba..fead423 100644
--- a/ql/src/test/queries/clientpositive/groupby3_noskew.q
+++ b/ql/src/test/queries/clientpositive/groupby3_noskew.q
@@ -5,11 +5,11 @@ set hive.map.aggr=false;
set hive.groupby.skewindata=false;
set mapred.reduce.tasks=31;
-CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE) STORED AS TEXTFILE;
+CREATE TABLE dest1_n63(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT
+INSERT OVERWRITE TABLE dest1_n63 SELECT
sum(substr(src.value,5)),
avg(substr(src.value,5)),
avg(DISTINCT substr(src.value,5)),
@@ -21,7 +21,7 @@ INSERT OVERWRITE TABLE dest1 SELECT
var_samp(substr(src.value,5));
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT
+INSERT OVERWRITE TABLE dest1_n63 SELECT
sum(substr(src.value,5)),
avg(substr(src.value,5)),
avg(DISTINCT substr(src.value,5)),
@@ -32,7 +32,7 @@ INSERT OVERWRITE TABLE dest1 SELECT
variance(substr(src.value,5)),
var_samp(substr(src.value,5));
-SELECT dest1.* FROM dest1;
+SELECT dest1_n63.* FROM dest1_n63;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby3_noskew_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby3_noskew_multi_distinct.q b/ql/src/test/queries/clientpositive/groupby3_noskew_multi_distinct.q
index 2c8cf5d..4b49abf 100644
--- a/ql/src/test/queries/clientpositive/groupby3_noskew_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/groupby3_noskew_multi_distinct.q
@@ -5,11 +5,11 @@ set hive.map.aggr=false;
set hive.groupby.skewindata=false;
set mapred.reduce.tasks=31;
-CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE, c10 DOUBLE, c11 DOUBLE) STORED AS TEXTFILE;
+CREATE TABLE dest1_n24(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE, c10 DOUBLE, c11 DOUBLE) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT
+INSERT OVERWRITE TABLE dest1_n24 SELECT
sum(substr(src.value,5)),
avg(substr(src.value,5)),
avg(DISTINCT substr(src.value,5)),
@@ -23,7 +23,7 @@ INSERT OVERWRITE TABLE dest1 SELECT
count(DISTINCT substr(src.value, 5));
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT
+INSERT OVERWRITE TABLE dest1_n24 SELECT
sum(substr(src.value,5)),
avg(substr(src.value,5)),
avg(DISTINCT substr(src.value,5)),
@@ -36,5 +36,5 @@ INSERT OVERWRITE TABLE dest1 SELECT
sum(DISTINCT substr(src.value, 5)),
count(DISTINCT substr(src.value, 5));
-SELECT dest1.* FROM dest1;
+SELECT dest1_n24.* FROM dest1_n24;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby4.q b/ql/src/test/queries/clientpositive/groupby4.q
old mode 100755
new mode 100644
index 2660fde..87efa4e
--- a/ql/src/test/queries/clientpositive/groupby4.q
+++ b/ql/src/test/queries/clientpositive/groupby4.q
@@ -5,14 +5,14 @@ set hive.groupby.skewindata=true;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE;
+CREATE TABLE dest1_n168(c1 STRING) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT substr(src.key,1,1) GROUP BY substr(src.key,1,1);
+INSERT OVERWRITE TABLE dest1_n168 SELECT substr(src.key,1,1) GROUP BY substr(src.key,1,1);
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT substr(src.key,1,1) GROUP BY substr(src.key,1,1);
+INSERT OVERWRITE TABLE dest1_n168 SELECT substr(src.key,1,1) GROUP BY substr(src.key,1,1);
-SELECT dest1.* FROM dest1;
+SELECT dest1_n168.* FROM dest1_n168;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby4_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby4_map.q b/ql/src/test/queries/clientpositive/groupby4_map.q
index 09f223a..9051bee 100644
--- a/ql/src/test/queries/clientpositive/groupby4_map.q
+++ b/ql/src/test/queries/clientpositive/groupby4_map.q
@@ -4,11 +4,11 @@ set hive.map.aggr=true;
set hive.groupby.skewindata=false;
set mapred.reduce.tasks=31;
-CREATE TABLE dest1(key INT) STORED AS TEXTFILE;
+CREATE TABLE dest1_n40(key INT) STORED AS TEXTFILE;
EXPLAIN
-FROM src INSERT OVERWRITE TABLE dest1 SELECT count(1);
+FROM src INSERT OVERWRITE TABLE dest1_n40 SELECT count(1);
-FROM src INSERT OVERWRITE TABLE dest1 SELECT count(1);
+FROM src INSERT OVERWRITE TABLE dest1_n40 SELECT count(1);
-SELECT dest1.* FROM dest1;
+SELECT dest1_n40.* FROM dest1_n40;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby4_map_skew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby4_map_skew.q b/ql/src/test/queries/clientpositive/groupby4_map_skew.q
index a8c8a8c..00269e9 100644
--- a/ql/src/test/queries/clientpositive/groupby4_map_skew.q
+++ b/ql/src/test/queries/clientpositive/groupby4_map_skew.q
@@ -4,11 +4,11 @@ set hive.map.aggr=true;
set hive.groupby.skewindata=true;
set mapred.reduce.tasks=31;
-CREATE TABLE dest1(key INT) STORED AS TEXTFILE;
+CREATE TABLE dest1_n141(key INT) STORED AS TEXTFILE;
EXPLAIN
-FROM src INSERT OVERWRITE TABLE dest1 SELECT count(1);
+FROM src INSERT OVERWRITE TABLE dest1_n141 SELECT count(1);
-FROM src INSERT OVERWRITE TABLE dest1 SELECT count(1);
+FROM src INSERT OVERWRITE TABLE dest1_n141 SELECT count(1);
-SELECT dest1.* FROM dest1;
+SELECT dest1_n141.* FROM dest1_n141;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby4_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby4_noskew.q b/ql/src/test/queries/clientpositive/groupby4_noskew.q
index 69e1597..cf2b163 100644
--- a/ql/src/test/queries/clientpositive/groupby4_noskew.q
+++ b/ql/src/test/queries/clientpositive/groupby4_noskew.q
@@ -7,14 +7,14 @@ set mapred.reduce.tasks=31;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE;
+CREATE TABLE dest1_n33(c1 STRING) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT substr(src.key,1,1) GROUP BY substr(src.key,1,1);
+INSERT OVERWRITE TABLE dest1_n33 SELECT substr(src.key,1,1) GROUP BY substr(src.key,1,1);
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT substr(src.key,1,1) GROUP BY substr(src.key,1,1);
+INSERT OVERWRITE TABLE dest1_n33 SELECT substr(src.key,1,1) GROUP BY substr(src.key,1,1);
-SELECT dest1.* FROM dest1;
+SELECT dest1_n33.* FROM dest1_n33;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby5.q b/ql/src/test/queries/clientpositive/groupby5.q
old mode 100755
new mode 100644
index 73e68c4..f6f76c5
--- a/ql/src/test/queries/clientpositive/groupby5.q
+++ b/ql/src/test/queries/clientpositive/groupby5.q
@@ -5,18 +5,18 @@ set hive.groupby.skewindata=true;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
+CREATE TABLE dest1_n36(key INT, value STRING) STORED AS TEXTFILE;
EXPLAIN
-INSERT OVERWRITE TABLE dest1
+INSERT OVERWRITE TABLE dest1_n36
SELECT src.key, sum(substr(src.value,5))
FROM src
GROUP BY src.key;
-INSERT OVERWRITE TABLE dest1
+INSERT OVERWRITE TABLE dest1_n36
SELECT src.key, sum(substr(src.value,5))
FROM src
GROUP BY src.key;
-SELECT dest1.* FROM dest1;
+SELECT dest1_n36.* FROM dest1_n36;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby5_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby5_map.q b/ql/src/test/queries/clientpositive/groupby5_map.q
index 0704b69..8651560 100644
--- a/ql/src/test/queries/clientpositive/groupby5_map.q
+++ b/ql/src/test/queries/clientpositive/groupby5_map.q
@@ -3,11 +3,11 @@ set hive.map.aggr=true;
set hive.groupby.skewindata=false;
set mapred.reduce.tasks=31;
-CREATE TABLE dest1(key INT) STORED AS TEXTFILE;
+CREATE TABLE dest1_n75(key INT) STORED AS TEXTFILE;
EXPLAIN
-FROM src INSERT OVERWRITE TABLE dest1 SELECT sum(src.key);
+FROM src INSERT OVERWRITE TABLE dest1_n75 SELECT sum(src.key);
-FROM src INSERT OVERWRITE TABLE dest1 SELECT sum(src.key);
+FROM src INSERT OVERWRITE TABLE dest1_n75 SELECT sum(src.key);
-SELECT dest1.* FROM dest1;
+SELECT dest1_n75.* FROM dest1_n75;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby5_map_skew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby5_map_skew.q b/ql/src/test/queries/clientpositive/groupby5_map_skew.q
index 469c42f..ecb6976 100644
--- a/ql/src/test/queries/clientpositive/groupby5_map_skew.q
+++ b/ql/src/test/queries/clientpositive/groupby5_map_skew.q
@@ -3,11 +3,11 @@ set hive.map.aggr=true;
set hive.groupby.skewindata=true;
set mapred.reduce.tasks=31;
-CREATE TABLE dest1(key INT) STORED AS TEXTFILE;
+CREATE TABLE dest1_n76(key INT) STORED AS TEXTFILE;
EXPLAIN
-FROM src INSERT OVERWRITE TABLE dest1 SELECT sum(src.key);
+FROM src INSERT OVERWRITE TABLE dest1_n76 SELECT sum(src.key);
-FROM src INSERT OVERWRITE TABLE dest1 SELECT sum(src.key);
+FROM src INSERT OVERWRITE TABLE dest1_n76 SELECT sum(src.key);
-SELECT dest1.* FROM dest1;
+SELECT dest1_n76.* FROM dest1_n76;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby5_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby5_noskew.q b/ql/src/test/queries/clientpositive/groupby5_noskew.q
index 392b265..4181c5f 100644
--- a/ql/src/test/queries/clientpositive/groupby5_noskew.q
+++ b/ql/src/test/queries/clientpositive/groupby5_noskew.q
@@ -7,18 +7,18 @@ set mapred.reduce.tasks=31;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
+CREATE TABLE dest1_n31(key INT, value STRING) STORED AS TEXTFILE;
EXPLAIN
-INSERT OVERWRITE TABLE dest1
+INSERT OVERWRITE TABLE dest1_n31
SELECT src.key, sum(substr(src.value,5))
FROM src
GROUP BY src.key;
-INSERT OVERWRITE TABLE dest1
+INSERT OVERWRITE TABLE dest1_n31
SELECT src.key, sum(substr(src.value,5))
FROM src
GROUP BY src.key;
-SELECT dest1.* FROM dest1;
+SELECT dest1_n31.* FROM dest1_n31;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby6.q b/ql/src/test/queries/clientpositive/groupby6.q
old mode 100755
new mode 100644
index fee53e4..f626640
--- a/ql/src/test/queries/clientpositive/groupby6.q
+++ b/ql/src/test/queries/clientpositive/groupby6.q
@@ -5,15 +5,15 @@ set hive.groupby.skewindata=true;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE;
+CREATE TABLE dest1_n92(c1 STRING) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT DISTINCT substr(src.value,5,1);
+INSERT OVERWRITE TABLE dest1_n92 SELECT DISTINCT substr(src.value,5,1);
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT DISTINCT substr(src.value,5,1);
+INSERT OVERWRITE TABLE dest1_n92 SELECT DISTINCT substr(src.value,5,1);
-SELECT dest1.* FROM dest1;
+SELECT dest1_n92.* FROM dest1_n92;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby6_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby6_map.q b/ql/src/test/queries/clientpositive/groupby6_map.q
index 9d184e0..68d327d 100644
--- a/ql/src/test/queries/clientpositive/groupby6_map.q
+++ b/ql/src/test/queries/clientpositive/groupby6_map.q
@@ -6,15 +6,15 @@ set mapred.reduce.tasks=31;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE;
+CREATE TABLE dest1_n19(c1 STRING) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT DISTINCT substr(src.value,5,1);
+INSERT OVERWRITE TABLE dest1_n19 SELECT DISTINCT substr(src.value,5,1);
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT DISTINCT substr(src.value,5,1);
+INSERT OVERWRITE TABLE dest1_n19 SELECT DISTINCT substr(src.value,5,1);
-SELECT dest1.* FROM dest1;
+SELECT dest1_n19.* FROM dest1_n19;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby6_map_skew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby6_map_skew.q b/ql/src/test/queries/clientpositive/groupby6_map_skew.q
index d47750c..704a346 100644
--- a/ql/src/test/queries/clientpositive/groupby6_map_skew.q
+++ b/ql/src/test/queries/clientpositive/groupby6_map_skew.q
@@ -6,15 +6,15 @@ set mapred.reduce.tasks=31;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE;
+CREATE TABLE dest1_n98(c1 STRING) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT DISTINCT substr(src.value,5,1);
+INSERT OVERWRITE TABLE dest1_n98 SELECT DISTINCT substr(src.value,5,1);
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT DISTINCT substr(src.value,5,1);
+INSERT OVERWRITE TABLE dest1_n98 SELECT DISTINCT substr(src.value,5,1);
-SELECT dest1.* FROM dest1;
+SELECT dest1_n98.* FROM dest1_n98;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby6_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby6_noskew.q b/ql/src/test/queries/clientpositive/groupby6_noskew.q
index a40af5f..bbf6712 100644
--- a/ql/src/test/queries/clientpositive/groupby6_noskew.q
+++ b/ql/src/test/queries/clientpositive/groupby6_noskew.q
@@ -7,15 +7,15 @@ set mapred.reduce.tasks=31;
-- SORT_QUERY_RESULTS
-CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE;
+CREATE TABLE dest1_n100(c1 STRING) STORED AS TEXTFILE;
EXPLAIN
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT DISTINCT substr(src.value,5,1);
+INSERT OVERWRITE TABLE dest1_n100 SELECT DISTINCT substr(src.value,5,1);
FROM src
-INSERT OVERWRITE TABLE dest1 SELECT DISTINCT substr(src.value,5,1);
+INSERT OVERWRITE TABLE dest1_n100 SELECT DISTINCT substr(src.value,5,1);
-SELECT dest1.* FROM dest1;
+SELECT dest1_n100.* FROM dest1_n100;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby7.q b/ql/src/test/queries/clientpositive/groupby7.q
index a3ea700..6d07a07 100644
--- a/ql/src/test/queries/clientpositive/groupby7.q
+++ b/ql/src/test/queries/clientpositive/groupby7.q
@@ -4,15 +4,15 @@ set hive.groupby.skewindata=true;
-- SORT_QUERY_RESULTS
-CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE;
-CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE;
+CREATE TABLE DEST1_n132(key INT, value STRING) STORED AS TEXTFILE;
+CREATE TABLE DEST2_n34(key INT, value STRING) STORED AS TEXTFILE;
SET hive.exec.compress.intermediate=true;
SET hive.exec.compress.output=true;
FROM SRC
-INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key
-INSERT OVERWRITE TABLE DEST2 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key;
+INSERT OVERWRITE TABLE DEST1_n132 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key
+INSERT OVERWRITE TABLE DEST2_n34 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key;
-SELECT DEST1.* FROM DEST1;
-SELECT DEST2.* FROM DEST2;
+SELECT DEST1_n132.* FROM DEST1_n132;
+SELECT DEST2_n34.* FROM DEST2_n34;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby7_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby7_map.q b/ql/src/test/queries/clientpositive/groupby7_map.q
index 8164042..95e5386 100644
--- a/ql/src/test/queries/clientpositive/groupby7_map.q
+++ b/ql/src/test/queries/clientpositive/groupby7_map.q
@@ -6,20 +6,20 @@ set mapred.reduce.tasks=31;
-- SORT_QUERY_RESULTS
-CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE;
-CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE;
+CREATE TABLE DEST1_n82(key INT, value STRING) STORED AS TEXTFILE;
+CREATE TABLE DEST2_n19(key INT, value STRING) STORED AS TEXTFILE;
SET hive.exec.compress.intermediate=true;
SET hive.exec.compress.output=true;
EXPLAIN
FROM SRC
-INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key
-INSERT OVERWRITE TABLE DEST2 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key;
+INSERT OVERWRITE TABLE DEST1_n82 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key
+INSERT OVERWRITE TABLE DEST2_n19 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key;
FROM SRC
-INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key
-INSERT OVERWRITE TABLE DEST2 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key;
+INSERT OVERWRITE TABLE DEST1_n82 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key
+INSERT OVERWRITE TABLE DEST2_n19 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key;
-SELECT DEST1.* FROM DEST1;
-SELECT DEST2.* FROM DEST2;
+SELECT DEST1_n82.* FROM DEST1_n82;
+SELECT DEST2_n19.* FROM DEST2_n19;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby7_map_multi_single_reducer.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby7_map_multi_single_reducer.q b/ql/src/test/queries/clientpositive/groupby7_map_multi_single_reducer.q
index c25d602..36ac4bc 100644
--- a/ql/src/test/queries/clientpositive/groupby7_map_multi_single_reducer.q
+++ b/ql/src/test/queries/clientpositive/groupby7_map_multi_single_reducer.q
@@ -5,20 +5,20 @@ set mapred.reduce.tasks=31;
-- SORT_QUERY_RESULTS
-CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE;
-CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE;
+CREATE TABLE DEST1_n15(key INT, value STRING) STORED AS TEXTFILE;
+CREATE TABLE DEST2_n3(key INT, value STRING) STORED AS TEXTFILE;
SET hive.exec.compress.intermediate=true;
SET hive.exec.compress.output=true;
EXPLAIN
FROM SRC
-INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key
-INSERT OVERWRITE TABLE DEST2 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key;
+INSERT OVERWRITE TABLE DEST1_n15 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key
+INSERT OVERWRITE TABLE DEST2_n3 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key;
FROM SRC
-INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key
-INSERT OVERWRITE TABLE DEST2 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key;
+INSERT OVERWRITE TABLE DEST1_n15 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key
+INSERT OVERWRITE TABLE DEST2_n3 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key;
-SELECT DEST1.* FROM DEST1;
-SELECT DEST2.* FROM DEST2;
+SELECT DEST1_n15.* FROM DEST1_n15;
+SELECT DEST2_n3.* FROM DEST2_n3;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby7_map_skew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby7_map_skew.q b/ql/src/test/queries/clientpositive/groupby7_map_skew.q
index afd09fe..8a4c3c1 100644
--- a/ql/src/test/queries/clientpositive/groupby7_map_skew.q
+++ b/ql/src/test/queries/clientpositive/groupby7_map_skew.q
@@ -5,20 +5,20 @@ set mapred.reduce.tasks=31;
-- SORT_QUERY_RESULTS
-CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE;
-CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE;
+CREATE TABLE DEST1_n21(key INT, value STRING) STORED AS TEXTFILE;
+CREATE TABLE DEST2_n5(key INT, value STRING) STORED AS TEXTFILE;
SET hive.exec.compress.intermediate=true;
SET hive.exec.compress.output=true;
EXPLAIN
FROM SRC
-INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key
-INSERT OVERWRITE TABLE DEST2 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key;
+INSERT OVERWRITE TABLE DEST1_n21 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key
+INSERT OVERWRITE TABLE DEST2_n5 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key;
FROM SRC
-INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key
-INSERT OVERWRITE TABLE DEST2 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key;
+INSERT OVERWRITE TABLE DEST1_n21 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key
+INSERT OVERWRITE TABLE DEST2_n5 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key;
-SELECT DEST1.* FROM DEST1;
-SELECT DEST2.* FROM DEST2;
+SELECT DEST1_n21.* FROM DEST1_n21;
+SELECT DEST2_n5.* FROM DEST2_n5;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby7_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby7_noskew.q b/ql/src/test/queries/clientpositive/groupby7_noskew.q
index fcdaeb4..20a7082 100644
--- a/ql/src/test/queries/clientpositive/groupby7_noskew.q
+++ b/ql/src/test/queries/clientpositive/groupby7_noskew.q
@@ -6,20 +6,20 @@ set mapred.reduce.tasks=31;
-- SORT_QUERY_RESULTS
-CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE;
-CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE;
+CREATE TABLE DEST1_n101(key INT, value STRING) STORED AS TEXTFILE;
+CREATE TABLE DEST2_n28(key INT, value STRING) STORED AS TEXTFILE;
SET hive.exec.compress.intermediate=true;
SET hive.exec.compress.output=true;
EXPLAIN
FROM SRC
-INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key
-INSERT OVERWRITE TABLE DEST2 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key;
+INSERT OVERWRITE TABLE DEST1_n101 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key
+INSERT OVERWRITE TABLE DEST2_n28 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key;
FROM SRC
-INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key
-INSERT OVERWRITE TABLE DEST2 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key;
+INSERT OVERWRITE TABLE DEST1_n101 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key
+INSERT OVERWRITE TABLE DEST2_n28 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key;
-SELECT DEST1.* FROM DEST1;
-SELECT DEST2.* FROM DEST2;
+SELECT DEST1_n101.* FROM DEST1_n101;
+SELECT DEST2_n28.* FROM DEST2_n28;
http://git-wip-us.apache.org/repos/asf/hive/blob/38d3b8e1/ql/src/test/queries/clientpositive/groupby7_noskew_multi_single_reducer.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby7_noskew_multi_single_reducer.q b/ql/src/test/queries/clientpositive/groupby7_noskew_multi_single_reducer.q
index f8ee474..07cef3f 100644
--- a/ql/src/test/queries/clientpositive/groupby7_noskew_multi_single_reducer.q
+++ b/ql/src/test/queries/clientpositive/groupby7_noskew_multi_single_reducer.q
@@ -5,20 +5,20 @@ set mapred.reduce.tasks=31;
-- SORT_QUERY_RESULTS
-CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE;
-CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE;
+CREATE TABLE DEST1_n170(key INT, value STRING) STORED AS TEXTFILE;
+CREATE TABLE DEST2_n42(key INT, value STRING) STORED AS TEXTFILE;
SET hive.exec.compress.intermediate=true;
SET hive.exec.compress.output=true;
EXPLAIN
FROM SRC
-INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key ORDER BY SRC.key limit 10
-INSERT OVERWRITE TABLE DEST2 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key ORDER BY SRC.key limit 10;
+INSERT OVERWRITE TABLE DEST1_n170 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key ORDER BY SRC.key limit 10
+INSERT OVERWRITE TABLE DEST2_n42 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key ORDER BY SRC.key limit 10;
FROM SRC
-INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key ORDER BY SRC.key limit 10
-INSERT OVERWRITE TABLE DEST2 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key ORDER BY SRC.key limit 10;
+INSERT OVERWRITE TABLE DEST1_n170 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key ORDER BY SRC.key limit 10
+INSERT OVERWRITE TABLE DEST2_n42 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY SRC.key ORDER BY SRC.key limit 10;
-SELECT DEST1.* FROM DEST1;
-SELECT DEST2.* FROM DEST2;
+SELECT DEST1_n170.* FROM DEST1_n170;
+SELECT DEST2_n42.* FROM DEST2_n42;